@storm-software/workspace-tools 1.10.7 → 1.10.9

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

@@ -5399,7 +5399,7 @@ var require_common = __commonJS({
     var fs = require("fs");
     var path2 = require("path");
     var minimatch2 = require_minimatch();
-    var isAbsolute2 = require_path_is_absolute();
+    var isAbsolute = require_path_is_absolute();
     var Minimatch2 = minimatch2.Minimatch;
     function alphasort(a, b) {
       return a.localeCompare(b, "en");
@@ -5469,7 +5469,7 @@ var require_common = __commonJS({
       self2.root = path2.resolve(self2.root);
       if (process.platform === "win32")
         self2.root = self2.root.replace(/\\/g, "/");
-      self2.cwdAbs = isAbsolute2(self2.cwd) ? self2.cwd : makeAbs(self2, self2.cwd);
+      self2.cwdAbs = isAbsolute(self2.cwd) ? self2.cwd : makeAbs(self2, self2.cwd);
       if (process.platform === "win32")
         self2.cwdAbs = self2.cwdAbs.replace(/\\/g, "/");
       self2.nomount = !!options.nomount;
@@ -5549,7 +5549,7 @@ var require_common = __commonJS({
       var abs = f;
       if (f.charAt(0) === "/") {
         abs = path2.join(self2.root, f);
-      } else if (isAbsolute2(f) || f === "") {
+      } else if (isAbsolute(f) || f === "") {
         abs = f;
       } else if (self2.changedCwd) {
         abs = path2.resolve(self2.cwd, f);
@@ -5589,7 +5589,7 @@ var require_sync = __commonJS({
     var util = require("util");
     var path2 = require("path");
     var assert = require("assert");
-    var isAbsolute2 = require_path_is_absolute();
+    var isAbsolute = require_path_is_absolute();
     var common = require_common();
     var setopts = common.setopts;
     var ownProp = common.ownProp;
@@ -5661,10 +5661,10 @@ var require_sync = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute2(prefix) || isAbsolute2(pattern.map(function(p) {
+      else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute2(prefix))
+        if (!prefix || !isAbsolute(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -5861,7 +5861,7 @@ var require_sync = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists)
         return;
-      if (prefix && isAbsolute2(prefix) && !this.nomount) {
+      if (prefix && isAbsolute(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path2.join(this.root, prefix);
@@ -6063,7 +6063,7 @@ var require_glob = __commonJS({
     var EE = require("events").EventEmitter;
     var path2 = require("path");
     var assert = require("assert");
-    var isAbsolute2 = require_path_is_absolute();
+    var isAbsolute = require_path_is_absolute();
     var globSync2 = require_sync();
     var common = require_common();
     var setopts = common.setopts;
@@ -6285,10 +6285,10 @@ var require_glob = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute2(prefix) || isAbsolute2(pattern.map(function(p) {
+      else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute2(prefix))
+        if (!prefix || !isAbsolute(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -6373,7 +6373,7 @@ var require_glob = __commonJS({
         this._emitQueue.push([index, e]);
         return;
       }
-      var abs = isAbsolute2(e) ? e : this._makeAbs(e);
+      var abs = isAbsolute(e) ? e : this._makeAbs(e);
       if (this.mark)
         e = this._mark(e);
       if (this.absolute)
@@ -6528,7 +6528,7 @@ var require_glob = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists)
         return cb();
-      if (prefix && isAbsolute2(prefix) && !this.nomount) {
+      if (prefix && isAbsolute(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path2.join(this.root, prefix);
@@ -18383,9 +18383,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -24319,9 +24319,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -24600,9 +24600,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -25095,7 +25095,7 @@ var require_dist = __commonJS({
       loadTsConfig: () => loadTsConfig2
     });
     module2.exports = __toCommonJS2(src_exports);
-    var import_path3 = __toESM2(require("path"), 1);
+    var import_path2 = __toESM2(require("path"), 1);
     var import_fs2 = __toESM2(require("fs"), 1);
     var singleComment = Symbol("singleComment");
     var multiComment = Symbol("multiComment");
@@ -25191,10 +25191,10 @@ var require_dist = __commonJS({
       }
     }
     var req = false ? createRequire(import_meta.url) : require;
-    var findUp = (name, startDir, stopDir = import_path3.default.parse(startDir).root) => {
+    var findUp = (name, startDir, stopDir = import_path2.default.parse(startDir).root) => {
       let dir = startDir;
       while (dir !== stopDir) {
-        const file = import_path3.default.join(dir, name);
+        const file = import_path2.default.join(dir, name);
         if (import_fs2.default.existsSync(file))
           return file;
         if (!file.endsWith(".json")) {
@@ -25202,17 +25202,17 @@ var require_dist = __commonJS({
           if (import_fs2.default.existsSync(fileWithExt))
             return fileWithExt;
         }
-        dir = import_path3.default.dirname(dir);
+        dir = import_path2.default.dirname(dir);
       }
       return null;
     };
     var resolveTsConfigFromFile = (cwd, filename) => {
-      if (import_path3.default.isAbsolute(filename))
+      if (import_path2.default.isAbsolute(filename))
         return import_fs2.default.existsSync(filename) ? filename : null;
       return findUp(filename, cwd);
     };
     var resolveTsConfigFromExtends = (cwd, name) => {
-      if (import_path3.default.isAbsolute(name))
+      if (import_path2.default.isAbsolute(name))
         return import_fs2.default.existsSync(name) ? name : null;
       if (name.startsWith("."))
         return findUp(name, cwd);
@@ -25221,14 +25221,14 @@ var require_dist = __commonJS({
     };
     var loadTsConfigInternal = (dir = process.cwd(), name = "tsconfig.json", isExtends = false) => {
       var _a, _b;
-      dir = import_path3.default.resolve(dir);
+      dir = import_path2.default.resolve(dir);
       const id = isExtends ? resolveTsConfigFromExtends(dir, name) : resolveTsConfigFromFile(dir, name);
       if (!id)
         return null;
       const data = jsoncParse(import_fs2.default.readFileSync(id, "utf-8"));
-      const configDir = import_path3.default.dirname(id);
+      const configDir = import_path2.default.dirname(id);
       if ((_a = data.compilerOptions) == null ? void 0 : _a.baseUrl) {
-        data.compilerOptions.baseUrl = import_path3.default.join(
+        data.compilerOptions.baseUrl = import_path2.default.join(
           configDir,
           data.compilerOptions.baseUrl
         );
@@ -25306,7 +25306,7 @@ var require_dist2 = __commonJS({
     });
     module2.exports = __toCommonJS2(src_exports);
     var import_fs2 = __toESM2(require("fs"), 1);
-    var import_path22 = __toESM2(require("path"), 1);
+    var import_path2 = __toESM2(require("path"), 1);
     var import_url3 = require("url");
     var import_esbuild = require("esbuild");
     var import_load_tsconfig = require_dist();
@@ -25381,7 +25381,7 @@ var require_dist2 = __commonJS({
         name: "bundle-require:external",
         setup(ctx) {
           ctx.onResolve({ filter: /.*/ }, async (args) => {
-            if (args.path[0] === "." || import_path22.default.isAbsolute(args.path)) {
+            if (args.path[0] === "." || import_path2.default.isAbsolute(args.path)) {
               return;
             }
             if (match2(args.path, external)) {
@@ -25414,7 +25414,7 @@ var require_dist2 = __commonJS({
             const injectLines = [
               `const ${FILENAME_VAR_NAME} = ${JSON.stringify(args.path)};`,
               `const ${DIRNAME_VAR_NAME} = ${JSON.stringify(
-                import_path22.default.dirname(args.path)
+                import_path2.default.dirname(args.path)
               )};`,
               `const ${IMPORT_META_URL_VAR_NAME} = ${JSON.stringify(
                 (0, import_url3.pathToFileURL)(args.path).href
@@ -25422,7 +25422,7 @@ var require_dist2 = __commonJS({
             ];
             return {
               contents: injectLines.join("") + contents,
-              loader: inferLoader(import_path22.default.extname(args.path))
+              loader: inferLoader(import_path2.default.extname(args.path))
             };
           });
         }
@@ -25536,9 +25536,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -53111,7 +53111,7 @@ ${indicator}`;
     };
     var ABSOLUTE_PATH_REGEX = /^(?:\/|(?:[A-Za-z]:)?[/\\|])/;
     var RELATIVE_PATH_REGEX = /^\.?\.(\/|$)/;
-    function isAbsolute2(path2) {
+    function isAbsolute(path2) {
       return ABSOLUTE_PATH_REGEX.test(path2);
     }
     function isRelative(path2) {
@@ -53156,12 +53156,12 @@ ${indicator}`;
       return base.slice(0, Math.max(0, base.length - node_path.extname(id).length));
     }
     function relativeId(id) {
-      if (!isAbsolute2(id))
+      if (!isAbsolute(id))
         return id;
       return relative(node_path.resolve(), id);
     }
     function isPathFragment(name) {
-      return name[0] === "/" || name[0] === "." && (name[1] === "/" || name[1] === ".") || isAbsolute2(name);
+      return name[0] === "/" || name[0] === "." && (name[1] === "/" || name[1] === ".") || isAbsolute(name);
     }
     var UPPER_DIR_REGEX = /^(\.\.\/)*\.\.$/;
     function getImportPath(importerId, targetPath, stripJsExtension, ensureFileName) {
@@ -55268,7 +55268,7 @@ ${smallChunks} are below minChunkSize.`
     exports.getAliasName = getAliasName;
     exports.getImportPath = getImportPath;
     exports.getRollupUrl = getRollupUrl;
-    exports.isAbsolute = isAbsolute2;
+    exports.isAbsolute = isAbsolute;
     exports.isPathFragment = isPathFragment;
     exports.isRelative = isRelative;
     exports.isValidUrl = isValidUrl;
@@ -77085,7 +77085,7 @@ var require_util4 = __commonJS({
         }
         path2 = url.path;
       }
-      var isAbsolute2 = exports.isAbsolute(path2);
+      var isAbsolute = exports.isAbsolute(path2);
       var parts = path2.split(/\/+/);
       for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
         part = parts[i];
@@ -77105,7 +77105,7 @@ var require_util4 = __commonJS({
       }
       path2 = parts.join("/");
       if (path2 === "") {
-        path2 = isAbsolute2 ? "/" : ".";
+        path2 = isAbsolute ? "/" : ".";
       }
       if (url) {
         url.path = path2;
@@ -267221,9 +267221,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=ihschbnim6dhlbjmzikdamq5bu_@microsoft+api-extractor@7.38.3_@swc+core@1._kikmqi53olysam5eifirrinffy/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=hu77hduz5nak7c7dpazidqkjea_@microsoft+api-extractor@7.38.3_@swc+core@1._zxqmp774nlsuuzd7jfgvocfzay/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -269416,7 +269416,7 @@ var require_dist5 = __commonJS({
       let aliasPool = new AliasPool();
       let assignAlias = aliasPool.assign.bind(aliasPool);
       const packagePath = _path.join(
-        program.getCurrentDirectory(),
+        options.workspaceRoot ? options.workspaceRoot : program.getCurrentDirectory(),
         packageJsonSearch(options.outDir, options.silent, "dts", logger)
       );
       logger.info("dts", `\u26A1 Getting Exports (DTS generate): ${packagePath}`);
@@ -269522,6 +269522,7 @@ var require_dist5 = __commonJS({
       if (!rawTsconfig.data.compilerOptions) {
         rawTsconfig.data.compilerOptions = {};
       }
+      const packagePath = packageJsonSearch(options.outDir, options.silent, "dts", logger);
       logger.info("tsc", "Getting temporary declaration directory");
       let declarationDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0);
       logger.info("tsc", declarationDir);
@@ -269538,7 +269539,8 @@ var require_dist5 = __commonJS({
             declarationMap: true,
             declarationDir,
             emitDeclarationOnly: true
-          }
+          },
+          include: [...rawTsconfig.data.include, _path.join(packagePath, "**/*")]
         },
         _typescript2.default.sys,
         options.workspaceRoot ? options.workspaceRoot : tsconfig ? _path.dirname.call(void 0, tsconfig) : options.projectRoot
@@ -269769,7 +269771,8 @@ var require_dist5 = __commonJS({
       let declarationDir = _chunkGQ77QZBOjs.ensureTempDeclarationDir.call(void 0);
       let outDir = options.outDir || "dist";
       let pkgPath = packageJsonSearch(outDir, options.silent, "dts", logger2);
-      logger2.info("dts", `\u26A1 Preparing to run Rollup (DTS generate): ${pkgPath}`);
+      !options.silent && logger2.info("dts", `\u26A1 Preparing to run Rollup (DTS generate): ${pkgPath}`);
+      !options.silent && logger2.info("dts", `\u26A1 Exports list to use in generation: ${exports2.map((e) => JSON.stringify(e)).join("\n")}`);
       let pkg = await _chunk7G76EW2Rjs.loadPkg.call(void 0, pkgPath);
       let dtsExtension = _chunkGQ77QZBOjs.defaultOutExtension.call(void 0, { format, pkgType: pkg.type }).dts;
       let dtsInputFilePath = _path2.default.join(
@@ -269796,7 +269799,7 @@ var require_dist5 = __commonJS({
         options.experimentalDts.entry
       )) {
         sourceFileName = _chunkGQ77QZBOjs.toAbsolutePath.call(void 0, sourceFileName);
-        const outFileName = _path2.default.join(outDir, out + dtsExtension);
+        const outFileName = _path2.default.join(outDir, "decl", out + dtsExtension);
         const currentExports = exports2.filter(
           (declaration) => declaration.sourceFileName === sourceFileName
         );
@@ -276332,7 +276335,6 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // packages/workspace-tools/src/executors/tsup/get-config.ts
-var import_path2 = require("path");
 var import_tsup = __toESM(require_dist5());
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
@@ -276449,7 +276451,6 @@ function legacyConfig({
   };
 }
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
-  main,
   outputPath,
   tsConfig,
   debug,
@@ -276463,14 +276464,11 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   tsdocMetadata,
   define: define2,
   env,
-  verbose
+  verbose,
+  ...rest
 }) {
-  const entryPath = main ? main : sourceRoot;
   const entry = globSync(
-    [
-      (0, import_path2.isAbsolute)(entryPath) ? entryPath : (0, import_devkit.joinPathFragments)(workspaceRoot, entryPath),
-      ...additionalEntryPoints ?? []
-    ],
+    [rest.entry ? rest.entry : sourceRoot, ...additionalEntryPoints ?? []],
     {
       withFileTypes: true
     }

package/src/executors/tsup/schema.d.ts

@@ -16,7 +16,7 @@ export type TsupExecutorSchema = Omit<
   | "esbuildOptions"
   | "esbuildConfig"
 > & {
-  main?: string;
+  entry?: string;
   options: Options;
   clean: boolean;
   debug: boolean;

package/src/executors/tsup/schema.json

@@ -6,7 +6,7 @@
   "type": "object",
   "properties": {
     "properties": {
-      "main": {
+      "entry": {
         "type": "string",
         "description": "The path to the entry file, relative to project."
       },