@storm-software/config-tools 1.40.1 → 1.41.1

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.41.1 (2024-04-25)
+
+
+### 🩹 Fixes
+
+- **config-tools:** Resovled issue with parsing env values ([bb0e395a](https://github.com/storm-software/storm-ops/commit/bb0e395a))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.41.0 (2024-04-24)
+
+
+### 🚀 Features
+
+- **config-tools:** Enhanced the config loading and logging processes ([0e3b7cef](https://github.com/storm-software/storm-ops/commit/0e3b7cef))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.40.1 (2024-04-22)
 
 

package/declarations.d.ts

@@ -106,6 +106,9 @@ export { exitWithSuccess };
 declare function handleProcess(config?: StormConfig): void;
 export { handleProcess };
 
+declare function formatLogMessage(message?: any, prefix?: string): string;
+export { formatLogMessage };
+
 /**
  * Write a message to the console at the `fatal` log level
  *

package/index.cjs

@@ -38777,8 +38777,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);
@@ -60208,6 +60208,7 @@ __export(src_exports, {
   findFileName: () => findFileName,
   findWorkspaceRoot: () => findWorkspaceRoot,
   findWorkspaceRootSafe: () => findWorkspaceRootSafe,
+  formatLogMessage: () => formatLogMessage,
   getChalk: () => getChalk,
   getConfigEnv: () => getConfigEnv,
   getConfigFile: () => getConfigFile,
@@ -68358,47 +68359,10 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_deepmerge = __toESM(require_cjs());
-var 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
-    }
-  });
-};
-var 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/utilities/get-default-config.ts
+var import_node_fs10 = require("node:fs");
+var import_node_path6 = require("node:path");
 
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
@@ -72269,8 +72233,6 @@ var COLOR_KEYS = [
 ];
 
 // packages/config-tools/src/utilities/get-default-config.ts
-var import_node_fs10 = require("node:fs");
-var import_node_path6 = require("node:path");
 var DEFAULT_COLOR_CONFIG = {
   dark: "#1d232a",
   light: "#f4f4f5",
@@ -72463,7 +72425,9 @@ var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
     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))}
 
 `
       );
@@ -72473,7 +72437,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))}
 `
       );
     };
@@ -72482,7 +72448,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))}
 `
       );
     };
@@ -72491,7 +72459,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))}
 `
       );
     };
@@ -72500,7 +72470,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))}
 `
       );
     };
@@ -72509,7 +72481,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))}
 `
       );
     };
@@ -72517,7 +72491,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))}
 `
     );
   };
@@ -72544,6 +72520,19 @@ var getStopwatch = (name) => {
     );
   };
 };
+var 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;
+};
+var _isFunction = (value2) => {
+  try {
+    return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
+  } catch (e2) {
+    return false;
+  }
+};
 
 // packages/config-tools/src/utilities/process-handler.ts
 var exitWithError = (config) => {
@@ -72680,6 +72669,78 @@ var applyWorkspaceTokens = async (options, config, tokenizerFn) => {
   return result;
 };
 
+// packages/config-tools/src/config-file/get-config-file.ts
+var 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;
+};
+var 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/env/get-env.ts
 var getExtensionEnv = (extensionName) => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
@@ -72984,8 +73045,8 @@ var setSingleThemeColorConfigEnv = (prefix, config) => {
 };
 var setMultiThemeColorConfigEnv = (prefix, config) => {
   return {
-    light: setBaseThemeColorConfigEnv(`${prefix}_LIGHT_`, config.light),
-    dark: setBaseThemeColorConfigEnv(`${prefix}_DARK_`, config.dark)
+    light: setBaseThemeColorConfigEnv(`${prefix}LIGHT_`, config.light),
+    dark: setBaseThemeColorConfigEnv(`${prefix}DARK_`, config.dark)
   };
 };
 var setBaseThemeColorConfigEnv = (prefix, config) => {
@@ -73025,6 +73086,7 @@ var setBaseThemeColorConfigEnv = (prefix, config) => {
 };
 
 // packages/config-tools/src/create-storm-config.ts
+var import_deepmerge2 = __toESM(require_cjs());
 var _extension_cache = /* @__PURE__ */ new WeakMap();
 var _static_cache = void 0;
 var createConfig = (workspaceRoot) => {
@@ -73073,7 +73135,9 @@ var loadStormConfig = async (workspaceRoot) => {
   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",
@@ -73082,10 +73146,7 @@ var loadStormConfig = async (workspaceRoot) => {
   }
   config = StormConfigSchema.parse(
     await getDefaultConfig(
-      {
-        ...getConfigEnv(),
-        ...configFile
-      },
+      (0, import_deepmerge2.default)(configFile, getConfigEnv(), {}),
       _workspaceRoot
     )
   );
@@ -73111,6 +73172,7 @@ var loadStormConfig = async (workspaceRoot) => {
   findFileName,
   findWorkspaceRoot,
   findWorkspaceRootSafe,
+  formatLogMessage,
   getChalk,
   getConfigEnv,
   getConfigFile,

package/index.js

@@ -38783,8 +38783,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);
@@ -68317,47 +68317,10 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_deepmerge = __toESM(require_cjs());
-var 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
-    }
-  });
-};
-var 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/utilities/get-default-config.ts
+import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
+import { join as join3 } from "node:path";
 
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
@@ -72228,8 +72191,6 @@ var COLOR_KEYS = [
 ];
 
 // packages/config-tools/src/utilities/get-default-config.ts
-import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
-import { join as join3 } from "node:path";
 var DEFAULT_COLOR_CONFIG = {
   dark: "#1d232a",
   light: "#f4f4f5",
@@ -72422,7 +72383,9 @@ var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
     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))}
 
 `
       );
@@ -72432,7 +72395,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))}
 `
       );
     };
