@storm-software/workspace-tools 1.50.3 → 1.50.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.50.3",
+  "version": "1.50.5",
   "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

@@ -115224,16 +115224,35 @@ var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrie
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(getWorkspaceRoot());
 
 // 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) => {
+function getExtraDependencies(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());
 }
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
@@ -115545,7 +115564,7 @@ var build = async (options, config) => {
     writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
-${_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
+${!_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
         (key) => `${key}: ${!tsupOptions[key] || _isPrimitive(tsupOptions[key]) ? tsupOptions[key] : _isFunction2(tsupOptions[key]) ? "<function>" : JSON.stringify(tsupOptions[key])}`
       ).join("\n") : "<function>"}
 `
@@ -115687,7 +115706,7 @@ ${Object.keys(options).map(
       return ret;
     }, options.external);
   }
-  for (const thirdPartyDependency of getExternalDependencies(
+  for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
   )) {
@@ -115695,7 +115714,7 @@ ${Object.keys(options).map(
     if (packageConfig?.packageName && config?.externalPackagePatterns?.some(
       (pattern) => packageConfig.packageName.includes(pattern)
     ) && !externalDependencies?.some(
-      (externalDependency) => externalDependency.name.includes(packageConfig.packageName)
+      (externalDependency) => externalDependency.name === packageConfig.packageName
     )) {
       externalDependencies.push(thirdPartyDependency);
     }
@@ -115725,6 +115744,9 @@ ${externalDependencies.map((dep) => {
   if (options.entry) {
     entryPoints.push(options.entry);
   }
+  if (options.additionalEntryPoints) {
+    entryPoints.push(...options.additionalEntryPoints);
+  }
   if (options.emitOnAll === true) {
     entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
@@ -115752,9 +115774,6 @@ ${externalDependencies.map((dep) => {
       return ret;
     }, entryPoints);
   }
-  if (options.additionalEntryPoints) {
-    entryPoints.push(...options.additionalEntryPoints);
-  }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
@@ -115892,7 +115911,7 @@ ${(0, import_node_fs5.readFileSync)(file, "utf-8")}`,
       )
     );
   }
