@storm-software/workspace-tools 1.13.10 → 1.13.12

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.13.11](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.13.10...workspace-tools-v1.13.11) (2023-11-27)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Clean up around tsup patch dts build ([4650a98](https://github.com/storm-software/storm-ops/commit/4650a9884784707e927bc2352643e1a3bc535fd4))
+
+## [1.13.10](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.13.9...workspace-tools-v1.13.10) (2023-11-27)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Updated how emit is called ([dcc7bc5](https://github.com/storm-software/storm-ops/commit/dcc7bc54a6de0123d47decc548ea0e611cdecd95))
+
 ## [1.13.9](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.13.8...workspace-tools-v1.13.9) (2023-11-26)
 
 

package/index.js

@@ -37426,9 +37426,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -39075,9 +39075,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -39355,9 +39355,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -40291,9 +40291,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -95291,9 +95291,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/index.js
 var require_dist6 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qwons7v7lum2v4wah3jzfocdxq_@microsoft+api-extractor@7.38.3_@swc+core@1._xc4l5l3wzuyqyow7vb757qxpvq/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=qpq4mfyowuxksz23pdogh2uc4i_@microsoft+api-extractor@7.38.3_@swc+core@1._p3ksrt6te5ke5cutzhpgt27u7m/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97528,8 +97528,11 @@ var require_dist6 = __commonJS({
       return _fs2.default.promises.readFile(name, "utf8");
     };
     var addFile = async (name, map, options, logger3) => {
-      const relativeName = name.replaceAll("/", "\\").replace(options.workspaceRoot, "").replaceAll("\\", "/");
-      if (map && map.has(relativeName)) {
+      let relativeName = name.replaceAll("/", "\\").replace(options.workspaceRoot, "").replaceAll("\\", "/");
+      if (!relativeName.startsWith("/")) {
+        relativeName = `/${relativeName}`;
+      }
+      if (map && !map.has(relativeName)) {
         logger3.info("tsc", `Adding file to FS Map: ${relativeName}`);
         const file = await getFile(name, logger3);
         map.set(relativeName, file);
@@ -97562,6 +97565,7 @@ var require_dist6 = __commonJS({
           ...rawTsconfig.data,
           compilerOptions: {
             ...rawTsconfig.data.compilerOptions,
+            ...compilerOptions,
             // Enable declaration emit and disable javascript emit
             outDir: options.outDir,
             allowJs: true,
@@ -97622,10 +97626,16 @@ var require_dist6 = __commonJS({
       logger.info("tsc", "Created program");
       logger.info("tsc", "Emitting DTS files with the following options: ");
       logger.info("tsc", parsedTsconfig.options);
-      logger.info("tsc", "Emitting DTS files");
-      program.emit();
-      logger.info("tsc", "Emit DTS files complete");
-      logger.info("tsc", fsMap);
+      try {
+        logger.info("tsc", "Emitting DTS files");
+        logger.info("tsc", fsMap);
+        program.emit();
+        logger.info("tsc", "Emit DTS files complete");
+        logger.info("tsc", fsMap);
+      } catch (e) {
+        logger.error("tsc", "An error occured while emitting DTS files");
+        logger.error("tsc", e);
+      }
       return getExports(options, program, fsMap);
     }
     async function runTypeScriptCompiler(options) {
@@ -97636,7 +97646,11 @@ var require_dist6 = __commonJS({
         };
         logger.info("tsc", "Build start");
         const dtsOptions = options.experimentalDts;
-        const exports2 = await emit(options, dtsOptions.compilerOptions, options.tsconfig);
+        const exports2 = await emit(
+          options,
+          dtsOptions.compilerOptions,
+          options.tsconfig
+        );
         logger.success("tsc", `\u26A1\uFE0F Build success in ${getDuration()}`);
         return exports2;
       } catch (error) {
@@ -97736,23 +97750,17 @@ var require_dist6 = __commonJS({
         pkgPath = pkgPath.slice(0, -1);
       }
       logger2.info("dts", `\u26A1 Preparing to run API Extractor (DTS generate): ${pkgPath}`);
-      let packageJsonFullPath = options.workspaceRoot ? _path2.default.join(options.workspaceRoot, pkgPath, "package.json") : _path2.default.join(pkgPath, "package.json");
-      const splits = pkgPath.split("\\");
-      logger2.info("dts", splits);
-      let packageName = pkgPath;
-      if (splits.length > 2) {
-        packageName = splits[splits.length - 2];
-      }
       const apiReferenceProjectDir = _path2.default.join(
         "<projectFolder>",
-        pkgPath,
-        "api-reports"
+        "docs",
+        "api-reports",
+        options.projectRoot
       );
       let configObject = {
         mainEntryPointFilePath: inputFilePath,
         apiReport: {
           enabled: options.apiReport !== false,
-          reportFileName: `${packageName}.api.md`,
+          reportFileName: "api-report.md",
           reportFolder: apiReferenceProjectDir,
           reportTempFolder: _path2.default.join(
             "<projectFolder>",
@@ -97764,7 +97772,7 @@ var require_dist6 = __commonJS({
           enabled: options.docModel !== false,
           apiJsonFilePath: _path2.default.join(
             apiReferenceProjectDir,
-            `${packageName}.api.json`
+            "documents-model.api.json"
           )
         },
         dtsRollup: {
@@ -97777,19 +97785,20 @@ var require_dist6 = __commonJS({
           betaTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
             options.outDir,
-            `index-beta.d.ts`
+            "index-beta.d.ts"
           ),
           publicTrimmedFilePath: _path2.default.join(
             "<projectFolder>",
             options.outDir,
-            `index-public.d.ts`
+            "index-public.d.ts"
           )
         },
         tsdocMetadata: {
           enabled: options.tsdocMetadata !== false,
           tsdocMetadataFilePath: _path2.default.join(
-            apiReferenceProjectDir,
-            `${packageName}.api.tsdoc-metadata.json`
+            "<projectFolder>",
+            pkgPath,
+            "tsdoc-metadata.api.json"
           )
         },
         compiler: {