@@ -72441,7 +72406,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))}
 `
       );
     };
@@ -72450,7 +72417,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))}
 `
       );
     };
@@ -72459,7 +72428,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))}
 `
       );
     };
@@ -72468,7 +72439,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))}
 `
       );
     };
@@ -72476,7 +72449,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))}
 `
     );
   };
@@ -72503,6 +72478,19 @@ var getStopwatch = (name) => {
     );
   };
 };
+var 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;
+};
+var _isFunction = (value2) => {
+  try {
+    return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
+  } catch (e2) {
+    return false;
+  }
+};
 
 // packages/config-tools/src/utilities/process-handler.ts
 var exitWithError = (config) => {
@@ -72639,6 +72627,78 @@ var applyWorkspaceTokens = async (options, config, tokenizerFn) => {
   return result;
 };
 
+// packages/config-tools/src/config-file/get-config-file.ts
+var 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;
+};
+var 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/env/get-env.ts
 var getExtensionEnv = (extensionName) => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
@@ -72943,8 +73003,8 @@ var setSingleThemeColorConfigEnv = (prefix, config) => {
 };
 var setMultiThemeColorConfigEnv = (prefix, config) => {
   return {
-    light: setBaseThemeColorConfigEnv(`${prefix}_LIGHT_`, config.light),
-    dark: setBaseThemeColorConfigEnv(`${prefix}_DARK_`, config.dark)
+    light: setBaseThemeColorConfigEnv(`${prefix}LIGHT_`, config.light),
+    dark: setBaseThemeColorConfigEnv(`${prefix}DARK_`, config.dark)
   };
 };
 var setBaseThemeColorConfigEnv = (prefix, config) => {
@@ -72984,6 +73044,7 @@ var setBaseThemeColorConfigEnv = (prefix, config) => {
 };
 
 // packages/config-tools/src/create-storm-config.ts
+var import_deepmerge2 = __toESM(require_cjs());
 var _extension_cache = /* @__PURE__ */ new WeakMap();
 var _static_cache = void 0;
 var createConfig = (workspaceRoot) => {
@@ -73032,7 +73093,9 @@ var loadStormConfig = async (workspaceRoot) => {
   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",
@@ -73041,10 +73104,7 @@ var loadStormConfig = async (workspaceRoot) => {
   }
   config = StormConfigSchema.parse(
     await getDefaultConfig(
-      {
-        ...getConfigEnv(),
-        ...configFile
-      },
+      (0, import_deepmerge2.default)(configFile, getConfigEnv(), {}),
       _workspaceRoot
     )
   );
@@ -73069,6 +73129,7 @@ export {
   findFileName,
   findWorkspaceRoot,
   findWorkspaceRootSafe,
+  formatLogMessage,
   getChalk,
   getConfigEnv,
   getConfigFile,