@storm-software/workspace-tools 1.62.8 → 1.62.10

package/src/generators/release-version/generator.js

@@ -174425,12 +174425,10 @@ var import_version = require("nx/src/command-line/release/version");
 var import_utils = require("nx/src/tasks-runner/utils");
 var import_semver = require("nx/src/command-line/release/utils/semver");
 var import_node_path = require("node:path");
-var import_config_tools2 = require("@storm-software/config-tools");
 var import_update_lock_file = __toESM(require_update_lock_file());
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var import_config_tools = require("@storm-software/config-tools");
-var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
+var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -174446,30 +174444,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
     }
   }
   if (result.includes("{workspaceRoot}")) {
+    const { findWorkspaceRoot } = await import("@storm-software/config-tools");
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? (0, import_config_tools.findWorkspaceRoot)()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
     );
   }
   return result;
 };
-var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
-  const result = options8;
-  if (!result) {
+var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
+  if (!options8) {
     return {};
   }
-  return Object.keys(options8).reduce((ret, option) => {
+  const result = {};
+  for (const option of Object.keys(options8)) {
     if (typeof options8[option] === "string") {
-      ret[option] = tokenizerFn(options8[option], config);
+      result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
     } else if (Array.isArray(options8[option])) {
-      ret[option] = options8[option].map(
-        (item) => typeof item === "string" ? tokenizerFn(item, config) : item
+      result[option] = await Promise.all(
+        options8[option].map(
+          async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
+        )
       );
     } else if (typeof options8[option] === "object") {
-      ret[option] = applyWorkspaceTokens(options8[option], config, tokenizerFn);
+      result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
     }
-    return ret;
-  }, {});
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/base/base-generator.ts
@@ -174481,7 +174482,7 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
     writeDebug,
     writeError,
     writeFatal,
-    writeInfo: writeInfo2,
+    writeInfo,
     writeSuccess,
     writeTrace,
     findWorkspaceRootSafe,
@@ -174491,7 +174492,7 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
   let options8 = _options;
   let config;
   try {
-    writeInfo2(config, `\u26A1 Running the ${name} generator...
+    writeInfo(config, `\u26A1 Running the ${name} generator...
 
 `);
     const workspaceRoot = findWorkspaceRootSafe();
@@ -174520,7 +174521,7 @@ ${Object.keys(process.env).map((key2) => ` - ${key2}=${JSON.stringify(process.en
       `Generator schema options \u2699\uFE0F 
 ${Object.keys(options8 ?? {}).map((key2) => ` - ${key2}=${JSON.stringify(options8[key2])}`).join("\n")}`
     );
-    const tokenized = applyWorkspaceTokens(
+    const tokenized = await applyWorkspaceTokens(
       options8,
       { workspaceRoot: tree.root, config },
       applyWorkspaceGeneratorTokens
@@ -174574,6 +174575,7 @@ var import_config = require("nx/src/command-line/release/config/config");
 var import_semver2 = __toESM(require_semver3());
 var import_resolve_local_package_dependencies = __toESM(require_resolve_local_package_dependencies());
 async function releaseVersionGeneratorFn(tree, options8, config) {
+  const { writeInfo, findWorkspaceRoot } = await import("@storm-software/config-tools");
   const versionData = {};
   if (options8.specifier) {
     if (!(0, import_semver.isValidSemverSpecifier)(options8.specifier)) {
@@ -174596,7 +174598,7 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
   const projects = options8.projects;
   const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {
     if (projectNode?.data?.root === config?.workspaceRoot || projectNode?.data?.root === ".") {
-      return config?.workspaceRoot ?? (0, import_config_tools2.findWorkspaceRoot)();
+      return config?.workspaceRoot ?? findWorkspaceRoot();
     }
     if (!customPackageRoot) {
       return projectNode.data.root;
@@ -174621,11 +174623,11 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
     const packageRoot = projectNameToPackageRootMap.get(projectName);
     const packageJsonPath = (0, import_devkit.joinPathFragments)(packageRoot ?? "./", "package.json");
     const workspaceRelativePackageJsonPath = (0, import_node_path.relative)(
-      config?.workspaceRoot ?? (0, import_config_tools2.findWorkspaceRoot)(),
+      config?.workspaceRoot ?? findWorkspaceRoot(),
       packageJsonPath
     );
     const log = (msg) => {
-      (0, import_config_tools2.writeInfo)(config, `${projectName}: ${msg}`);
+      writeInfo(config, `${projectName}: ${msg}`);
     };
     if (!tree.exists(packageJsonPath)) {
       throw new Error(
@@ -174634,7 +174636,7 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
 To fix this you will either need to add a package.json file at that location, or configure "release" within your nx.json to exclude "${projectName}" from the current release group, or amend the packageRoot configuration to point to where the package.json should be.`
       );
     }
-    (0, import_config_tools2.writeInfo)(config, `Running release version for project: ${project.name}`);
+    writeInfo(config, `Running release version for project: ${project.name}`);
     const projectPackageJson = (0, import_devkit.readJson)(tree, packageJsonPath);
     log(
       `\u{1F50D} Reading data for package "${projectPackageJson.name}" from ${workspaceRelativePackageJsonPath}`

package/src/utils/index.js

@@ -459217,8 +459217,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
-var import_config_tools = require("@storm-software/config-tools");
-var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
+var applyWorkspaceExecutorTokens = async (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -459261,14 +459260,15 @@ var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
     result = result.replaceAll("{sourceRoot}", sourceRoot);
   }
   if (result.includes("{workspaceRoot}")) {
+    const { findWorkspaceRoot } = await import("@storm-software/config-tools");
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? (0, import_config_tools.findWorkspaceRoot)()
+      tokenizerOptions.workspaceRoot ?? findWorkspaceRoot()
     );
   }
   return result;
 };
-var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
+var applyWorkspaceGeneratorTokens = async (option, tokenizerOptions) => {
   let result = option;
   if (!result) {
     return result;
@@ -459284,30 +459284,33 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
     }
   }
   if (result.includes("{workspaceRoot}")) {
+    const { findWorkspaceRoot } = await import("@storm-software/config-tools");
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? (0, import_config_tools.findWorkspaceRoot)()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config?.workspaceRoot ?? findWorkspaceRoot()
     );
   }
   return result;
 };
-var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
-  const result = options8;
-  if (!result) {
+var applyWorkspaceTokens = async (options8, config, tokenizerFn) => {
+  if (!options8) {
     return {};
   }
-  return Object.keys(options8).reduce((ret, option) => {
+  const result = {};
+  for (const option of Object.keys(options8)) {
     if (typeof options8[option] === "string") {
-      ret[option] = tokenizerFn(options8[option], config);
+      result[option] = await Promise.resolve(tokenizerFn(options8[option], config));
     } else if (Array.isArray(options8[option])) {
-      ret[option] = options8[option].map(
-        (item) => typeof item === "string" ? tokenizerFn(item, config) : item
+      result[option] = await Promise.all(
+        options8[option].map(
+          async (item) => typeof item === "string" ? await Promise.resolve(tokenizerFn(item, config)) : item
+        )
       );
     } else if (typeof options8[option] === "object") {
-      ret[option] = applyWorkspaceTokens(options8[option], config, tokenizerFn);
+      result[option] = await applyWorkspaceTokens(options8[option], config, tokenizerFn);
     }
-    return ret;
-  }, {});
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
@@ -459332,23 +459335,30 @@ var getFileBanner = (name, commentStart = "//") => {
   while (name.length + padding.length < 12) {
     padding += " ";
   }
+  let titleName = process.env.STORM_NAMESPACE ?? "";
+  if (titleName) {
+    if (titleName?.startsWith("@")) {
+      titleName = titleName.slice(1);
+    }
+    titleName = (titleName.charAt(0).toUpperCase() + titleName.slice(1)).split("-").filter((word) => word && word.length > 0).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+  }
   return `
 
 ${commentStart} -------------------------------------------------------------------
 ${commentStart}
 ${commentStart}                         ${padding}Storm Software
-${commentStart}                 \u26A1 ${process.env.STORM_NAMESPACE} - ${name}
+${commentStart}                 \u26A1 ${titleName ? `${titleName} - ` : ""}${name}
 ${commentStart}
-${commentStart} This code was released as part of the ${process.env.STORM_NAMESPACE} project. ${process.env.STORM_NAMESPACE}
+${commentStart} This code was released as part of the ${titleName ? `${titleName} ` : ""}project. ${titleName ? titleName : "This project"}
 ${commentStart} is maintained by Storm Software under the ${process.env.STORM_LICENSE ?? "Apache License 2.0"}, and is
 ${commentStart} free for commercial and private use. For more information, please visit
 ${commentStart} our licensing page.
 ${commentStart}
 ${commentStart}    Website: ${process.env.STORM_HOMEPAGE ?? "https://stormsoftware.org"}
 ${commentStart}    Repository: ${process.env.STORM_REPOSITORY ?? "https://github.com/storm-software/storm-stack"}
-${commentStart}    Documentation: https://stormsoftware.org/docs/storm-stack
-${commentStart}    Contact: https://stormsoftware.org/contact
-${commentStart}    Licensing: https://stormsoftware.org/licensing
+${commentStart}    Documentation: https://stormsoftware.org/docs${titleName?.startsWith("@") ? `/${titleName.slice(1)}` : ""}
+${commentStart}    Contact: ${process.env.STORM_HOMEPAGE ? process.env.STORM_HOMEPAGE.endsWith("/") ? process.env.STORM_HOMEPAGE.slice(-1) : process.env.STORM_HOMEPAGE : "https://stormsoftware.org"}/contact
+${commentStart}    Licensing: ${process.env.STORM_HOMEPAGE ? process.env.STORM_HOMEPAGE.endsWith("/") ? process.env.STORM_HOMEPAGE.slice(-1) : process.env.STORM_HOMEPAGE : "https://stormsoftware.org"}/licensing
 ${commentStart}
 ${commentStart} -------------------------------------------------------------------
 
@@ -459358,8 +459368,10 @@ ${commentStart} ----------------------------------------------------------------
 
 // packages/workspace-tools/src/utils/get-project-configurations.ts
 var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
-var import_config_tools2 = require("@storm-software/config-tools");
-var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)((0, import_config_tools2.findWorkspaceRoot)());
+var getProjectConfigurations = async () => {
+  const { findWorkspaceRoot } = await import("@storm-software/config-tools");
+  return (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)(findWorkspaceRoot());
+};
 var getProjectConfiguration = (projectName) => getProjectConfigurations()?.[projectName];
 
 // packages/workspace-tools/src/utils/get-project-deps.ts
@@ -459635,8 +459647,8 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const { LogLevel, getLogLevel, writeInfo, writeWarning, findWorkspaceRoot: findWorkspaceRoot3 } = await import("@storm-software/config-tools");
-  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot3();
+  const { LogLevel, getLogLevel, writeInfo, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;