@storm-software/workspace-tools 1.34.1 → 1.35.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.34.2](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.34.1...workspace-tools-v1.34.2) (2023-12-22)
+
+
+### Bug Fixes
+
+* **config-tools:** Resolved issue in configuration defaulter function ([92e10c1](https://github.com/storm-software/storm-ops/commit/92e10c1fa0283eaf341f4bc9338628cbdb546eb9))
+
+## [1.34.1](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.34.0...workspace-tools-v1.34.1) (2023-12-22)
+
+
+### Bug Fixes
+
+* **config-tools:** Resolved export issue in type declarations ([9125a40](https://github.com/storm-software/storm-ops/commit/9125a40607db1f58351cd9ef12e86f62b234d753))
+
 # [1.34.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.33.1...workspace-tools-v1.34.0) (2023-12-22)
 
 

package/index.js

@@ -106265,22 +106265,22 @@ module.exports = __toCommonJS(workspace_tools_exports);
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search();
-var getConfigFile = async () => {
+var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
   }
-  let cosmiconfigResult = await getConfigFileName("storm");
+  let cosmiconfigResult = await getConfigFileName("storm", filePath);
   if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-    cosmiconfigResult = await getConfigFileName("storm-software");
+    cosmiconfigResult = await getConfigFileName("storm-software", filePath);
     if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-      cosmiconfigResult = await getConfigFileName("storm-stack");
+      cosmiconfigResult = await getConfigFileName("storm-stack", filePath);
       if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-        cosmiconfigResult = await getConfigFileName("storm-cloud");
+        cosmiconfigResult = await getConfigFileName("storm-cloud", filePath);
         if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-          cosmiconfigResult = await getConfigFileName("acidic");
+          cosmiconfigResult = await getConfigFileName("acidic", filePath);
           if (!cosmiconfigResult || cosmiconfigResult.isEmpty) {
-            cosmiconfigResult = await getConfigFileName("acid");
+            cosmiconfigResult = await getConfigFileName("acid", filePath);
           }
         }
       }
@@ -109976,8 +109976,8 @@ var ColorConfigSchema = objectType({
   fatal: stringType().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#7d1a1a").describe("The fatal color of the workspace")
 }).describe("Colors used for various workspace elements");
 var StormConfigSchema = objectType({
-  name: stringType().trim().toLowerCase().describe("The name of the package"),
-  namespace: stringType().trim().toLowerCase().default("storm-software").describe("The namespace of the package"),
+  name: stringType().trim().toLowerCase().optional().describe("The name of the package"),
+  namespace: stringType().trim().toLowerCase().optional().describe("The namespace of the package"),
   organization: stringType().trim().default("storm-software").describe("The organization of the workspace"),
   repository: stringType().trim().url().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
   license: stringType().trim().default("Apache License 2.0").describe("The root directory of the package"),
@@ -109994,7 +109994,7 @@ var StormConfigSchema = objectType({
   ci: booleanType().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: stringType().trim().describe("The root directory of the workspace"),
+  workspaceRoot: stringType().trim().optional().describe("The root directory of the workspace"),
   packageDirectory: stringType().trim().optional().describe("The root directory of the package"),
   buildDirectory: stringType().trim().default("dist").describe("The build directory for the workspace"),
   runtimeDirectory: stringType().trim().default("node_modules/.storm").describe("The runtime directory of Storm"),
@@ -110004,7 +110004,7 @@ var StormConfigSchema = objectType({
   packageManager: enumType(["npm", "yarn", "pnpm", "bun"]).default("npm").describe("The package manager used by the repository"),
   timezone: stringType().trim().default("America/New_York").describe("The default timezone of the workspace"),
   locale: stringType().trim().default("en-US").describe("The default locale of the workspace"),
-  logLevel: enumType(["silent", "fatal", "error", "warn", "info", "debug", "trace"]).optional().describe(
+  logLevel: enumType(["silent", "fatal", "error", "warn", "info", "debug", "trace"]).default("debug").describe(
     "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
   ),
   configFile: stringType().trim().nullable().default(null).describe(
@@ -110029,7 +110029,7 @@ var DefaultColorConfig = {
   fatal: "#7d1a1a"
 };
 var DefaultStormConfig = {
-  name: "storm-workspace",
+  name: "storm",
   namespace: "storm-software",
   license: "Apache License 2.0",
   homepage: "https://stormsoftware.org",
@@ -110069,19 +110069,18 @@ var getDefaultConfig = (config = {}, root) => {
       packageJson.homepage && (homepage = packageJson.homepage);
     }
   }
-  return StormConfigSchema.parse(
-    Object.assign(config, {
-      ...DefaultStormConfig,
-      colors: { ...DefaultColorConfig },
-      workspaceRoot,
-      name,
-      namespace,
-      repository,
-      license: license ?? DefaultStormConfig.license,
-      homepage: homepage ?? DefaultStormConfig.homepage,
-      extensions: {}
-    })
-  );
+  return StormConfigSchema.parse({
+    ...config,
+    ...DefaultStormConfig,
+    colors: { ...config.colors, ...DefaultColorConfig },
+    workspaceRoot,
+    name,
+    namespace,
+    repository,
+    license: license ?? DefaultStormConfig.license,
+    homepage: homepage ?? DefaultStormConfig.homepage,
+    extensions: {}
+  });
 };
 
 // packages/config-tools/src/utilities/get-log-level.ts
@@ -110144,6 +110143,7 @@ var getConfigEnv = () => {
     owner: process.env[`${prefix}OWNER`],
     worker: process.env[`${prefix}WORKER`],
     organization: process.env[`${prefix}ORGANIZATION`],
+    packageManager: process.env[`${prefix}PACKAGE_MANAGER`],
     license: process.env[`${prefix}LICENSE`],
     homepage: process.env[`${prefix}HOMEPAGE`],
     timezone: process.env[`${prefix}TIMEZONE`] ?? process.env.TZ,
@@ -110213,51 +110213,52 @@ var setExtensionEnv = (extensionName, extension) => {
 };
 var setConfigEnv = (config) => {
   const prefix = `STORM_`;
-  process.env[`${prefix}NAME`] = config.name;
-  process.env[`${prefix}NAMESPACE`] = config.namespace;
-  process.env[`${prefix}OWNER`] = config.owner;
-  process.env[`${prefix}WORKER`] = config.worker;
-  process.env[`${prefix}ORGANIZATION`] = config.organization;
-  process.env[`${prefix}LICENSE`] = config.license;
-  process.env[`${prefix}HOMEPAGE`] = config.homepage;
-  process.env[`${prefix}TIMEZONE`] = config.timezone;
-  process.env.TZ = config.timezone;
-  process.env.DEFAULT_TIMEZONE = config.timezone;
-  process.env[`${prefix}LOCALE`] = config.locale;
-  process.env.LOCALE = config.locale;
-  process.env.DEFAULT_LOCALE = config.locale;
-  process.env.LANG = config.locale ? `${config.locale.replaceAll("-", "_")}.UTF-8` : "en_US.UTF-8";
-  process.env[`${prefix}CONFIG_FILE`] = config.configFile;
-  process.env[`${prefix}WORKSPACE_ROOT`] = config.workspaceRoot;
-  process.env.NX_WORKSPACE_ROOT = config.workspaceRoot;
-  process.env.NX_WORKSPACE_ROOT_PATH = config.workspaceRoot;
-  process.env[`${prefix}PACKAGE_DIRECTORY`] = config.packageDirectory;
-  process.env[`${prefix}BUILD_DIRECTORY`] = config.buildDirectory;
-  process.env[`${prefix}RUNTIME_VERSION`] = config.runtimeVersion;
-  process.env[`${prefix}RUNTIME_DIRECTORY`] = config.runtimeDirectory;
-  process.env[`${prefix}ENV`] = config.env;
-  process.env.NODE_ENV = config.env;
-  process.env.ENVIRONMENT = config.env;
-  process.env[`${prefix}CI`] = String(config.ci);
-  process.env.CI = String(config.ci);
-  process.env.CONTINUOUS_INTEGRATION = String(config.ci);
-  process.env[`${prefix}COLOR_PRIMARY`] = config.colors.primary;
-  process.env[`${prefix}COLOR_BACKGROUND`] = config.colors.background;
-  process.env[`${prefix}COLOR_SUCCESS`] = config.colors.success;
-  process.env[`${prefix}COLOR_INFO`] = config.colors.info;
-  process.env[`${prefix}COLOR_WARNING`] = config.colors.warning;
-  process.env[`${prefix}COLOR_ERROR`] = config.colors.error;
-  process.env[`${prefix}COLOR_FATAL`] = config.colors.fatal;
-  process.env[`${prefix}REPOSITORY`] = config.repository;
-  process.env[`${prefix}BRANCH`] = config.branch;
-  process.env[`${prefix}PRE_MAJOR`] = String(config.preMajor);
-  process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
-  process.env.LOG_LEVEL = String(config.logLevel);
-  process.env.NX_VERBOSE_LOGGING = String(
+  config.name && (process.env[`${prefix}NAME`] = config.name);
+  config.namespace && (process.env[`${prefix}NAMESPACE`] = config.namespace);
+  config.owner && (process.env[`${prefix}OWNER`] = config.owner);
+  config.worker && (process.env[`${prefix}WORKER`] = config.worker);
+  config.organization && (process.env[`${prefix}ORGANIZATION`] = config.organization);
+  config.packageManager && (process.env[`${prefix}PACKAGE_MANAGER`] = config.packageManager);
+  config.license && (process.env[`${prefix}LICENSE`] = config.license);
+  config.homepage && (process.env[`${prefix}HOMEPAGE`] = config.homepage);
+  config.timezone && (process.env[`${prefix}TIMEZONE`] = config.timezone);
+  config.timezone && (process.env.TZ = config.timezone);
+  config.timezone && (process.env.DEFAULT_TIMEZONE = config.timezone);
+  config.locale && (process.env[`${prefix}LOCALE`] = config.locale);
+  config.locale && (process.env.LOCALE = config.locale);
+  config.locale && (process.env.DEFAULT_LOCALE = config.locale);
+  config.locale && (process.env.LANG = config.locale ? `${config.locale.replaceAll("-", "_")}.UTF-8` : "en_US.UTF-8");
+  config.configFile && (process.env[`${prefix}CONFIG_FILE`] = config.configFile);
+  config.workspaceRoot && (process.env[`${prefix}WORKSPACE_ROOT`] = config.workspaceRoot);
+  config.workspaceRoot && (process.env.NX_WORKSPACE_ROOT = config.workspaceRoot);
+  config.workspaceRoot && (process.env.NX_WORKSPACE_ROOT_PATH = config.workspaceRoot);
+  config.packageDirectory && (process.env[`${prefix}PACKAGE_DIRECTORY`] = config.packageDirectory);
+  config.buildDirectory && (process.env[`${prefix}BUILD_DIRECTORY`] = config.buildDirectory);
+  config.runtimeVersion && (process.env[`${prefix}RUNTIME_VERSION`] = config.runtimeVersion);
+  config.runtimeDirectory && (process.env[`${prefix}RUNTIME_DIRECTORY`] = config.runtimeDirectory);
+  config.env && (process.env[`${prefix}ENV`] = config.env);
+  config.env && (process.env.NODE_ENV = config.env);
+  config.env && (process.env.ENVIRONMENT = config.env);
+  config.ci && (process.env[`${prefix}CI`] = String(config.ci));
+  config.ci && (process.env.CI = String(config.ci));
+  config.ci && (process.env.CONTINUOUS_INTEGRATION = String(config.ci));
+  config.colors.primary && (process.env[`${prefix}COLOR_PRIMARY`] = config.colors.primary);
+  config.colors.background && (process.env[`${prefix}COLOR_BACKGROUND`] = config.colors.background);
+  config.colors.success && (process.env[`${prefix}COLOR_SUCCESS`] = config.colors.success);
+  config.colors.info && (process.env[`${prefix}COLOR_INFO`] = config.colors.info);
+  config.colors.warning && (process.env[`${prefix}COLOR_WARNING`] = config.colors.warning);
+  config.colors.error && (process.env[`${prefix}COLOR_ERROR`] = config.colors.error);
+  config.colors.fatal && (process.env[`${prefix}COLOR_FATAL`] = config.colors.fatal);
+  config.repository && (process.env[`${prefix}REPOSITORY`] = config.repository);
+  config.branch && (process.env[`${prefix}BRANCH`] = config.branch);
+  config.preMajor && (process.env[`${prefix}PRE_MAJOR`] = String(config.preMajor));
+  config.logLevel && (process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel));
+  config.logLevel && (process.env.LOG_LEVEL = String(config.logLevel));
+  config.logLevel && (process.env.NX_VERBOSE_LOGGING = String(
     getLogLevel(config.logLevel) >= LogLevel.DEBUG ? true : false
-  );
-  process.env.RUST_BACKTRACE = getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none";
-  process.env[`${prefix}CONFIG`] = JSON.stringify(config);
+  ));
+  config.logLevel && (process.env.RUST_BACKTRACE = getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none");
+  config && (process.env[`${prefix}CONFIG`] = JSON.stringify(config));
   Object.keys(config.extensions ?? {}).forEach((key) => {
     config.extensions[key] && Object.keys(config.extensions[key]) && setExtensionEnv(key, config.extensions[key]);
   });