fix(tools-nx-forecast): Resolved module loading issues during executors

storm-software · Sep 29, 2023 · d83806d · d83806d
1 parent 32a9806
commit d83806d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'java', 'javascript' ]
+        language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both

diff --git a/libs/contact/typescript/server/attachment/project.json b/libs/contact/typescript/server/attachment/project.json
@@ -45,7 +45,7 @@
       }
     },
     "generate": {
-      "executor": "@stormstack/tools-nx-forecast:generate",
+      "executor": "@stormstack/tools-nx-forecast:project-generate",
       "options": {
         "outputPath": "libs/contact/typescript/server/attachment/src/__generated__",
         "schema": "schema.4cast",

diff --git a/tools/nx/forecast/executors.json b/tools/nx/forecast/executors.json
@@ -1,12 +1,9 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "name": "@stormstack/tools-nx-forecast",
-  "version": "0.0.1",
   "executors": {
-    "generate": {
-      "implementation": "../../../dist/tools/nx/forecast/src/executors/generate/impl",
-      "schema": "../../../dist/tools/nx/forecast/src/executors/generate/schema.json",
-      "description": "Generate code based on a provided Forecast model."
+    "project-generate": {
+      "implementation": "../../../dist/tools/nx/forecast/src/executors/project-generate/impl",
+      "schema": "../../../dist/tools/nx/forecast/src/executors/project-generate/schema.json",
+      "description": "⚡ Generate code for a specific project based on a provided Forecast model schema"
     }
   }
 }
diff --git a/tools/nx/forecast/generators.json b/tools/nx/forecast/generators.json
@@ -1,7 +1,4 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "name": "@stormstack/tools-nx-forecast",
-  "version": "0.0.1",
   "generators": {
     "generate": {
       "implementation": "../../../dist/tools/nx/forecast/src/generators/generate/impl",

diff --git a/tools/nx/forecast/package.json b/tools/nx/forecast/package.json
@@ -7,6 +7,6 @@
     "@nx/devkit": "16.7.0",
     "fs-extra": "^11.1.1"
   },
-  "builders": "./executors.json",
-  "schematics": "./generators.json"
+  "executors": "./executors.json",
+  "generators": "./generators.json"
 }
diff --git a/tools/nx/forecast/project.json b/tools/nx/forecast/project.json
@@ -13,7 +13,7 @@
         "project": "tools/nx/forecast/package.json",
         "main": "tools/nx/forecast/index.ts",
         "additionalEntryPoints": [
-          "tools/nx/forecast/src/executors/generate/impl.ts",
+          "tools/nx/forecast/src/executors/project-generate/impl.ts",
           "tools/nx/forecast/src/generators/generate/impl.ts"
         ],
         "deleteOutputPath": true,

diff --git a/...x/forecast/src/executors/generate/impl.ts → ...st/src/executors/project-generate/impl.ts b/...x/forecast/src/executors/generate/impl.ts → ...st/src/executors/project-generate/impl.ts
diff --git a/...recast/src/executors/generate/schema.d.ts → ...rc/executors/project-generate/schema.d.ts b/...recast/src/executors/generate/schema.d.ts → ...rc/executors/project-generate/schema.d.ts
diff --git a/...recast/src/executors/generate/schema.json → ...rc/executors/project-generate/schema.json b/...recast/src/executors/generate/schema.json → ...rc/executors/project-generate/schema.json
@@ -1,9 +1,9 @@
 {
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
-  "id": "generate",
-  "title": "StormStack - Forecast Generate (Executor)",
-  "description": "⚡ Generate code based on a provided Forecast model schema",
+  "id": "project-generate",
+  "title": "StormStack - Forecast Project Generate (Executor)",
+  "description": "⚡ Generate code for a specific project based on a provided Forecast model schema",
   "type": "object",
   "properties": {
     "schema": {