@storm-software/workspace-tools 1.13.9 → 1.13.11

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [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)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Fixed issue with `packageJsonFullPath` parameter of api-extractor ([69e4021](https://github.com/storm-software/storm-ops/commit/69e40219d7db548736b640ebada7fa14aee8a325))
+
 ## [1.13.8](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.13.7...workspace-tools-v1.13.8) (2023-11-26)
 
 

package/index.js

@@ -37426,9 +37426,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/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=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/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=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/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=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/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=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/index.js
 var require_dist6 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=xxu5vvx4qtxbzzjbqrr6w3yj7e_@microsoft+api-extractor@7.38.3_@swc+core@1._exf5cfyikbtte7t3sqpqjcfp2q/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97523,62 +97523,6 @@ var require_dist6 = __commonJS({
       }
       return program.getRootFileNames().flatMap(extractExports);
     }
-    function emitDtsFiles(program, host, options) {
-      let fileMapping = /* @__PURE__ */ new Map();
-      let writeFile = (fileName, text, writeByteOrderMark, onError, sourceFiles, data) => {
-        const sourceFile = _optionalChain([sourceFiles, "optionalAccess", (_14) => _14[0]]);
-        let sourceFileName = _optionalChain([sourceFile, "optionalAccess", (_15) => _15.fileName]);
-        if (sourceFileName && !fileName.endsWith(".map")) {
-          const cwd = options.workspaceRoot ? options.workspaceRoot : program.getCurrentDirectory();
-          fileMapping.set(
-            _chunkGQ77QZBOjs.toAbsolutePath.call(void 0, sourceFileName, cwd),
-            _chunkGQ77QZBOjs.toAbsolutePath.call(void 0, fileName, cwd)
-          );
-        }
-        return host.writeFile(
-          fileName,
-          text,
-          writeByteOrderMark,
-          onError,
-          sourceFiles,
-          data
-        );
-      };
-      logger.info("tsc", "Emitting DTS files");
-      let emitResult = program.emit(void 0, writeFile, void 0, true);
-      let diagnostics = _typescript2.default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-      let diagnosticMessages = [];
-      diagnostics.forEach((diagnostic) => {
-        if (diagnostic.file) {
-          let { line, character } = _typescript2.default.getLineAndCharacterOfPosition(
-            diagnostic.file,
-            diagnostic.start
-          );
-          let message = _typescript2.default.flattenDiagnosticMessageText(
-            diagnostic.messageText,
-            "\n"
-          );
-          diagnosticMessages.push(
-            `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`
-          );
-        } else {
-          let message = _typescript2.default.flattenDiagnosticMessageText(
-            diagnostic.messageText,
-            "\n"
-          );
-          diagnosticMessages.push(message);
-        }
-      });
-      let diagnosticMessage = diagnosticMessages.join("\n");
-      if (diagnosticMessage) {
-        logger.error(
-          "TSC",
-          "Failed to emit declaration files.\n\n" + diagnosticMessage
-        );
-        throw new Error("TypeScript compilation failed");
-      }
-      return fileMapping;
-    }
     var getFile = (name, logger3) => {
       logger3.info("tsc", `Reading file content for: ${name}`);
       return _fs2.default.promises.readFile(name, "utf8");
@@ -97618,6 +97562,7 @@ var require_dist6 = __commonJS({
           ...rawTsconfig.data,
           compilerOptions: {
             ...rawTsconfig.data.compilerOptions,
+            ...compilerOptions,
             // Enable declaration emit and disable javascript emit
             outDir: options.outDir,
             allowJs: true,
@@ -97678,9 +97623,17 @@ var require_dist6 = __commonJS({
       logger.info("tsc", "Created program");
       logger.info("tsc", "Emitting DTS files with the following options: ");
       logger.info("tsc", parsedTsconfig.options);
-      let fileMapping = emitDtsFiles(program, host.compilerHost, options);
-      logger.info("tsc", fileMapping);
-      return getExports(options, program, fileMapping);
+      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) {
       try {
@@ -97690,7 +97643,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) {
@@ -97790,23 +97747,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>",
@@ -97818,7 +97769,7 @@ var require_dist6 = __commonJS({
           enabled: options.docModel !== false,
           apiJsonFilePath: _path2.default.join(
             apiReferenceProjectDir,
-            `${packageName}.api.json`
+            "documents-model.api.json"
           )
         },
         dtsRollup: {
@@ -97831,19 +97782,19 @@ 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`
+            "tsdoc-metadata.api.json"
           )
         },
         compiler: {