@storm-software/workspace-tools 1.19.3 → 1.20.0

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

@@ -19,7 +19,7 @@ export type TsupExecutorSchema = Omit<
   | "esbuildConfig"
   | "platform"
 > & {
-  entry?: string;
+  entry: string;
   options: Options;
   clean: boolean;
   debug: boolean;
@@ -31,6 +31,6 @@ export type TsupExecutorSchema = Omit<
   docModel?: boolean;
   tsdocMetadata?: boolean;
   includeSrc?: boolean;
-  platform?: Platform;
-  plugins?: any[];
+  platform: Platform;
+  plugins: any[];
 };

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

@@ -105206,20 +105206,19 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, config) => {
   let result = option;
   if (!result) {
     return result;
   }
-  const workspaceRoot = getWorkspaceRoot2();
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectsConfigurations?.projects && config?.projectName) {
+  if (config?.projectName) {
     const context = config;
     projectName = context.projectName;
-    projectRoot = context.projectsConfigurations.projects[projectName].root;
-    sourceRoot = context.projectsConfigurations.projects[projectName].sourceRoot;
+    projectRoot = context.root;
+    sourceRoot = context.sourceRoot;
   } else {
     const projectConfig = config;
     projectName = projectConfig.name;
@@ -105236,27 +105235,67 @@ var applyWorkspaceTokens = (option, config) => {
     result = result.replaceAll("{sourceRoot}", sourceRoot);
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", workspaceRoot);
+    result = result.replaceAll(
+      "{workspaceRoot}",
+      config.workspaceRoot ?? getWorkspaceRoot2()
+    );
   }
   return result;
 };
+var applyWorkspaceTokens = (options, config, tokenizerFn) => {
+  let result = options;
+  if (!result) {
+    return {};
+  }
+  return Object.keys(options).reduce(
+    (ret, option) => {
+      if (options[option] === void 0 || options[option] === null || typeof options[option] === "number" || typeof options[option] === "boolean" || typeof options[option] === "string") {
+        ret[option] = tokenizerFn(option, config);
+      } else if (Array.isArray(options[option])) {
+        ret[option] = options[option].map(
+          (item) => tokenizerFn(item, config)
+        );
+      } else if (typeof options[option] === "object") {
+        ret[option] = tokenizerFn(options[option], config);
+      }
+      return ret;
+    },
+    {}
+  );
+};
 
 // packages/workspace-tools/src/base/base-executor.ts
-var withRunExecutor = (name, executorFn, executorOptions = { skipReadingConfig: false }) => async (options, context) => {
+var withRunExecutor = (name, executorFn, executorOptions = {
+  skipReadingConfig: false
+}) => async (options, context) => {
   const startTime = Date.now();
   try {
     console.info(`\u26A1 Running the ${name} executor...`);
-    console.debug(`\u2699\uFE0F Executor schema options: 
+    if (executorOptions?.applyDefaultFn) {
+      options = executorOptions.applyDefaultFn(options);
+    }
+    console.debug(`\u2699\uFE0F  Executor schema options: 
 `, options);
-    const tokenized = Object.keys(options).reduce(
-      (ret, key) => {
-        ret[key] = applyWorkspaceTokens(
-          options[key],
-          context
-        );
-        return ret;
+    if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
+      throw new Error(
+        "The Build process failed because the context is not valid. Please run this command from a workspace."
+      );
+    }
+    const workspaceRoot = getWorkspaceRoot2();
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
+    const projectName = context.projectsConfigurations.projects[context.projectName].name;
+    const tokenized = applyWorkspaceTokens(
+      options,
+      {
+        workspaceRoot,
+        projectRoot,
+        sourceRoot,
+        projectName,
+        ...context.projectsConfigurations.projects[context.projectName],
+        ...executorOptions
       },
-      options
+      applyWorkspaceExecutorTokens
     );
     let config;
     if (!executorOptions.skipReadingConfig) {
@@ -111834,28 +111873,9 @@ var outExtension = ({ format: format2 }) => {
 };
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-async function tsupExecutor(options, context) {
+async function tsupExecutorFn(options, context) {
   try {
     console.log("\u{1F4E6}  Running Storm build executor on the workspace");
-    options.entry ??= "{sourceRoot}/index.ts";
-    options.outputPath ??= "dist/{projectRoot}";
-    options.tsConfig ??= "tsconfig.json";
-    options.platform ??= "neutral";
-    options.verbose ??= false;
-    options.external ??= [];
-    options.additionalEntryPoints ??= [];
-    options.assets ??= [];
-    options.plugins ??= [];
-    options.includeSrc ??= true;
-    options.clean ??= true;
-    options.bundle ??= true;
-    options.debug ??= false;
-    options.watch ??= false;
-    options.apiReport ??= true;
-    options.docModel ??= true;
-    options.tsdocMetadata ??= true;
-    options.define ??= {};
-    options.env ??= {};
     options.verbose && console.log(
       `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
@@ -111871,17 +111891,9 @@ ${Object.keys(options).map(
     const workspaceRoot = getWorkspaceRoot2();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
-    const outputPath = applyWorkspaceTokens(
-      options.outputPath ? options.outputPath : "dist/{projectRoot}",
-      context
-    );
-    options.entry = applyWorkspaceTokens(
-      options.entry ? options.entry : "{sourceRoot}/index.ts",
-      context
-    );
     if (options.clean !== false) {
-      console.log(`\u{1F9F9} Cleaning output path: ${outputPath}`);
-      (0, import_fs_extra.removeSync)(outputPath);
+      console.log(`\u{1F9F9} Cleaning output path: ${options.outputPath}`);
+      (0, import_fs_extra.removeSync)(options.outputPath);
     }
     const assets = Array.from(options.assets);
     assets.push({
@@ -111902,7 +111914,7 @@ ${Object.keys(options).map(
       });
     }
     const result = await (0, import_js.copyAssets)(
-      { assets, watch: options.watch, outputPath },
+      { assets, watch: options.watch, outputPath: options.outputPath },
       context
     );
     if (!result.success) {
@@ -112031,7 +112043,11 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path4.join)("packages", context.projectName);
-    const packageJsonPath = (0, import_path4.join)(context.root, outputPath, "package.json");
+    const packageJsonPath = (0, import_path4.join)(
+      context.root,
+      options.outputPath,
+      "package.json"
+    );
     console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_fs3.writeFileSync)(
       packageJsonPath,
@@ -112053,10 +112069,10 @@ ${externalDependencies.map((dep) => {
     );
     if (options.includeSrc !== false) {
       const files = globSync([
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.ts"),
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.tsx"),
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.js"),
-        (0, import_devkit.joinPathFragments)(context.root, 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(
@@ -112082,7 +112098,7 @@ ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
       ...options,
       dtsTsConfig: getNormalizedTsConfig(
         context.root,
-        outputPath,
+        options.outputPath,
         (0, import_tsc.createTypeScriptCompilationOptions)(
           (0, import_normalize_options.normalizeOptions)(
             {
@@ -112108,7 +112124,7 @@ ${options.banner}
 
 `
       } : void 0,
-      outputPath
+      outputPath: options.outputPath
     });
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
@@ -112171,12 +112187,41 @@ var isPrimitive = (value) => {
     return false;
   }
 };
-var executor_default = tsupExecutor;
+var applyDefault = (options) => {
+  options.entry ??= "{sourceRoot}/index.ts";
+  options.outputPath ??= "dist/{projectRoot}";
+  options.tsConfig ??= "tsconfig.json";
+  options.platform ??= "neutral";
+  options.verbose ??= false;
+  options.external ??= [];
+  options.additionalEntryPoints ??= [];
+  options.assets ??= [];
+  options.plugins ??= [];
+  options.includeSrc ??= true;
+  options.clean ??= true;
+  options.bundle ??= true;
+  options.debug ??= false;
+  options.watch ??= false;
+  options.apiReport ??= true;
+  options.docModel ??= true;
+  options.tsdocMetadata ??= true;
+  options.define ??= {};
+  options.env ??= {};
+  return options;
+};
+var executor_default = withRunExecutor(
+  "TypeScript Build using tsup",
+  tsupExecutorFn,
+  {
+    skipReadingConfig: false,
+    applyDefaultFn: applyDefault
+  }
+);
 
 // packages/workspace-tools/src/executors/tsup-neutral/executor.ts
 var tsNeutralBuildExecutorFn = (options, context, config) => {
   options.plugins ??= [];
-  return executor_default(
+  return tsupExecutorFn(
     {
       ...options,
       platform: "neutral",
@@ -112197,9 +112242,18 @@ var tsNeutralBuildExecutorFn = (options, context, config) => {
     context
   );
 };
+var applyDefault2 = (options) => {
+  options = applyDefault({ ...options, platform: "neutral" });
+  options.plugins ??= [];
+  return options;
+};
 var executor_default2 = withRunExecutor(
   "TypeScript Build (Neutral Platform)",
-  tsNeutralBuildExecutorFn
+  tsNeutralBuildExecutorFn,
+  {
+    skipReadingConfig: false,
+    applyDefaultFn: applyDefault2
+  }
 );
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,8 +1,9 @@
-import { TsupExecutorSchema } from "../tsup/schema";
+import { Platform, TsupExecutorSchema } from "../tsup/schema";
 
 export type TsupNeutralExecutorSchema = Omit<
   TsupExecutorSchema,
   "env" | "platform"
 > & {
   transports?: string[];
+  platform?: Platform;
 };

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

@@ -105336,20 +105336,19 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, config) => {
   let result = option;
   if (!result) {
     return result;
   }
-  const workspaceRoot = getWorkspaceRoot2();
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectsConfigurations?.projects && config?.projectName) {
+  if (config?.projectName) {
     const context = config;
     projectName = context.projectName;
-    projectRoot = context.projectsConfigurations.projects[projectName].root;
-    sourceRoot = context.projectsConfigurations.projects[projectName].sourceRoot;
+    projectRoot = context.root;
+    sourceRoot = context.sourceRoot;
   } else {
     const projectConfig = config;
     projectName = projectConfig.name;
@@ -105366,27 +105365,67 @@ var applyWorkspaceTokens = (option, config) => {
     result = result.replaceAll("{sourceRoot}", sourceRoot);
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", workspaceRoot);
+    result = result.replaceAll(
+      "{workspaceRoot}",
+      config.workspaceRoot ?? getWorkspaceRoot2()
+    );
   }
   return result;
 };
+var applyWorkspaceTokens = (options, config, tokenizerFn) => {
+  let result = options;
+  if (!result) {
+    return {};
+  }
+  return Object.keys(options).reduce(
+    (ret, option) => {
+      if (options[option] === void 0 || options[option] === null || typeof options[option] === "number" || typeof options[option] === "boolean" || typeof options[option] === "string") {
+        ret[option] = tokenizerFn(option, config);
+      } else if (Array.isArray(options[option])) {
+        ret[option] = options[option].map(
+          (item) => tokenizerFn(item, config)
+        );
+      } else if (typeof options[option] === "object") {
+        ret[option] = tokenizerFn(options[option], config);
+      }
+      return ret;
+    },
+    {}
+  );
+};
 
 // packages/workspace-tools/src/base/base-executor.ts
-var withRunExecutor = (name, executorFn, executorOptions = { skipReadingConfig: false }) => async (options, context) => {
+var withRunExecutor = (name, executorFn, executorOptions = {
+  skipReadingConfig: false
+}) => async (options, context) => {
   const startTime = Date.now();
   try {
     console.info(`\u26A1 Running the ${name} executor...`);
-    console.debug(`\u2699\uFE0F Executor schema options: 
+    if (executorOptions?.applyDefaultFn) {
+      options = executorOptions.applyDefaultFn(options);
+    }
+    console.debug(`\u2699\uFE0F  Executor schema options: 
 `, options);
-    const tokenized = Object.keys(options).reduce(
-      (ret, key) => {
-        ret[key] = applyWorkspaceTokens(
-          options[key],
-          context
-        );
-        return ret;
+    if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
+      throw new Error(
+        "The Build process failed because the context is not valid. Please run this command from a workspace."
+      );
+    }
+    const workspaceRoot = getWorkspaceRoot2();
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
+    const projectName = context.projectsConfigurations.projects[context.projectName].name;
+    const tokenized = applyWorkspaceTokens(
+      options,
+      {
+        workspaceRoot,
+        projectRoot,
+        sourceRoot,
+        projectName,
+        ...context.projectsConfigurations.projects[context.projectName],
+        ...executorOptions
       },
-      options
+      applyWorkspaceExecutorTokens
     );
     let config;
     if (!executorOptions.skipReadingConfig) {
@@ -111964,28 +112003,9 @@ var outExtension = ({ format: format2 }) => {
 };
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-async function tsupExecutor(options, context) {
+async function tsupExecutorFn(options, context) {
   try {
     console.log("\u{1F4E6}  Running Storm build executor on the workspace");
-    options.entry ??= "{sourceRoot}/index.ts";
-    options.outputPath ??= "dist/{projectRoot}";
-    options.tsConfig ??= "tsconfig.json";
-    options.platform ??= "neutral";
-    options.verbose ??= false;
-    options.external ??= [];
-    options.additionalEntryPoints ??= [];
-    options.assets ??= [];
-    options.plugins ??= [];
-    options.includeSrc ??= true;
-    options.clean ??= true;
-    options.bundle ??= true;
-    options.debug ??= false;
-    options.watch ??= false;
-    options.apiReport ??= true;
-    options.docModel ??= true;
-    options.tsdocMetadata ??= true;
-    options.define ??= {};
-    options.env ??= {};
     options.verbose && console.log(
       `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
@@ -112001,17 +112021,9 @@ ${Object.keys(options).map(
     const workspaceRoot = getWorkspaceRoot2();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
-    const outputPath = applyWorkspaceTokens(
-      options.outputPath ? options.outputPath : "dist/{projectRoot}",
-      context
-    );
-    options.entry = applyWorkspaceTokens(
-      options.entry ? options.entry : "{sourceRoot}/index.ts",
-      context
-    );
     if (options.clean !== false) {
-      console.log(`\u{1F9F9} Cleaning output path: ${outputPath}`);
-      (0, import_fs_extra.removeSync)(outputPath);
+      console.log(`\u{1F9F9} Cleaning output path: ${options.outputPath}`);
+      (0, import_fs_extra.removeSync)(options.outputPath);
     }
     const assets = Array.from(options.assets);
     assets.push({
@@ -112032,7 +112044,7 @@ ${Object.keys(options).map(
       });
     }
     const result = await (0, import_js.copyAssets)(
-      { assets, watch: options.watch, outputPath },
+      { assets, watch: options.watch, outputPath: options.outputPath },
       context
     );
     if (!result.success) {
@@ -112161,7 +112173,11 @@ ${externalDependencies.map((dep) => {
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path4.join)("packages", context.projectName);
-    const packageJsonPath = (0, import_path4.join)(context.root, outputPath, "package.json");
+    const packageJsonPath = (0, import_path4.join)(
+      context.root,
+      options.outputPath,
+      "package.json"
+    );
     console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_fs3.writeFileSync)(
       packageJsonPath,
@@ -112183,10 +112199,10 @@ ${externalDependencies.map((dep) => {
     );
     if (options.includeSrc !== false) {
       const files = globSync([
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.ts"),
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.tsx"),
-        (0, import_devkit.joinPathFragments)(context.root, outputPath, "src/**/*.js"),
-        (0, import_devkit.joinPathFragments)(context.root, 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(
@@ -112212,7 +112228,7 @@ ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
       ...options,
       dtsTsConfig: getNormalizedTsConfig(
         context.root,
-        outputPath,
+        options.outputPath,
         (0, import_tsc.createTypeScriptCompilationOptions)(
           (0, import_normalize_options.normalizeOptions)(
             {
@@ -112238,7 +112254,7 @@ ${options.banner}
 
 `
       } : void 0,
-      outputPath
+      outputPath: options.outputPath
     });
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
@@ -112301,16 +112317,43 @@ var isPrimitive = (value) => {
     return false;
   }
 };
-var executor_default = tsupExecutor;
+var applyDefault = (options) => {
+  options.entry ??= "{sourceRoot}/index.ts";
+  options.outputPath ??= "dist/{projectRoot}";
+  options.tsConfig ??= "tsconfig.json";
+  options.platform ??= "neutral";
+  options.verbose ??= false;
+  options.external ??= [];
+  options.additionalEntryPoints ??= [];
+  options.assets ??= [];
+  options.plugins ??= [];
+  options.includeSrc ??= true;
+  options.clean ??= true;
+  options.bundle ??= true;
+  options.debug ??= false;
+  options.watch ??= false;
+  options.apiReport ??= true;
+  options.docModel ??= true;
+  options.tsdocMetadata ??= true;
+  options.define ??= {};
+  options.env ??= {};
+  return options;
+};
+var executor_default = withRunExecutor(
+  "TypeScript Build using tsup",
+  tsupExecutorFn,
+  {
+    skipReadingConfig: false,
+    applyDefaultFn: applyDefault
+  }
+);
 
 // packages/workspace-tools/src/executors/tsup-node/executor.ts
 var tsNodeBuildExecutorFn = (options, context, config) => {
-  options.plugins ??= [];
-  options.transports ??= ["pino-pretty", "pino-loki"];
   if (options.transports && Array.isArray(options.transports) && options.transports.length > 0) {
     options.plugins.push(esbuildPluginPino({ transports: options.transports }));
   }
-  return executor_default(
+  return tsupExecutorFn(
     {
       ...options,
       platform: "node",
@@ -112331,9 +112374,19 @@ var tsNodeBuildExecutorFn = (options, context, config) => {
     context
   );
 };
+var applyDefault2 = (options) => {
+  options = applyDefault({ ...options, platform: "node" });
+  options.plugins ??= [];
+  options.transports ??= ["pino-pretty", "pino-loki"];
+  return options;
+};
 var executor_default2 = withRunExecutor(
   "TypeScript Build (NodeJs Platform)",
-  tsNodeBuildExecutorFn
+  tsNodeBuildExecutorFn,
+  {
+    skipReadingConfig: false,
+    applyDefaultFn: applyDefault2
+  }
 );
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,6 +1,9 @@
 import { TsupNeutralExecutorSchema } from "../tsup-neutral/schema";
+import { Platform } from "../tsup/schema";
 
 export type TsupNodeExecutorSchema = Omit<
   TsupNeutralExecutorSchema,
   "platform"
->;
+> & {
+  platform?: Platform;
+};