@storm-software/workspace-tools 1.35.4 → 1.36.0

package/src/executors/tsup-node/executor.js

@@ -12458,12 +12458,12 @@ var require_install_packages_task = __commonJS({
     var child_process_1 = require("child_process");
     var path_1 = require("path");
     var nx_1 = require_nx();
-    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments3 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments2 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments2(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments2(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -41382,7 +41382,7 @@ var require_project_name_and_root_utils = __commonJS({
     var nx_1 = require_nx();
     var get_workspace_layout_1 = require_get_workspace_layout();
     var names_1 = require_names();
-    var { joinPathFragments: joinPathFragments3, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments2, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
     var deprecationWarning = stripIndents`
     In Nx 18, generating projects will no longer derive the name and root.
     Please provide the exact project name and root in the future.`;
@@ -41458,14 +41458,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments2(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments2(relativeCwd, asProvidedProjectName);
         }
       }
       if (asProvidedProjectName.startsWith("@")) {
@@ -41498,7 +41498,7 @@ var require_project_name_and_root_utils = __commonJS({
       const derivedSimpleProjectName = name;
       let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
       if (derivedProjectDirectoryWithoutLayout !== ".") {
-        derivedProjectDirectory = joinPathFragments3(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments2(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -110474,7 +110474,7 @@ ${commentStart} ----------------------------------------------------------------
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_esbuild_decorators = __toESM(require_src());
-var import_devkit2 = __toESM(require_devkit());
+var import_devkit = __toESM(require_devkit());
 var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -116707,33 +116707,8 @@ var import_prettier = require("prettier");
 var import_tsup = __toESM(require_dist6());
 var ts = __toESM(require("typescript"));
 
-// packages/workspace-tools/src/utils/file-path-utils.ts
-var removeExtension = (filePath) => {
-  return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
-};
-
-// packages/workspace-tools/src/utils/get-project-configurations.ts
-var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
-var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
-  getWorkspaceRoot()
-);
-
-// packages/workspace-tools/src/utils/get-project-deps.ts
-function getExternalDependencies(projectName, graph) {
-  const allDeps = graph.dependencies[projectName];
-  return Array.from(
-    allDeps.reduce((acc, node) => {
-      const found = graph.externalNodes[node.target];
-      if (found)
-        acc.push(found);
-      return acc;
-    }, [])
-  );
-}
-
-// packages/workspace-tools/src/executors/tsup/get-config.ts
-var import_devkit = __toESM(require_devkit());
-function modernConfig({
+// packages/workspace-tools/src/base/get-tsup-config.ts
+function defaultConfig({
   entry,
   outDir,
   projectRoot,
@@ -116756,9 +116731,8 @@ function modernConfig({
   generatePackageJson,
   dtsTsConfig
 }) {
-  let outputPath = (0, import_devkit.joinPathFragments)(outDir, "dist", "modern");
   return {
-    name: "modern",
+    name: "default",
     entry,
     format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
     target: platform !== "node" ? [
@@ -116778,7 +116752,7 @@ function modernConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir: outputPath,
+    outDir,
     silent: !verbose,
     metafile: true,
     shims,
@@ -116794,7 +116768,7 @@ function modernConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: outputPath
+          outDir
         }
       }
     },
@@ -116815,77 +116789,6 @@ function modernConfig({
     outExtension
   };
 }
-function legacyConfig({
-  entry,
-  outDir,
-  projectRoot,
-  workspaceRoot,
-  tsconfig = "tsconfig.json",
-  splitting,
-  treeshake,
-  debug = false,
-  external,
-  banner = {},
-  platform = "neutral",
-  verbose = false,
-  shims = true,
-  define: define2,
-  env,
-  plugins,
-  generatePackageJson,
-  dtsTsConfig
-}) {
-  let outputPath = (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy");
-  return {
-    name: "legacy",
-    entry,
-    format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
-    target: ["es2022", "node18"],
-    tsconfig,
-    splitting,
-    generatePackageJson,
-    treeshake: treeshake ? {
-      preset: "recommended"
-    } : false,
-    projectRoot,
-    workspaceRoot,
-    outDir: outputPath,
-    silent: !verbose,
-    metafile: true,
-    shims,
-    external,
-    platform,
-    banner,
-    define: define2,
-    env,
-    dts: false,
-    experimentalDts: {
-      entry,
-      compilerOptions: {
-        ...dtsTsConfig,
-        options: {
-          ...dtsTsConfig.options,
-          outDir: outputPath
-        }
-      }
-    },
-    /*minify: debug ? false : "terser",
-    terserOptions: {
-      compress: true,
-      ecma: 2020,
-      keep_classnames: true,
-      keep_fnames: true
-    },*/
-    apiReport: false,
-    docModel: false,
-    tsdocMetadata: false,
-    sourcemap: debug,
-    clean: false,
-    tsconfigDecoratorMetadata: true,
-    plugins,
-    outExtension
-  };
-}
 function getConfig(workspaceRoot, projectRoot, getConfigFn, {
   outputPath,
   tsConfig,
@@ -116922,6 +116825,30 @@ var outExtension = ({ format: format2 }) => {
   };
 };
 
+// packages/workspace-tools/src/utils/file-path-utils.ts
+var removeExtension = (filePath) => {
+  return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+};
+
+// packages/workspace-tools/src/utils/get-project-configurations.ts
+var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
+  getWorkspaceRoot()
+);
+
+// packages/workspace-tools/src/utils/get-project-deps.ts
+function getExternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName];
+  return Array.from(
+    allDeps.reduce((acc, node) => {
+      const found = graph.externalNodes[node.target];
+      if (found)
+        acc.push(found);
+      return acc;
+    }, [])
+  );
+}
+
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function tsupExecutorFn(options, context) {
   try {
@@ -116978,8 +116905,8 @@ ${Object.keys(options).map(
       throw new Error("The Build process failed trying to copy assets");
     }
     const pathToPackageJson = (0, import_path4.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)(
+    const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
+    const workspacePackageJson = (0, import_devkit.readJsonFile)(
       (0, import_path4.join)(workspaceRoot, "package.json")
     );
     options.external = options.external || [];
@@ -117018,7 +116945,7 @@ ${Object.keys(options).map(
           console.log(`\u26A1 Adding implicit dependency: ${key}`);
           const projectConfig = projectConfigs[key];
           if (projectConfig?.targets?.build) {
-            const projectPackageJson = (0, import_devkit2.readJsonFile)(
+            const projectPackageJson = (0, import_devkit.readJsonFile)(
               projectConfig.targets?.build.options.project
             );
             if (projectPackageJson?.name && !options.external.includes(projectPackageJson.name)) {
@@ -117068,7 +116995,7 @@ ${externalDependencies.map((dep) => {
       entryPoints.push(options.entry);
     }
     if (options.emitOnAll === true) {
-      entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+      entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
       entryPoints.push(...options.additionalEntryPoints);
@@ -117080,7 +117007,7 @@ ${externalDependencies.map((dep) => {
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit2.joinPathFragments)(
+      let propertyKey = (0, import_devkit.joinPathFragments)(
         filePath.path,
         removeExtension(filePath.name)
       ).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
@@ -117089,19 +117016,19 @@ ${externalDependencies.map((dep) => {
           propertyKey = propertyKey.substring(1);
         }
         console.debug(
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!(propertyKey in ret)) {
-          ret[propertyKey] = (0, import_devkit2.joinPathFragments)(filePath.path, filePath.name);
+          ret[propertyKey] = (0, import_devkit.joinPathFragments)(filePath.path, filePath.name);
         }
       }
       return ret;
     }, {});
     if (options.generatePackageJson !== false) {
-      const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
+      const projectGraph = (0, import_devkit.readCachedProjectGraph)();
       delete packageJson.dependencies;
       externalDependencies.forEach((externalDependency) => {
         const packageConfig = externalDependency.node.data;
@@ -117120,83 +117047,86 @@ ${externalDependencies.map((dep) => {
           packageJson.dependencies[packageName] = "latest";
         }
       });
+      const distPaths = _isFunction(options.getConfig) ? [""] : Object.keys(options.getConfig).map((key) => `${key}/`);
       packageJson.type = "module";
-      packageJson.exports ??= {
-        ".": {
-          import: {
-            types: "./dist/modern/index.d.ts",
-            default: "./dist/modern/index.js"
-          },
-          require: {
-            types: "./dist/modern/index.d.cts",
-            default: "./dist/modern/index.cjs"
-          },
-          default: {
-            types: "./dist/modern/index.d.ts",
-            default: "./dist/modern/index.js"
+      if (distPaths.length > 1) {
+        packageJson.exports ??= {
+          ".": {
+            import: {
+              types: `./${distPaths[0]}index.d.ts`,
+              default: `./${distPaths[0]}index.js`
+            },
+            require: {
+              types: `./${distPaths[0]}index.d.cts`,
+              default: `./${distPaths[0]}index.cjs`
+            },
+            default: {
+              types: `./${distPaths[0]}index.d.ts`,
+              default: `./${distPaths[0]}index.js`
+            },
+            ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
+              [removeExtension(entryPoint).replace(sourceRoot, "")]: {
+                types: (0, import_path4.join)(
+                  `./${distPaths[0]}`,
+                  `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
+                ),
+                default: (0, import_path4.join)(
+                  `./${distPaths[0]}`,
+                  `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
+                )
+              }
+            }))
           },
-          ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
-            [removeExtension(entryPoint).replace(sourceRoot, "")]: {
-              types: (0, import_path4.join)(
-                "./dist/modern",
-                `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
-              ),
-              default: (0, import_path4.join)(
-                "./dist/modern",
-                `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
-              )
+          "./package.json": "./package.json"
+        };
+        packageJson.exports = Object.keys(entry).reduce(
+          (ret, key) => {
+            let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+            packageJsonKey = packageJsonKey.replaceAll("/index", "");
+            if (!ret[packageJsonKey]) {
+              ret[packageJsonKey] = {
+                import: {
+                  types: `./${distPaths[0]}index.d.ts`,
+                  default: `./${distPaths[0]}${key}.js`
+                },
+                require: {
+                  types: `./${distPaths[0]}index.d.cts`,
+                  default: `./${distPaths[0]}${key}.cjs`
+                },
+                default: {
+                  types: `./${distPaths[0]}index.d.ts`,
+                  default: `./${distPaths[0]}${key}.js`
+                }
+              };
             }
-          }))
-        },
-        "./package.json": "./package.json"
-      };
-      packageJson.exports = Object.keys(entry).reduce(
-        (ret, key) => {
-          let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
-          packageJsonKey = packageJsonKey.replaceAll("/index", "");
-          if (!ret[packageJsonKey]) {
-            ret[packageJsonKey] = {
-              import: {
-                types: "./dist/modern/index.d.ts",
-                default: `./dist/modern/${key}.js`
-              },
-              require: {
-                types: "./dist/modern/index.d.cts",
-                default: `./dist/modern/${key}.cjs`
-              },
-              default: {
-                types: "./dist/modern/index.d.ts",
-                default: `./dist/modern/${key}.js`
-              }
-            };
+            return ret;
+          },
+          packageJson.exports
+        );
+        packageJson.funding ??= workspacePackageJson.funding;
+        packageJson.types ??= `${distPaths.length > 1 ? distPaths[1] : distPaths[0]}index.d.ts`;
+        packageJson.typings ??= `${distPaths.length > 1 ? distPaths[1] : distPaths[0]}index.d.ts`;
+        packageJson.typescript ??= {
+          definition: `${distPaths.length > 1 ? distPaths[1] : distPaths[0]}index.d.ts`
+        };
+        packageJson.main ??= `${distPaths.length > 1 ? distPaths[1] : distPaths[0]}index.cjs`;
+        packageJson.module ??= `${distPaths.length > 1 ? distPaths[1] : distPaths[0]}index.js`;
+        options.platform && options.platform !== "node" && (packageJson.browser ??= `${distPaths[0]}index.global.js`);
+        if (options.includeSrc === true) {
+          let distSrc = sourceRoot.replace(projectRoot, "");
+          if (distSrc.startsWith("/")) {
+            distSrc = distSrc.substring(1);
           }
-          return ret;
-        },
-        packageJson.exports
-      );
-      packageJson.funding ??= workspacePackageJson.funding;
-      packageJson.types ??= "dist/legacy/index.d.ts";
-      packageJson.typings ??= "dist/legacy/index.d.ts";
-      packageJson.typescript ??= {
-        definition: "dist/legacy/index.d.ts"
-      };
-      packageJson.main ??= "dist/legacy/index.cjs";
-      packageJson.module ??= "dist/legacy/index.js";
-      options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-      if (options.includeSrc === true) {
-        let distSrc = sourceRoot.replace(projectRoot, "");
-        if (distSrc.startsWith("/")) {
-          distSrc = distSrc.substring(1);
-        }
-        packageJson.source ??= `${(0, import_path4.join)(distSrc, "index.ts").replaceAll(
-          "\\",
-          "/"
-        )}`;
-      }
-      packageJson.sideEffects ??= false;
-      packageJson.files ??= ["dist/**/*"];
-      if (options.includeSrc === true && !packageJson.files.includes("src")) {
-        packageJson.files.push("src/**/*");
+          packageJson.source ??= `${(0, import_path4.join)(distSrc, "index.ts").replaceAll(
+            "\\",
+            "/"
+          )}`;
+        }
+        packageJson.sideEffects ??= false;
+        packageJson.files ??= ["dist/**/*"];
+        if (options.includeSrc === true && !packageJson.files.includes("src")) {
+          packageJson.files.push("src/**/*");
+        }
       }
       packageJson.publishConfig ??= {
         access: "public"
@@ -117225,10 +117155,10 @@ ${externalDependencies.map((dep) => {
     }
     if (options.includeSrc === true) {
       const files = globSync([
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
+        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
+        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
+        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
+        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
       ]);
       await Promise.allSettled(
         files.map(
@@ -117300,10 +117230,12 @@ ${options.banner}
       outputPath: options.outputPath,
       entry
     };
-    const config = (0, import_tsup.defineConfig)([
-      getConfig(context.root, projectRoot, legacyConfig, getConfigOptions),
-      getConfig(context.root, projectRoot, modernConfig, getConfigOptions)
-    ]);
+    const getConfigFns = _isFunction(options.getConfig) ? [options.getConfig] : Object.keys(options.getConfig).map((key) => options.getConfig[key]);
+    const config = (0, import_tsup.defineConfig)(
+      getConfigFns.map(
+        (getConfigFn) => getConfig(context.root, projectRoot, getConfigFn, getConfigOptions)
+      )
+    );
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
     } else {
@@ -117343,7 +117275,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
   );
   tsConfig.options.pathsBasePath = workspaceRoot;
   if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
-    tsConfig.options.tsBuildInfoFile = (0, import_devkit2.joinPathFragments)(
+    tsConfig.options.tsBuildInfoFile = (0, import_devkit.joinPathFragments)(
       outputPath,
       "tsconfig.tsbuildinfo"
     );
@@ -117390,6 +117322,7 @@ var applyDefaultOptions = (options) => {
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;
+  options.getConfig ??= defaultConfig;
   return options;
 };
 var executor_default = withRunExecutor(
@@ -117402,6 +117335,88 @@ var executor_default = withRunExecutor(
     }
   }
 );
+var _isFunction = (value) => {
+  try {
+    return value instanceof Function || typeof value === "function" || !!(value && value.constructor && value?.call && value?.apply);
+  } catch (e) {
+    return false;
+  }
+};
+
+// packages/workspace-tools/src/executors/tsup-node/get-config.ts
+function nodeConfig({
+  entry,
+  outDir,
+  projectRoot,
+  workspaceRoot,
+  tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
+  debug = false,
+  shims = true,
+  external,
+  banner = {},
+  platform = "node",
+  verbose = false,
+  apiReport = true,
+  docModel = true,
+  tsdocMetadata = true,
+  define: define2,
+  env,
+  plugins,
+  generatePackageJson,
+  dtsTsConfig
+}) {
+  return {
+    name: "node",
+    entry,
+    format: ["cjs", "esm"],
+    target: ["esnext", "node20"],
+    tsconfig,
+    splitting,
+    generatePackageJson,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
+    projectRoot,
+    workspaceRoot,
+    outDir,
+    silent: !verbose,
+    metafile: true,
+    shims,
+    external,
+    platform,
+    banner,
+    define: define2,
+    env,
+    dts: false,
+    experimentalDts: {
+      entry,
+      compilerOptions: {
+        ...dtsTsConfig,
+        options: {
+          ...dtsTsConfig.options,
+          outDir
+        }
+      }
+    },
+    minify: debug ? false : "terser",
+    terserOptions: {
+      compress: true,
+      ecma: 2020,
+      keep_classnames: true,
+      keep_fnames: true
+    },
+    apiReport,
+    docModel,
+    tsdocMetadata,
+    sourcemap: debug,
+    clean: false,
+    tsconfigDecoratorMetadata: true,
+    plugins,
+    outExtension
+  };
+}
 
 // packages/workspace-tools/src/executors/tsup-node/executor.ts
 var tsNodeBuildExecutorFn = (options, context, config) => {
@@ -117429,6 +117444,7 @@ var tsNodeBuildExecutorFn = (options, context, config) => {
 var applyDefaultOptions2 = (options) => {
   return {
     ...applyDefaultOptions({ plugins: [], ...options, platform: "node" }),
+    getConfig: nodeConfig,
     transports: ["pino-pretty", "pino-loki"]
   };
 };