@storm-software/workspace-tools 1.45.0 → 1.45.2

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

@@ -34308,7 +34308,7 @@ var require_jsonfile = __commonJS({
       return obj;
     }
     var readFile = universalify.fromPromise(_readFile);
-    function readFileSync(file, options = {}) {
+    function readFileSync2(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
       }
@@ -34340,7 +34340,7 @@ var require_jsonfile = __commonJS({
     }
     var jsonfile = {
       readFile,
-      readFileSync,
+      readFileSync: readFileSync2,
       writeFile,
       writeFileSync
     };
@@ -43477,6 +43477,189 @@ var import_devkit2 = __toESM(require_devkit());
 
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
+
+// packages/config-tools/src/utilities/logger.ts
+var chalk = __toESM(require_source(), 1);
+
+// 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) {
+    case "all":
+      return LogLevel.ALL;
+    case "trace":
+      return LogLevel.TRACE;
+    case "debug":
+      return LogLevel.DEBUG;
+    case "info":
+      return LogLevel.INFO;
+    case "warn":
+      return LogLevel.WARN;
+    case "error":
+      return LogLevel.ERROR;
+    case "fatal":
+      return LogLevel.FATAL;
+    case "silent":
+      return LogLevel.SILENT;
+    default:
+      return LogLevel.INFO;
+  }
+};
+var getLogLevelLabel = (logLevel) => {
+  if (logLevel >= LogLevel.ALL) {
+    return LogLevelLabel.ALL;
+  }
+  if (logLevel >= LogLevel.TRACE) {
+    return LogLevelLabel.TRACE;
+  }
+  if (logLevel >= LogLevel.DEBUG) {
+    return LogLevelLabel.DEBUG;
+  }
+  if (logLevel >= LogLevel.INFO) {
+    return LogLevelLabel.INFO;
+  }
+  if (logLevel >= LogLevel.WARN) {
+    return LogLevelLabel.WARN;
+  }
+  if (logLevel >= LogLevel.ERROR) {
+    return LogLevelLabel.ERROR;
+  }
+  if (logLevel >= LogLevel.FATAL) {
+    return LogLevelLabel.FATAL;
+  }
+  if (logLevel <= LogLevel.SILENT) {
+    return LogLevelLabel.SILENT;
+  }
+  return LogLevelLabel.INFO;
+};
+
+// packages/config-tools/src/utilities/logger.ts
+var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
+  if (typeof logLevel === "number" && (logLevel >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL)) {
+    return (_) => {
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.fatal ? config.colors.fatal : "#1fb2a6"
+        )(message)}
+
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.error ? config.colors.error : "#7d1a1a"
+        )(message)}
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.warning ? config.colors.warning : "#fcc419"
+        )(message)}
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.info ? config.colors.info : "#0ea5e9"
+        )(message)}
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.success ? config.colors.success : "#087f5b"
+        )(message)}
+`
+      );
+    };
+  }
+  if (typeof logLevel === "number" && LogLevel.DEBUG >= logLevel || typeof logLevel === "string" && LogLevel.DEBUG >= getLogLevel(logLevel)) {
+    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.hex(
+          config?.colors?.primary ? config.colors.primary : "#1fb2a6"
+        )(message)}
+`
+      );
+    };
+  }
+  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.hex(
+        config?.colors?.primary ? config.colors.primary : "#1fb2a6"
+      )(message)}
+`
+    );
+  };
+};
+var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
+var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
+var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
+var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
+var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
+var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
+var writeTrace = (config, message) => getLogFn(config, LogLevel.TRACE)(message);
+var getStopwatch = (name) => {
+  const start = process.hrtime();
+  return () => {
+    const end = process.hrtime(start);
+    console.info(
+      chalk.dim(
+        `\u23F1\uFE0F  The${name ? ` ${name}` : ""} process took ${Math.round(
+          end[0] * 1e3 + end[1] / 1e6
+        )}ms to complete`
+      )
+    );
+  };
+};
+
+// packages/config-tools/src/config-file/get-config-file.ts
 var _static_cache = void 0;
 var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
@@ -43503,6 +43686,10 @@ var getConfigFile = async (filePath) => {
     console.warn(
       "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
     );
+    writeWarning(
+      { logLevel: "error" },
+      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
+    );
     return void 0;
   }
   const config = cosmiconfigResult.config ?? {};
@@ -43583,6 +43770,10 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
   return result;
 }
 
+// packages/config-tools/src/utilities/get-default-config.ts
+var import_node_fs2 = require("node:fs");
+var import_node_path2 = require("node:path");
+
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -47243,183 +47434,50 @@ var DefaultStormConfig = {
   colors: { ...DefaultColorConfig },
   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) {
-    case "all":
-      return LogLevel.ALL;
-    case "trace":
-      return LogLevel.TRACE;
-    case "debug":
-      return LogLevel.DEBUG;
-    case "info":
-      return LogLevel.INFO;
-    case "warn":
-      return LogLevel.WARN;
-    case "error":
-      return LogLevel.ERROR;
-    case "fatal":
-      return LogLevel.FATAL;
-    case "silent":
-      return LogLevel.SILENT;
-    default:
-      return LogLevel.INFO;
-  }
-};
-var getLogLevelLabel = (logLevel) => {
-  if (logLevel >= LogLevel.ALL) {
-    return LogLevelLabel.ALL;
-  }
-  if (logLevel >= LogLevel.TRACE) {
-    return LogLevelLabel.TRACE;
-  }
-  if (logLevel >= LogLevel.DEBUG) {
-    return LogLevelLabel.DEBUG;
-  }
-  if (logLevel >= LogLevel.INFO) {
-    return LogLevelLabel.INFO;
-  }
-  if (logLevel >= LogLevel.WARN) {
-    return LogLevelLabel.WARN;
-  }
-  if (logLevel >= LogLevel.ERROR) {
-    return LogLevelLabel.ERROR;
-  }
-  if (logLevel >= LogLevel.FATAL) {
-    return LogLevelLabel.FATAL;
-  }
-  if (logLevel <= LogLevel.SILENT) {
-    return LogLevelLabel.SILENT;
-  }
-  return LogLevelLabel.INFO;
-};
-
-// packages/config-tools/src/utilities/logger.ts
-var chalk = __toESM(require_source(), 1);
-var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
-  if (typeof logLevel === "number" && (logLevel >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(config.logLevel ?? process.env?.STORM_LOG_LEVEL)) {
-    return (_) => {
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.fatal ? config.colors.fatal : "#1fb2a6"
-        )(message)}
-
-`
-      );
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.error ? config.colors.error : "#7d1a1a"
-        )(message)}
-`
-      );
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.warning ? config.colors.warning : "#fcc419"
-        )(message)}
-`
-      );
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.info ? config.colors.info : "#0ea5e9"
-        )(message)}
-`
-      );
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.success ? config.colors.success : "#087f5b"
-        )(message)}
-`
-      );
-    };
-  }
-  if (typeof logLevel === "number" && LogLevel.DEBUG >= logLevel || typeof logLevel === "string" && LogLevel.DEBUG >= getLogLevel(logLevel)) {
-    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.hex(
-          config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-        )(message)}
-`
-      );
-    };
+var getDefaultConfig = (config = {}, root) => {
+  let name = "storm-workspace";
+  let namespace = "storm-software";
+  let repository = "https://github.com/storm-software/storm-ops";
+  let license = DefaultStormConfig.license;
+  let homepage = DefaultStormConfig.homepage;
+  const workspaceRoot = findWorkspaceRoot(root);
+  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
+    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
+      encoding: "utf-8"
+    });
+    if (file) {
+      const packageJson = JSON.parse(file);
+      if (packageJson.name) {
+        name = packageJson.name;
+      }
+      if (packageJson.namespace) {
+        namespace = packageJson.namespace;
+      }
+      if (packageJson.repository?.url) {
+        repository = packageJson.repository?.url;
+      }
+      if (packageJson.license) {
+        license = packageJson.license;
+      }
+      if (packageJson.homepage) {
+        homepage = packageJson.homepage;
+      }
+    }
   }
-  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.hex(
-        config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-      )(message)}
-`
-    );
-  };
-};
-var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
-var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
-var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
-var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
-var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
-var writeTrace = (config, message) => getLogFn(config, LogLevel.TRACE)(message);
-var getStopwatch = (name) => {
-  const start = process.hrtime();
-  return () => {
-    const end = process.hrtime(start);
-    console.info(
-      chalk.dim(
-        `\u23F1\uFE0F  The${name ? ` ${name}` : ""} process took ${Math.round(
-          end[0] * 1e3 + end[1] / 1e6
-        )}ms to complete`
-      )
-    );
-  };
+  return StormConfigSchema.parse({
+    ...DefaultStormConfig,
+    ...config,
+    colors: { ...DefaultColorConfig, ...config.colors },
+    workspaceRoot,
+    name,
+    namespace,
+    repository,
+    license: license ?? DefaultStormConfig.license,
+    homepage: homepage ?? DefaultStormConfig.homepage,
+    extensions: {
+      ...config.extensions
+    }
+  });
 };
 
 // packages/config-tools/src/env/set-env.ts
@@ -47609,39 +47667,21 @@ var getConfigEnv = () => {
 
 // packages/config-tools/src/create-storm-config.ts
 var loadStormConfig = async (workspaceRoot) => {
+  let config = {};
   let _workspaceRoot = workspaceRoot;
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = await getConfigFile(_workspaceRoot);
-  const configEnv = getConfigEnv();
-  for (const key of Object.keys(configEnv)) {
-    if (configEnv[key] !== void 0 && configEnv[key] !== null) {
-      if (key === "colors") {
-        configFile.colors = {
-          primary: process.env.STORM_COLOR_PRIMARY ?? 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];
-      }
-    }
-  }
-  const config = StormConfigSchema.parse(configFile);
+  config = StormConfigSchema.parse(
+    await getDefaultConfig(
+      {
+        ...await getConfigFile(_workspaceRoot),
+        ...getConfigEnv()
+      },
+      _workspaceRoot
+    )
+  );
   setConfigEnv(config);
-  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(configFile[key]);
-  }
-  console.debug("\r\n\r\n");
   return config;
 };