@storm-software/workspace-tools 1.13.15 → 1.13.16

package/src/executors/tsup/get-config.js

@@ -240,9 +240,9 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -6549,9 +6549,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -6829,9 +6829,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -7765,9 +7765,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -59804,7 +59804,7 @@ var require_vfs_cjs_development = __commonJS({
       return vHost;
     }
     function createVirtualLanguageServiceHost(sys, rootFiles, compilerOptions, ts2, customTransformers) {
-      var fileNames = [].concat(rootFiles);
+      var fileNames2 = [].concat(rootFiles);
       var _createVirtualCompile = createVirtualCompilerHost(sys, compilerOptions, ts2), compilerHost = _createVirtualCompile.compilerHost, _updateFile2 = _createVirtualCompile.updateFile;
       var fileVersions = /* @__PURE__ */ new Map();
       var projectVersion = 0;
@@ -59827,7 +59827,7 @@ var require_vfs_cjs_development = __commonJS({
         // is used in bisecting for changes, it needs to guard against being busted in that
         // couple-week period, so we defensively make a slice here.
         getScriptFileNames: function getScriptFileNames() {
-          return fileNames.slice();
+          return fileNames2.slice();
         },
         getScriptSnapshot: function getScriptSnapshot(fileName) {
           var contents = sys.readFile(fileName);
@@ -59846,8 +59846,8 @@ var require_vfs_cjs_development = __commonJS({
         updateFile: function updateFile(sourceFile) {
           projectVersion++;
           fileVersions.set(sourceFile.fileName, projectVersion.toString());
-          if (!fileNames.includes(sourceFile.fileName)) {
-            fileNames.push(sourceFile.fileName);
+          if (!fileNames2.includes(sourceFile.fileName)) {
+            fileNames2.push(sourceFile.fileName);
           }
           _updateFile2(sourceFile);
         }
@@ -62765,9 +62765,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/index.js
 var require_dist6 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=73u54ejdk7ltp664vib6oxuiuu_@microsoft+api-extractor@7.38.3_@swc+core@1._pxjyxn5f3fufsl4odtbgbj3qqe/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=v3i5izuihlhi3k74xpov7onvhm_@microsoft+api-extractor@7.38.3_@swc+core@1._3j6ypyhhwgwauhbu54hri2onty/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -65053,21 +65053,6 @@ var require_dist6 = __commonJS({
       }
       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, options2, logger3) => {
-      let relativeName = name.replaceAll("/", "\\").replace(options2.workspaceRoot, "").replaceAll("\\", "/");
-      if (relativeName.startsWith("/")) {
-        relativeName = relativeName.substring(1);
-      }
-      if (map && !map.has(relativeName)) {
-        logger3.info("tsc", `Adding file to FS Map: ${relativeName}`);
-        const file = await getFile(name, logger3);
-        map.set(relativeName, file);
-      }
-    };
     async function emit(options2, compilerOptions, tsconfig) {
       logger.info("tsc", `Trying to find ${tsconfig || "tsconfig.json"}`);
       let rawTsconfig = _bundlerequire.loadTsConfig.call(
@@ -65090,82 +65075,18 @@ var require_dist6 = __commonJS({
       logger.info("tsc", "Raw tsconfig.json: ");
       logger.info("tsc", rawTsconfig);
       logger.info("tsc", "Parsing tsconfig.json");
-      let parsedTsconfig = _typescript2.default.parseJsonConfigFileContent(
-        tscOptions?.tsConfig ? tscOptions.tsConfig : {
-          ...rawTsconfig.data,
-          compilerOptions: {
-            ...rawTsconfig.data.compilerOptions,
-            ...compilerOptions,
-            // Enable declaration emit and disable javascript emit
-            outDir: options2.outDir,
-            allowJs: true,
-            noEmit: false,
-            declaration: true,
-            declarationMap: true,
-            declarationDir,
-            emitDeclarationOnly: true
-          },
-          files: [
-            ...rawTsconfig.data.files ?? [],
-            ...rawTsconfig.files ?? []
-          ],
-          include: [
-            ...rawTsconfig.data.include?.map?.((include) => _path.join(
-              options2.projectRoot,
-              include
-            )) ?? []
-          ],
-          exclude: [
-            ...rawTsconfig.data.exclude?.map?.((exclude) => _path.join(
-              options2.projectRoot,
-              exclude
-            )) ?? []
-          ]
-        },
-        _typescript2.default.sys,
-        options2.workspaceRoot ? options2.workspaceRoot : tsconfig ? _path.dirname.call(void 0, tsconfig) : options2.projectRoot
-      );
-      logger.info("tsc", parsedTsconfig);
-      const fsMap2 = await _tsvfs2.createDefaultMapFromNodeModules(
-        parsedTsconfig.options,
-        _typescript2.default,
-        options2.workspaceRoot
-      );
-      logger.info("tsc", "Created FS Map");
-      await Promise.all(parsedTsconfig.fileNames.map((fileName) => addFile(fileName, fsMap2, options2, logger)));
-      logger.info("tsc", "Added files to FS Map");
-      const system = _tsvfs2.createFSBackedSystem(
-        fsMap2,
-        options2.workspaceRoot,
-        _typescript2.default
-      );
-      logger.info("tsc", "Created virtual file system");
-      const host = _tsvfs2.createVirtualCompilerHost(
-        system,
-        parsedTsconfig.options,
-        _typescript2.default
-      );
-      logger.info("tsc", "Created virtual compiler host");
-      const fileNames = [...fsMap2.keys()];
-      logger.info("tsc", `Found the following file names: ${fileNames.join(" \n")}`);
-      const program = _typescript2.default.createProgram(
-        fileNames,
-        parsedTsconfig.options,
-        host.compilerHost
-      );
-      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");
-        fileMapping = emitDtsFiles(program, host.compilerHost, options2);
-        logger.info("tsc", "Emit DTS files complete");
-        logger.info("tsc", fileMapping);
-      } catch (e) {
-        logger.error("tsc", "An error occured while emitting DTS files");
-        logger.error("tsc", e);
-      }
+      compilerOptions.declarationDir = declarationDir;
+      logger.info("tsc", "Using the following compiler Options: ");
+      logger.info("tsc", compilerOptions);
+      const host = _typescript2.default.createCompilerHost(compilerOptions.options);
+      const program = _typescript2.default.createProgram({
+        rootNames: tsconfig.fileNames,
+        options: tsconfig.options,
+        host
+      });
+      const fileMapping = emitDtsFiles(program, host, options2);
+      logger.info("tsc", `Emitted the following file names: 
+${fileNames.join(" \n")}`);
       return getExports(options2, program, fileMapping);
     }
     async function runTypeScriptCompiler(options2) {
@@ -72109,8 +72030,9 @@ function modernConfig({
   define: define2,
   env: env2,
   tsCdnStorage,
-  tscOptions: tscOptions2
+  dtsTsConfig
 }) {
+  let outputPath = (0, import_path2.join)(outDir, "dist", "modern");
   return {
     name: "modern",
     entry,
@@ -72127,7 +72049,7 @@ function modernConfig({
     tsconfig,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_path2.join)(outDir, "dist", "modern"),
+    outDir: outputPath,
     silent: !verbose,
     metafile: true,
     shims: true,
@@ -72141,7 +72063,13 @@ function modernConfig({
     experimentalDts: {
       entry,
       compilerOptions: {
-        noEmit: false
+        ...dtsTsConfig,
+        outDir: outputPath,
+        allowJs: true,
+        noEmit: false,
+        declaration: true,
+        declarationMap: true,
+        emitDeclarationOnly: true
       }
     },
     apiReport,
@@ -72150,8 +72078,7 @@ function modernConfig({
     sourcemap: debug,
     clean: false,
     tsCdnStorage,
-    outExtension,
-    tscOptions: tscOptions2
+    outExtension
   };
 }
 function legacyConfig({
@@ -72168,8 +72095,9 @@ function legacyConfig({
   define: define2,
   env: env2,
   tsCdnStorage,
-  tscOptions: tscOptions2
+  dtsTsConfig
 }) {
+  let outputPath = (0, import_path2.join)(outDir, "dist", "legacy");
   return {
     name: "legacy",
     entry,
@@ -72178,7 +72106,7 @@ function legacyConfig({
     tsconfig,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_path2.join)(outDir, "dist", "legacy"),
+    outDir: outputPath,
     silent: !verbose,
     metafile: true,
     shims: true,
@@ -72192,7 +72120,13 @@ function legacyConfig({
     experimentalDts: {
       entry,
       compilerOptions: {
-        noEmit: false
+        ...dtsTsConfig,
+        outDir: outputPath,
+        allowJs: true,
+        noEmit: false,
+        declaration: true,
+        declarationMap: true,
+        emitDeclarationOnly: true
       }
     },
     apiReport: false,
@@ -72201,8 +72135,7 @@ function legacyConfig({
     sourcemap: debug,
     clean: false,
     tsCdnStorage,
-    outExtension,
-    tscOptions: tscOptions2
+    outExtension
   };
 }
 function workerConfig({
@@ -72221,7 +72154,7 @@ function workerConfig({
   define: define2,
   env: env2,
   tsCdnStorage,
-  tscOptions: tscOptions2
+  dtsTsConfig
 }) {
   return {
     name: "worker",
@@ -72255,8 +72188,7 @@ function workerConfig({
     sourcemap: debug,
     clean: false,
     tsCdnStorage,
-    outExtension,
-    tscOptions: tscOptions2
+    outExtension
   };
 }
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
@@ -72274,7 +72206,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   define: define2,
   env: env2,
   verbose,
-  tscOptions: tscOptions2,
+  dtsTsConfig,
   ...rest
 }) {
   const entry = globSync(
@@ -72318,7 +72250,7 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
       workspaceRoot
     }),
     options: options2,
-    tscOptions: tscOptions2
+    dtsTsConfig
   };
   if (platform === "worker") {
     return (0, import_tsup.defineConfig)(workerConfig(params));