@storm-software/workspace-tools 1.43.9 → 1.43.11

package/src/generators/neutral-library/generator.js

@@ -43514,29 +43514,6 @@ var getConfigFile = async (filePath) => {
   return config;
 };
 
-// packages/config-tools/src/types.ts
-var LogLevel = {
-  SILENT: 0,
-  FATAL: 10,
-  ERROR: 20,
-  WARN: 30,
-  INFO: 40,
-  SUCCESS: 45,
-  DEBUG: 60,
-  TRACE: 70,
-  ALL: 100
-};
-var LogLevelLabel = {
-  SILENT: "silent",
-  FATAL: "fatal",
-  ERROR: "error",
-  WARN: "warn",
-  INFO: "info",
-  DEBUG: "debug",
-  TRACE: "trace",
-  ALL: "all"
-};
-
 // packages/config-tools/src/utilities/find-up.ts
 var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
@@ -47267,6 +47244,29 @@ var DefaultStormConfig = {
   extensions: {}
 };
 
+// packages/config-tools/src/types.ts
+var LogLevel = {
+  SILENT: 0,
+  FATAL: 10,
+  ERROR: 20,
+  WARN: 30,
+  INFO: 40,
+  SUCCESS: 45,
+  DEBUG: 60,
+  TRACE: 70,
+  ALL: 100
+};
+var LogLevelLabel = {
+  SILENT: "silent",
+  FATAL: "fatal",
+  ERROR: "error",
+  WARN: "warn",
+  INFO: "info",
+  DEBUG: "debug",
+  TRACE: "trace",
+  ALL: "all"
+};
+
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
   switch (label) {
@@ -47598,16 +47598,6 @@ var setConfigEnv = (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 = {
@@ -47628,7 +47618,9 @@ var getConfigEnv = () => {
     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),
+    ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
+      process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
+    ) : void 0,
     colors: {
       primary: process.env[`${prefix}COLOR_PRIMARY`],
       background: process.env[`${prefix}COLOR_BACKGROUND`],
@@ -47640,9 +47632,8 @@ var getConfigEnv = () => {
     },
     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: {}
+    preMajor: process.env[`${prefix}PRE_MAJOR`] !== void 0 ? Boolean(process.env[`${prefix}PRE_MAJOR`]) : void 0,
+    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`] : void 0
   };
   const serializedConfig = process.env[`${prefix}CONFIG`];
   if (serializedConfig) {
@@ -47654,14 +47645,7 @@ var getConfigEnv = () => {
       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);
+  return config;
 };
 
 // packages/config-tools/src/create-storm-config.ts
@@ -47670,15 +47654,19 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   console.debug("\n\n");
   console.debug(`Loaded Storm config from ${config.configFile}`);
   for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
     console.debug(configFile[key]);
   }
   console.debug("\n\n");

package/src/generators/node-library/generator.js

@@ -43514,29 +43514,6 @@ var getConfigFile = async (filePath) => {
   return config;
 };
 
-// packages/config-tools/src/types.ts
-var LogLevel = {
-  SILENT: 0,
-  FATAL: 10,
-  ERROR: 20,
-  WARN: 30,
-  INFO: 40,
-  SUCCESS: 45,
-  DEBUG: 60,
-  TRACE: 70,
-  ALL: 100
-};
-var LogLevelLabel = {
-  SILENT: "silent",
-  FATAL: "fatal",
-  ERROR: "error",
-  WARN: "warn",
-  INFO: "info",
-  DEBUG: "debug",
-  TRACE: "trace",
-  ALL: "all"
-};
-
 // packages/config-tools/src/utilities/find-up.ts
 var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
@@ -47267,6 +47244,29 @@ var DefaultStormConfig = {
   extensions: {}
 };
 
+// packages/config-tools/src/types.ts
+var LogLevel = {
+  SILENT: 0,
+  FATAL: 10,
+  ERROR: 20,
+  WARN: 30,
+  INFO: 40,
+  SUCCESS: 45,
+  DEBUG: 60,
+  TRACE: 70,
+  ALL: 100
+};
+var LogLevelLabel = {
+  SILENT: "silent",
+  FATAL: "fatal",
+  ERROR: "error",
+  WARN: "warn",
+  INFO: "info",
+  DEBUG: "debug",
+  TRACE: "trace",
+  ALL: "all"
+};
+
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
   switch (label) {
@@ -47598,16 +47598,6 @@ var setConfigEnv = (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 = {
@@ -47628,7 +47618,9 @@ var getConfigEnv = () => {
     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),
+    ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
+      process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
+    ) : void 0,
     colors: {
       primary: process.env[`${prefix}COLOR_PRIMARY`],
       background: process.env[`${prefix}COLOR_BACKGROUND`],
@@ -47640,9 +47632,8 @@ var getConfigEnv = () => {
     },
     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: {}
+    preMajor: process.env[`${prefix}PRE_MAJOR`] !== void 0 ? Boolean(process.env[`${prefix}PRE_MAJOR`]) : void 0,
+    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`] : void 0
   };
   const serializedConfig = process.env[`${prefix}CONFIG`];
   if (serializedConfig) {
@@ -47654,14 +47645,7 @@ var getConfigEnv = () => {
       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);
+  return config;
 };
 
 // packages/config-tools/src/create-storm-config.ts
@@ -47670,15 +47654,19 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   console.debug("\n\n");
   console.debug(`Loaded Storm config from ${config.configFile}`);
   for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
     console.debug(configFile[key]);
   }
   console.debug("\n\n");

