@storm-software/workspace-tools 1.29.0 → 1.30.1

package/package.json

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

@@ -117216,22 +117216,23 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   platform,
   ...rest
 }) {
-  const entry = globSync(
-    [
-      rest.entry ? rest.entry : (0, import_devkit.joinPathFragments)(
-        sourceRoot.includes(workspaceRoot) ? sourceRoot : (0, import_devkit.joinPathFragments)(workspaceRoot, sourceRoot),
-        "**/*.{ts,tsx}"
-      ),
-      ...additionalEntryPoints ?? []
-    ],
-    {
-      withFileTypes: true
-    }
-  ).reduce((ret, filePath) => {
+  const entryPoints = [];
+  if (rest.entry) {
+    entryPoints.push(rest.entry);
+  }
+  if (rest.packageAll !== false) {
+    entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+  }
+  if (additionalEntryPoints) {
+    entryPoints.push(...additionalEntryPoints);
+  }
+  const entry = globSync(entryPoints, {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117357,16 +117358,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          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;
@@ -117374,7 +117376,7 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const externalDependencies = options.external.reduce((acc, name) => {
+    let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
         acc.push({
@@ -117382,22 +117384,20 @@ ${Object.keys(options).map(
           outputs: [],
           node: externalNode
         });
-      } else {
-        const workspaceNode = context.projectGraph.nodes[name];
-        if (workspaceNode) {
-          acc.push({
-            name,
-            outputs: [],
-            node: workspaceNode
-          });
-        }
       }
       return acc;
     }, []);
-    options.verbose && console.log(`Added the following external dependencies:
-${externalDependencies.map((dep) => {
-      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
-    }).join("\n")}`);
+    externalDependencies = implicitDependencies.reduce((acc, name) => {
+      const internalNode = context.projectGraph.nodes[name];
+      if (internalNode) {
+        acc.push({
+          name,
+          outputs: [],
+          node: internalNode
+        });
+      }
+      return acc;
+    }, externalDependencies);
     if (options.bundle === false) {
       for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
         context.projectName,
@@ -117410,6 +117410,10 @@ ${externalDependencies.map((dep) => {
         }
       }
     }
+    console.log(`Building with the following dependencies marked as external:
+    ${externalDependencies.map((dep) => {
+      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
+    }).join("\n")}`);
     const prettierOptions = {
       plugins: ["prettier-plugin-packagejson"],
       trailingComma: "none",
@@ -117452,20 +117456,20 @@ ${externalDependencies.map((dep) => {
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117691,6 +117695,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
+  options.packageAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

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

@@ -88613,22 +88613,23 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   platform,
   ...rest
 }) {
-  const entry = globSync(
-    [
-      rest.entry ? rest.entry : (0, import_devkit.joinPathFragments)(
-        sourceRoot.includes(workspaceRoot) ? sourceRoot : (0, import_devkit.joinPathFragments)(workspaceRoot, sourceRoot),
-        "**/*.{ts,tsx}"
-      ),
-      ...additionalEntryPoints ?? []
-    ],
-    {
-      withFileTypes: true
-    }
-  ).reduce((ret, filePath) => {
+  const entryPoints = [];
+  if (rest.entry) {
+    entryPoints.push(rest.entry);
+  }
+  if (rest.packageAll !== false) {
+    entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+  }
+  if (additionalEntryPoints) {
+    entryPoints.push(...additionalEntryPoints);
+  }
+  const entry = globSync(entryPoints, {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);

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

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

package/src/executors/tsup/schema.json

@@ -71,6 +71,11 @@
       "description": "Should the source files be added to the distribution folder in an `src` directory.",
       "default": false
     },
+    "packageAll": {
+      "type": "boolean",
+      "description": "Should the build run for each file contained in the package individually.",
+      "default": true
+    },
     "generatePackageJson": {
       "type": "boolean",
       "description": "Should a package.json file be generated in the output folder or should the existing one be copied in.",

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

@@ -117247,22 +117247,23 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   platform,
   ...rest
 }) {
-  const entry = globSync(
-    [
-      rest.entry ? rest.entry : (0, import_devkit.joinPathFragments)(
-        sourceRoot.includes(workspaceRoot) ? sourceRoot : (0, import_devkit.joinPathFragments)(workspaceRoot, sourceRoot),
-        "**/*.{ts,tsx}"
-      ),
-      ...additionalEntryPoints ?? []
-    ],
-    {
-      withFileTypes: true
-    }
-  ).reduce((ret, filePath) => {
+  const entryPoints = [];
+  if (rest.entry) {
+    entryPoints.push(rest.entry);
+  }
+  if (rest.packageAll !== false) {
+    entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+  }
+  if (additionalEntryPoints) {
+    entryPoints.push(...additionalEntryPoints);
+  }
+  const entry = globSync(entryPoints, {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117388,16 +117389,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          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;
@@ -117405,7 +117407,7 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const externalDependencies = options.external.reduce((acc, name) => {
+    let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
         acc.push({
@@ -117413,22 +117415,20 @@ ${Object.keys(options).map(
           outputs: [],
           node: externalNode
         });
-      } else {
-        const workspaceNode = context.projectGraph.nodes[name];
-        if (workspaceNode) {
-          acc.push({
-            name,
-            outputs: [],
-            node: workspaceNode
-          });
-        }
       }
       return acc;
     }, []);
-    options.verbose && console.log(`Added the following external dependencies:
-${externalDependencies.map((dep) => {
-      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
-    }).join("\n")}`);
+    externalDependencies = implicitDependencies.reduce((acc, name) => {
+      const internalNode = context.projectGraph.nodes[name];
+      if (internalNode) {
+        acc.push({
+          name,
+          outputs: [],
+          node: internalNode
+        });
+      }
+      return acc;
+    }, externalDependencies);
     if (options.bundle === false) {
       for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
         context.projectName,
@@ -117441,6 +117441,10 @@ ${externalDependencies.map((dep) => {
         }
       }
     }
+    console.log(`Building with the following dependencies marked as external:
+    ${externalDependencies.map((dep) => {
+      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
+    }).join("\n")}`);
     const prettierOptions = {
       plugins: ["prettier-plugin-packagejson"],
       trailingComma: "none",
@@ -117483,20 +117487,20 @@ ${externalDependencies.map((dep) => {
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117722,6 +117726,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
+  options.packageAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;

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

@@ -117247,22 +117247,23 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   platform,
   ...rest
 }) {
-  const entry = globSync(
-    [
-      rest.entry ? rest.entry : (0, import_devkit.joinPathFragments)(
-        sourceRoot.includes(workspaceRoot) ? sourceRoot : (0, import_devkit.joinPathFragments)(workspaceRoot, sourceRoot),
-        "**/*.{ts,tsx}"
-      ),
-      ...additionalEntryPoints ?? []
-    ],
-    {
-      withFileTypes: true
-    }
-  ).reduce((ret, filePath) => {
+  const entryPoints = [];
+  if (rest.entry) {
+    entryPoints.push(rest.entry);
+  }
+  if (rest.packageAll !== false) {
+    entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+  }
+  if (additionalEntryPoints) {
+    entryPoints.push(...additionalEntryPoints);
+  }
+  const entry = globSync(entryPoints, {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     let propertyKey = (0, import_devkit.joinPathFragments)(
       filePath.path,
       removeExtension(filePath.name)
-    ).replaceAll(workspaceRoot, "").replaceAll("\\", "/").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+    ).replaceAll("\\", "/").replaceAll(workspaceRoot.substring(1).replaceAll("\\", "/"), "").replaceAll(sourceRoot.replaceAll("\\", "/"), "").replaceAll(projectRoot.replaceAll("\\", "/"), "");
     if (propertyKey) {
       while (propertyKey.startsWith("/")) {
         propertyKey = propertyKey.substring(1);
@@ -117388,16 +117389,17 @@ ${Object.keys(options).map(
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce(
         (ret, key) => {
-          if (context.projectsConfigurations.projects[key].root) {
-            const packageJson = (0, import_devkit2.readJsonFile)(
-              (0, import_path3.join)(
-                context.root,
-                context.projectsConfigurations.projects[key].root,
-                "package.json"
-              )
-            );
-            if (packageJson.name && !options.external.includes(packageJson.name)) {
-              ret.push(packageJson.name);
+          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;
@@ -117405,7 +117407,7 @@ ${Object.keys(options).map(
         options.external
       );
     }
-    const externalDependencies = options.external.reduce((acc, name) => {
+    let externalDependencies = options.external.reduce((acc, name) => {
       const externalNode = context.projectGraph.externalNodes[`npm:${name}`];
       if (externalNode) {
         acc.push({
@@ -117413,22 +117415,20 @@ ${Object.keys(options).map(
           outputs: [],
           node: externalNode
         });
-      } else {
-        const workspaceNode = context.projectGraph.nodes[name];
-        if (workspaceNode) {
-          acc.push({
-            name,
-            outputs: [],
-            node: workspaceNode
-          });
-        }
       }
       return acc;
     }, []);
-    options.verbose && console.log(`Added the following external dependencies:
-${externalDependencies.map((dep) => {
-      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
-    }).join("\n")}`);
+    externalDependencies = implicitDependencies.reduce((acc, name) => {
+      const internalNode = context.projectGraph.nodes[name];
+      if (internalNode) {
+        acc.push({
+          name,
+          outputs: [],
+          node: internalNode
+        });
+      }
+      return acc;
+    }, externalDependencies);
     if (options.bundle === false) {
       for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
         context.projectName,
@@ -117441,6 +117441,10 @@ ${externalDependencies.map((dep) => {
         }
       }
     }
+    console.log(`Building with the following dependencies marked as external:
+    ${externalDependencies.map((dep) => {
+      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
+    }).join("\n")}`);
     const prettierOptions = {
       plugins: ["prettier-plugin-packagejson"],
       trailingComma: "none",
@@ -117483,20 +117487,20 @@ ${externalDependencies.map((dep) => {
             default: "./dist/modern/index.cjs"
           },
           default: {
-            types: "./dist/modern/**/*.d.ts",
-            default: "./dist/modern/**/*.js"
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
           },
           "./*": {
             "import": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             },
             require: {
-              types: "./dist/modern/**/*.d.cts",
+              types: "./dist/modern/index.d.cts",
               default: "./dist/modern/**/*.cjs"
             },
             "default": {
-              types: "./dist/modern/**/*.d.ts",
+              types: "./dist/modern/index.d.ts",
               default: "./dist/modern/**/*.js"
             }
           },
@@ -117722,6 +117726,7 @@ var applyDefaultOptions = (options) => {
   options.apiReport ??= true;
   options.docModel ??= true;
   options.tsdocMetadata ??= true;
+  options.packageAll ??= true;
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;