@storm-software/workspace-tools 1.20.0 → 1.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.20.0",
+  "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,7 +6755,8 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
@@ -6763,17 +6764,30 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     projectName = context.projectName;
     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);
   }
@@ -6786,12 +6800,12 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
 };
-var applyWorkspaceGeneratorTokens = (option, config) => {
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -6799,7 +6813,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -6847,9 +6861,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {
     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();
+      const configEnv = getConfigEnv();
+      config = await getDefaultConfig({
+        ...configFile,
+        ...configEnv
+      });
+      setConfigEnv(config);
+      console.debug(`Loaded Storm config into env:
+  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
+    }
     const tokenized = applyWorkspaceTokens(
       options,
       {
+        config,
         workspaceRoot,
         projectRoot,
         sourceRoot,
@@ -6859,18 +6886,6 @@ var withRunExecutor = (name, executorFn, executorOptions = {
       },
       applyWorkspaceExecutorTokens
     );
-    let config;
-    if (!executorOptions.skipReadingConfig) {
-      const configFile = await getConfigFile();
-      const configEnv = getConfigEnv();
-      config = await getDefaultConfig({
-        ...configFile,
-        ...configEnv
-      });
-      setConfigEnv(config);
-      console.debug(`Loaded Storm config into env:
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
-    }
     const result = await Promise.resolve(
       executorFn(tokenized, context, config)
     );
@@ -6905,11 +6920,6 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       options = generatorOptions.applyDefaultFn(options);
     }
     console.debug("\u2699\uFE0F  Generator schema options: \n", options);
-    const tokenized = applyWorkspaceTokens(
-      options,
-      { workspaceRoot: tree.root },
-      applyWorkspaceGeneratorTokens
-    );
     let config;
     if (!generatorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -6922,6 +6932,11 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       console.debug(`Loaded Storm config into env:
 ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
     }
+    const tokenized = applyWorkspaceTokens(
+      options,
+      { workspaceRoot: tree.root, config },
+      applyWorkspaceGeneratorTokens
+    );
     const result = await Promise.resolve(
       generatorFn(tree, tokenized, config)
     );

package/src/executors/tsup/executor.js

@@ -111442,7 +111442,8 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
@@ -111450,17 +111451,30 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     projectName = context.projectName;
     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);
   }
@@ -111473,7 +111487,7 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -111521,9 +111535,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {
     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();
+      const configEnv = getConfigEnv();
+      config = await getDefaultConfig({
+        ...configFile,
+        ...configEnv
+      });
+      setConfigEnv(config);
+      console.debug(`Loaded Storm config into env:
+  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
+    }
     const tokenized = applyWorkspaceTokens(
       options,
       {
+        config,
         workspaceRoot,
         projectRoot,
         sourceRoot,
@@ -111533,18 +111560,6 @@ var withRunExecutor = (name, executorFn, executorOptions = {
       },
       applyWorkspaceExecutorTokens
     );
-    let config;
-    if (!executorOptions.skipReadingConfig) {
-      const configFile = await getConfigFile();
-      const configEnv = getConfigEnv();
-      config = await getDefaultConfig({
-        ...configFile,
-        ...configEnv
-      });
-      setConfigEnv(config);
-      console.debug(`Loaded Storm config into env:
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
-    }
     const result = await Promise.resolve(
       executorFn(tokenized, context, config)
     );

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

@@ -105206,7 +105206,8 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
@@ -105214,17 +105215,30 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     projectName = context.projectName;
     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);
   }
@@ -105237,7 +105251,7 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -105285,9 +105299,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {
     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();
+      const configEnv = getConfigEnv();
+      config = await getDefaultConfig({
+        ...configFile,
+        ...configEnv
+      });
+      setConfigEnv(config);
+      console.debug(`Loaded Storm config into env:
+  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
+    }
     const tokenized = applyWorkspaceTokens(
       options,
       {
+        config,
         workspaceRoot,
         projectRoot,
         sourceRoot,
@@ -105297,18 +105324,6 @@ var withRunExecutor = (name, executorFn, executorOptions = {
       },
       applyWorkspaceExecutorTokens
     );
-    let config;
-    if (!executorOptions.skipReadingConfig) {
-      const configFile = await getConfigFile();
-      const configEnv = getConfigEnv();
-      config = await getDefaultConfig({
-        ...configFile,
-        ...configEnv
-      });
-      setConfigEnv(config);
-      console.debug(`Loaded Storm config into env:
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
-    }
     const result = await Promise.resolve(
       executorFn(tokenized, context, config)
     );

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

@@ -105336,7 +105336,8 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
@@ -105344,17 +105345,30 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     projectName = context.projectName;
     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);
   }
@@ -105367,7 +105381,7 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -105415,9 +105429,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {
     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();
+      const configEnv = getConfigEnv();
+      config = await getDefaultConfig({
+        ...configFile,
+        ...configEnv
+      });
+      setConfigEnv(config);
+      console.debug(`Loaded Storm config into env:
+  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
+    }
     const tokenized = applyWorkspaceTokens(
       options,
       {
+        config,
         workspaceRoot,
         projectRoot,
         sourceRoot,
@@ -105427,18 +105454,6 @@ var withRunExecutor = (name, executorFn, executorOptions = {
       },
       applyWorkspaceExecutorTokens
     );
-    let config;
-    if (!executorOptions.skipReadingConfig) {
-      const configFile = await getConfigFile();
-      const configEnv = getConfigEnv();
-      config = await getDefaultConfig({
-        ...configFile,
-        ...configEnv
-      });
-      setConfigEnv(config);
-      console.debug(`Loaded Storm config into env:
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
-    }
     const result = await Promise.resolve(
       executorFn(tokenized, context, config)
     );

package/src/generators/config-schema/generator.js

@@ -29603,7 +29603,7 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceGeneratorTokens = (option, config) => {
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -29611,7 +29611,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -29649,11 +29649,6 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       options = generatorOptions.applyDefaultFn(options);
     }
     console.debug("\u2699\uFE0F  Generator schema options: \n", options);
-    const tokenized = applyWorkspaceTokens(
-      options,
-      { workspaceRoot: tree.root },
-      applyWorkspaceGeneratorTokens
-    );
     let config;
     if (!generatorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -29666,6 +29661,11 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       console.debug(`Loaded Storm config into env:
 ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
     }
+    const tokenized = applyWorkspaceTokens(
+      options,
+      { workspaceRoot: tree.root, config },
+      applyWorkspaceGeneratorTokens
+    );
     const result = await Promise.resolve(
       generatorFn(tree, tokenized, config)
     );

package/src/generators/node-library/generator.js

@@ -43935,7 +43935,7 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceGeneratorTokens = (option, config) => {
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -43943,7 +43943,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -43981,11 +43981,6 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       options = generatorOptions.applyDefaultFn(options);
     }
     console.debug("\u2699\uFE0F  Generator schema options: \n", options);
-    const tokenized = applyWorkspaceTokens(
-      options,
-      { workspaceRoot: tree.root },
-      applyWorkspaceGeneratorTokens
-    );
     let config;
     if (!generatorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -43998,6 +43993,11 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       console.debug(`Loaded Storm config into env:
 ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
     }
+    const tokenized = applyWorkspaceTokens(
+      options,
+      { workspaceRoot: tree.root, config },
+      applyWorkspaceGeneratorTokens
+    );
     const result = await Promise.resolve(
       generatorFn(tree, tokenized, config)
     );

package/src/generators/preset/generator.js

@@ -24960,7 +24960,7 @@ var getWorkspaceRoot2 = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceGeneratorTokens = (option, config) => {
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -24968,7 +24968,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -25006,11 +25006,6 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       options = generatorOptions.applyDefaultFn(options);
     }
     console.debug("\u2699\uFE0F  Generator schema options: \n", options);
-    const tokenized = applyWorkspaceTokens(
-      options,
-      { workspaceRoot: tree.root },
-      applyWorkspaceGeneratorTokens
-    );
     let config;
     if (!generatorOptions.skipReadingConfig) {
       const configFile = await getConfigFile();
@@ -25023,6 +25018,11 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
       console.debug(`Loaded Storm config into env:
 ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`);
     }
+    const tokenized = applyWorkspaceTokens(
+      options,
+      { workspaceRoot: tree.root, config },
+      applyWorkspaceGeneratorTokens
+    );
     const result = await Promise.resolve(
       generatorFn(tree, tokenized, config)
     );

package/src/utils/index.js

@@ -60,7 +60,8 @@ var getWorkspaceRoot = () => {
 };
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var applyWorkspaceExecutorTokens = (option, config) => {
+var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+  console.log("applyWorkspaceExecutorTokens", option);
   let result = option;
   if (!result) {
     return result;
@@ -68,17 +69,30 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   let projectName;
   let projectRoot;
   let sourceRoot;
-  if (config?.projectName) {
-    const context = config;
+  if (tokenizerOptions?.projectName) {
+    const context = tokenizerOptions;
     projectName = context.projectName;
     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);
   }
@@ -91,12 +105,12 @@ var applyWorkspaceExecutorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot()
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot()
     );
   }
   return result;
 };
-var applyWorkspaceGeneratorTokens = (option, config) => {
+var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -104,7 +118,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot()
     );
   }
   return result;