package/src/generators/preset/generator.js

@@ -26273,29 +26273,6 @@ var getConfigFile = async (filePath) => {
   return config;
 };
 
-// packages/config-tools/src/types.ts
-var LogLevel = {
-  SILENT: 0,
-  FATAL: 10,
-  ERROR: 20,
-  WARN: 30,
-  INFO: 40,
-  SUCCESS: 45,
-  DEBUG: 60,
-  TRACE: 70,
-  ALL: 100
-};
-var LogLevelLabel = {
-  SILENT: "silent",
-  FATAL: "fatal",
-  ERROR: "error",
-  WARN: "warn",
-  INFO: "info",
-  DEBUG: "debug",
-  TRACE: "trace",
-  ALL: "all"
-};
-
 // packages/config-tools/src/utilities/find-up.ts
 var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
@@ -30026,6 +30003,29 @@ var DefaultStormConfig = {
   extensions: {}
 };
 
+// packages/config-tools/src/types.ts
+var LogLevel = {
+  SILENT: 0,
+  FATAL: 10,
+  ERROR: 20,
+  WARN: 30,
+  INFO: 40,
+  SUCCESS: 45,
+  DEBUG: 60,
+  TRACE: 70,
+  ALL: 100
+};
+var LogLevelLabel = {
+  SILENT: "silent",
+  FATAL: "fatal",
+  ERROR: "error",
+  WARN: "warn",
+  INFO: "info",
+  DEBUG: "debug",
+  TRACE: "trace",
+  ALL: "all"
+};
+
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
   switch (label) {
@@ -30357,16 +30357,6 @@ var setConfigEnv = (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 = {
@@ -30387,7 +30377,9 @@ var getConfigEnv = () => {
     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),
+    ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
+      process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
+    ) : void 0,
     colors: {
       primary: process.env[`${prefix}COLOR_PRIMARY`],
       background: process.env[`${prefix}COLOR_BACKGROUND`],
@@ -30399,9 +30391,8 @@ var getConfigEnv = () => {
     },
     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: {}
+    preMajor: process.env[`${prefix}PRE_MAJOR`] !== void 0 ? Boolean(process.env[`${prefix}PRE_MAJOR`]) : void 0,
+    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`] : void 0
   };
   const serializedConfig = process.env[`${prefix}CONFIG`];
   if (serializedConfig) {
@@ -30413,14 +30404,7 @@ var getConfigEnv = () => {
       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);
+  return config;
 };
 
 // packages/config-tools/src/create-storm-config.ts
@@ -30429,15 +30413,19 @@ var loadStormConfig = async (workspaceRoot) => {
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = {
-    ...await getConfigFile(_workspaceRoot),
-    ...getConfigEnv()
-  };
+  const configFile = await getConfigFile(_workspaceRoot);
+  const configEnv = getConfigEnv();
+  for (const key of Object.keys(configEnv)) {
+    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
+      configFile[key] = configEnv[key];
+    }
+  }
   const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   console.debug("\n\n");
   console.debug(`Loaded Storm config from ${config.configFile}`);
   for (const key of Object.keys(configFile)) {
+    console.debug(` ----- ${key} ----- `);
     console.debug(configFile[key]);
   }
   console.debug("\n\n");