@storm-software/workspace-tools 1.10.4 → 1.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/src/executors/tsup/executor.js

@@ -5399,7 +5399,7 @@ var require_common = __commonJS({
     var fs = require("fs");
     var path2 = require("path");
     var minimatch2 = require_minimatch();
-    var isAbsolute = require_path_is_absolute();
+    var isAbsolute2 = 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 = isAbsolute(self2.cwd) ? self2.cwd : makeAbs(self2, self2.cwd);
+      self2.cwdAbs = isAbsolute2(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 (isAbsolute(f) || f === "") {
+      } else if (isAbsolute2(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 isAbsolute = require_path_is_absolute();
+    var isAbsolute2 = 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 (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+      else if (isAbsolute2(prefix) || isAbsolute2(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute(prefix))
+        if (!prefix || !isAbsolute2(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 && isAbsolute(prefix) && !this.nomount) {
+      if (prefix && isAbsolute2(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 isAbsolute = require_path_is_absolute();
+    var isAbsolute2 = 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 (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+      else if (isAbsolute2(prefix) || isAbsolute2(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute(prefix))
+        if (!prefix || !isAbsolute2(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -6373,7 +6373,7 @@ var require_glob = __commonJS({
         this._emitQueue.push([index, e]);
         return;
       }
-      var abs = isAbsolute(e) ? e : this._makeAbs(e);
+      var abs = isAbsolute2(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 && isAbsolute(prefix) && !this.nomount) {
+      if (prefix && isAbsolute2(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path2.join(this.root, prefix);
@@ -20351,7 +20351,7 @@ var require_util2 = __commonJS({
         }
         path2 = url.path;
       }
-      var isAbsolute = exports.isAbsolute(path2);
+      var isAbsolute2 = exports.isAbsolute(path2);
       var parts = path2.split(/\/+/);
       for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
         part = parts[i];
@@ -20371,7 +20371,7 @@ var require_util2 = __commonJS({
       }
       path2 = parts.join("/");
       if (path2 === "") {
-        path2 = isAbsolute ? "/" : ".";
+        path2 = isAbsolute2 ? "/" : ".";
       }
       if (url) {
         url.path = path2;
@@ -408390,9 +408390,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-EPAEWGCP.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-EPAEWGCP.js
 var require_chunk_EPAEWGCP = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-EPAEWGCP.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var version = "8.0.0";
@@ -410039,9 +410039,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-GQ77QZBO.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-GQ77QZBO.js
 var require_chunk_GQ77QZBO = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-GQ77QZBO.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -410320,9 +410320,9 @@ var require_chunk_GQ77QZBO = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-UIX4URMV.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-UIX4URMV.js
 var require_chunk_UIX4URMV = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-UIX4URMV.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireWildcard(obj) {
@@ -410815,7 +410815,7 @@ var require_dist = __commonJS({
       loadTsConfig: () => loadTsConfig2
     });
     module2.exports = __toCommonJS2(src_exports);
-    var import_path3 = __toESM2(require("path"), 1);
+    var import_path4 = __toESM2(require("path"), 1);
     var import_fs3 = __toESM2(require("fs"), 1);
     var singleComment = Symbol("singleComment");
     var multiComment = Symbol("multiComment");
@@ -410911,10 +410911,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_path4.default.parse(startDir).root) => {
       let dir = startDir;
       while (dir !== stopDir) {
-        const file = import_path3.default.join(dir, name);
+        const file = import_path4.default.join(dir, name);
         if (import_fs3.default.existsSync(file))
           return file;
         if (!file.endsWith(".json")) {
@@ -410922,17 +410922,17 @@ var require_dist = __commonJS({
           if (import_fs3.default.existsSync(fileWithExt))
             return fileWithExt;
         }
-        dir = import_path3.default.dirname(dir);
+        dir = import_path4.default.dirname(dir);
       }
       return null;
     };
     var resolveTsConfigFromFile = (cwd, filename) => {
-      if (import_path3.default.isAbsolute(filename))
+      if (import_path4.default.isAbsolute(filename))
         return import_fs3.default.existsSync(filename) ? filename : null;
       return findUp(filename, cwd);
     };
     var resolveTsConfigFromExtends = (cwd, name) => {
-      if (import_path3.default.isAbsolute(name))
+      if (import_path4.default.isAbsolute(name))
         return import_fs3.default.existsSync(name) ? name : null;
       if (name.startsWith("."))
         return findUp(name, cwd);
@@ -410941,14 +410941,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_path4.default.resolve(dir);
       const id = isExtends ? resolveTsConfigFromExtends(dir, name) : resolveTsConfigFromFile(dir, name);
       if (!id)
         return null;
       const data = jsoncParse(import_fs3.default.readFileSync(id, "utf-8"));
-      const configDir = import_path3.default.dirname(id);
+      const configDir = import_path4.default.dirname(id);
       if ((_a = data.compilerOptions) == null ? void 0 : _a.baseUrl) {
-        data.compilerOptions.baseUrl = import_path3.default.join(
+        data.compilerOptions.baseUrl = import_path4.default.join(
           configDir,
           data.compilerOptions.baseUrl
         );
@@ -411031,11 +411031,11 @@ var require_dist2 = __commonJS({
     var import_esbuild = require("esbuild");
     var import_load_tsconfig = require_dist();
     var import_fs3 = __toESM2(require("fs"), 1);
-    var import_path3 = __toESM2(require("path"), 1);
+    var import_path4 = __toESM2(require("path"), 1);
     var getPkgType = () => {
       try {
         const pkg = JSON.parse(
-          import_fs3.default.readFileSync(import_path3.default.resolve("package.json"), "utf-8")
+          import_fs3.default.readFileSync(import_path4.default.resolve("package.json"), "utf-8")
         );
         return pkg.type;
       } catch (error) {
@@ -411044,7 +411044,7 @@ var require_dist2 = __commonJS({
     function guessFormat(inputFile) {
       if (!usingDynamicImport)
         return "cjs";
-      const ext2 = import_path3.default.extname(inputFile);
+      const ext2 = import_path4.default.extname(inputFile);
       const type = getPkgType();
       if (ext2 === ".js") {
         return type === "module" ? "esm" : "cjs";
@@ -411256,9 +411256,9 @@ var require_dist2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-7G76EW2R.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-7G76EW2R.js
 var require_chunk_7G76EW2R = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/chunk-7G76EW2R.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -438831,7 +438831,7 @@ ${indicator}`;
     };
     var ABSOLUTE_PATH_REGEX = /^(?:\/|(?:[A-Za-z]:)?[/\\|])/;
     var RELATIVE_PATH_REGEX = /^\.?\.(\/|$)/;
-    function isAbsolute(path2) {
+    function isAbsolute2(path2) {
       return ABSOLUTE_PATH_REGEX.test(path2);
     }
     function isRelative(path2) {
@@ -438876,12 +438876,12 @@ ${indicator}`;
       return base.slice(0, Math.max(0, base.length - node_path.extname(id).length));
     }
     function relativeId(id) {
-      if (!isAbsolute(id))
+      if (!isAbsolute2(id))
         return id;
       return relative(node_path.resolve(), id);
     }
     function isPathFragment(name) {
-      return name[0] === "/" || name[0] === "." && (name[1] === "/" || name[1] === ".") || isAbsolute(name);
+      return name[0] === "/" || name[0] === "." && (name[1] === "/" || name[1] === ".") || isAbsolute2(name);
     }
     var UPPER_DIR_REGEX = /^(\.\.\/)*\.\.$/;
     function getImportPath(importerId, targetPath, stripJsExtension, ensureFileName) {
@@ -440988,7 +440988,7 @@ ${smallChunks} are below minChunkSize.`
     exports.getAliasName = getAliasName;
     exports.getImportPath = getImportPath;
     exports.getRollupUrl = getRollupUrl;
-    exports.isAbsolute = isAbsolute;
+    exports.isAbsolute = isAbsolute2;
     exports.isPathFragment = isPathFragment;
     exports.isRelative = isRelative;
     exports.isValidUrl = isValidUrl;
@@ -465064,9 +465064,9 @@ var require_chokidar = __commonJS({
   }
 });
 
-// node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/index.js
+// node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/index.js
 var require_dist5 = __commonJS({
-  "node_modules/.pnpm/tsup@8.0.0_patch_hash=m5d7qaigvbst7blv2cqvhcnqka_@microsoft+api-extractor@7.38.3_@swc+core@1._bdwxrrieyl7nvwx4mb2daqadl4/node_modules/tsup/dist/index.js"(exports) {
+  "node_modules/.pnpm/tsup@8.0.0_patch_hash=vacgs4a4zp4upsktddmbhsrzv4_@microsoft+api-extractor@7.38.3_@swc+core@1._yxo57q7bbndqw4wwnkeuag3hqa/node_modules/tsup/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault(obj) {
@@ -467573,7 +467573,7 @@ var require_dist5 = __commonJS({
               ...options?.experimentalDts?.compilerOptions ?? {},
               noEmit: false
             },
-            include: [`${pkgPath}/**/*`]
+            include: [_path2.default.join(pkgPath, "/**/*")]
           }
         },
         projectFolder: "./"
@@ -467583,9 +467583,13 @@ var require_dist5 = __commonJS({
         configObjectFullPath: void 0,
         packageJsonFullPath
       };
-      logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
-      logger2.info("dts", "\u26A1 Running API Extractor with the following config: \n", prepareOptions);
-      logger2.info(
+      !options.silent && logger2.info("dts", `\u26A1 Current Directory: ${__dirname}`);
+      !options.silent && logger2.info(
+        "dts",
+        "\u26A1 Running API Extractor with the following config: \n",
+        prepareOptions
+      );
+      !options.silent && logger2.info(
         "dts",
         "\u26A1 Using the following compiler options: \n",
         JSON.stringify(prepareOptions.configObject?.compiler)
@@ -467598,6 +467602,11 @@ var require_dist5 = __commonJS({
       }
       const { ExtractorConfig, Extractor } = imported;
       const extractorConfig = ExtractorConfig.prepare(prepareOptions);
+      !options.silent && logger2.info(
+        "dts",
+        "\u26A1 Invoking extractor with the following prepare options: \n",
+        JSON.stringify(extractorConfig)
+      );
       const extractorResult = Extractor.invoke(extractorConfig, {
         // Equivalent to the "--local" command-line parameter
         localBuild: true,
@@ -474183,7 +474192,7 @@ glob.glob = glob;
 var import_node_events = require("node:events");
 var import_project_graph = require("nx/src/project-graph/project-graph");
 var import_fileutils = require("nx/src/utils/fileutils");
-var import_path2 = require("path");
+var import_path3 = require("path");
 var import_prettier = require("prettier");
 var import_tsup2 = __toESM(require_dist5());
 
@@ -474239,6 +474248,7 @@ var removeExtension = (filePath) => {
 
 // packages/workspace-tools/src/executors/tsup/get-config.ts
 var import_devkit = __toESM(require_devkit());
+var import_path2 = require("path");
 var import_tsup = __toESM(require_dist5());
 function modernConfig({
   entry,
@@ -474364,9 +474374,16 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   env,
   verbose
 }) {
-  const entry = globSync([main, ...additionalEntryPoints ?? []], {
-    withFileTypes: true
-  }).reduce((ret, filePath) => {
+  const entryPath = main ? main : sourceRoot;
+  const entry = globSync(
+    [
+      (0, import_path2.isAbsolute)(entryPath) ? entryPath : (0, import_devkit.joinPathFragments)(workspaceRoot, entryPath),
+      ...additionalEntryPoints ?? []
+    ],
+    {
+      withFileTypes: true
+    }
+  ).reduce((ret, filePath) => {
     ret[removeExtension(filePath.name)] = (0, import_devkit.joinPathFragments)(
       filePath.path,
       filePath.name
@@ -474436,7 +474453,6 @@ var outExtension = ({ options, format: format2, pkgType }) => {
 async function runExecutor(options, context) {
   try {
     console.log("\u{1F4E6}  Running Storm build executor on the workspace");
-    options.main ??= "src/index.ts";
     options.outputPath ??= "dist/{projectRoot}";
     options.tsConfig ??= "tsconfig.json";
     options.banner ??= process.env.STORM_FILE_BANNER;
@@ -474470,7 +474486,7 @@ ${Object.keys(options).map(
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
     const outputPath = applyWorkspaceTokens(
-      options.outputPath ? options.outputPath : (0, import_path2.join)(workspaceRoot, "dist", projectRoot),
+      options.outputPath ? options.outputPath : (0, import_path3.join)(workspaceRoot, "dist", projectRoot),
       context
     );
     if (options.clean !== false) {
@@ -474529,7 +474545,7 @@ ${externalDependencies.map((dep) => {
       }
     }
     const projectGraph = await (0, import_project_graph.buildProjectGraphWithoutDaemon)();
-    const pathToPackageJson = (0, import_path2.join)(context.root, projectRoot, "package.json");
+    const pathToPackageJson = (0, import_path3.join)(context.root, projectRoot, "package.json");
     const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
     const workspacePackageJson = (0, import_devkit2.readJsonFile)(
       (0, import_devkit2.joinPathFragments)(workspaceRoot, "package.json")