@storm-software/config-tools 1.1.2 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.1.3](https://github.com/storm-software/storm-ops/compare/config-tools-v1.1.2...config-tools-v1.1.3) (2023-12-02)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue with `esbuildPluginPino` plugin for neutral build ([dba1022](https://github.com/storm-software/storm-ops/commit/dba102278281102a359c1c7cff087b9969b58c7c))
+
+## [1.1.2](https://github.com/storm-software/storm-ops/compare/config-tools-v1.1.1...config-tools-v1.1.2) (2023-12-02)
+
+
+### Bug Fixes
+
+* **config-tools:** Resolved issue with updated `createStormConfig` schema ([cbc6941](https://github.com/storm-software/storm-ops/commit/cbc69413e1ebbf5521c638401a34c604f25c2854))
+* **config-tools:** Updated the config schema's default values ([42fc718](https://github.com/storm-software/storm-ops/commit/42fc7183f2725e435d006897fb349c02f7454ff9))
+
 ## [1.1.1](https://github.com/storm-software/storm-ops/compare/config-tools-v1.1.0...config-tools-v1.1.1) (2023-12-02)
 
 

package/README.md

@@ -16,7 +16,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.1.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
+[![Version](https://img.shields.io/badge/version-1.1.1-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
 [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <h3 align="center" bold="true">⚠️ <b>Attention</b> ⚠️ This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be availible through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.</h3><br />

package/index.js

@@ -38,6 +38,84 @@ var getConfigFile = async () => {
 // packages/config-tools/src/create-storm-config.ts
 import { wrap as wrap2 } from "@decs/typeschema";
 
+// packages/config-tools/src/types.ts
+import { wrap } from "@decs/typeschema";
+
+// packages/config-tools/src/schema.ts
+import * as z from "zod";
+var ColorConfigSchema = z.object({
+  primary: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The primary color of the workspace"),
+  background: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The background color of the workspace"),
+  success: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#087f5b").describe("The success color of the workspace"),
+  info: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The informational color of the workspace"),
+  warning: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#fcc419").describe("The warning color of the workspace"),
+  error: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#990000").describe("The error color of the workspace"),
+  fatal: z.string().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 = z.object({
+  name: z.string().trim().toLowerCase().describe("The name of the package"),
+  namespace: z.string().trim().toLowerCase().default("storm-software").describe("The namespace of the package"),
+  organization: z.string().trim().default("storm-software").describe("The organization of the workspace"),
+  repository: z.string().trim().url().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
+  license: z.string().trim().default("Apache License 2.0").describe("The root directory of the package"),
+  homepage: z.string().trim().url().default("https://stormsoftware.org").describe("The homepage of the workspace"),
+  branch: z.string().trim().default("main").describe("The branch of the workspace"),
+  preMajor: z.boolean().default(false).describe(
+    "An indicator specifying if the package is still in it's pre-major version"
+  ),
+  owner: z.string().trim().default("@storm-software/development").describe("The owner of the package"),
+  worker: z.string().trim().default("stormie-bot").describe(
+    "The worker of the package (this is the bot that will be used to perform various tasks)"
+  ),
+  env: z.enum(["development", "staging", "production"]).default("production").describe("The current runtime environment of the package"),
+  ci: z.boolean().default(true).describe(
+    "An indicator specifying if the current environment is a CI environment"
+  ),
+  workspaceRoot: z.string().trim().describe("The root directory of the workspace"),
+  packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
+  buildDirectory: z.string().trim().default("dist").describe("The build directory for the workspace"),
+  runtimeDirectory: z.string().trim().default("node_modules/.storm").describe("The runtime directory of Storm"),
+  runtimeVersion: z.string().trim().regex(
+    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+  ).default("1.0.0").describe("The global version of the Storm runtime"),
+  timezone: z.string().trim().default("America/New_York").describe("The default timezone of the workspace"),
+  locale: z.string().trim().default("en-US").describe("The default locale of the workspace"),
+  logLevel: z.enum(["silent", "fatal", "error", "warn", "info", "debug", "trace"]).optional().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: z.string().trim().nullable().default(null).describe(
+    "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
+  ),
+  colors: ColorConfigSchema.describe(
+    "Storm theme config values used for styling various package elements"
+  ),
+  extensions: z.record(z.any()).describe("Configuration of each used extension")
+}).describe(
+  "Storm Workspace config values used during various dev-ops processes. This type is a combination of the StormPackageConfig and StormProject types. It represents the config of the entire monorepo."
+);
+
+// packages/config-tools/src/types.ts
+var wrapped_ColorConfig = wrap(ColorConfigSchema);
+var wrapped_StormConfig = wrap(StormConfigSchema);
+var LogLevel = {
+  SILENT: 0,
+  FATAL: 10,
+  ERROR: 20,
+  WARN: 30,
+  INFO: 40,
+  DEBUG: 60,
+  TRACE: 70
+};
+var LogLevelLabel = {
+  SILENT: "silent",
+  FATAL: "fatal",
+  ERROR: "error",
+  WARN: "warn",
+  INFO: "info",
+  DEBUG: "debug",
+  TRACE: "trace"
+};
+
 // packages/config-tools/src/utilities/get-default-config.ts
 import { existsSync } from "fs";
 import { readFile } from "fs/promises";
@@ -61,7 +139,7 @@ var DefaultStormConfig = {
   worker: "stormie-bot",
   runtimeDirectory: "node_modules/.storm",
   colors: { ...DefaultColorConfig },
-  modules: {}
+  extensions: {}
 };
 var getDefaultConfig = async (config = {}) => {
   let name = "storm-workspace";
@@ -97,7 +175,7 @@ var getDefaultConfig = async (config = {}) => {
     env: "production",
     branch: "main",
     organization: "storm-software",
-    modules: {},
+    extensions: {},
     ci: true,
     configFile: join(workspaceRoot, "storm.config.js"),
     runtimeVersion: "1.0.0",
@@ -111,6 +189,47 @@ var getWorkspaceRoot = () => {
   return root?.dir;
 };
 
+// packages/config-tools/src/utilities/get-log-level.ts
+var getLogLevel = (label) => {
+  switch (label) {
+    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.TRACE) {
+    return LogLevelLabel.TRACE;
+  } else if (logLevel >= LogLevel.DEBUG) {
+    return LogLevelLabel.DEBUG;
+  } else if (logLevel >= LogLevel.INFO) {
+    return LogLevelLabel.INFO;
+  } else if (logLevel >= LogLevel.WARN) {
+    return LogLevelLabel.WARN;
+  } else if (logLevel >= LogLevel.ERROR) {
+    return LogLevelLabel.ERROR;
+  } else if (logLevel >= LogLevel.FATAL) {
+    return LogLevelLabel.FATAL;
+  } else if (logLevel <= LogLevel.SILENT) {
+    return LogLevelLabel.SILENT;
+  } else {
+    return LogLevelLabel.INFO;
+  }
+};
+
 // packages/config-tools/src/env/get-env.ts
 var getExtensionEnv = (extensionName) => {
   const prefix = `STORM_EXTENSION_${extensionName.toUpperCase()}_`;
@@ -124,7 +243,6 @@ var getExtensionEnv = (extensionName) => {
 };
 var getConfigEnv = () => {
   const prefix = `STORM_`;
-  const defaultConfig = getDefaultConfig();
   let config = {
     name: process.env[`${prefix}NAME`],
     namespace: process.env[`${prefix}NAMESPACE`],
@@ -157,6 +275,9 @@ 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: {}
   };
   const serializedConfig = process.env[`${prefix}CONFIG`];
@@ -173,63 +294,6 @@ var getConfigEnv = () => {
   }, config);
 };
 
-// packages/config-tools/src/types.ts
-import { wrap } from "@decs/typeschema";
-
-// packages/config-tools/src/schema.ts
-import * as z from "zod";
-var ColorConfigSchema = z.object({
-  primary: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The primary color of the workspace"),
-  background: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The background color of the workspace"),
-  success: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#087f5b").describe("The success color of the workspace"),
-  info: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The informational color of the workspace"),
-  warning: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#fcc419").describe("The warning color of the workspace"),
-  error: z.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#990000").describe("The error color of the workspace"),
-  fatal: z.string().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 = z.object({
-  name: z.string().trim().toLowerCase().describe("The name of the package"),
-  namespace: z.string().trim().toLowerCase().default("storm-software").describe("The namespace of the package"),
-  organization: z.string().trim().default("storm-software").describe("The organization of the workspace"),
-  repository: z.string().trim().url().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
-  license: z.string().trim().default("Apache License 2.0").describe("The root directory of the package"),
-  homepage: z.string().trim().url().default("https://stormsoftware.org").describe("The homepage of the workspace"),
-  branch: z.string().trim().default("main").describe("The branch of the workspace"),
-  preMajor: z.boolean().default(false).describe(
-    "An indicator specifying if the package is still in it's pre-major version"
-  ),
-  owner: z.string().trim().default("@storm-software/development").describe("The owner of the package"),
-  worker: z.string().trim().default("stormie-bot").describe(
-    "The worker of the package (this is the bot that will be used to perform various tasks)"
-  ),
-  env: z.enum(["development", "staging", "production"]).default("production").describe("The current runtime environment of the package"),
-  ci: z.boolean().default(true).describe(
-    "An indicator specifying if the current environment is a CI environment"
-  ),
-  workspaceRoot: z.string().trim().describe("The root directory of the workspace"),
-  packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
-  buildDirectory: z.string().trim().default("dist").describe("The build directory for the workspace"),
-  runtimeDirectory: z.string().trim().default("node_modules/.storm").describe("The runtime directory of Storm"),
-  runtimeVersion: z.string().trim().regex(
-    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-  ).default("1.0.0").describe("The global version of the Storm runtime"),
-  timezone: z.string().trim().default("America/New_York").describe("The default timezone of the workspace"),
-  locale: z.string().trim().default("en-US").describe("The default locale of the workspace"),
-  configFile: z.string().trim().nullable().default(null).describe(
-    "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
-  ),
-  colors: ColorConfigSchema.describe(
-    "Storm theme config values used for styling various package elements"
-  ),
-  extensions: z.record(z.any()).describe("Configuration of each used extension")
-}).describe(
-  "Storm Workspace config values used during various dev-ops processes. This type is a combination of the StormPackageConfig and StormProject types. It represents the config of the entire monorepo."
-);
-
-// packages/config-tools/src/types.ts
-var wrapped_ColorConfig = wrap(ColorConfigSchema);
-var wrapped_StormConfig = wrap(StormConfigSchema);
-
 // packages/config-tools/src/create-storm-config.ts
 var _extension_cache = /* @__PURE__ */ new WeakMap();
 var _static_cache2 = void 0;
@@ -242,8 +306,8 @@ var createStormConfig = async (extensionName, schema) => {
     result = _static_cache2;
   }
   if (schema && extensionName) {
-    const moduleConfig = await createConfigExtension(extensionName, schema);
-    result.modules[extensionName] = moduleConfig;
+    const extensionConfig = await createConfigExtension(extensionName, schema);
+    result.extensions[extensionName] = extensionConfig;
   }
   _static_cache2 = result;
   return result;
@@ -294,10 +358,15 @@ var setConfigEnv = (config) => {
   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;
@@ -318,6 +387,11 @@ var setConfigEnv = (config) => {
   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.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);
   Object.keys(config.extensions ?? {}).forEach((key) => {
     config.extensions[key] && Object.keys(config.extensions[key]) && setExtensionEnv(key, config.extensions[key]);
@@ -327,6 +401,8 @@ export {
   ColorConfigSchema,
   DefaultColorConfig,
   DefaultStormConfig,
+  LogLevel,
+  LogLevelLabel,
   StormConfigSchema,
   createConfigExtension,
   createStormConfig,
@@ -334,6 +410,8 @@ export {
   getConfigFile,
   getDefaultConfig,
   getExtensionEnv,
+  getLogLevel,
+  getLogLevelLabel,
   setConfigEnv,
   setExtensionEnv,
   wrapped_ColorConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/config-tools",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "private": false,
   "description": "⚡The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
   "repository": {