@storm-software/workspace-tools 1.9.0 → 1.10.1

package/package.json

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

@@ -408390,9 +408390,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -410039,9 +410039,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -410320,9 +410320,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -411256,9 +411256,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -465064,9 +465064,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -467515,6 +467515,7 @@ var require_dist5 = __commonJS({
       }
       const apiReferenceProjectDir = _path2.default.join(
         "<projectFolder>",
+        pkgPath,
         "api-reports"
       );
       let configObject = {
@@ -467541,10 +467542,12 @@ var require_dist5 = __commonJS({
           untrimmedFilePath: outputFilePath,
           betaTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
+            options.outDir,
             `index-beta.d.ts`
           ),
           publicTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
+            options.outDir,
             `index-public.d.ts`
           )
         },
@@ -467556,18 +467559,19 @@ var require_dist5 = __commonJS({
           )
         },
         compiler: {
-          tsconfigFilePath
+          tsconfigFilePath: _path2.default.join(
+            "<projectFolder>",
+            tsconfigFilePath.replace(options.workspaceRoot, "")
+          )
         },
-        projectFolder: _path2.default.join(
-          options.workspaceRoot,
-          pkgPath
-        )
+        projectFolder: _path2.default.join("..", "..", "..", "..", "..", "..")
       };
       const prepareOptions = {
         configObject,
         configObjectFullPath: void 0,
         packageJsonFullPath
       };
