@storm-software/workspace-tools 1.13.11 → 1.13.13

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.13.12](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.13.11...workspace-tools-v1.13.12) (2023-11-27)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue around adding files to api-extractor config ([4ad4118](https://github.com/storm-software/storm-ops/commit/4ad41184c0c8d1f803846b5bb653dc8fffc905e6))
+
+## [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)
 
 

package/index.js

@@ -37426,9 +37426,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// 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
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "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) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/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=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "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) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/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=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "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) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/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=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "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) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/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=ey2bly4qh77gvdv3ymoz7pnvnm_@microsoft+api-extractor@7.38.3_@swc+core@1._rzdpkyxhwa3hk5iyolbhuxsk3a/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/index.js
 var require_dist6 = __commonJS({
-  "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) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ozahcrvbx3dbyb7o5rk2jowdzi_@microsoft+api-extractor@7.38.3_@swc+core@1._eqrbl6tdl36m7ygs4afj6pyolu/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -97523,13 +97523,72 @@ 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");
     };
     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);
@@ -97623,17 +97682,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;
       try {
         logger.info("tsc", "Emitting DTS files");
-        logger.info("tsc", fsMap);
-        program.emit();
+        fileMapping = emitDtsFiles(program, host.compilerHost, options);
         logger.info("tsc", "Emit DTS files complete");
-        logger.info("tsc", fsMap);
+        logger.info("tsc", fileMapping);
       } catch (e) {
         logger.error("tsc", "An error occured while emitting DTS files");
         logger.error("tsc", e);
       }
-      return getExports(options, program, fsMap);
+      return getExports(options, program, fileMapping);
     }
     async function runTypeScriptCompiler(options) {
       try {
@@ -97793,7 +97852,9 @@ var require_dist6 = __commonJS({
         tsdocMetadata: {
           enabled: options.tsdocMetadata !== false,
           tsdocMetadataFilePath: _path2.default.join(
-            apiReferenceProjectDir,
+            "<projectFolder>",
+            "dist",
+            options.projectRoot,
             "tsdoc-metadata.api.json"
           )
         },