@storm-software/workspace-tools 1.16.7 → 1.16.8

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.16.7](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.16.6...workspace-tools-v1.16.7) (2023-11-29)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Reduce path length of `mainEntryPointFilePath` api-extractor option ([1e747d3](https://github.com/storm-software/storm-ops/commit/1e747d34c5c9c82e00884d140632f9e725950672))
+
 ## [1.16.6](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.16.5...workspace-tools-v1.16.6) (2023-11-29)
 
 

package/index.js

@@ -40019,9 +40019,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/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=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -40761,9 +40761,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -41697,9 +41697,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -95505,9 +95505,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=d2blsoru5emald3pptgqr7ui44_@microsoft+api-extractor@7.38.3_@swc+core@1._mqw7rfk4yr63tv2o25rdqexiv4/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=mwafxokpvbjw3x2brcsxgpq25u_@microsoft+api-extractor@7.38.3_@swc+core@1._oivrduymnsbv3knduf2tb3tfgy/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97867,58 +97867,112 @@ var require_dist5 = __commonJS({
         throw new Error("Unknown declaration");
       }
     }
+    function formatDistributionExports(exports2, fromFilePath, toFilePath) {
+      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))
+        )
+      );
+      if (!importPath.match(/^\.+\//)) {
+        importPath = "./" + 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 logger2 = _chunk7G76EW2Rjs.createLogger.call(void 0);
     function rollupDtsFile(options, inputFilePath, dtsExtension, tsconfigFilePath) {
       let projectFolder = packageJsonSearch(options.outDir, options.silent, "dts", logger2);
       !options.silent && logger2.info("dts", `\u26A1 Preparing to run API Extractor (DTS generate): ${projectFolder}`);
-      const apiReferenceProjectDir = _path2.default.join(
-        options.workspaceRoot,
+      const apiReferenceProjectDir = `<projectFolder>/${_path2.default.join(
         "docs",
         "api-reports",
         options.projectRoot
-      ).replaceAll("/", "\\");
+      ).replaceAll("\\", "/")}`;
       let configObject = {
-        mainEntryPointFilePath: inputFilePath.includes(options.workspaceRoot) ? inputFilePath : _path2.default.join(options.workspaceRoot, inputFilePath),
+        mainEntryPointFilePath: inputFilePath,
         apiReport: {
           enabled: options.apiReport !== false,
           reportFileName: "api-report.md",
           reportFolder: apiReferenceProjectDir,
-          reportTempFolder: _path2.default.join(
-            options.workspaceRoot,
+          reportTempFolder: `<projectFolder>/${_path2.default.join(
             "tmp",
             "api-reports"
-          ).replaceAll("/", "\\")
+          ).replaceAll("\\", "/")}`
         },
         docModel: {
           enabled: options.docModel !== false,
           apiJsonFilePath: _path2.default.join(
             apiReferenceProjectDir,
             "documents-model.api.json"
-          ).replaceAll("/", "\\")
+          ).replaceAll("\\", "/")
         },
         dtsRollup: {
           enabled: true,
           untrimmedFilePath: `<projectFolder>/${_path2.default.join(
-            options.outDir.replaceAll("\\", "/").replace(projectFolder.replaceAll("\\", "/"), ""),
+            options.outDir,
             `index${dtsExtension}`
           ).replaceAll("\\", "/")}`,
           betaTrimmedFilePath: `<projectFolder>/${_path2.default.join(
-            options.outDir.replaceAll("\\", "/").replace(projectFolder.replaceAll("\\", "/"), ""),
-            "index-beta.d.ts"
+            options.outDir,
+            `index-beta${dtsExtension}`
           ).replaceAll("\\", "/")}`,
           publicTrimmedFilePath: `<projectFolder>/${_path2.default.join(
-            options.outDir.replaceAll("\\", "/").replace(projectFolder.replaceAll("\\", "/"), ""),
-            "index-public.d.ts"
+            options.outDir,
+            `index-public${dtsExtension}`
           ).replaceAll("\\", "/")}`
         },
         tsdocMetadata: {
           enabled: options.tsdocMetadata !== false,
-          tsdocMetadataFilePath: "<projectFolder>/tsdoc-metadata.api.json"
+          tsdocMetadataFilePath: `<projectFolder>/${_path2.default.join(
+            projectFolder,
+            "tsdoc-metadata.api.json"
+          ).replaceAll("\\", "/")}`
         },
         compiler: {
           tsconfigFilePath
         },
-        projectFolder: `./${projectFolder}`
+        projectFolder: `./`
       };
       const prepareOptions = {
         configObject,
@@ -97975,7 +98029,7 @@ var require_dist5 = __commonJS({
       let dtsExtension = _chunkGQ77QZBOjs.defaultOutExtension.call(void 0, { format: format2, pkgType: pkg.type }).dts;
       let dtsInputFilePath = _path2.default.join(
         declarationDir,
-        outDir.replaceAll("\\", "/").replace(pkgPath.replaceAll("\\", "/"), ""),
+        pkgPath,
         "_tsup-dts-aggregation" + dtsExtension
       );
       dtsInputFilePath = dtsInputFilePath.replace(/\.d\.mts$/, ".dmts.d.ts").replace(/\.d\.cts$/, ".dcts.d.ts");
@@ -97990,6 +98044,20 @@ var require_dist5 = __commonJS({
         dtsExtension,
         options.tsconfig || "tsconfig.json"
       );
+      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);
+        const currentExports = exports2.filter(
+          (declaration) => declaration.sourceFileName === sourceFileName
+        );
+        _chunkGQ77QZBOjs.writeFileSync.call(
+          void 0,
+          outFileName,
+          formatDistributionExports(currentExports, outFileName, outDir)
+        );
+      }
     }
     async function runDtsRollup(options, exports2) {
       try {
@@ -105063,11 +105131,11 @@ ${Object.keys(options).map(
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
     const outputPath = applyWorkspaceTokens(
-      options.outputPath ? options.outputPath : (0, import_path3.join)(workspaceRoot, "dist", projectRoot),
+      options.outputPath ? options.outputPath : "dist/{projectRoot}",
       context
     );
     options.entry = applyWorkspaceTokens(
-      options.entry ? options.entry : (0, import_path3.join)(sourceRoot, "index.ts"),
+      options.entry ? options.entry : "{sourceRoot}/index.ts",
       context
     );
     if (options.clean !== false) {
@@ -105085,7 +105153,7 @@ ${Object.keys(options).map(
       glob: "LICENSE",
       output: "."
     });
-    if (options.includeSrc) {
+    if (options.includeSrc !== false) {
       assets.push({
         input: sourceRoot,
         glob: "**/{*.ts,*.tsx,*.js,*.jsx}",
@@ -105178,13 +105246,19 @@ ${externalDependencies.map((dep) => {
     packageJson.main ??= "dist/legacy/index.cjs";
     packageJson.module ??= "dist/legacy/index.js";
     options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-    options.includeSrc && (packageJson.source ??= `./${(0, import_path3.join)(
-      sourceRoot.replace(projectRoot, ""),
-      "index.ts"
-    ).replaceAll("\\", "/")}`);
+    if (options.includeSrc !== false) {
+      let distSrc = sourceRoot.replace(projectRoot, "");
+      if (distSrc.startsWith("/")) {
+        distSrc = distSrc.substring(1);
+      }
+      packageJson.source ??= `./${(0, import_path3.join)(distSrc, "index.ts").replaceAll(
+        "\\",
+        "/"
+      )}`;
+    }
     packageJson.sideEffects ??= false;
     packageJson.files ??= ["dist"];
-    if (options.includeSrc && !packageJson.files.includes("src")) {
+    if (options.includeSrc !== false && !packageJson.files.includes("src")) {
       packageJson.files.push("src");
     }
     packageJson.publishConfig ??= {
@@ -105218,12 +105292,12 @@ ${externalDependencies.map((dep) => {
         endOfLine: "lf"
       })
     );
-    if (options.banner && options.includeSrc) {
+    if (options.banner && options.includeSrc !== false) {
       const files = globSync([
-        (0, import_path3.join)(context.root, outputPath, "src/**/*.ts").replaceAll("/", "\\"),
-        (0, import_path3.join)(context.root, outputPath, "src/**/*.tsx").replaceAll("/", "\\"),
-        (0, import_path3.join)(context.root, outputPath, "src/**/*.js").replaceAll("/", "\\"),
-        (0, import_path3.join)(context.root, outputPath, "src/**/*.jsx").replaceAll("/", "\\")
+        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.ts"),
+        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.tsx"),
+        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.js"),
+        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.jsx")
       ]);
       await Promise.allSettled(
         files.map(