@storm-software/workspace-tools 1.19.3 → 1.20.1

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

@@ -29593,12 +29593,62 @@ var setConfigEnv = (config) => {
   });
 };
 
+// packages/workspace-tools/src/utils/get-workspace-root.ts
+var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
+var getWorkspaceRoot2 = () => {
+  const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
+  process.env.STORM_REPO_ROOT ??= root?.dir;
+  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
+  return root?.dir;
+};
+
+// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
+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-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();
@@ -29611,7 +29661,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
@@ -29636,24 +29693,12 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
 
 // packages/workspace-tools/src/utils/get-project-configurations.ts
 var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
-
-// packages/workspace-tools/src/utils/get-workspace-root.ts
-var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
-var getWorkspaceRoot2 = () => {
-  const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
-  process.env.STORM_REPO_ROOT ??= root?.dir;
-  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
-  return root?.dir;
-};
-
-// packages/workspace-tools/src/utils/get-project-configurations.ts
 var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(
   getWorkspaceRoot2()
 );
 
 // packages/workspace-tools/src/generators/config-schema/generator.ts
 async function configSchemaGeneratorFn(tree, options) {
-  const schema = {};
   const projectConfigurations = getProjectConfigurations();
   const workspaceRoot = getWorkspaceRoot2();
   const modules = await Promise.all(

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

@@ -43925,12 +43925,62 @@ var setConfigEnv = (config) => {
   });
 };
 
+// packages/workspace-tools/src/utils/get-workspace-root.ts
+var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
+var getWorkspaceRoot2 = () => {
+  const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
+  process.env.STORM_REPO_ROOT ??= root?.dir;
+  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
+  return root?.dir;
+};
+
+// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
+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-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();
@@ -43943,7 +43993,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

package/src/generators/preset/generator.js

@@ -24950,12 +24950,62 @@ var setConfigEnv = (config) => {
   });
 };
 
+// packages/workspace-tools/src/utils/get-workspace-root.ts
+var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
+var getWorkspaceRoot2 = () => {
+  const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
+  process.env.STORM_REPO_ROOT ??= root?.dir;
+  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
+  return root?.dir;
+};
+
+// packages/workspace-tools/src/utils/apply-workspace-tokens.ts
+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-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();
@@ -24968,7 +25018,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

package/src/utils/index.js

@@ -20,6 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   WorkspaceStorage: () => WorkspaceStorage,
+  applyWorkspaceExecutorTokens: () => applyWorkspaceExecutorTokens,
+  applyWorkspaceGeneratorTokens: () => applyWorkspaceGeneratorTokens,
   applyWorkspaceTokens: () => applyWorkspaceTokens,
   eslintVersion: () => eslintVersion,
   findCacheDirectory: () => findCacheDirectory,
@@ -58,26 +60,39 @@ var getWorkspaceRoot = () => {
 };
 
 // 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 = getWorkspaceRoot();
   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);
   }
@@ -88,10 +103,47 @@ var applyWorkspaceTokens = (option, config) => {
     result = result.replaceAll("{sourceRoot}", sourceRoot);
   }
   if (result.includes("{workspaceRoot}")) {
-    result = result.replaceAll("{workspaceRoot}", workspaceRoot);
+    result = result.replaceAll(
+      "{workspaceRoot}",
+      tokenizerOptions.workspaceRoot ?? getWorkspaceRoot()
+    );
+  }
+  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 ?? getWorkspaceRoot()
+    );
   }
   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/utils/file-path-utils.ts
 var import_node_path = require("node:path");
@@ -283,6 +335,8 @@ var WorkspaceStorage = class {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   WorkspaceStorage,
+  applyWorkspaceExecutorTokens,
+  applyWorkspaceGeneratorTokens,
   applyWorkspaceTokens,
   eslintVersion,
   findCacheDirectory,