@storm-software/workspace-tools 1.62.8 → 1.62.10

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.62.10 (2024-02-27)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Update all imports to `config-tools` in the package ([85202800](https://github.com/storm-software/storm-ops/commit/85202800))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.62.9 (2024-02-27)
+
+
+### 🩹 Fixes
+
+- **config-tools:** Update config packages to only use cjs ([75e4a16b](https://github.com/storm-software/storm-ops/commit/75e4a16b))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.62.8 (2024-02-27)
 
 

package/declarations.d.ts

@@ -1,4 +1,4 @@
-import type { StormConfig } from "@storm-software/config-tools";
+import type { StormConfig } from "@storm-software/config";
 import type { TsupExecutorSchema } from "./src/executors/tsup/schema";
 import type { ExecutorContext } from "@nx/devkit";
 import type { Tree } from "@nx/devkit";

package/index.js

@@ -476154,8 +476154,7 @@ __export(workspace_tools_exports, {
 module.exports = __toCommonJS(workspace_tools_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;
@@ -476198,14 +476197,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;
@@ -476221,30 +476221,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-executor.ts
@@ -476254,24 +476257,24 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
     writeDebug,
     writeError,
     writeFatal,
-    writeInfo: writeInfo3,
+    writeInfo,
     writeSuccess,
     writeTrace,
-    findWorkspaceRoot: findWorkspaceRoot5,
+    findWorkspaceRoot,
     loadStormConfig
   } = await import("@storm-software/config-tools");
   const stopwatch = getStopwatch(name);
   let options8 = _options;
   let config;
   try {
-    writeInfo3(config, `\u26A1 Running the ${name} executor...
+    writeInfo(config, `\u26A1 Running the ${name} executor...
 `);
     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 = findWorkspaceRoot5();
+    const workspaceRoot = findWorkspaceRoot();
     const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
     const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
@@ -476306,7 +476309,7 @@ ${Object.keys(options8).map(
         (key2) => ` - ${key2}=${_isFunction(options8[key2]) ? "<function>" : JSON.stringify(options8[key2])}`
       ).join("\n")}`
     );
-    const tokenized = applyWorkspaceTokens(
+    const tokenized = await applyWorkspaceTokens(
       options8,
       {
         config,
@@ -476375,7 +476378,7 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
     writeDebug,
     writeError,
     writeFatal,
-    writeInfo: writeInfo3,
+    writeInfo,
     writeSuccess,
     writeTrace,
     findWorkspaceRootSafe,
@@ -476385,7 +476388,7 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
   let options8 = _options;
   let config;
   try {
-    writeInfo3(config, `\u26A1 Running the ${name} generator...
+    writeInfo(config, `\u26A1 Running the ${name} generator...
 
 `);
     const workspaceRoot = findWorkspaceRootSafe();
@@ -476414,7 +476417,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
@@ -476940,23 +476943,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} -------------------------------------------------------------------
 
@@ -477067,8 +477077,8 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const { LogLevel, getLogLevel, writeInfo: writeInfo3, writeWarning, findWorkspaceRoot: findWorkspaceRoot5 } = await import("@storm-software/config-tools");
-  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot5();
+  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;
@@ -477127,7 +477137,7 @@ ${options8.banner}
     outputPath: options8.outputPath
   };
   if (options8.getConfig) {
-    writeInfo3(config, "\u26A1 Running the Build process");
+    writeInfo(config, "\u26A1 Running the Build process");
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
@@ -483407,8 +483417,10 @@ var import_fileutils = require("nx/src/utils/fileutils.js");
 
 // 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
@@ -483472,13 +483484,13 @@ async function tsupExecutorFn(options8, context, config) {
     LogLevel,
     getLogLevel,
     writeDebug,
-    writeInfo: writeInfo3,
+    writeInfo,
     writeSuccess,
     writeTrace,
     writeWarning,
-    findWorkspaceRoot: findWorkspaceRoot5
+    findWorkspaceRoot
   } = await import("@storm-software/config-tools");
-  writeInfo3(config, "\u{1F4E6}  Running Storm build executor on the workspace");
+  writeInfo(config, "\u{1F4E6}  Running Storm build executor on the workspace");
   writeDebug(
     config,
     `\u2699\uFE0F  Executor options:
@@ -483492,11 +483504,11 @@ ${Object.keys(options8).map(
       "The Build process failed because the context is not valid. Please run this command from a workspace."
     );
   }
-  const workspaceRoot = findWorkspaceRoot5();
+  const workspaceRoot = findWorkspaceRoot();
   const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
   const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
   if (options8.clean !== false) {
-    writeInfo3(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
+    writeInfo(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
     (0, import_fs_extra.removeSync)(options8.outputPath);
   }
   const assets = Array.from(options8.assets);
@@ -484194,12 +484206,12 @@ var executor_default4 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/executors/typia/executor.ts
-var import_config_tools3 = require("@storm-software/config-tools");
 var import_fs_extra2 = __toESM(require_lib4());
 var import_TypiaProgrammer = __toESM(require_TypiaProgrammer());
 async function typiaExecutorFn(options8, _4, config) {
+  const { writeInfo } = await import("@storm-software/config-tools");
   if (options8.clean !== false) {
-    (0, import_config_tools3.writeInfo)(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
+    writeInfo(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
     (0, import_fs_extra2.removeSync)(options8.outputPath);
   }
   await import_TypiaProgrammer.TypiaProgrammer.build({
@@ -488823,10 +488835,10 @@ var zodToJsonSchema = (schema2, options8) => {
 };
 
 // packages/workspace-tools/src/generators/config-schema/generator.ts
-var import_config_tools4 = require("@storm-software/config-tools");
 async function configSchemaGeneratorFn(tree, options8, config) {
+  const { findWorkspaceRoot } = await import("@storm-software/config-tools");
   const projectConfigurations = getProjectConfigurations();
-  const workspaceRoot = config?.workspaceRoot ?? (0, import_config_tools4.findWorkspaceRoot)();
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const modules = await Promise.all(
     Object.keys(projectConfigurations).map(async (key2) => {
       if (projectConfigurations[key2]?.config) {
@@ -489160,7 +489172,6 @@ var import_version = require("nx/src/command-line/release/version");
 var import_utils2 = require("nx/src/tasks-runner/utils");
 var import_semver = require("nx/src/command-line/release/utils/semver");
 var import_node_path4 = require("node:path");
-var import_config_tools5 = require("@storm-software/config-tools");
 var import_update_lock_file = __toESM(require_update_lock_file());
 var import_node_child_process = require("node:child_process");
 var import_git = require("nx/src/command-line/release/utils/git");
@@ -489169,6 +489180,7 @@ var import_config2 = 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)) {
@@ -489191,7 +489203,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_tools5.findWorkspaceRoot)();
+      return config?.workspaceRoot ?? findWorkspaceRoot();
     }
     if (!customPackageRoot) {
       return projectNode.data.root;
@@ -489216,11 +489228,11 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
     const packageRoot = projectNameToPackageRootMap.get(projectName);
     const packageJsonPath = (0, import_devkit13.joinPathFragments)(packageRoot ?? "./", "package.json");
     const workspaceRelativePackageJsonPath = (0, import_node_path4.relative)(
-      config?.workspaceRoot ?? (0, import_config_tools5.findWorkspaceRoot)(),
+      config?.workspaceRoot ?? findWorkspaceRoot(),
       packageJsonPath
     );
     const log = (msg) => {
-      (0, import_config_tools5.writeInfo)(config, `${projectName}: ${msg}`);
+      writeInfo(config, `${projectName}: ${msg}`);
     };
     if (!tree.exists(packageJsonPath)) {
       throw new Error(
@@ -489229,7 +489241,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_tools5.writeInfo)(config, `Running release version for project: ${project.name}`);
+    writeInfo(config, `Running release version for project: ${project.name}`);
     const projectPackageJson = (0, import_devkit13.readJson)(tree, packageJsonPath);
     log(
       `\u{1F50D} Reading data for package "${projectPackageJson.name}" from ${workspaceRelativePackageJsonPath}`