From d83806d05de1c71c376209a4f2ac9ac25521534f Mon Sep 17 00:00:00 2001
From: Patrick Sullivan <patrick.joseph.sullivan@protonmail.com>
Date: Fri, 29 Sep 2023 18:27:36 -0400
Subject: [PATCH] fix(tools-nx-forecast): Resolved module loading issues during
 executors

---
 .github/workflows/codeql.yml                          |  2 +-
 .../contact/typescript/server/attachment/project.json |  2 +-
 tools/nx/forecast/executors.json                      | 11 ++++-------
 tools/nx/forecast/generators.json                     |  3 ---
 tools/nx/forecast/package.json                        |  4 ++--
 tools/nx/forecast/project.json                        |  2 +-
 .../executors/{generate => project-generate}/impl.ts  |  0
 .../{generate => project-generate}/schema.d.ts        |  0
 .../{generate => project-generate}/schema.json        |  6 +++---
 9 files changed, 12 insertions(+), 18 deletions(-)
 rename tools/nx/forecast/src/executors/{generate => project-generate}/impl.ts (100%)
 rename tools/nx/forecast/src/executors/{generate => project-generate}/schema.d.ts (100%)
 rename tools/nx/forecast/src/executors/{generate => project-generate}/schema.json (82%)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index db2aeca5..7b92cac6 100644
--- 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
index 8e0cf6b1..43a227a8 100644
--- 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
index a8d205da..d279687d 100644
--- 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
index e3e6c60e..61e5b279 100644
--- 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
index 143e23d2..9f4553ad 100644
--- 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
index 44a9c600..bfe46807 100644
--- 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/tools/nx/forecast/src/executors/generate/impl.ts b/tools/nx/forecast/src/executors/project-generate/impl.ts
similarity index 100%
rename from tools/nx/forecast/src/executors/generate/impl.ts
rename to tools/nx/forecast/src/executors/project-generate/impl.ts
diff --git a/tools/nx/forecast/src/executors/generate/schema.d.ts b/tools/nx/forecast/src/executors/project-generate/schema.d.ts
similarity index 100%
rename from tools/nx/forecast/src/executors/generate/schema.d.ts
rename to tools/nx/forecast/src/executors/project-generate/schema.d.ts
diff --git a/tools/nx/forecast/src/executors/generate/schema.json b/tools/nx/forecast/src/executors/project-generate/schema.json
similarity index 82%
rename from tools/nx/forecast/src/executors/generate/schema.json
rename to tools/nx/forecast/src/executors/project-generate/schema.json
index f3e21ec5..2226512d 100644
--- a/tools/nx/forecast/src/executors/generate/schema.json
+++ b/tools/nx/forecast/src/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": {