@storm-software/workspace-tools 1.7.21 → 1.7.22

package/package.json

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

@@ -408390,9 +408390,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js
 var require_chunk_NSPLMNA4 = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "7.2.0";
@@ -410039,9 +410039,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js
 var require_chunk_B7UJSB4N = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -410255,9 +410255,9 @@ var require_chunk_B7UJSB4N = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js
 var require_chunk_GEVDEBBW = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -411191,9 +411191,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js
 var require_chunk_52KWB5QB = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -470479,9 +470479,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -472070,27 +472070,23 @@ var require_dist5 = __commonJS({
       let pkgPath = options.outDir ? options.outDir : process.cwd();
       logger.info(format2, `\u26A1 Preparing to run ESBuild: ${pkgPath}`);
       if (pkgPath) {
-        const splits = pkgPath.split(_path2.default.sep);
+        const splits = pkgPath.split("/");
         if (splits.length > 0) {
-          let pkgPathIndex = -1;
-          for (let i = splits.length - 1; i > 0 && pkgPathIndex < 0; i--) {
+          for (let i = 0; i < splits.length - 1; i++) {
             const packageJsonPath = _path2.default.join(
               splits.slice(
                 0,
                 splits.length - i
-              ).join(_path2.default.sep),
+              ).join("/"),
               "package.json"
             );
             logger.info(format2, `\u26A1 Searching for package.json file in ${packageJsonPath} (index: ${i})`);
             if (_fs2.default.existsSync(packageJsonPath)) {
               logger.info(format2, `\u26A1 Found the package.json file in ${packageJsonPath} (index: ${i})`);
-              pkgPathIndex = i;
+              pkgPath = packageJsonPath.replace("package.json", "");
+              break;
             }
           }
-          logger.info(format2, `\u26A1 Package path index: ${pkgPathIndex}`);
-          if (pkgPathIndex) {
-            pkgPath = splits.slice(0, pkgPathIndex).join(_path2.default.sep);
-          }
         }
       }
       logger.info(format2, `\u26A1 Running ESBuild: ${pkgPath}`);
@@ -479182,6 +479178,7 @@ function modernConfig({
   external,
   banner = {},
   platform = "node",
+  verbose = false,
   options
 }) {
   return {
@@ -479199,7 +479196,7 @@ function modernConfig({
     ] : ["esnext", "node18"],
     tsconfig,
     outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "modern"),
-    silent: false,
+    silent: !verbose,
     metafile: true,
     shims: true,
     minify: false,
@@ -479220,6 +479217,7 @@ function legacyConfig({
   external,
   banner = {},
   platform = "node",
+  verbose = false,
   options
 }) {
   return {
@@ -479229,7 +479227,7 @@ function legacyConfig({
     target: ["es2022", "node18"],
     tsconfig,
     outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy"),
-    silent: false,
+    silent: !verbose,
     metafile: true,
     shims: true,
     minify: false,
@@ -479250,7 +479248,8 @@ function getConfig(sourceRoot, {
   platform,
   external,
   options,
-  additionalEntryPoints
+  additionalEntryPoints,
+  verbose
 }) {
   const entry = globSync(
     [
@@ -479275,6 +479274,7 @@ function getConfig(sourceRoot, {
       banner,
       platform,
       external,
+      verbose,
       options
     }),
     legacyConfig({
@@ -479285,6 +479285,7 @@ function getConfig(sourceRoot, {
       banner,
       platform,
       external,
+      verbose,
       options
     })
   ]);
@@ -479315,7 +479316,12 @@ var outExtension = ({ options, format: format2, pkgType }) => {
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function runExecutor(options, context) {
   try {
-    console.log("\u{1F4E6}  Running build executor on the workspace");
+    console.log("\u{1F4E6}  Running Storm build executor on the workspace");
+    options.verbose && console.log(
+      `\u2699\uFE0F  Executor options:
+${Object.keys(options).map((key) => ({ [key]: options[key] })).join("\n")}
+`
+    );
     if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
       throw new Error(
         "The Build process failed because the context is not valid. Please run this command from a workspace."
@@ -479329,7 +479335,7 @@ async function runExecutor(options, context) {
       context
     );
     if (options.clean !== false) {
-      console.log("\u{1F9F9} Cleaning output path");
+      console.log(`\u{1F9F9} Cleaning output path: ${outputPath}`);
       (0, import_fs_extra.removeSync)(outputPath);
     }
     const assets = Array.from(options.assets);
@@ -479367,6 +479373,10 @@ async function runExecutor(options, context) {
       }
       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")}`);
     if (!options.bundle) {
       for (const thirdPartyDependency of (0, import_get_extra_dependencies.getExtraDependencies)(
         context.projectName,
@@ -479496,7 +479506,7 @@ ${(0, import_fs2.readFileSync)(file, "utf-8")}`,
     });
     const config = getConfig(sourceRoot, {
       ...options,
-      banner: { js: `// ${banner}`, css: `/* ${banner} */` },
+      banner: banner ? { js: `// ${banner}`, css: `/* ${banner} */` } : void 0,
       outputPath
     });
     if (typeof config === "function") {
@@ -479516,7 +479526,7 @@ ${(0, import_fs2.readFileSync)(file, "utf-8")}`,
   }
 }
 var build = async (options) => {
-  console.log("\u2699\uFE0F  Tsup build config: \n", options);
+  Array.isArray(options) ? options.length > 0 ? options[0].silent : false : options.silent && console.log("\u2699\uFE0F  Tsup build config: \n", options, "\n");
   if (Array.isArray(options)) {
     await Promise.all(options.map((buildOptions) => (0, import_tsup2.build)(buildOptions)));
   } else {

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

@@ -18383,9 +18383,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js
 var require_chunk_NSPLMNA4 = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-NSPLMNA4.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "7.2.0";
@@ -24319,9 +24319,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js
 var require_chunk_B7UJSB4N = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-B7UJSB4N.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -24535,9 +24535,9 @@ var require_chunk_B7UJSB4N = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js
 var require_chunk_GEVDEBBW = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-GEVDEBBW.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -25471,9 +25471,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js
 var require_chunk_52KWB5QB = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/chunk-52KWB5QB.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -87142,9 +87142,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@7.2.0_patch_hash=36if3rnyedgwbeoukxouep2kf4_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@7.2.0_patch_hash=gr2wsdlapo7vwpir5qk7uoa264_@swc+core@1.3.96_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -88733,27 +88733,23 @@ var require_dist5 = __commonJS({
       let pkgPath = options.outDir ? options.outDir : process.cwd();
       logger.info(format, `\u26A1 Preparing to run ESBuild: ${pkgPath}`);
       if (pkgPath) {
-        const splits = pkgPath.split(_path2.default.sep);
+        const splits = pkgPath.split("/");
         if (splits.length > 0) {
-          let pkgPathIndex = -1;
-          for (let i = splits.length - 1; i > 0 && pkgPathIndex < 0; i--) {
+          for (let i = 0; i < splits.length - 1; i++) {
             const packageJsonPath = _path2.default.join(
               splits.slice(
                 0,
                 splits.length - i
-              ).join(_path2.default.sep),
+              ).join("/"),
               "package.json"
             );
             logger.info(format, `\u26A1 Searching for package.json file in ${packageJsonPath} (index: ${i})`);
             if (_fs2.default.existsSync(packageJsonPath)) {
               logger.info(format, `\u26A1 Found the package.json file in ${packageJsonPath} (index: ${i})`);
-              pkgPathIndex = i;
+              pkgPath = packageJsonPath.replace("package.json", "");
+              break;
             }
           }
-          logger.info(format, `\u26A1 Package path index: ${pkgPathIndex}`);
-          if (pkgPathIndex) {
-            pkgPath = splits.slice(0, pkgPathIndex).join(_path2.default.sep);
-          }
         }
       }
       logger.info(format, `\u26A1 Running ESBuild: ${pkgPath}`);
@@ -95790,6 +95786,7 @@ function modernConfig({
   external,
   banner = {},
   platform = "node",
+  verbose = false,
   options
 }) {
   return {
@@ -95807,7 +95804,7 @@ function modernConfig({
     ] : ["esnext", "node18"],
     tsconfig,
     outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "modern"),
-    silent: false,
+    silent: !verbose,
     metafile: true,
     shims: true,
     minify: false,
@@ -95828,6 +95825,7 @@ function legacyConfig({
   external,
   banner = {},
   platform = "node",
+  verbose = false,
   options
 }) {
   return {
@@ -95837,7 +95835,7 @@ function legacyConfig({
     target: ["es2022", "node18"],
     tsconfig,
     outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy"),
-    silent: false,
+    silent: !verbose,
     metafile: true,
     shims: true,
     minify: false,
@@ -95858,7 +95856,8 @@ function getConfig(sourceRoot, {
   platform,
   external,
   options,
-  additionalEntryPoints
+  additionalEntryPoints,
+  verbose
 }) {
   const entry = globSync(
     [
@@ -95883,6 +95882,7 @@ function getConfig(sourceRoot, {
       banner,
       platform,
       external,
+      verbose,
       options
     }),
     legacyConfig({
@@ -95893,6 +95893,7 @@ function getConfig(sourceRoot, {
       banner,
       platform,
       external,
+      verbose,
       options
     })
   ]);

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

@@ -20,4 +20,5 @@ export type TsupExecutorSchema = Omit<
   clean: boolean;
   debug: boolean;
   banner?: string;
+  verbose: boolean;
 };

package/src/executors/tsup/schema.json

@@ -76,6 +76,11 @@
         "description": "A short heading added to the top of each typescript file added in the output folder's src directory.",
         "default": "This code was developed by Storm Software (https://stormsoftware.org) and is licensed under the Apache License 2.0."
       },
+      "verbose": {
+        "type": "boolean",
+        "description": "Should write extra log outputs with details from the executor.",
+        "default": false
+      },
       "options": {
         "type": "object",
         "description": "Additional options to pass to tsup. See https://paka.dev/npm/tsup@7.2.0/api#d35d54aca71eb26e.",