+      logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
       logger2.info("dts", "\u26A1 Running API Extractor with the following config: \n", prepareOptions);
       const imported = _chunkGQ77QZBOjs.getApiExtractor.call(void 0);
       if (!imported) {
@@ -467598,10 +467602,11 @@ var require_dist5 = __commonJS({
       let dtsExtension = _chunkGQ77QZBOjs.defaultOutExtension.call(void 0, { format: format2, pkgType: pkg.type }).dts;
       let dtsInputFilePath = _path2.default.join(
         declarationDir,
+        outDir.replace(pkgPath, ""),
         "_tsup-dts-aggregation" + dtsExtension
       );
       dtsInputFilePath = dtsInputFilePath.replace(/\.d\.mts$/, ".dmts.d.ts").replace(/\.d\.cts$/, ".dcts.d.ts");
-      let dtsOutputFilePath = _path2.default.join(pkgPath, "index" + dtsExtension);
+      let dtsOutputFilePath = _path2.default.join(outDir, "index" + dtsExtension);
       _chunkGQ77QZBOjs.writeFileSync.call(
         void 0,
         dtsInputFilePath,
@@ -467609,8 +467614,15 @@ var require_dist5 = __commonJS({
       );
       rollupDtsFile(
         options,
-        dtsInputFilePath,
-        dtsOutputFilePath,
+        _path2.default.join(
+          "<projectFolder>",
+          dtsInputFilePath.replace(options.workspaceRoot, "")
+        ),
+        _path2.default.join(
+          "<projectFolder>",
+          options.outDir,
+          `index${dtsExtension}`
+        ),
         options.tsconfig || "tsconfig.json"
       );
       for (let [out, sourceFileName] of Object.entries(
@@ -474321,6 +474333,7 @@ function legacyConfig({
   };
 }
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
+  main,
   outputPath,
   tsConfig,
   debug,
@@ -474336,14 +474349,9 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   env,
   verbose
 }) {
-  const entry = globSync(
-    [
-      (0, import_devkit.joinPathFragments)(sourceRoot, "**/*.ts"),
-      (0, import_devkit.joinPathFragments)(sourceRoot, "**/*.tsx"),
-      ...additionalEntryPoints ?? []
-    ],
-    { withFileTypes: true }
-  ).reduce((ret, filePath) => {
+  const entry = globSync([main, ...additionalEntryPoints ?? []], {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     ret[removeExtension(filePath.name)] = (0, import_devkit.joinPathFragments)(
       filePath.path,
       filePath.name
@@ -474413,6 +474421,7 @@ var outExtension = ({ options, format: format2, pkgType }) => {
 async function runExecutor(options, context) {
   try {
     console.log("\u{1F4E6}  Running Storm build executor on the workspace");
+    options.main ??= "src/index.ts";
     options.outputPath ??= "dist/{projectRoot}";
     options.tsConfig ??= "tsconfig.json";
     options.banner ??= process.env.STORM_FILE_BANNER;

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

@@ -18383,9 +18383,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -24319,9 +24319,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -24600,9 +24600,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -25536,9 +25536,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -267221,9 +267221,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qx64uvenwjot73rwnjbhbs5tsq_@microsoft+api-extractor@7.38.3_@swc+core@1._vumzwl6nnff7gu3d7itfoln6lm/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mhmndm2qckd7wlr6hl6c4lrzua_@microsoft+api-extractor@7.38.3_@swc+core@1._bv42izpdz3lcxeoz4g3sqwonly/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -269672,6 +269672,7 @@ var require_dist5 = __commonJS({
       }
       const apiReferenceProjectDir = _path2.default.join(
         "<projectFolder>",
+        pkgPath,
         "api-reports"
       );
       let configObject = {
@@ -269698,10 +269699,12 @@ var require_dist5 = __commonJS({
           untrimmedFilePath: outputFilePath,
           betaTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
+            options.outDir,
             `index-beta.d.ts`
           ),
           publicTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
+            options.outDir,
             `index-public.d.ts`
           )
         },
@@ -269713,18 +269716,19 @@ var require_dist5 = __commonJS({
           )
         },
         compiler: {
-          tsconfigFilePath
+          tsconfigFilePath: _path2.default.join(
+            "<projectFolder>",
+            tsconfigFilePath.replace(options.workspaceRoot, "")
+          )
         },
-        projectFolder: _path2.default.join(
-          options.workspaceRoot,
-          pkgPath
-        )
+        projectFolder: _path2.default.join("..", "..", "..", "..", "..", "..")
       };
       const prepareOptions = {
         configObject,
         configObjectFullPath: void 0,
         packageJsonFullPath
       };
+      logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
       logger2.info("dts", "\u26A1 Running API Extractor with the following config: \n", prepareOptions);
       const imported = _chunkGQ77QZBOjs.getApiExtractor.call(void 0);
       if (!imported) {
@@ -269755,10 +269759,11 @@ var require_dist5 = __commonJS({
       let dtsExtension = _chunkGQ77QZBOjs.defaultOutExtension.call(void 0, { format, pkgType: pkg.type }).dts;
       let dtsInputFilePath = _path2.default.join(
         declarationDir,
+        outDir.replace(pkgPath, ""),
         "_tsup-dts-aggregation" + dtsExtension
       );
       dtsInputFilePath = dtsInputFilePath.replace(/\.d\.mts$/, ".dmts.d.ts").replace(/\.d\.cts$/, ".dcts.d.ts");
-      let dtsOutputFilePath = _path2.default.join(pkgPath, "index" + dtsExtension);
+      let dtsOutputFilePath = _path2.default.join(outDir, "index" + dtsExtension);
       _chunkGQ77QZBOjs.writeFileSync.call(
         void 0,
         dtsInputFilePath,
@@ -269766,8 +269771,15 @@ var require_dist5 = __commonJS({
       );
       rollupDtsFile(
         options,
-        dtsInputFilePath,
-        dtsOutputFilePath,
+        _path2.default.join(
+          "<projectFolder>",
+          dtsInputFilePath.replace(options.workspaceRoot, "")
+        ),
+        _path2.default.join(
+          "<projectFolder>",
+          options.outDir,
+          `index${dtsExtension}`
+        ),
         options.tsconfig || "tsconfig.json"
       );
       for (let [out, sourceFileName] of Object.entries(
@@ -276423,6 +276435,7 @@ function legacyConfig({
   };
 }
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
+  main,
   outputPath,
   tsConfig,
   debug,
@@ -276438,14 +276451,9 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   env,
   verbose
 }) {
-  const entry = globSync(
-    [
-      (0, import_devkit.joinPathFragments)(sourceRoot, "**/*.ts"),
-      (0, import_devkit.joinPathFragments)(sourceRoot, "**/*.tsx"),
-      ...additionalEntryPoints ?? []
-    ],
-    { withFileTypes: true }
-  ).reduce((ret, filePath) => {
+  const entry = globSync([main, ...additionalEntryPoints ?? []], {
+    withFileTypes: true
+  }).reduce((ret, filePath) => {
     ret[removeExtension(filePath.name)] = (0, import_devkit.joinPathFragments)(
       filePath.path,
       filePath.name

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

@@ -3,7 +3,6 @@ import { Options } from "tsup";
 
 export type TsupExecutorSchema = Omit<
   EsBuildExecutorOptions,
-  | "main"
   | "outputFileName"
   | "metafile"
   | "generatePackageJson"

package/src/executors/tsup/schema.json

@@ -6,6 +6,11 @@
   "type": "object",
   "properties": {
     "properties": {
+      "main": {
+        "type": "string",
+        "description": "The path to the entry file, relative to project.",
+        "default": "src/index.ts"
+      },
       "outputPath": {
         "type": "string",
         "description": "The output path of the generated files.",