@storm-software/workspace-tools 1.16.12 → 1.16.14

package/package.json

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

@@ -40019,9 +40019,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -40481,9 +40481,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -40681,13 +40681,12 @@ var require_chunk_GQ77QZBO = __commonJS({
       };
     }
     function ensureTempDeclarationDir(options) {
-      let projectFolder = packageJsonSearch(options.outDir, options.silent, "dts", logger2);
-      const dirPath = _path2.default.join(options.workspaceRoot, projectFolder, "tmp", "declarations");
+      const dirPath = _path2.default.join(options.workspaceRoot, "tmp", ".tsup", "declaration");
       if (_fs2.default.existsSync(dirPath)) {
         return dirPath;
       }
       _fs2.default.mkdirSync(dirPath, { recursive: true });
-      const gitIgnorePath = _path2.default.join(options.workspaceRoot, projectFolder, "tmp", ".gitignore");
+      const gitIgnorePath = _path2.default.join(options.workspaceRoot, "tmp", ".tsup", ".gitignore");
       writeFileSync3(gitIgnorePath, "**/*\n");
       return dirPath;
     }
@@ -40762,9 +40761,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -41698,9 +41697,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -95506,9 +95505,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=4o7xevcixzlrqw5gm3wlleqhou_@microsoft+api-extractor@7.38.3_@swc+core@1._tguqvnpknvrsonece4nkdclyai/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qxnf7byziqgqhnednmsidq2bie_@microsoft+api-extractor@7.38.3_@swc+core@1._mqsjacg6tchxug6yxrkojdzkhi/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97077,7 +97076,7 @@ var require_dist5 = __commonJS({
     };
     var generateExternal = async (external, options, logger3) => {
       const result = [];
-      const pkgJsonPath = packageJsonSearch2(options.outDir, options.silent, "CLI", logger3);
+      const pkgJsonPath = packageJsonSearch(options.outDir, options.silent, "CLI", logger3);
       for (const item of external) {
         if (typeof item !== "string" || !item.endsWith("package.json")) {
           result.push(item);
@@ -97089,7 +97088,7 @@ var require_dist5 = __commonJS({
       }
       return result;
     };
-    var packageJsonSearch2 = (outDir, silent, format2, logger3) => {
+    var packageJsonSearch = (outDir, silent, format2, logger3) => {
       let pkgPath = outDir ? outDir : process.cwd();
       !silent && logger3 && logger3.info(format2, `\u26A1 Beginning search for package.json file: ${pkgPath}`);
       if (pkgPath) {
@@ -97124,7 +97123,7 @@ var require_dist5 = __commonJS({
           `\u26A1 No package.json file found, using ${pkgPath} as the output directory`
         );
       }
-      return pkgPath.replaceAll("\\", "/");
+      return pkgPath;
     };
     async function runEsbuild(options, {
       format: format2,
@@ -97133,7 +97132,7 @@ var require_dist5 = __commonJS({
       buildDependencies,
       pluginContainer
     }) {
-      const pkgPath = packageJsonSearch2(options.outDir, options.silent, format2, logger3);
+      const pkgPath = packageJsonSearch(options.outDir, options.silent, format2, logger3);
       logger3.info(format2, `\u26A1 Running ESBuild: ${pkgPath}`);
       const pkg = await _chunk7G76EW2Rjs.loadPkg.call(void 0, pkgPath);
       const deps = await _chunk7G76EW2Rjs.getProductionDeps.call(void 0, pkgPath);
@@ -97824,13 +97823,6 @@ var require_dist5 = __commonJS({
         };
         logger.info("tsc", "Build start");
         const dtsOptions = options.experimentalDts;
-        if (!dtsOptions.compilerOptions) {
-          dtsOptions.compilerOptions = {};
-        } else if (!dtsOptions.compilerOptions.options) {
-          dtsOptions.compilerOptions.options = {};
-        }
-        let tempDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0, options);
-        dtsOptions.compilerOptions.options.declarationDir = _path2.default.join(tempDir, "declarations");
         const exports2 = await emit(
           options,
           dtsOptions.compilerOptions,
@@ -97875,77 +97867,19 @@ var require_dist5 = __commonJS({
         throw new Error("Unknown declaration");
       }
     }
-    function formatDistributionExports(exports2, fromFilePath, toFilePath, logger3, options) {
-      let importPath = _chunkGQ77QZBOjs.trimDtsExtension.call(
-        void 0,
-        _path2.default.posix.relative(
-          _path2.default.posix.dirname(_path2.default.posix.normalize(
-            _chunkGQ77QZBOjs.slash.call(
-              void 0,
-              _path2.default.join(options.workspaceRoot, fromFilePath)
-            )
-          )),
-          _path2.default.posix.normalize(_chunkGQ77QZBOjs.slash.call(
-            void 0,
-            _path2.default.join(options.workspaceRoot, toFilePath)
-          ))
-        )
-      );
-      if (!importPath.match(/^\.+\//)) {
-        importPath = "./" + importPath;
+    var logger2 = _chunk7G76EW2Rjs.createLogger.call(void 0);
+    function rollupDtsFile(options, inputFilePath, dtsExtension, tsconfigFilePath) {
+      let pkgPath = packageJsonSearch(options.outDir, options.silent, "dts", logger2);
+      if (pkgPath.endsWith("/")) {
+        pkgPath = pkgPath.slice(0, -1);
       }
-      !options.silent && logger3.info("dts", `\u26A1 Formatting Distribution Exports with Import Path: ${importPath}`);
-      let seen = {
-        named: /* @__PURE__ */ new Set(),
-        module: /* @__PURE__ */ new Set()
-      };
-      const lines = exports2.filter((declaration) => {
-        if (declaration.kind === "module") {
-          if (seen.module.has(declaration.moduleName)) {
-            return false;
-          }
-          seen.module.add(declaration.moduleName);
-          return true;
-        } else if (declaration.kind === "named") {
-          if (seen.named.has(declaration.name)) {
-            return false;
-          }
-          seen.named.add(declaration.name);
-          return true;
-        } else {
-          return false;
-        }
-      }).map((declaration) => formatDistributionExport(declaration, importPath)).filter(_chunkGQ77QZBOjs.truthy);
-      if (lines.length === 0) {
-        lines.push("export {};");
-      }
-      return lines.join("\n") + "\n";
-    }
-    function formatDistributionExport(declaration, dest) {
-      if (declaration.kind === "named") {
-        return [
-          "export",
-          declaration.isTypeOnly ? "type" : "",
-          "{",
-          declaration.alias,
-          declaration.name === declaration.alias ? "" : `as ${declaration.name}`,
-          "} from",
-          `'${dest}';`
-        ].filter(_chunkGQ77QZBOjs.truthy).join(" ");
-      } else if (declaration.kind === "module") {
-        return `export * from '${declaration.moduleName}';`;
-      }
-      return "";
-    }
-    var logger22 = _chunk7G76EW2Rjs.createLogger.call(void 0);
-    function rollupDtsFile(options, tmpDirPath, inputFilePath, outputFilePath, tsconfigFilePath) {
-      let projectFolder = packageJsonSearch2(options.outDir, options.silent, "dts", logger22);
-      !options.silent && logger22.info("dts", `\u26A1 Preparing to run API Extractor (DTS generate): ${projectFolder}`);
-      const apiReferenceProjectDir = `<projectFolder>/${_path2.default.join(
+      logger2.info("dts", `\u26A1 Preparing to run API Extractor (DTS generate): ${pkgPath}`);
+      const apiReferenceProjectDir = _path2.default.join(
+        "<projectFolder>",
         "docs",
         "api-reports",
         options.projectRoot
-      ).replaceAll("\\", "/")}`;
+      ).replaceAll("\\", "/");
       let configObject = {
         mainEntryPointFilePath: inputFilePath,
         apiReport: {
@@ -97953,9 +97887,10 @@ var require_dist5 = __commonJS({
           reportFileName: "api-report.md",
           reportFolder: apiReferenceProjectDir,
           reportTempFolder: _path2.default.join(
-            tmpDirPath,
+            "<projectFolder>",
+            "tmp",
             "api-reports"
-          ).replaceAll("/", "\\")
+          ).replaceAll("\\", "/")
         },
         docModel: {
           enabled: options.docModel !== false,
@@ -97966,36 +97901,53 @@ var require_dist5 = __commonJS({
         },
         dtsRollup: {
           enabled: true,
-          untrimmedFilePath: `<projectFolder>/${outputFilePath.replaceAll("\\", "/")}`
+          untrimmedFilePath: _path2.default.join(
+            "<projectFolder>",
+            options.outDir,
+            `index${dtsExtension}`
+          ).replaceAll("\\", "/"),
+          betaTrimmedFilePath: _path2.default.join(
+            "<projectFolder>",
+            options.outDir,
+            "index-beta.d.ts"
+          ).replaceAll("\\", "/"),
+          publicTrimmedFilePath: _path2.default.join(
+            "<projectFolder>",
+            options.outDir,
+            "index-public.d.ts"
+          ).replaceAll("\\", "/")
         },
         tsdocMetadata: {
           enabled: options.tsdocMetadata !== false,
-          tsdocMetadataFilePath: `<projectFolder>/${_path2.default.join(
-            projectFolder,
+          tsdocMetadataFilePath: _path2.default.join(
+            "<projectFolder>",
+            "dist",
+            options.projectRoot,
             "tsdoc-metadata.api.json"
-          ).replaceAll("\\", "/")}`
+          ).replaceAll("\\", "/")
         },
         compiler: {
           tsconfigFilePath
         },
-        projectFolder: `./`
+        projectFolder: "./"
       };
       const prepareOptions = {
         configObject,
         configObjectFullPath: void 0,
         packageJsonFullPath: _path2.default.join(
           options.workspaceRoot,
-          projectFolder,
+          "dist",
+          options.projectRoot,
           "package.json"
-        )
+        ).replaceAll("\\", "/")
       };
-      !options.silent && logger22.info("dts", `\u26A1 Current Directory: ${__dirname}`);
-      !options.silent && logger22.info(
+      !options.silent && logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
+      !options.silent && logger2.info(
         "dts",
         "\u26A1 Running API Extractor with the following config: \n",
         prepareOptions
       );
-      !options.silent && logger22.info(
+      !options.silent && logger2.info(
         "dts",
         "\u26A1 Using the following compiler options: \n",
         JSON.stringify(prepareOptions.configObject?.compiler)
@@ -98008,7 +97960,7 @@ var require_dist5 = __commonJS({
       }
       const { ExtractorConfig, Extractor } = imported;
       const extractorConfig = ExtractorConfig.prepare(prepareOptions);
-      !options.silent && logger22.info(
+      !options.silent && logger2.info(
         "dts",
         "\u26A1 Invoking extractor with the following prepare options: \n",
         JSON.stringify(extractorConfig)
@@ -98026,51 +97978,33 @@ var require_dist5 = __commonJS({
       }
     }
     async function rollupDtsFiles(options, exports2, format2) {
-      let tempDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0, options);
+      let declarationDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0, options);
       let outDir = options.outDir || "dist";
-      let pkgPath = packageJsonSearch2(outDir, options.silent, "dts", logger22);
-      !options.silent && logger22.info("dts", `\u26A1 Preparing to run Rollup (DTS generate): ${pkgPath}`);
-      !options.silent && logger22.info("dts", `\u26A1 Exports list to use in generation: ${exports2.map((e) => JSON.stringify(e)).join("\n")}`);
+      let pkgPath = packageJsonSearch(outDir, options.silent, "dts", logger2);
+      !options.silent && logger2.info("dts", `\u26A1 Preparing to run Rollup (DTS generate): ${pkgPath}`);
+      !options.silent && logger2.info("dts", `\u26A1 Exports list to use in generation: ${exports2.map((e) => JSON.stringify(e)).join("\n")}`);
       let pkg = await _chunk7G76EW2Rjs.loadPkg.call(void 0, pkgPath);
       let dtsExtension = _chunkGQ77QZBOjs.defaultOutExtension.call(void 0, { format: format2, pkgType: pkg.type }).dts;
-      let declarationDir = _path2.default.join(tempDir, "declarations");
       let dtsInputFilePath = _path2.default.join(
         declarationDir,
+        outDir.replace(pkgPath, ""),
         "_tsup-dts-aggregation" + dtsExtension
-      );
+      ).replaceAll("\\", "/");
       dtsInputFilePath = dtsInputFilePath.replace(/\.d\.mts$/, ".dmts.d.ts").replace(/\.d\.cts$/, ".dcts.d.ts");
       _chunkGQ77QZBOjs.writeFileSync.call(
         void 0,
         dtsInputFilePath,
         formatAggregationExports(exports2, declarationDir)
       );
-      let dtsOutputFilePath = _path2.default.join(outDir, "declarations" + dtsExtension);
       rollupDtsFile(
         options,
-        tempDir,
-        dtsInputFilePath,
-        dtsOutputFilePath,
+        _path2.default.join(
+          "<projectFolder>",
+          dtsInputFilePath.replace(options.workspaceRoot, "")
+        ).replaceAll("\\", "/"),
+        dtsExtension,
         options.tsconfig || "tsconfig.json"
       );
-      for (let [out, sourceFileName] of Object.entries(
-        options.experimentalDts.entry
-      )) {
-        sourceFileName = _chunkGQ77QZBOjs.toAbsolutePath.call(void 0, sourceFileName).replaceAll("/", "\\");
-        const outFileName = _path2.default.join(
-          options.workspaceRoot,
-          outDir,
-          out + dtsExtension
-        ).replaceAll("/", "\\");
-        !options.silent && logger22.info("dts", `\u26A1 Checking exports generation for file: ${outFileName}`);
-        const currentExports = exports2.filter(
-          (declaration) => declaration.sourceFileName.replaceAll("/", "\\") === sourceFileName.replaceAll("/", "\\")
-        );
-        _chunkGQ77QZBOjs.writeFileSync.call(
-          void 0,
-          outFileName,
-          formatDistributionExports(currentExports, outFileName, dtsOutputFilePath, logger22, options)
-        );
-      }
     }
     async function runDtsRollup(options, exports2) {
       try {
@@ -98078,17 +98012,17 @@ var require_dist5 = __commonJS({
         const getDuration = () => {
           return `${Math.floor(Date.now() - start)}ms`;
         };
-        logger22.info("dts", "Build start");
+        logger2.info("dts", "Build start");
         if (!exports2) {
           throw new Error("Unexpected internal error: dts exports is not define");
         }
         for (const format2 of options.format) {
           await rollupDtsFiles(options, exports2, format2);
         }
-        logger22.success("dts", `\u26A1\uFE0F Build success in ${getDuration()}`);
+        logger2.success("dts", `\u26A1\uFE0F Build success in ${getDuration()}`);
       } catch (error) {
         _chunkUIX4URMVjs.handleError.call(void 0, error);
-        logger22.error("dts", "Build error");
+        logger2.error("dts", "Build error");
       }
     }
     var cjsInterop = () => {
@@ -98155,7 +98089,7 @@ var require_dist5 = __commonJS({
         options.entry = entry;
         logger3.info("CLI", `Building entry: ${JSON.stringify(entry)}`);
       }
-      !options.silent && logger22.info("CLI", `\u26A1 Normalizing options: ${options.tsconfig}`);
+      !options.silent && logger2.info("CLI", `\u26A1 Normalizing options: ${options.tsconfig}`);
       const tsconfig = _bundlerequire.loadTsConfig.call(void 0, options.workspaceRoot, options.tsconfig);
       if (tsconfig) {
         logger3.info(
@@ -105345,7 +105279,8 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
         noEmit: false,
         declaration: true,
         declarationMap: true,
-        emitDeclarationOnly: true
+        emitDeclarationOnly: true,
+        declarationDir: (0, import_path3.join)(workspaceRoot, "tmp", ".tsup", "declaration")
       }
     },
     ts.sys,