@storm-software/workspace-tools 1.19.3 → 1.20.1

package/package.json

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

package/src/base/index.js

@@ -6755,26 +6755,39 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
   }
-  const workspaceRoot = getWorkspaceRoot2();
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectsConfigurations?.projects && config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     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;
+    const projectConfig = tokenizerOptions;
     projectName = projectConfig.name;
     projectRoot = projectConfig.root;
     sourceRoot = projectConfig.sourceRoot;
   }
+  if (tokenizerOptions.config) {
+    const configKeys = Object.keys(tokenizerOptions.config);
+    if (configKeys.some((configKey) => result.includes(`{${configKey}}`))) {
+      configKeys.forEach((configKey) => {
+        if (result.includes(`{${configKey}}`)) {
+          result = result.replaceAll(
+            `{${configKey}}`,
+            tokenizerOptions.config[configKey]
+          );
+        }
+      });
+    }
+  }
   if (result.includes("{projectName}")) {
     result = result.replaceAll("{projectName}", projectName);
   }
@@ -6785,28 +6798,69 @@ var applyWorkspaceTokens = (option, config) => {
     result = result.replaceAll("{sourceRoot}", sourceRoot);
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", workspaceRoot);
+    result = result.replaceAll(
+      "{workspaceRoot}",
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot2()
+    );
+  }
+  return result;
+};
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
+  let result = option;
+  if (!result) {
+    return result;
+  }
+  if (result.includes("{workspaceRoot}")) {
+    result = result.replaceAll(
+      "{workspaceRoot}",
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.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;
-      },
-      options
-    );
+    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;
     let config;
     if (!executorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -6817,8 +6871,21 @@ var withRunExecutor = (name, executorFn, executorOptions = { skipReadingConfig:
       });
       setConfigEnv(config);
       console.debug(`Loaded Storm config into env:
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
-    }
+  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
+    }
+    const tokenized = applyWorkspaceTokens(
+      options,
+      {
+        config,
+        workspaceRoot,
+        projectRoot,
+        sourceRoot,
+        projectName,
+        ...context.projectsConfigurations.projects[context.projectName],
+        ...executorOptions
+      },
+      applyWorkspaceExecutorTokens
+    );
     const result = await Promise.resolve(
       executorFn(tokenized, context, config)
     );
@@ -6843,11 +6910,16 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
 };
 
 // packages/workspace-tools/src/base/base-generator.ts
-var withRunGenerator = (name, generatorFn, generatorOptions = { skipReadingConfig: false }) => async (tree, options) => {
+var withRunGenerator = (name, generatorFn, generatorOptions = {
+  skipReadingConfig: false
+}) => async (tree, options) => {
   const startTime = Date.now();
   try {
     console.info(`\u26A1 Running the ${name} generator...`);
-    console.debug("\u2699\uFE0F Generator schema options: \n", options);
+    if (generatorOptions?.applyDefaultFn) {
+      options = generatorOptions.applyDefaultFn(options);
+    }
+    console.debug("\u2699\uFE0F  Generator schema options: \n", options);
     let config;
     if (!generatorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -6860,7 +6932,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = { skipReadingConfi
       console.debug(`Loaded Storm config into env:
 ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
     }
-    const result = await Promise.resolve(generatorFn(tree, options, config));
+    const tokenized = applyWorkspaceTokens(
+      options,
+      { workspaceRoot: tree.root, config },
+      applyWorkspaceGeneratorTokens
+    );
+    const result = await Promise.resolve(
+      generatorFn(tree, tokenized, config)
+    );
     if (result && (!result.success || result.error && result?.error?.message && typeof result?.error?.message === "string" && result?.error?.name && typeof result?.error?.name === "string")) {
       throw new Error(`The ${name} generator failed to run`, {
         cause: result.error