@storm-software/workspace-tools 1.73.0 → 1.73.1

package/src/executors/tsup-neutral/executor.js

@@ -46588,8 +46588,8 @@ var require_pax = __commonJS({
         return len + s2;
       }
     };
-    Pax.parse = (string, ex, g4) => new Pax(merge2(parseKV(string), ex), g4);
-    var merge2 = (a2, b6) => b6 ? Object.keys(a2).reduce((s2, k4) => (s2[k4] = a2[k4], s2), b6) : a2;
+    Pax.parse = (string, ex, g4) => new Pax(merge3(parseKV(string), ex), g4);
+    var merge3 = (a2, b6) => b6 ? Object.keys(a2).reduce((s2, k4) => (s2[k4] = a2[k4], s2), b6) : a2;
     var parseKV = (string) => string.replace(/\n$/, "").split("\n").reduce(parseKVLine, /* @__PURE__ */ Object.create(null));
     var parseKVLine = (set, line) => {
       const n = parseInt(line, 10);
@@ -66808,64 +66808,6 @@ var require_cjs = __commonJS({
   }
 });
 
-// packages/config-tools/src/config-file/get-config-file.ts
-var import_deepmerge, getConfigFileByName, getConfigFile;
-var init_get_config_file = __esm({
-  "packages/config-tools/src/config-file/get-config-file.ts"() {
-    init_find_workspace_root();
-    init_dist10();
-    import_deepmerge = __toESM(require_cjs());
-    getConfigFileByName = async (fileName, filePath) => {
-      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
-      return loadConfig({
-        cwd: workspacePath,
-        packageJson: true,
-        name: fileName,
-        envName: fileName?.toUpperCase(),
-        jitiOptions: {
-          debug: true,
-          cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
-        }
-      });
-    };
-    getConfigFile = async (filePath, additionalFileNames = []) => {
-      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
-      let { config, configFile } = await loadConfig({
-        cwd: workspacePath,
-        name: "storm"
-      });
-      if (additionalFileNames && additionalFileNames.length > 0) {
-        const results = await Promise.all(
-          additionalFileNames.map(
-            (fileName) => loadConfig({
-              cwd: workspacePath,
-              name: fileName
-            })
-          )
-        );
-        for (const result of results) {
-          if (result) {
-            config = (0, import_deepmerge.default)(config ?? {}, result.config ?? {});
-          }
-        }
-      }
-      if (!config) {
-        return void 0;
-      }
-      config.configFile = configFile;
-      config.runtimeVersion = "0.0.1";
-      return config;
-    };
-  }
-});
-
-// packages/config-tools/src/config-file/index.ts
-var init_config_file = __esm({
-  "packages/config-tools/src/config-file/index.ts"() {
-    init_get_config_file();
-  }
-});
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 function setErrorMap(map) {
   overrideErrorMap = map;
@@ -72513,7 +72455,7 @@ var init_chalk = __esm({
 });
 
 // packages/config-tools/src/utilities/logger.ts
-var getLogFn, writeFatal, writeError, writeWarning, writeInfo, writeSuccess, writeDebug, writeTrace, writeSystem, getStopwatch;
+var getLogFn, writeFatal, writeError, writeWarning, writeInfo, writeSuccess, writeDebug, writeTrace, writeSystem, getStopwatch, formatLogMessage, _isFunction;
 var init_logger = __esm({
   "packages/config-tools/src/utilities/logger.ts"() {
     init_types2();
@@ -72532,7 +72474,9 @@ var init_logger = __esm({
         return (message) => {
           console.error(
             `
-${_chalk.bold.hex(colors.error)(">")} ${_chalk.bold.bgHex(colors.fatal).whiteBright(" \u{1F480} Fatal ")}  ${_chalk.hex(colors.error)(message)}
+${_chalk.bold.hex(colors.error ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#b62324").whiteBright(
+              " \u{1F480} Fatal "
+            )}  ${_chalk.hex(colors.error ?? "#f85149")(formatLogMessage(message))}
 
 `
           );
@@ -72542,7 +72486,9 @@ ${_chalk.bold.hex(colors.error)(">")} ${_chalk.bold.bgHex(colors.fatal).whiteBri
         return (message) => {
           console.error(
             `
-${_chalk.bold.hex(colors.error)(">")} ${_chalk.bold.bgHex(colors.error).whiteBright(" \u2718 Error ")}  ${_chalk.hex(colors.error)(message)}
+${_chalk.bold.hex(colors.error ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.error ?? "#f85149").whiteBright(
+              " \u2718 Error "
+            )}  ${_chalk.hex(colors.error ?? "#f85149")(formatLogMessage(message))}
 `
           );
         };
@@ -72551,7 +72497,9 @@ ${_chalk.bold.hex(colors.error)(">")} ${_chalk.bold.bgHex(colors.error).whiteBri
         return (message) => {
           console.warn(
             `
-${_chalk.bold.hex(colors.warning)("> ")} ${_chalk.bold.bgHex(colors.warning).whiteBright("  \u26A0 Warn  ")}  ${_chalk.hex(colors.warning)(message)}
+${_chalk.bold.hex(colors.warning ?? "#e3b341")("> ")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
+              "  \u26A0 Warn  "
+            )}  ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
 `
           );
         };
@@ -72560,7 +72508,9 @@ ${_chalk.bold.hex(colors.warning)("> ")} ${_chalk.bold.bgHex(colors.warning).whi
         return (message) => {
           console.info(
             `
-${_chalk.bold.hex(colors.success)(">")} ${_chalk.bold.bgHex(colors.success).whiteBright(" \u2713 Success ")}  ${_chalk.hex(colors.success)(message)}
+${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
+              " \u2713 Success "
+            )}  ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
 `
           );
         };
@@ -72569,7 +72519,9 @@ ${_chalk.bold.hex(colors.success)(">")} ${_chalk.bold.bgHex(colors.success).whit
         return (message) => {
           console.info(
             `
-${_chalk.bold.hex(colors.info)(">")} ${_chalk.bold.bgHex(colors.info).whiteBright("  \u2139 Info  ")}  ${_chalk.hex(colors.info)(message)}
+${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
+              "  \u2139 Info  "
+            )}  ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
 `
           );
         };
@@ -72578,7 +72530,9 @@ ${_chalk.bold.hex(colors.info)(">")} ${_chalk.bold.bgHex(colors.info).whiteBrigh
         return (message) => {
           console.debug(
             `
-${_chalk.bold.hex(colors.primary)(">")} ${_chalk.bold.bgHex(colors.primary).whiteBright(" \u{1F6E0}  Debug ")}  ${_chalk.hex(colors.primary)(message)}
+${_chalk.bold.hex(colors.primary ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.primary ?? "#1fb2a6").whiteBright(
+              " \u{1F6E0}  Debug "
+            )}  ${_chalk.hex(colors.primary ?? "#1fb2a6")(formatLogMessage(message))}
 `
           );
         };
@@ -72586,7 +72540,9 @@ ${_chalk.bold.hex(colors.primary)(">")} ${_chalk.bold.bgHex(colors.primary).whit
       return (message) => {
         console.log(
           `
-${_chalk.bold.hex(colors.primary)(">")} ${_chalk.bold.bgHex(colors.primary).whiteBright(" \u2709 System ")}  ${_chalk.hex(colors.primary)(message)}
+${_chalk.bold.hex(colors.primary ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.primary ?? "#1fb2a6").whiteBright(
+            " \u2709 System "
+          )}  ${_chalk.hex(colors.primary ?? "#1fb2a6")(formatLogMessage(message))}
 `
         );
       };
@@ -72613,6 +72569,19 @@ ${_chalk.bold.hex(colors.primary)(">")} ${_chalk.bold.bgHex(colors.primary).whit
         );
       };
     };
+    formatLogMessage = (message, prefix = "-") => {
+      return typeof message === "string" ? message : typeof message === "object" ? Object.keys(message).map(
+        (key) => ` ${prefix} ${key} = ${_isFunction(message[key]) ? "<function>" : typeof message[key] === "object" ? `
+${formatLogMessage(message[key], `${prefix}-`)}` : message[key]}`
+      ).join("\n") : message;
+    };
+    _isFunction = (value2) => {
+      try {
+        return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
+      } catch (e2) {
+        return false;
+      }
+    };
   }
 });
 
@@ -72789,6 +72758,94 @@ var init_utilities = __esm({
   }
 });
 
+// packages/config-tools/src/config-file/get-config-file.ts
+var import_deepmerge, getConfigFileByName, getConfigFile;
+var init_get_config_file = __esm({
+  "packages/config-tools/src/config-file/get-config-file.ts"() {
+    init_find_workspace_root();
+    init_dist10();
+    import_deepmerge = __toESM(require_cjs());
+    init_utilities();
+    getConfigFileByName = async (fileName, filePath, options = {}) => {
+      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
+      let config = loadConfig({
+        cwd: workspacePath,
+        packageJson: true,
+        name: fileName,
+        envName: fileName?.toUpperCase(),
+        jitiOptions: {
+          debug: true,
+          cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
+        },
+        ...options
+      });
+      if (!config || Object.keys(config).length === 0) {
+        config = loadConfig({
+          cwd: workspacePath,
+          packageJson: true,
+          name: fileName,
+          envName: fileName?.toUpperCase(),
+          jitiOptions: {
+            debug: true,
+            cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
+          },
+          configFile: fileName,
+          ...options
+        });
+      }
+      return config;
+    };
+    getConfigFile = async (filePath, additionalFileNames = []) => {
+      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
+      let { config, configFile } = await getConfigFileByName(
+        "storm",
+        workspacePath
+      );
+      if (config && Object.keys(config).length > 0) {
+        writeTrace(
+          `Found Storm configuration file "${configFile}" at "${workspacePath}"`,
+          {
+            logLevel: "all"
+          }
+        );
+        writeTrace(config, { logLevel: "all" });
+      }
+      if (additionalFileNames && additionalFileNames.length > 0) {
+        const results = await Promise.all(
+          additionalFileNames.map(
+            (fileName) => getConfigFileByName(fileName, workspacePath)
+          )
+        );
+        for (const result of results) {
+          if (result?.config && Object.keys(result.config).length > 0) {
+            writeTrace(
+              `Found additional configuration file "${result.configFile}" at "${workspacePath}"`,
+              {
+                logLevel: "all"
+              }
+            );
+            writeTrace(result.config, { logLevel: "all" });
+            config = (0, import_deepmerge.default)(config ?? {}, result.config ?? {});
+          }
+        }
+      }
+      if (!config) {
+        return void 0;
+      }
+      config.configFile = configFile;
+      config.runtimeVersion = "0.0.1";
+      return config;
+    };
+  }
+});
+
+// packages/config-tools/src/config-file/index.ts
+var init_config_file = __esm({
+  "packages/config-tools/src/config-file/index.ts"() {
+    init_get_config_file();
+  }
+});
+
 // packages/config-tools/src/env/get-env.ts
 var getExtensionEnv, getConfigEnv, getThemeColorConfigEnv, getSingleThemeColorConfigEnv, getMultiThemeColorConfigEnv, getBaseThemeColorConfigEnv;
 var init_get_env = __esm({
@@ -73150,7 +73207,7 @@ var init_set_env = __esm({
 });
 
 // packages/config-tools/src/create-storm-config.ts
-var _extension_cache, _static_cache, createConfig, createStormConfig, createConfigExtension, loadStormConfig;
+var import_deepmerge2, _extension_cache, _static_cache, createConfig, createStormConfig, createConfigExtension, loadStormConfig;
 var init_create_storm_config = __esm({
   "packages/config-tools/src/create-storm-config.ts"() {
     init_get_config_file();
@@ -73159,6 +73216,7 @@ var init_create_storm_config = __esm({
     init_schema();
     init_utilities();
     init_get_default_config();
+    import_deepmerge2 = __toESM(require_cjs());
     _extension_cache = /* @__PURE__ */ new WeakMap();
     _static_cache = void 0;
     createConfig = (workspaceRoot) => {
@@ -73207,7 +73265,9 @@ var init_create_storm_config = __esm({
       if (!_workspaceRoot) {
         _workspaceRoot = findWorkspaceRoot();
       }
-      const configFile = await getConfigFile(_workspaceRoot);
+      let configFile = await getConfigFile(
+        _workspaceRoot
+      );
       if (!configFile) {
         writeWarning(
           "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.json` file to the root of your workspace if it is not.\n",
@@ -73216,10 +73276,7 @@ var init_create_storm_config = __esm({
       }
       config = StormConfigSchema.parse(
         await getDefaultConfig(
-          {
-            ...getConfigEnv(),
-            ...configFile
-          },
+          (0, import_deepmerge2.default)(getConfigEnv(), configFile, {}),
           _workspaceRoot
         )
       );
@@ -73257,6 +73314,7 @@ __export(src_exports, {
   findFileName: () => findFileName,
   findWorkspaceRoot: () => findWorkspaceRoot,
   findWorkspaceRootSafe: () => findWorkspaceRootSafe,
+  formatLogMessage: () => formatLogMessage,
   getChalk: () => getChalk,
   getConfigEnv: () => getConfigEnv,
   getConfigFile: () => getConfigFile,
@@ -73396,7 +73454,7 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
       writeTrace2(
         `Loaded Storm config into env: 
 ${Object.keys(process.env).filter((key) => key.startsWith("STORM_")).map(
-          (key) => ` - ${key}=${_isFunction(process.env[key]) ? "<function>" : JSON.stringify(process.env[key])}`
+          (key) => ` - ${key}=${_isFunction2(process.env[key]) ? "<function>" : JSON.stringify(process.env[key])}`
         ).join("\n")}`,
         config
       );
@@ -73411,7 +73469,7 @@ ${Object.keys(process.env).filter((key) => key.startsWith("STORM_")).map(
     writeTrace2(
       `Executor schema options \u2699\uFE0F 
 ${Object.keys(options).map(
-        (key) => ` - ${key}=${_isFunction(options[key]) ? "<function>" : JSON.stringify(options[key])}`
+        (key) => ` - ${key}=${_isFunction2(options[key]) ? "<function>" : JSON.stringify(options[key])}`
       ).join("\n")}`,
       config
     );
@@ -73436,7 +73494,7 @@ ${Object.keys(options).map(
       writeDebug2("Completed the preProcess hook", config);
     }
     const ret = executorFn(tokenized, context, config);
-    if (_isFunction(ret?.next)) {
+    if (_isFunction2(ret?.next)) {
       const asyncGen = ret;
       for await (const iter of asyncGen) {
       }
@@ -73477,7 +73535,7 @@ ${Object.keys(options).map(
     stopwatch();
   }
 };
-var _isFunction = (value2) => {
+var _isFunction2 = (value2) => {
   try {
     return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
   } catch (e2) {
@@ -73497,7 +73555,7 @@ async function tsupExecutorFn(options, context, config) {
   writeDebug2(
     `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
-      (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : _isFunction2(options[key]) ? "<function>" : JSON.stringify(options[key])}`
+      (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : _isFunction3(options[key]) ? "<function>" : JSON.stringify(options[key])}`
     ).join("\n")}
 `,
     config
@@ -73535,7 +73593,7 @@ var _isPrimitive = (value2) => {
     return false;
   }
 };
-var _isFunction2 = (value2) => {
+var _isFunction3 = (value2) => {
   try {
     return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
   } catch (e2) {