@storm-software/workspace-tools 1.71.1 → 1.72.0

package/src/generators/preset/generator.js

@@ -70263,8 +70263,9 @@ var init_schema = __esm({
   "packages/config/src/schema.ts"() {
     init_lib();
     ColorConfigSchema = z4.object({
+      dark: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The dark background color of the workspace"),
+      light: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#f4f4f5").describe("The light background color of the workspace"),
       primary: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The primary color of the workspace"),
-      background: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The background color of the workspace"),
       success: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#087f5b").describe("The success color of the workspace"),
       info: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The informational color of the workspace"),
       warning: z4.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#fcc419").describe("The warning color of the workspace"),
@@ -70299,7 +70300,7 @@ var init_schema = __esm({
       skipCache: z4.boolean().default(false).describe("Should all known types of workspace caching be skipped?"),
       cacheDirectory: z4.string().trim().default("node_modules/.cache/storm").describe("The directory used to store the workspace's cached file data"),
       buildDirectory: z4.string().trim().default("dist").describe("The build directory for the workspace"),
-      runtimeDirectory: z4.string().trim().default("node_modules/.storm").describe("The runtime directory of Storm"),
+      outputDirectory: z4.string().trim().default("node_modules/.storm").describe("The runtime directory of Storm"),
       runtimeVersion: z4.string().trim().regex(
         /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
       ).default("1.0.0").describe("The global version of the Storm runtime"),
@@ -70362,7 +70363,8 @@ var init_get_default_config = __esm({
     init_find_workspace_root();
     DEFAULT_COLOR_CONFIG = {
       primary: "#1fb2a6",
-      background: "#1d232a",
+      dark: "#1d232a",
+      light: "#f4f4f5",
       success: "#087f5b",
       info: "#0ea5e9",
       warning: "#fcc419",
@@ -72107,7 +72109,7 @@ var init_logger = __esm({
     init_types2();
     init_get_log_level();
     init_chalk();
-    getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
+    getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
       let _chalk = getChalk();
       const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
       if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
@@ -72141,7 +72143,7 @@ ${_chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")}
         return (message) => {
           console.warn(
             `
-${_chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")("> ")} ${_chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").whiteBright(" \u26A0 Warn ")}  ${_chalk.hex(
+${_chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")("> ")} ${_chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").whiteBright("  \u26A0 Warn  ")}  ${_chalk.hex(
               config?.colors?.warning ? config.colors.warning : "#fcc419"
             )(message)}
 `
@@ -72191,14 +72193,14 @@ ${_chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")("
         );
       };
     };
-    writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
-    writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
-    writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
-    writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
-    writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
-    writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
-    writeTrace = (config, message) => getLogFn(config, LogLevel.TRACE)(message);
-    writeSystem = (config, message) => getLogFn(config, LogLevel.ALL)(message);
+    writeFatal = (message, config) => getLogFn(LogLevel.FATAL, config)(message);
+    writeError = (message, config) => getLogFn(LogLevel.ERROR, config)(message);
+    writeWarning = (message, config) => getLogFn(LogLevel.WARN, config)(message);
+    writeInfo = (message, config) => getLogFn(LogLevel.INFO, config)(message);
+    writeSuccess = (message, config) => getLogFn(LogLevel.SUCCESS, config)(message);
+    writeDebug = (message, config) => getLogFn(LogLevel.DEBUG, config)(message);
+    writeTrace = (message, config) => getLogFn(LogLevel.TRACE, config)(message);
+    writeSystem = (message, config) => getLogFn(LogLevel.ALL, config)(message);
     getStopwatch = (name) => {
       const start = process.hrtime();
       return () => {
@@ -72222,40 +72224,43 @@ var init_process_handler = __esm({
   "packages/config-tools/src/utilities/process-handler.ts"() {
     init_logger();
     exitWithError = (config) => {
-      writeFatal(config, "Exiting script with an error status...");
+      writeFatal("Exiting script with an error status...", config);
       process.exit(1);
     };
     exitWithSuccess = (config) => {
-      writeSuccess(config, "Script completed successfully. Exiting...");
+      writeSuccess("Script completed successfully. Exiting...", config);
       process.exit(0);
     };
     handleProcess = (config) => {
       writeTrace(
-        config,
-        `Using the following arguments to process the script: ${process.argv.join(", ")}`
+        `Using the following arguments to process the script: ${process.argv.join(", ")}`,
+        config
       );
       process.on("unhandledRejection", (error) => {
-        writeError(config, `An Unhandled Rejection occurred while running the program: ${error}`);
+        writeError(
+          `An Unhandled Rejection occurred while running the program: ${error}`,
+          config
+        );
         exitWithError(config);
       });
       process.on("uncaughtException", (error) => {
         writeError(
-          config,
           `An Uncaught Exception occurred while running the program: ${error.message} 
-Stacktrace: ${error.stack}`
+Stacktrace: ${error.stack}`,
+          config
         );
         exitWithError(config);
       });
       process.on("SIGTERM", (signal) => {
-        writeError(config, `The program terminated with signal code: ${signal}`);
+        writeError(`The program terminated with signal code: ${signal}`, config);
         exitWithError(config);
       });
       process.on("SIGINT", (signal) => {
-        writeError(config, `The program terminated with signal code: ${signal}`);
+        writeError(`The program terminated with signal code: ${signal}`, config);
         exitWithError(config);
       });
       process.on("SIGHUP", (signal) => {
-        writeError(config, `The program terminated with signal code: ${signal}`);
+        writeError(`The program terminated with signal code: ${signal}`, config);
         exitWithError(config);
       });
     };
@@ -72395,7 +72400,9 @@ var init_get_env = __esm({
     getExtensionEnv = (extensionName) => {
       const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
       return Object.keys(process.env).filter((key) => key.startsWith(prefix)).reduce((ret, key) => {
-        const name = key.replace(prefix, "").split("_").map((i) => i.length > 0 ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1) : "").join("");
+        const name = key.replace(prefix, "").split("_").map(
+          (i) => i.length > 0 ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1) : ""
+        ).join("");
         if (name) {
           ret[name] = process.env[key];
         }
@@ -72423,14 +72430,15 @@ var init_get_env = __esm({
         skipCache: process.env[`${prefix}SKIP_CACHE`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CACHE`]) : void 0,
         cacheDirectory: correctPaths(process.env[`${prefix}CACHE_DIRECTORY`]),
         runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
-        runtimeDirectory: correctPaths(process.env[`${prefix}RUNTIME_DIRECTORY`]),
+        outputDirectory: correctPaths(process.env[`${prefix}OUTPUT_DIRECTORY`]),
         env: process.env[`${prefix}ENV`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
         ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
           process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
         ) : void 0,
         colors: {
           primary: process.env[`${prefix}COLOR_PRIMARY`],
-          background: process.env[`${prefix}COLOR_BACKGROUND`],
+          dark: process.env[`${prefix}COLOR_DARK`],
+          light: process.env[`${prefix}COLOR_LIGHT`],
           success: process.env[`${prefix}COLOR_SUCCESS`],
           info: process.env[`${prefix}COLOR_INFO`],
           warning: process.env[`${prefix}COLOR_WARNING`],
@@ -72441,7 +72449,11 @@ var init_get_env = __esm({
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
         externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-        logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0
+        logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
+          Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
+        ) ? getLogLevelLabel(
+          Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
+        ) : process.env[`${prefix}LOG_LEVEL`] : void 0
       };
       const serializedConfig = process.env[`${prefix}CONFIG`];
       if (serializedConfig) {
@@ -72536,10 +72548,14 @@ var init_set_env = __esm({
         process.env.NX_WORKSPACE_ROOT_PATH = correctPaths(config.workspaceRoot);
       }
       if (config.packageDirectory) {
-        process.env[`${prefix}PACKAGE_DIRECTORY`] = correctPaths(config.packageDirectory);
+        process.env[`${prefix}PACKAGE_DIRECTORY`] = correctPaths(
+          config.packageDirectory
+        );
       }
       if (config.buildDirectory) {
-        process.env[`${prefix}BUILD_DIRECTORY`] = correctPaths(config.buildDirectory);
+        process.env[`${prefix}BUILD_DIRECTORY`] = correctPaths(
+          config.buildDirectory
+        );
       }
       if (config.skipCache !== void 0) {
         process.env[`${prefix}SKIP_CACHE`] = String(config.skipCache);
@@ -72549,13 +72565,17 @@ var init_set_env = __esm({
         }
       }
       if (!config.skipCache && config.cacheDirectory) {
-        process.env[`${prefix}CACHE_DIRECTORY`] = correctPaths(config.cacheDirectory);
+        process.env[`${prefix}CACHE_DIRECTORY`] = correctPaths(
+          config.cacheDirectory
+        );
       }
       if (config.runtimeVersion) {
         process.env[`${prefix}RUNTIME_VERSION`] = config.runtimeVersion;
       }
-      if (config.runtimeDirectory) {
-        process.env[`${prefix}RUNTIME_DIRECTORY`] = correctPaths(config.runtimeDirectory);
+      if (config.outputDirectory) {
+        process.env[`${prefix}OUTPUT_DIRECTORY`] = correctPaths(
+          config.outputDirectory
+        );
       }
       if (config.env) {
         process.env[`${prefix}ENV`] = config.env;
@@ -72570,8 +72590,11 @@ var init_set_env = __esm({
       if (config.colors.primary) {
         process.env[`${prefix}COLOR_PRIMARY`] = config.colors.primary;
       }
-      if (config.colors.background) {
-        process.env[`${prefix}COLOR_BACKGROUND`] = config.colors.background;
+      if (config.colors.dark) {
+        process.env[`${prefix}COLOR_DARK`] = config.colors.dark;
+      }
+      if (config.colors.light) {
+        process.env[`${prefix}COLOR_LIGHT`] = config.colors.light;
       }
       if (config.colors.success) {
         process.env[`${prefix}COLOR_SUCCESS`] = config.colors.success;
@@ -72652,10 +72675,7 @@ var init_create_storm_config = __esm({
       if (schema && extensionName) {
         result.extensions = {
           ...result.extensions,
-          [extensionName]: createConfigExtension(
-            extensionName,
-            schema
-          )
+          [extensionName]: createConfigExtension(extensionName, schema)
         };
       }
       _static_cache = result;
@@ -72682,8 +72702,8 @@ var init_create_storm_config = __esm({
       const configFile = await getConfigFile(_workspaceRoot);
       if (!configFile) {
         writeWarning(
-          { logLevel: "all" },
-          "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not.\n"
+          "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not.\n",
+          { logLevel: "all" }
         );
       }
       config = StormConfigSchema.parse(
@@ -72794,34 +72814,34 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
   let options = _options;
   let config;
   try {
-    writeInfo2(config, `\u26A1 Running the ${name} generator...
+    writeInfo2(`\u26A1 Running the ${name} generator...
 
-`);
+`, config);
     const workspaceRoot = findWorkspaceRoot2();
     if (!generatorOptions.skipReadingConfig) {
       writeDebug2(
-        config,
         `Loading the Storm Config from environment variables and storm.config.js file...
- - workspaceRoot: ${workspaceRoot}`
+ - workspaceRoot: ${workspaceRoot}`,
+        config
       );
       config = await loadStormConfig2(workspaceRoot);
       writeTrace2(
-        config,
         `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`
+${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
+        config
       );
     }
     if (generatorOptions?.hooks?.applyDefaultOptions) {
-      writeDebug2(config, "Running the applyDefaultOptions hook...");
+      writeDebug2("Running the applyDefaultOptions hook...", config);
       options = await Promise.resolve(
         generatorOptions.hooks.applyDefaultOptions(options, config)
       );
-      writeDebug2(config, "Completed the applyDefaultOptions hook");
+      writeDebug2("Completed the applyDefaultOptions hook", config);
     }
     writeTrace2(
-      config,
       `Generator schema options \u2699\uFE0F 
-${Object.keys(options ?? {}).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`
+${Object.keys(options ?? {}).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`,
+      config
     );
     const tokenized = await applyWorkspaceTokens(
       options,
@@ -72829,37 +72849,41 @@ ${Object.keys(options ?? {}).map((key) => ` - ${key}=${JSON.stringify(options[ke
       applyWorkspaceBaseTokens
     );
     if (generatorOptions?.hooks?.preProcess) {
-      writeDebug2(config, "Running the preProcess hook...");
-      await Promise.resolve(generatorOptions.hooks.preProcess(tokenized, config));
-      writeDebug2(config, "Completed the preProcess hook");
+      writeDebug2("Running the preProcess hook...", config);
+      await Promise.resolve(
+        generatorOptions.hooks.preProcess(tokenized, config)
+      );
+      writeDebug2("Completed the preProcess hook", config);
     }
-    const result = await Promise.resolve(generatorFn(tree, tokenized, config));
+    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
       });
     }
     if (generatorOptions?.hooks?.postProcess) {
-      writeDebug2(config, "Running the postProcess hook...");
+      writeDebug2("Running the postProcess hook...", config);
       await Promise.resolve(generatorOptions.hooks.postProcess(config));
-      writeDebug2(config, "Completed the postProcess hook");
+      writeDebug2("Completed the postProcess hook", config);
     }
-    writeSuccess2(config, `Completed running the ${name} task executor!
-`);
+    writeSuccess2(`Completed running the ${name} task executor!
+`, config);
     return {
       ...result,
       success: true
     };
   } catch (error) {
     writeFatal2(
-      config,
-      "A fatal error occurred while running the generator - the process was forced to terminate"
+      "A fatal error occurred while running the generator - the process was forced to terminate",
+      config
     );
     writeError2(
-      config,
       `An exception was thrown in the generator's process 
  - Details: ${error.message}
- - Stacktrace: ${error.stack}`
+ - Stacktrace: ${error.stack}`,
+      config
     );
     return {
       success: false
@@ -73024,39 +73048,54 @@ async function presetGeneratorFn(tree, options) {
   });
   await (0, import_devkit.formatFiles)(tree);
   let dependencies = {
-    "@nx/devkit": "^18.0.4",
-    "@nx/jest": "^18.0.4",
-    "@nx/js": "^18.0.4",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^11.1.0",
-    "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.2.2",
-    "@semantic-release/npm": "^11.0.1",
-    "@semantic-release/release-notes-generator": "^12.1.0",
+    "@biomejs/biome": "1.6.4",
+    "@commitlint/cli": "19.2.1",
+    "@ls-lint/ls-lint": "2.2.3",
+    "@ltd/j-toml": "1.38.0",
+    "@nx/devkit": "18.2.3",
+    "@nx/esbuild": "18.2.3",
+    "@nx/eslint": "18.2.3",
+    "@nx/eslint-plugin": "18.2.3",
+    "@nx/js": "18.2.3",
+    "@nx/plugin": "18.2.3",
+    "@nx/workspace": "18.2.3",
+    "@storm-software/config": "latest",
+    "@storm-software/config-tools": "latest",
     "@storm-software/git-tools": "latest",
     "@storm-software/linting-tools": "latest",
     "@storm-software/testing-tools": "latest",
     "@storm-software/workspace-tools": "latest",
-    "@types/jest": "^29.5.8",
-    "@types/node": "20.8.10",
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    jest: "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-environment-node": "^29.7.0",
-    "lint-staged": "^15.0.2",
-    log4brains: "^1.0.1",
-    prettier: "^3.0.3",
-    "prettier-plugin-packagejson": "^2.4.6",
-    "prettier-plugin-prisma": "^5.0.0",
-    "semantic-release": "^22.0.7",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    tslib: "^2.6.2",
-    terser: "^5.24.0",
-    typescript: typescriptVersion,
-    verdaccio: "^5.27.0"
+    "@swc-node/register": "1.9.0",
+    "@swc/cli": "0.3.12",
+    "@swc/core": "1.4.12",
+    "@swc/helpers": "0.5.8",
+    "@swc/wasm": "1.4.12",
+    "@taplo/cli": "0.7.0",
+    "@types/jest": "29.5.12",
+    "@types/node": "20.12.5",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
+    "conventional-changelog-conventionalcommits": "7.0.2",
+    "esbuild": "0.20.2",
+    "esbuild-register": "3.5.0",
+    "eslint": "9.0.0",
+    "eslint-config-prettier": "9.1.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-environment-node": "29.7.0",
+    "lefthook": "1.6.8",
+    "nx": "18.2.3",
+    "prettier": "3.2.5",
+    "prettier-plugin-prisma": "5.0.0",
+    "prettier-plugin-tailwindcss": "0.5.13",
+    "rimraf": "5.0.5",
+    "ts-jest": "29.1.2",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
+    "tsconfig-paths": "4.2.0",
+    "tslib": "2.6.2",
+    "typescript": typescriptVersion,
+    "verdaccio": "5.30.3"
   };
   if (options.includeApps) {
     dependencies = {
@@ -73072,6 +73111,12 @@ async function presetGeneratorFn(tree, options) {
       "@nx/storybook": "latest"
     };
   }
+  if (options.includeRust) {
+    dependencies = {
+      ...dependencies,
+      "@monodon/rust": "1.4.0"
+    };
+  }
   if (options.nxCloud) {
     dependencies = {
       ...dependencies,

package/src/generators/preset/schema.d.ts

@@ -5,6 +5,7 @@ export interface PresetGeneratorSchema {
   name: string;
   organization: string;
   includeApps: boolean;
+  includeRust: boolean;
   namespace?: string;
   description?: string;
   repositoryUrl?: string;

package/src/generators/preset/schema.json

@@ -76,6 +76,16 @@
       },
       "x-prompt": "What is the workspace's GitHub repository URL?"
     },
+    "includeRust": {
+      "type": "boolean",
+      "description": "Should the workspace include Rust support?",
+      "default": false,
+      "$default": {
+        "$source": "argv",
+        "index": 6
+      },
+      "x-prompt": "Should the workspace include Rust support?"
+    },
     "nxCloud": {
       "type": "boolean",
       "description": "Should distributed caching with Nx Cloud be enabled for the workspace?",