@storm-software/workspace-tools 1.20.0 → 1.20.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.20.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.19.3...workspace-tools-v1.20.0) (2023-12-02)
+
+
+### Features
+
+* **workspace-tools:** Added default options function parameter to workspace tools ([9a5c880](https://github.com/storm-software/storm-ops/commit/9a5c880c24898f5c593c32d1d13e978c5e0b3356))
+
 ## [1.19.3](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.19.2...workspace-tools-v1.19.3) (2023-12-02)
 
 

package/index.js

@@ -105242,7 +105242,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;
@@ -105250,17 +105251,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);
   }
@@ -105273,12 +105287,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;
@@ -105286,7 +105300,7 @@ var applyWorkspaceGeneratorTokens = (option, config) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
     );
   }
   return result;
@@ -105334,9 +105348,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,
@@ -105346,18 +105373,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)
     );
@@ -105392,11 +105407,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();
@@ -105409,6 +105419,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)
     );