@storm-software/workspace-tools 1.30.2 → 1.30.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.30.2",
+  "version": "1.30.4",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/src/executors/tsup/executor.js

@@ -18464,46 +18464,6 @@ var require_devkit = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js
-var require_get_extra_dependencies = __commonJS({
-  "node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getExtraDependencies = void 0;
-    function getExtraDependencies2(projectName, graph) {
-      const deps = /* @__PURE__ */ new Map();
-      recur(projectName);
-      function recur(currProjectName) {
-        const allDeps = graph.dependencies[currProjectName];
-        const externalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.externalNodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        const internalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.nodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        for (const externalDep of externalDeps) {
-          deps.set(externalDep.name, {
-            name: externalDep.name,
-            outputs: [],
-            node: externalDep
-          });
-        }
-        for (const internalDep of internalDeps) {
-          recur(internalDep.name);
-        }
-      }
-      return Array.from(deps.values());
-    }
-    exports.getExtraDependencies = getExtraDependencies2;
-  }
-});
-
 // node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json
 var require_package2 = __commonJS({
   "node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json"(exports, module2) {
@@ -106595,7 +106555,6 @@ __export(executor_exports, {
 module.exports = __toCommonJS(executor_exports);
 var import_esbuild_decorators = __toESM(require_src());
 var import_devkit2 = __toESM(require_devkit());
-var import_get_extra_dependencies = __toESM(require_get_extra_dependencies());
 var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -116979,6 +116938,26 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
+// packages/workspace-tools/src/utils/get-project-deps.ts
+function getExternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.externalNodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
+
 // packages/workspace-tools/src/executors/tsup/get-config.ts
 var import_devkit = __toESM(require_devkit());
 var import_tsup = __toESM(require_dist5());
@@ -117214,13 +117193,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   tsConfig,
   additionalEntryPoints,
   platform,
+  emitOnAll = true,
   ...rest
 }) {
   const entryPoints = [];
   if (rest.entry) {
     entryPoints.push(rest.entry);
   }
-  if (rest.packageAll !== false) {
+  if (emitOnAll !== false) {
     entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
   }
   if (additionalEntryPoints) {
@@ -117232,7 +117212,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(2).replaceAll("\\", "/"), "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117354,28 +117334,6 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
-    if (implicitDependencies && implicitDependencies.length > 0) {
-      options.external = implicitDependencies.reduce(
-        (ret, key) => {
-          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
-            const buildTargetName = Object.keys(
-              context.projectsConfigurations.projects[key].targets
-            ).find((name) => name.toLowerCase() === "build");
-            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
-              const packageJson = (0, import_devkit2.readJsonFile)(
-                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
-              );
-              if (packageJson?.name && !options.external.includes(packageJson.name)) {
-                ret.push(packageJson.name);
-              }
-            }
-          }
-          return ret;
-        },
-        options.external
-      );
-    }
     let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
@@ -117387,19 +117345,28 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    externalDependencies = implicitDependencies.reduce((acc, name) => {
-      const internalNode = context.projectGraph.nodes[name];
-      if (internalNode) {
-        acc.push({
-          name,
-          outputs: [],
-          node: internalNode
-        });
-      }
-      return acc;
-    }, externalDependencies);
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
+    }
     if (options.bundle === false) {
-      for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
+      for (const thirdPartyDependency of getExternalDependencies(
         context.projectName,
         context.projectGraph
       )) {
@@ -117411,7 +117378,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117435,7 +117402,7 @@ ${Object.keys(options).map(
       delete packageJson.dependencies;
       externalDependencies.forEach((entry) => {
         const packageConfig = entry.node.data;
-        if (packageConfig?.packageName && (!!(projectGraph.externalNodes[entry.node.name]?.type === "npm") || !!projectGraph.nodes[entry.node.name])) {
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
@@ -117444,6 +117411,10 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
+      });
       packageJson.type = "module";
       packageJson.exports ??= {
         ".": {
@@ -117695,7 +117666,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.packageAll ??= true;
+  options.emitOnAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

package/src/executors/tsup/get-config.js

@@ -88611,13 +88611,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   tsConfig,
   additionalEntryPoints,
   platform,
+  emitOnAll = true,
   ...rest
 }) {
   const entryPoints = [];
   if (rest.entry) {
     entryPoints.push(rest.entry);
   }
-  if (rest.packageAll !== false) {
+  if (emitOnAll !== false) {
     entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
   }
   if (additionalEntryPoints) {
@@ -88629,7 +88630,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(2).replaceAll("\\", "/"), "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);

package/src/executors/tsup/schema.d.ts

@@ -37,5 +37,5 @@ export type TsupExecutorSchema = Omit<
   splitting?: boolean;
   treeshake?: boolean;
   generatePackageJson?: boolean;
-  packageAll?: boolean;
+  emitOnAll?: boolean;
 };

package/src/executors/tsup/schema.json

@@ -71,9 +71,9 @@
       "description": "Should the source files be added to the distribution folder in an `src` directory.",
       "default": false
     },
-    "packageAll": {
+    "emitOnAll": {
       "type": "boolean",
-      "description": "Should the build run for each file contained in the package individually.",
+      "description": "Should each file contained in the package be emitted individually.",
       "default": true
     },
     "generatePackageJson": {

package/src/executors/tsup-browser/executor.js

@@ -26484,46 +26484,6 @@ var require_devkit = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js
-var require_get_extra_dependencies = __commonJS({
-  "node_modules/.pnpm/@nx+esbuild@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_esbuild@0.19._qd2wqrdgtfa7fy24o2frhwj6em/node_modules/@nx/esbuild/src/executors/esbuild/lib/get-extra-dependencies.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getExtraDependencies = void 0;
-    function getExtraDependencies2(projectName, graph) {
-      const deps = /* @__PURE__ */ new Map();
-      recur(projectName);
-      function recur(currProjectName) {
-        const allDeps = graph.dependencies[currProjectName];
-        const externalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.externalNodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        const internalDeps = allDeps.reduce((acc, node) => {
-          const found = graph.nodes[node.target];
-          if (found)
-            acc.push(found);
-          return acc;
-        }, []);
-        for (const externalDep of externalDeps) {
-          deps.set(externalDep.name, {
-            name: externalDep.name,
-            outputs: [],
-            node: externalDep
-          });
-        }
-        for (const internalDep of internalDeps) {
-          recur(internalDep.name);
-        }
-      }
-      return Array.from(deps.values());
-    }
-    exports.getExtraDependencies = getExtraDependencies2;
-  }
-});
-
 // node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json
 var require_package2 = __commonJS({
   "node_modules/.pnpm/@nx+js@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_typescript@5.2.2_verdaccio@5.27.0/node_modules/@nx/js/package.json"(exports, module2) {
@@ -110772,7 +110732,6 @@ ${commentStart} ----------------------------------------------------------------
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_esbuild_decorators = __toESM(require_src());
 var import_devkit2 = __toESM(require_devkit());
-var import_get_extra_dependencies = __toESM(require_get_extra_dependencies());
 var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -117010,6 +116969,26 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot2()
+);
+var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
+
+// packages/workspace-tools/src/utils/get-project-deps.ts
+function getExternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.externalNodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
+
 // packages/workspace-tools/src/executors/tsup/get-config.ts
 var import_devkit = __toESM(require_devkit());
 var import_tsup = __toESM(require_dist6());
@@ -117245,13 +117224,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   tsConfig,
   additionalEntryPoints,
   platform,
+  emitOnAll = true,
   ...rest
 }) {
   const entryPoints = [];
   if (rest.entry) {
     entryPoints.push(rest.entry);
   }
-  if (rest.packageAll !== false) {
+  if (emitOnAll !== false) {
     entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
   }
   if (additionalEntryPoints) {
@@ -117263,7 +117243,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(2).replaceAll("\\", "/"), "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117385,28 +117365,6 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
-    if (implicitDependencies && implicitDependencies.length > 0) {
-      options.external = implicitDependencies.reduce(
-        (ret, key) => {
-          if (Object.keys(context.projectsConfigurations.projects[key]?.targets).length > 0) {
-            const buildTargetName = Object.keys(
-              context.projectsConfigurations.projects[key].targets
-            ).find((name) => name.toLowerCase() === "build");
-            if (buildTargetName && context.projectsConfigurations.projects[key].targets[buildTargetName]?.options?.project) {
-              const packageJson = (0, import_devkit2.readJsonFile)(
-                context.projectsConfigurations.projects[key].targets[buildTargetName].options.project
-              );
-              if (packageJson?.name && !options.external.includes(packageJson.name)) {
-                ret.push(packageJson.name);
-              }
-            }
-          }
-          return ret;
-        },
-        options.external
-      );
-    }
     let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
@@ -117418,19 +117376,28 @@ ${Object.keys(options).map(
       }
       return acc;
     }, []);
-    externalDependencies = implicitDependencies.reduce((acc, name) => {
-      const internalNode = context.projectGraph.nodes[name];
-      if (internalNode) {
-        acc.push({
-          name,
-          outputs: [],
-          node: internalNode
-        });
-      }
-      return acc;
-    }, externalDependencies);
+    const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
+    const internalDependencies = [];
+    if (implicitDependencies && implicitDependencies.length > 0) {
+      options.external = implicitDependencies.reduce(
+        (ret, key) => {
+          const projectConfig = getProjectConfiguration(key);
+          if (projectConfig.targets?.build) {
+            const packageJson = (0, import_devkit2.readJsonFile)(
+              projectConfig.targets?.build.options.project
+            );
+            if (packageJson?.name && !options.external.includes(packageJson.name)) {
+              ret.push(packageJson.name);
+              internalDependencies.push(packageJson.name);
+            }
+          }
+          return ret;
+        },
+        options.external
+      );
+    }
     if (options.bundle === false) {
-      for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
+      for (const thirdPartyDependency of getExternalDependencies(
         context.projectName,
         context.projectGraph
       )) {
@@ -117442,7 +117409,7 @@ ${Object.keys(options).map(
       }
     }
     console.log(`Building with the following dependencies marked as external:
-    ${externalDependencies.map((dep) => {
+${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`);
     const prettierOptions = {
@@ -117466,7 +117433,7 @@ ${Object.keys(options).map(
       delete packageJson.dependencies;
       externalDependencies.forEach((entry) => {
         const packageConfig = entry.node.data;
-        if (packageConfig?.packageName && (!!(projectGraph.externalNodes[entry.node.name]?.type === "npm") || !!projectGraph.nodes[entry.node.name])) {
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
@@ -117475,6 +117442,10 @@ ${Object.keys(options).map(
           packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
         }
       });
+      internalDependencies.forEach((packageName) => {
+        packageJson.dependencies ??= {};
+        packageJson.dependencies[packageName] = "latest";
+      });
       packageJson.type = "module";
       packageJson.exports ??= {
         ".": {
@@ -117726,7 +117697,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
-  options.packageAll ??= true;
+  options.emitOnAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;