@storm-software/config-tools 1.41.1 → 1.41.3

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.41.3 (2024-04-26)
+
+
+### 🩹 Fixes
+
+- **config-tools:** Resolved issue applying default config ([8e1403b3](https://github.com/storm-software/storm-ops/commit/8e1403b3))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.41.2 (2024-04-26)
+
+
+### 🩹 Fixes
+
+- **config-tools:** Ensure defaulting doesn't overwrite file ([d14794e5](https://github.com/storm-software/storm-ops/commit/d14794e5))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.41.1 (2024-04-25)
 
 

package/index.cjs

@@ -72167,7 +72167,7 @@ var StormConfigSchema = z2.object({
   namespace: z2.string().trim().toLowerCase().optional().describe("The namespace of the package"),
   organization: z2.string().trim().default("storm-software").describe("The organization of the workspace"),
   repository: z2.string().trim().url().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
-  license: z2.string().trim().default("Apache License 2.0").describe("The root directory of the package"),
+  license: z2.string().trim().default("Apache 2.0").describe("The root directory of the package"),
   homepage: z2.string().trim().url().default("https://stormsoftware.com").describe("The homepage of the workspace"),
   branch: z2.string().trim().default("main").describe("The branch of the workspace"),
   preid: z2.string().optional().describe("A tag specifying the version pre-release identifier"),
@@ -72249,7 +72249,7 @@ var DEFAULT_COLOR_CONFIG = {
 var DEFAULT_STORM_CONFIG = {
   name: "storm",
   namespace: "storm-software",
-  license: "Apache License 2.0",
+  license: "Apache 2.0",
   homepage: "https://stormsoftware.com",
   owner: "@storm-software/development",
   worker: "stormie-bot",
@@ -72300,7 +72300,14 @@ var getDefaultConfig = (config = {}, root) => {
   }
   return StormConfigSchema.parse({
     ...DEFAULT_STORM_CONFIG,
-    ...config,
+    ...Object.keys(config).reduce((ret, key) => {
+      if (typeof config[key] === "string" && !config[key]) {
+        ret[key] = void 0;
+      } else {
+        ret[key] = config[key];
+      }
+      return ret;
+    }, {}),
     colors: { ...DEFAULT_COLOR_CONFIG, ...config.colors },
     workspaceRoot,
     name,
@@ -72521,10 +72528,10 @@ 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;
+  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 {
@@ -73144,13 +73151,15 @@ var loadStormConfig = async (workspaceRoot) => {
       { logLevel: "all" }
     );
   }
-  config = StormConfigSchema.parse(
-    await getDefaultConfig(
-      (0, import_deepmerge2.default)(configFile, getConfigEnv(), {}),
-      _workspaceRoot
-    )
+  config = getDefaultConfig(
+    (0, import_deepmerge2.default)(getConfigEnv(), configFile, {}),
+    _workspaceRoot
   );
   setConfigEnv(config);
+  writeInfo(`Using Storm configuration: 
+${formatLogMessage(config)}`, {
+    logLevel: "all"
+  });
   return config;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/index.js

@@ -72125,7 +72125,7 @@ var StormConfigSchema = z2.object({
   namespace: z2.string().trim().toLowerCase().optional().describe("The namespace of the package"),
   organization: z2.string().trim().default("storm-software").describe("The organization of the workspace"),
   repository: z2.string().trim().url().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
-  license: z2.string().trim().default("Apache License 2.0").describe("The root directory of the package"),
+  license: z2.string().trim().default("Apache 2.0").describe("The root directory of the package"),
   homepage: z2.string().trim().url().default("https://stormsoftware.com").describe("The homepage of the workspace"),
   branch: z2.string().trim().default("main").describe("The branch of the workspace"),
   preid: z2.string().optional().describe("A tag specifying the version pre-release identifier"),
@@ -72207,7 +72207,7 @@ var DEFAULT_COLOR_CONFIG = {
 var DEFAULT_STORM_CONFIG = {
   name: "storm",
   namespace: "storm-software",
-  license: "Apache License 2.0",
+  license: "Apache 2.0",
   homepage: "https://stormsoftware.com",
   owner: "@storm-software/development",
   worker: "stormie-bot",
@@ -72258,7 +72258,14 @@ var getDefaultConfig = (config = {}, root) => {
   }
   return StormConfigSchema.parse({
     ...DEFAULT_STORM_CONFIG,
-    ...config,
+    ...Object.keys(config).reduce((ret, key) => {
+      if (typeof config[key] === "string" && !config[key]) {
+        ret[key] = void 0;
+      } else {
+        ret[key] = config[key];
+      }
+      return ret;
+    }, {}),
     colors: { ...DEFAULT_COLOR_CONFIG, ...config.colors },
     workspaceRoot,
     name,
@@ -72479,10 +72486,10 @@ 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;
+  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 {
@@ -73102,13 +73109,15 @@ var loadStormConfig = async (workspaceRoot) => {
       { logLevel: "all" }
     );
   }
-  config = StormConfigSchema.parse(
-    await getDefaultConfig(
-      (0, import_deepmerge2.default)(configFile, getConfigEnv(), {}),
-      _workspaceRoot
-    )
+  config = getDefaultConfig(
+    (0, import_deepmerge2.default)(getConfigEnv(), configFile, {}),
+    _workspaceRoot
   );
   setConfigEnv(config);
+  writeInfo(`Using Storm configuration: 
+${formatLogMessage(config)}`, {
+    logLevel: "all"
+  });
   return config;
 };
 export {