-  await Promise.all(
+  await Promise.allSettled(
     entryPoints.map(
       (entryPoint) => runTsupBuild(
         {

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

@@ -109373,7 +109373,7 @@ var build = async (options, config) => {
     writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
-${_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
+${!_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
         (key) => `${key}: ${!tsupOptions[key] || _isPrimitive(tsupOptions[key]) ? tsupOptions[key] : _isFunction2(tsupOptions[key]) ? "<function>" : JSON.stringify(tsupOptions[key])}`
       ).join("\n") : "<function>"}
 `
@@ -115598,16 +115598,35 @@ var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrie
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(getWorkspaceRoot());
 
 // 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) => {
+function getExtraDependencies(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());
 }
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
@@ -115717,7 +115736,7 @@ ${Object.keys(options).map(
       return ret;
     }, options.external);
   }
-  for (const thirdPartyDependency of getExternalDependencies(
+  for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
   )) {
@@ -115725,7 +115744,7 @@ ${Object.keys(options).map(
     if (packageConfig?.packageName && config?.externalPackagePatterns?.some(
       (pattern) => packageConfig.packageName.includes(pattern)
     ) && !externalDependencies?.some(
-      (externalDependency) => externalDependency.name.includes(packageConfig.packageName)
+      (externalDependency) => externalDependency.name === packageConfig.packageName
     )) {
       externalDependencies.push(thirdPartyDependency);
     }
@@ -115755,6 +115774,9 @@ ${externalDependencies.map((dep) => {
   if (options.entry) {
     entryPoints.push(options.entry);
   }
+  if (options.additionalEntryPoints) {
+    entryPoints.push(...options.additionalEntryPoints);
+  }
   if (options.emitOnAll === true) {
     entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
@@ -115782,9 +115804,6 @@ ${externalDependencies.map((dep) => {
       return ret;
     }, entryPoints);
   }
-  if (options.additionalEntryPoints) {
-    entryPoints.push(...options.additionalEntryPoints);
-  }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
@@ -115922,7 +115941,7 @@ ${(0, import_node_fs5.readFileSync)(file, "utf-8")}`,
       )
     );
   }
-  await Promise.all(
+  await Promise.allSettled(
     entryPoints.map(
       (entryPoint) => runTsupBuild(
         {

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

@@ -109373,7 +109373,7 @@ var build = async (options, config) => {
     writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
-${_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
+${!_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
         (key) => `${key}: ${!tsupOptions[key] || _isPrimitive(tsupOptions[key]) ? tsupOptions[key] : _isFunction2(tsupOptions[key]) ? "<function>" : JSON.stringify(tsupOptions[key])}`
       ).join("\n") : "<function>"}
 `
@@ -115598,16 +115598,35 @@ var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrie
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(getWorkspaceRoot());
 
 // 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) => {
+function getExtraDependencies(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());
 }
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
@@ -115717,7 +115736,7 @@ ${Object.keys(options).map(
       return ret;
     }, options.external);
   }
-  for (const thirdPartyDependency of getExternalDependencies(
+  for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
   )) {
@@ -115725,7 +115744,7 @@ ${Object.keys(options).map(
     if (packageConfig?.packageName && config?.externalPackagePatterns?.some(
       (pattern) => packageConfig.packageName.includes(pattern)
     ) && !externalDependencies?.some(
-      (externalDependency) => externalDependency.name.includes(packageConfig.packageName)
+      (externalDependency) => externalDependency.name === packageConfig.packageName
     )) {
       externalDependencies.push(thirdPartyDependency);
     }
@@ -115755,6 +115774,9 @@ ${externalDependencies.map((dep) => {
   if (options.entry) {
     entryPoints.push(options.entry);
   }
+  if (options.additionalEntryPoints) {
+    entryPoints.push(...options.additionalEntryPoints);
+  }
   if (options.emitOnAll === true) {
     entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
@@ -115782,9 +115804,6 @@ ${externalDependencies.map((dep) => {
       return ret;
     }, entryPoints);
   }
-  if (options.additionalEntryPoints) {
-    entryPoints.push(...options.additionalEntryPoints);
-  }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
@@ -115922,7 +115941,7 @@ ${(0, import_node_fs5.readFileSync)(file, "utf-8")}`,
       )
     );
   }
-  await Promise.all(
+  await Promise.allSettled(
     entryPoints.map(
       (entryPoint) => runTsupBuild(
         {

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

@@ -109373,7 +109373,7 @@ var build = async (options, config) => {
     writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
-${_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
+${!_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
         (key) => `${key}: ${!tsupOptions[key] || _isPrimitive(tsupOptions[key]) ? tsupOptions[key] : _isFunction2(tsupOptions[key]) ? "<function>" : JSON.stringify(tsupOptions[key])}`
       ).join("\n") : "<function>"}
 `
@@ -115598,16 +115598,35 @@ var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrie
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(getWorkspaceRoot());
 
 // 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) => {
+function getExtraDependencies(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());
 }
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
@@ -115717,7 +115736,7 @@ ${Object.keys(options).map(
       return ret;
     }, options.external);
   }
-  for (const thirdPartyDependency of getExternalDependencies(
+  for (const thirdPartyDependency of getExtraDependencies(
     context.projectName,
     context.projectGraph
   )) {
@@ -115725,7 +115744,7 @@ ${Object.keys(options).map(
     if (packageConfig?.packageName && config?.externalPackagePatterns?.some(
       (pattern) => packageConfig.packageName.includes(pattern)
     ) && !externalDependencies?.some(
-      (externalDependency) => externalDependency.name.includes(packageConfig.packageName)
+      (externalDependency) => externalDependency.name === packageConfig.packageName
     )) {
       externalDependencies.push(thirdPartyDependency);
     }
@@ -115755,6 +115774,9 @@ ${externalDependencies.map((dep) => {
   if (options.entry) {
     entryPoints.push(options.entry);
   }
+  if (options.additionalEntryPoints) {
+    entryPoints.push(...options.additionalEntryPoints);
+  }
   if (options.emitOnAll === true) {
     entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
@@ -115782,9 +115804,6 @@ ${externalDependencies.map((dep) => {
       return ret;
     }, entryPoints);
   }
-  if (options.additionalEntryPoints) {
-    entryPoints.push(...options.additionalEntryPoints);
-  }
   if (options.generatePackageJson !== false) {
     const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
     packageJson.dependencies = void 0;
@@ -115922,7 +115941,7 @@ ${(0, import_node_fs5.readFileSync)(file, "utf-8")}`,
       )
     );
   }
-  await Promise.all(
+  await Promise.allSettled(
     entryPoints.map(
       (entryPoint) => runTsupBuild(
         {

package/src/utils/index.js

@@ -119532,7 +119532,7 @@ var build = async (options, config) => {
     writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
-${_isFunction(tsupOptions) ? Object.keys(tsupOptions).map(
+${!_isFunction(tsupOptions) ? Object.keys(tsupOptions).map(
         (key) => `${key}: ${!tsupOptions[key] || _isPrimitive(tsupOptions[key]) ? tsupOptions[key] : _isFunction(tsupOptions[key]) ? "<function>" : JSON.stringify(tsupOptions[key])}`
       ).join("\n") : "<function>"}
 `