@storm-software/workspace-tools 1.43.15 → 1.43.17

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 reset2 = function() {
+        var reset = function() {
           cancelReset();
           connection = subject = void 0;
           hasCompleted = hasErrored = false;
         };
         var resetAndUnsubscribe = function() {
           var conn = connection;
-          reset2();
+          reset();
           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(reset2, resetOnError, err);
+                resetConnection = handleReset(reset, resetOnError, err);
                 dest.error(err);
               },
               complete: function() {
                 hasCompleted = true;
                 cancelReset();
-                resetConnection = handleReset(reset2, resetOnComplete);
+                resetConnection = handleReset(reset, resetOnComplete);
                 dest.complete();
               }
             });
@@ -16205,13 +16205,13 @@ var require_share = __commonJS({
       };
     }
     exports.share = share;
-    function handleReset(reset2, on) {
+    function handleReset(reset, on) {
       var args = [];
       for (var _i = 2; _i < arguments.length; _i++) {
         args[_i - 2] = arguments[_i];
       }
       if (on === true) {
-        reset2();
+        reset();
         return;
       }
       if (on === false) {
@@ -16220,7 +16220,7 @@ var require_share = __commonJS({
       var onSubscriber = new Subscriber_1.SafeSubscriber({
         next: function() {
           onSubscriber.unsubscribe();
-          reset2();
+          reset();
         }
       });
       return innerFrom_1.innerFrom(on.apply(void 0, __spreadArray2([], __read2(args)))).subscribe(onSubscriber);
@@ -30088,14 +30088,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.error(
         `
-
-
- ${chalk.bold.hex(config?.colors?.fatal ? config.colors.fatal : "#1fb2a6")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.fatal ? config.colors.fatal : "#1fb2a6").white(" \u{1F480} Fatal ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.fatal ? config.colors.fatal : "#1fb2a6")(">")} ${chalk.bold.bgHex(config?.colors?.fatal ? config.colors.fatal : "#1fb2a6").white(" \u{1F480} Fatal ")}  ${chalk.hex(
           config?.colors?.fatal ? config.colors.fatal : "#1fb2a6"
-        )(message)} 
-
+        )(message)}
 
 `
       );
@@ -30105,15 +30100,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.error(
         `
-
-
- ${chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.error ? config.colors.error : "#7d1a1a").white(" \u{1F6D1} Error ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")} ${chalk.bold.bgHex(config?.colors?.error ? config.colors.error : "#7d1a1a").white(" \u{1F6D1} Error ")}  ${chalk.hex(
           config?.colors?.error ? config.colors.error : "#7d1a1a"
-        )(message)} 
-
-
+        )(message)}
 `
       );
     };
@@ -30122,15 +30111,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.warn(
         `
-
-
- ${chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").white(" \u26A0\uFE0F Warn ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")(">")} ${chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").white(" \u26A0\uFE0F Warn ")}  ${chalk.hex(
           config?.colors?.warning ? config.colors.warning : "#fcc419"
-        )(message)} 
-
-
+        )(message)}
 `
       );
     };
@@ -30139,15 +30122,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.info(
         `
-
-
- ${chalk.bold.hex(config?.colors?.info ? config.colors.info : "#0ea5e9")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.info ? config.colors.info : "#0ea5e9").white("  \u{1F4EC} Info  ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.info ? config.colors.info : "#0ea5e9")(">")} ${chalk.bold.bgHex(config?.colors?.info ? config.colors.info : "#0ea5e9").white("  \u{1F4EC} Info  ")}  ${chalk.hex(
           config?.colors?.info ? config.colors.info : "#0ea5e9"
-        )(message)} 
-
-
+        )(message)}
 `
       );
     };
@@ -30156,15 +30133,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.info(
         `
-
-
- ${chalk.bold.hex(config?.colors?.success ? config.colors.success : "#087f5b")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.success ? config.colors.success : "#087f5b").white(" \u{1F389} Success ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.success ? config.colors.success : "#087f5b")(">")} ${chalk.bold.bgHex(config?.colors?.success ? config.colors.success : "#087f5b").white(" \u{1F389} Success ")}  ${chalk.hex(
           config?.colors?.success ? config.colors.success : "#087f5b"
-        )(message)} 
-
-
+        )(message)}
 `
       );
     };
@@ -30173,15 +30144,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
     return (message) => {
       console.debug(
         `
-
-
- ${chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(
-          ">"
-        )} ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").white(" \u{1F9EA} Debug  ")}  ${chalk.reset.hex(
+${chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(">")} ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").white(" \u{1F9EA} Debug  ")}  ${chalk.hex(
           config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-        )(message)} 
-
-
+        )(message)}
 `
       );
     };
@@ -30189,15 +30154,9 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
   return (message) => {
     console.log(
       `
-
-
- ${chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(
-        ">"
-      )} ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").white("  \u{1F4E2} System  ")}  ${chalk.bold.hex(
+${chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(">")} ${chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").white("  \u{1F4E2} System  ")}  ${chalk.hex(
         config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-      )(message)} 
-
-
+      )(message)}
 `
     );
   };
@@ -30420,12 +30379,12 @@ var loadStormConfig = async (workspaceRoot) => {
       if (key === "colors") {
         configFile.colors = {
           primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
-          background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
-          success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
-          info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
-          warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
-          error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
-          fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
+          background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.background,
+          success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.success,
+          info: process.env.STORM_COLOR_INFO ?? configFile.colors?.info,
+          warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.warning,
+          error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.error,
+          fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.fatal
         };
       } else {
         configFile[key] = configEnv[key];
@@ -30434,13 +30393,14 @@ var loadStormConfig = async (workspaceRoot) => {
   }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
-  console.debug("\n\n");
+  console.debug("\r\n\r\n");
   console.debug(`Loaded Storm config from ${config.configFile}`);
   for (const key of Object.keys(configFile)) {
-    console.debug(` ----- ${key} ----- `);
+    console.debug(`
+ ----- ${key} ----- `);
     console.debug(configFile[key]);
   }
-  console.debug("\n\n");
+  console.debug("\r\n\r\n");
   return config;
 };