@storm-software/workspace-tools 1.42.4 → 1.43.1

package/src/generators/preset/generator.js

@@ -16158,14 +16158,14 @@ var require_share = __commonJS({
           resetConnection === null || resetConnection === void 0 ? void 0 : resetConnection.unsubscribe();
           resetConnection = void 0;
         };
-        var reset = function() {
+        var reset2 = function() {
           cancelReset();
           connection = subject = void 0;
           hasCompleted = hasErrored = false;
         };
         var resetAndUnsubscribe = function() {
           var conn = connection;
-          reset();
+          reset2();
           conn === null || conn === void 0 ? void 0 : conn.unsubscribe();
         };
         return lift_1.operate(function(source, subscriber) {
@@ -16189,13 +16189,13 @@ var require_share = __commonJS({
               error: function(err) {
                 hasErrored = true;
                 cancelReset();
-                resetConnection = handleReset(reset, resetOnError, err);
+                resetConnection = handleReset(reset2, resetOnError, err);
                 dest.error(err);
               },
               complete: function() {
                 hasCompleted = true;
                 cancelReset();
-                resetConnection = handleReset(reset, resetOnComplete);
+                resetConnection = handleReset(reset2, resetOnComplete);
                 dest.complete();
               }
             });
@@ -16205,13 +16205,13 @@ var require_share = __commonJS({
       };
     }
     exports.share = share;
-    function handleReset(reset, on) {
+    function handleReset(reset2, on) {
       var args = [];
       for (var _i = 2; _i < arguments.length; _i++) {
         args[_i - 2] = arguments[_i];
       }
       if (on === true) {
-        reset();
+        reset2();
         return;
       }
       if (on === false) {
@@ -16220,7 +16220,7 @@ var require_share = __commonJS({
       var onSubscriber = new Subscriber_1.SafeSubscriber({
         next: function() {
           onSubscriber.unsubscribe();
-          reset();
+          reset2();
         }
       });
       return innerFrom_1.innerFrom(on.apply(void 0, __spreadArray2([], __read2(args)))).subscribe(onSubscriber);
@@ -26280,6 +26280,7 @@ var LogLevel = {
   ERROR: 20,
   WARN: 30,
   INFO: 40,
+  SUCCESS: 45,
   DEBUG: 60,
   TRACE: 70,
   ALL: 100
@@ -30077,6 +30078,8 @@ var getDefaultConfig = (config = {}, root) => {
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
   switch (label) {
+    case "all":
+      return LogLevel.ALL;
     case "trace":
       return LogLevel.TRACE;
     case "debug":
@@ -30096,6 +30099,9 @@ var getLogLevel = (label) => {
   }
 };
 var getLogLevelLabel = (logLevel) => {
+  if (logLevel >= LogLevel.ALL) {
+    return LogLevelLabel.ALL;
+  }
   if (logLevel >= LogLevel.TRACE) {
     return LogLevelLabel.TRACE;
   }
@@ -30120,71 +30126,100 @@ var getLogLevelLabel = (logLevel) => {
   return LogLevelLabel.INFO;
 };
 
-// packages/config-tools/src/env/get-env.ts
-var 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("");
-    if (name) {
-      ret[name] = process.env[key];
-    }
-    return ret;
-  }, {});
-};
-var getConfigEnv = () => {
-  const prefix = "STORM_";
-  let config = {
-    name: process.env[`${prefix}NAME`],
-    namespace: process.env[`${prefix}NAMESPACE`],
-    owner: process.env[`${prefix}OWNER`],
-    worker: process.env[`${prefix}WORKER`],
-    organization: process.env[`${prefix}ORGANIZATION`],
-    packageManager: process.env[`${prefix}PACKAGE_MANAGER`],
-    license: process.env[`${prefix}LICENSE`],
-    homepage: process.env[`${prefix}HOMEPAGE`],
-    timezone: process.env[`${prefix}TIMEZONE`] ?? process.env.TZ,
-    locale: process.env[`${prefix}LOCALE`] ?? process.env.LOCALE,
-    configFile: process.env[`${prefix}CONFIG_FILE`],
-    workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`],
-    packageDirectory: process.env[`${prefix}PACKAGE_DIRECTORY`],
-    buildDirectory: process.env[`${prefix}BUILD_DIRECTORY`],
-    runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
-    runtimeDirectory: process.env[`${prefix}RUNTIME_DIRECTORY`],
-    env: process.env[`${prefix}ENV`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
-    ci: Boolean(process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION),
-    colors: {
-      primary: process.env[`${prefix}COLOR_PRIMARY`],
-      background: process.env[`${prefix}COLOR_BACKGROUND`],
-      success: process.env[`${prefix}COLOR_SUCCESS`],
-      info: process.env[`${prefix}COLOR_INFO`],
-      warning: process.env[`${prefix}COLOR_WARNING`],
-      error: process.env[`${prefix}COLOR_ERROR`],
-      fatal: process.env[`${prefix}COLOR_FATAL`]
-    },
-    repository: process.env[`${prefix}REPOSITORY`],
-    branch: process.env[`${prefix}BRANCH`],
-    preMajor: Boolean(process.env[`${prefix}PRE_MAJOR`]),
-    logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : LogLevelLabel.INFO,
-    extensions: {}
-  };
-  const serializedConfig = process.env[`${prefix}CONFIG`];
-  if (serializedConfig) {
-    const parsed = JSON.parse(serializedConfig);
-    config = {
-      ...config,
-      ...parsed,
-      colors: { ...config.colors, ...parsed.colors },
-      extensions: { ...config.extensions, ...parsed.extensions }
+// packages/config-tools/src/utilities/logger.ts
+var chalk = __toESM(require_source(), 1);
+var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
+  if (typeof logLevel === "number" && (logLevel >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL)) {
+    return (_) => {
     };
   }
-  const extensionPrefix = `${prefix}EXTENSION_`;
-  return Object.keys(process.env).filter((key) => key.startsWith(extensionPrefix)).reduce((ret, key) => {
-    const extensionName = key.substring(prefix.length, key.indexOf("_", prefix.length)).split("_").map((i) => i.length > 0 ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1) : "").join("");
-    if (extensionName) {
-      ret.extensions[extensionName] = getExtensionEnv(extensionName);
-    }
-    return ret;
-  }, config);
+  if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.error(
+        ` ${chalk.bold.bgHex(config?.colors?.fatal ? config.colors.fatal : "#1fb2a6").inverse("\n\n  \u{1F480} Fatal  ")} ${chalk.reset.hex(
+          config?.colors?.fatal ? config.colors.fatal : "#1fb2a6"
+        )(message)} 
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.error(
+        ` ${chalk.bold.bgHex(config?.colors?.error ? config.colors.error : "#7d1a1a").inverse("\n\n  \u{1F6D1} Error  ")} ${chalk.reset.hex(
+          config?.colors?.error ? config.colors.error : "#7d1a1a"
+        )(message)} 
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.warn(
+        ` ${chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").inverse("\n\n  \u26A0\uFE0F Warn  ")} ${chalk.reset.hex(
+          config?.colors?.warning ? config.colors.warning : "#fcc419"
+        )(message)} 
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.info(
+        ` ${chalk.bold.bgHex(config?.colors?.info ? config.colors.info : "#0ea5e9").inverse("\n\n  \u{1F4EC} Info  ")} ${chalk.reset.hex(
+          config?.colors?.info ? config.colors.info : "#0ea5e9"
+        )(message)} 
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.info(
+        ` ${chalk.bold.bgHex(config?.colors?.success ? config.colors.success : "#087f5b").inverse("\n\n  \u{1F389} Success  ")} ${chalk.reset.hex(
+          config?.colors?.success ? config.colors.success : "#087f5b"
+        )(message)} 
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.DEBUG >= logLevel || typeof logLevel === "string" && LogLevel.DEBUG >= getLogLevel(logLevel)) {
+    return (message) => {
+      console.debug(
+        ` ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").inverse("\n\n  \u{1F9EA} Debug  ")} ${chalk.reset.hex(
+          config?.colors?.primary ? config.colors.primary : "#1fb2a6"
+        )(message)} 
+`
+      );
+    };
+  }
+  return (message) => {
+    console.log(
+      ` ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").inverse("\n\n  \u{1F4E2} System  ")} ${chalk.bold.hex(
+        config?.colors?.primary ? config.colors.primary : "#1fb2a6"
+      )(message)} 
+`
+    );
+  };
+};
+var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
+var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
+var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
+var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
+var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
+var writeTrace = (config, message) => getLogFn(config, LogLevel.TRACE)(message);
+var getStopwatch = (name) => {
+  const start = process.hrtime();
+  return () => {
+    const end = process.hrtime(start);
+    console.info(
+      chalk.dim(
+        `\u23F1\uFE0F  The${name ? ` ${name}` : ""} process took ${Math.round(
+          end[0] * 1e3 + end[1] / 1e6
+        )}ms to complete`
+      )
+    );
+  };
 };
 
 // packages/config-tools/src/env/set-env.ts
@@ -30321,8 +30356,82 @@ var setConfigEnv = (config) => {
   }
 };
 
-// packages/workspace-tools/src/base/base-generator.ts
-var chalk = __toESM(require_source());
+// packages/config-tools/src/utilities/prepare-workspace.ts
+var prepareWorkspace = async () => {
+  const _STORM_CONFIG = getDefaultConfig({
+    ...await getConfigFile(),
+    ...getConfigEnv()
+  });
+  setConfigEnv(_STORM_CONFIG);
+  return _STORM_CONFIG;
+};
+
+// packages/config-tools/src/env/get-env.ts
+var 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("");
+    if (name) {
+      ret[name] = process.env[key];
+    }
+    return ret;
+  }, {});
+};
+var getConfigEnv = () => {
+  const prefix = "STORM_";
+  let config = {
+    name: process.env[`${prefix}NAME`],
+    namespace: process.env[`${prefix}NAMESPACE`],
+    owner: process.env[`${prefix}OWNER`],
+    worker: process.env[`${prefix}WORKER`],
+    organization: process.env[`${prefix}ORGANIZATION`],
+    packageManager: process.env[`${prefix}PACKAGE_MANAGER`],
+    license: process.env[`${prefix}LICENSE`],
+    homepage: process.env[`${prefix}HOMEPAGE`],
+    timezone: process.env[`${prefix}TIMEZONE`] ?? process.env.TZ,
+    locale: process.env[`${prefix}LOCALE`] ?? process.env.LOCALE,
+    configFile: process.env[`${prefix}CONFIG_FILE`],
+    workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`],
+    packageDirectory: process.env[`${prefix}PACKAGE_DIRECTORY`],
+    buildDirectory: process.env[`${prefix}BUILD_DIRECTORY`],
+    runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
+    runtimeDirectory: process.env[`${prefix}RUNTIME_DIRECTORY`],
+    env: process.env[`${prefix}ENV`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
+    ci: Boolean(process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION),
+    colors: {
+      primary: process.env[`${prefix}COLOR_PRIMARY`],
+      background: process.env[`${prefix}COLOR_BACKGROUND`],
+      success: process.env[`${prefix}COLOR_SUCCESS`],
+      info: process.env[`${prefix}COLOR_INFO`],
+      warning: process.env[`${prefix}COLOR_WARNING`],
+      error: process.env[`${prefix}COLOR_ERROR`],
+      fatal: process.env[`${prefix}COLOR_FATAL`]
+    },
+    repository: process.env[`${prefix}REPOSITORY`],
+    branch: process.env[`${prefix}BRANCH`],
+    preMajor: Boolean(process.env[`${prefix}PRE_MAJOR`]),
+    logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : LogLevelLabel.INFO,
+    extensions: {}
+  };
+  const serializedConfig = process.env[`${prefix}CONFIG`];
+  if (serializedConfig) {
+    const parsed = JSON.parse(serializedConfig);
+    config = {
+      ...config,
+      ...parsed,
+      colors: { ...config.colors, ...parsed.colors },
+      extensions: { ...config.extensions, ...parsed.extensions }
+    };
+  }
+  const extensionPrefix = `${prefix}EXTENSION_`;
+  return Object.keys(process.env).filter((key) => key.startsWith(extensionPrefix)).reduce((ret, key) => {
+    const extensionName = key.substring(prefix.length, key.indexOf("_", prefix.length)).split("_").map((i) => i.length > 0 ? i.trim().charAt(0).toUpperCase() + i.trim().slice(1) : "").join("");
+    if (extensionName) {
+      ret.extensions[extensionName] = getExtensionEnv(extensionName);
+    }
+    return ret;
+  }, config);
+};
 
 // packages/workspace-tools/src/utils/get-workspace-root.ts
 var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
@@ -30390,43 +30499,48 @@ var applyWorkspaceTokens = (options, config, tokenizerFn) => {
 var withRunGenerator = (name, generatorFn, generatorOptions = {
   skipReadingConfig: false
 }) => async (tree, _options) => {
-  const startTime = Date.now();
+  const stopwatch = getStopwatch(name);
   let options = _options;
+  let config;
   try {
-    console.info(chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
+    writeInfo(config, `\u26A1 Running the ${name} generator...
 
-`));
-    let config;
+`);
+    const workspaceRoot = getWorkspaceRoot();
     if (!generatorOptions.skipReadingConfig) {
-      config = getDefaultConfig({
-        ...await getConfigFile(),
-        ...getConfigEnv()
-      });
-      setConfigEnv(config);
-      getLogLevel(config.logLevel) >= LogLevel.DEBUG && console.debug(
-        chalk.dim(
-          `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
-        )
+      writeDebug(
+        config,
+        `Loading the Storm Config from environment variables and storm.config.js file...
+ - workspaceRoot: ${workspaceRoot}`
+      );
+      config = await prepareWorkspace();
+      writeTrace(
+        config,
+        `Loaded Storm config into env: 
+${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`
       );
     }
     if (generatorOptions?.hooks?.applyDefaultOptions) {
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the applyDefaultOptions hook..."));
+      writeDebug(config, "Running the applyDefaultOptions hook...");
       options = await Promise.resolve(
         generatorOptions.hooks.applyDefaultOptions(options, config)
       );
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the applyDefaultOptions hook..."));
+      writeDebug(config, "Completed the applyDefaultOptions hook");
     }
-    getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F  Generator schema options: \n"), options);
+    writeTrace(
+      config,
+      `Generator schema options \u2699\uFE0F 
+${Object.keys(options).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`
+    );
     const tokenized = applyWorkspaceTokens(
       options,
       { workspaceRoot: tree.root, config },
       applyWorkspaceGeneratorTokens
     );
     if (generatorOptions?.hooks?.preProcess) {
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the preProcess hook..."));
-      await Promise.resolve(generatorOptions.hooks.preProcess(options, config));
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the preProcess hook..."));
+      writeDebug(config, "Running the preProcess hook...");
+      await Promise.resolve(generatorOptions.hooks.preProcess(tokenized, config));
+      writeDebug(config, "Completed the preProcess hook");
     }
     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")) {
@@ -30435,33 +30549,31 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
       });
     }
     if (generatorOptions?.hooks?.postProcess) {
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the postProcess hook..."));
+      writeDebug(config, "Running the postProcess hook...");
       await Promise.resolve(generatorOptions.hooks.postProcess(config));
-      getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the postProcess hook..."));
+      writeDebug(config, "Completed the postProcess hook");
     }
-    console.info(
-      chalk.bold.hex("#087f5b")(`
-
-\u{1F389} Successfully completed running the ${name} generator!`)
-    );
+    writeSuccess(config, `Completed running the ${name} task executor!
+`);
     return {
       success: true
     };
   } catch (error) {
-    console.error(
-      chalk.bold.hex("#7d1a1a")("\u274C  An error occurred while running the generator\n\n"),
-      error
+    writeFatal(
+      config,
+      "A fatal error occurred while running the generator - the process was forced to terminate"
+    );
+    writeError(
+      config,
+      `An exception was thrown in the generator's process 
+ - Details: ${error.message}
+ - Stacktrace: ${error.stack}`
     );
-    console.error(error);
     return {
       success: false
     };
   } finally {
-    console.info(
-      chalk.hex("#0ea5e9").italic(
-        `\u23F1\uFE0F  The${name ? ` ${name}` : ""} generator took ${Date.now() - startTime}ms to complete`
-      )
-    );
+    stopwatch();
   }
 };