@storm-software/workspace-tools 1.16.10 → 1.16.12

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.16.11](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.16.10...workspace-tools-v1.16.11) (2023-11-29)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolve issue with path separators in tsup patch ([e7dc44d](https://github.com/storm-software/storm-ops/commit/e7dc44d77f8445a495fb7164d85498d4a2cbf179))
+
+## [1.16.10](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.16.9...workspace-tools-v1.16.10) (2023-11-29)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue with bad path module usage in tsup patch ([e0a984a](https://github.com/storm-software/storm-ops/commit/e0a984a656d65cb6f2b015ebac43d908bdded3d9))
+
 ## [1.16.9](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.16.8...workspace-tools-v1.16.9) (2023-11-29)
 
 

package/README.md

@@ -16,7 +16,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.16.8-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
+[![Version](https://img.shields.io/badge/version-1.16.10-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
 [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <h3 align="center" bold="true">⚠️ <b>Attention</b> ⚠️ This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be availible through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.</h3><br />

package/index.js

@@ -40019,9 +40019,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// 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
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "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) {
     "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=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// 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
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "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) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -40681,12 +40681,13 @@ var require_chunk_GQ77QZBO = __commonJS({
       };
     }
     function ensureTempDeclarationDir(options) {
-      const dirPath = _path2.default.join(options.workspaceRoot, "tmp", ".tsup", "declaration");
+      let projectFolder = packageJsonSearch(options.outDir, options.silent, "dts", logger2);
+      const dirPath = _path2.default.join(options.workspaceRoot, projectFolder, "tmp", "declarations");
       if (_fs2.default.existsSync(dirPath)) {
         return dirPath;
       }
       _fs2.default.mkdirSync(dirPath, { recursive: true });
-      const gitIgnorePath = _path2.default.join(options.workspaceRoot, "tmp", ".tsup", ".gitignore");
+      const gitIgnorePath = _path2.default.join(options.workspaceRoot, projectFolder, "tmp", ".gitignore");
       writeFileSync3(gitIgnorePath, "**/*\n");
       return dirPath;
     }
@@ -40761,9 +40762,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-UIX4URMV.js
+// 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
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "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) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -41697,9 +41698,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-7G76EW2R.js
+// 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
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "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) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -95505,9 +95506,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/index.js
+// 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
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ycbj4ze4nximjalgxenbuscbmq_@microsoft+api-extractor@7.38.3_@swc+core@1._sppchyqgfxkd36p6h24jhpliga/node_modules/tsup/dist/index.js"(exports) {
+  "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) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97076,7 +97077,7 @@ var require_dist5 = __commonJS({
     };
     var generateExternal = async (external, options, logger3) => {
       const result = [];
-      const pkgJsonPath = packageJsonSearch(options.outDir, options.silent, "CLI", logger3);
+      const pkgJsonPath = packageJsonSearch2(options.outDir, options.silent, "CLI", logger3);
       for (const item of external) {
         if (typeof item !== "string" || !item.endsWith("package.json")) {
           result.push(item);
@@ -97088,7 +97089,7 @@ var require_dist5 = __commonJS({
       }
       return result;
     };
-    var packageJsonSearch = (outDir, silent, format2, logger3) => {
+    var packageJsonSearch2 = (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) {
@@ -97132,7 +97133,7 @@ var require_dist5 = __commonJS({
       buildDependencies,
       pluginContainer
     }) {
-      const pkgPath = packageJsonSearch(options.outDir, options.silent, format2, logger3);
+      const pkgPath = packageJsonSearch2(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);
@@ -97823,6 +97824,13 @@ 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,
@@ -97867,17 +97875,26 @@ var require_dist5 = __commonJS({
         throw new Error("Unknown declaration");
       }
     }
-    function formatDistributionExports(exports2, fromFilePath, toFilePath) {
+    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, fromFilePath))),
-          _path2.default.posix.normalize(_chunkGQ77QZBOjs.slash.call(void 0, toFilePath))
+          _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;
       }
+      !options.silent && logger3.info("dts", `\u26A1 Formatting Distribution Exports with Import Path: ${importPath}`);
       let seen = {
         named: /* @__PURE__ */ new Set(),
         module: /* @__PURE__ */ new Set()
@@ -97920,10 +97937,10 @@ var require_dist5 = __commonJS({
       }
       return "";
     }
-    var logger2 = _chunk7G76EW2Rjs.createLogger.call(void 0);
-    function rollupDtsFile(options, inputFilePath, outputFilePath, tsconfigFilePath) {
-      let projectFolder = packageJsonSearch(options.outDir, options.silent, "dts", logger2);
-      !options.silent && logger2.info("dts", `\u26A1 Preparing to run API Extractor (DTS generate): ${projectFolder}`);
+    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(
         "docs",
         "api-reports",
@@ -97935,10 +97952,10 @@ var require_dist5 = __commonJS({
           enabled: options.apiReport !== false,
           reportFileName: "api-report.md",
           reportFolder: apiReferenceProjectDir,
-          reportTempFolder: `<projectFolder>/${_path2.default.join(
-            "tmp",
+          reportTempFolder: _path2.default.join(
+            tmpDirPath,
             "api-reports"
-          ).replaceAll("\\", "/")}`
+          ).replaceAll("/", "\\")
         },
         docModel: {
           enabled: options.docModel !== false,
@@ -97949,7 +97966,7 @@ var require_dist5 = __commonJS({
         },
         dtsRollup: {
           enabled: true,
-          untrimmedFilePath: outputFilePath
+          untrimmedFilePath: `<projectFolder>/${outputFilePath.replaceAll("\\", "/")}`
         },
         tsdocMetadata: {
           enabled: options.tsdocMetadata !== false,
@@ -97972,13 +97989,13 @@ var require_dist5 = __commonJS({
           "package.json"
         )
       };
-      !options.silent && logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
-      !options.silent && logger2.info(
+      !options.silent && logger22.info("dts", `\u26A1 Current Directory: ${__dirname}`);
+      !options.silent && logger22.info(
         "dts",
         "\u26A1 Running API Extractor with the following config: \n",
         prepareOptions
       );
-      !options.silent && logger2.info(
+      !options.silent && logger22.info(
         "dts",
         "\u26A1 Using the following compiler options: \n",
         JSON.stringify(prepareOptions.configObject?.compiler)
@@ -97991,7 +98008,7 @@ var require_dist5 = __commonJS({
       }
       const { ExtractorConfig, Extractor } = imported;
       const extractorConfig = ExtractorConfig.prepare(prepareOptions);
-      !options.silent && logger2.info(
+      !options.silent && logger22.info(
         "dts",
         "\u26A1 Invoking extractor with the following prepare options: \n",
         JSON.stringify(extractorConfig)
@@ -98009,16 +98026,16 @@ var require_dist5 = __commonJS({
       }
     }
     async function rollupDtsFiles(options, exports2, format2) {
-      let declarationDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0, options);
+      let tempDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0, options);
       let outDir = options.outDir || "dist";
-      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 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 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,
-        options.projectRoot,
         "_tsup-dts-aggregation" + dtsExtension
       );
       dtsInputFilePath = dtsInputFilePath.replace(/\.d\.mts$/, ".dmts.d.ts").replace(/\.d\.cts$/, ".dcts.d.ts");
@@ -98027,9 +98044,10 @@ var require_dist5 = __commonJS({
         dtsInputFilePath,
         formatAggregationExports(exports2, declarationDir)
       );
-      let dtsOutputFilePath = _path2.default.join(outDir, "declaration" + dtsExtension);
+      let dtsOutputFilePath = _path2.default.join(outDir, "declarations" + dtsExtension);
       rollupDtsFile(
         options,
+        tempDir,
         dtsInputFilePath,
         dtsOutputFilePath,
         options.tsconfig || "tsconfig.json"
@@ -98037,15 +98055,20 @@ var require_dist5 = __commonJS({
       for (let [out, sourceFileName] of Object.entries(
         options.experimentalDts.entry
       )) {
-        sourceFileName = _chunkGQ77QZBOjs.toAbsolutePath.call(void 0, sourceFileName);
-        const outFileName = _path2.default.join(outDir, out + dtsExtension);
+        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 === sourceFileName
+          (declaration) => declaration.sourceFileName.replaceAll("/", "\\") === sourceFileName.replaceAll("/", "\\")
         );
         _chunkGQ77QZBOjs.writeFileSync.call(
           void 0,
           outFileName,
-          formatDistributionExports(currentExports, outFileName, dtsOutputFilePath)
+          formatDistributionExports(currentExports, outFileName, dtsOutputFilePath, logger22, options)
         );
       }
     }
@@ -98055,17 +98078,17 @@ var require_dist5 = __commonJS({
         const getDuration = () => {
           return `${Math.floor(Date.now() - start)}ms`;
         };
-        logger2.info("dts", "Build start");
+        logger22.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);
         }
-        logger2.success("dts", `\u26A1\uFE0F Build success in ${getDuration()}`);
+        logger22.success("dts", `\u26A1\uFE0F Build success in ${getDuration()}`);
       } catch (error) {
         _chunkUIX4URMVjs.handleError.call(void 0, error);
-        logger2.error("dts", "Build error");
+        logger22.error("dts", "Build error");
       }
     }
     var cjsInterop = () => {
@@ -98132,7 +98155,7 @@ var require_dist5 = __commonJS({
         options.entry = entry;
         logger3.info("CLI", `Building entry: ${JSON.stringify(entry)}`);
       }
-      !options.silent && logger2.info("CLI", `\u26A1 Normalizing options: ${options.tsconfig}`);
+      !options.silent && logger22.info("CLI", `\u26A1 Normalizing options: ${options.tsconfig}`);
       const tsconfig = _bundlerequire.loadTsConfig.call(void 0, options.workspaceRoot, options.tsconfig);
       if (tsconfig) {
         logger3.info(
@@ -105364,8 +105387,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
         noEmit: false,
         declaration: true,
         declarationMap: true,
-        emitDeclarationOnly: true,
-        declarationDir: (0, import_path3.join)(workspaceRoot, "tmp", ".tsup", "declaration")
+        emitDeclarationOnly: true
       }
     },
     ts.sys,