@storm-software/git-tools 2.88.2 → 2.88.3

package/README.md

@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-2.88.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 Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&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)
+[![Version](https://img.shields.io/badge/version-2.88.2-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 Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&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)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/bin/{chunk-U55MG3QC.js → chunk-PLNZHR5C.js}

@@ -56581,6 +56581,8 @@ var ColorConfigMapSchema = z.union([
   }),
   z.record(z.string(), ColorConfigSchema)
 ]);
+var ExtendsItemSchema = z.string().trim().describe("The path to a base config file to use as a configuration preset file. Documentation can be found at https://github.com/unjs/c12#extending-configuration.");
+var ExtendsSchema = ExtendsItemSchema.or(z.array(ExtendsItemSchema)).describe("The path to a base config file to use as a configuration preset file. Documentation can be found at https://github.com/unjs/c12#extending-configuration.");
 var WorkspaceBotConfigSchema = z.object({
   name: z.string().trim().default("Stormie-Bot").describe("The workspace bot user's name (this is the bot that will be used to perform various tasks)"),
   email: z.string().trim().email().default("bot@stormsoftware.com").describe("The email of the workspace bot")
@@ -56595,11 +56597,11 @@ var WorkspaceDirectoryConfigSchema = z.object({
 }).describe("Various directories used by the workspace to store data, cache, and configuration files");
 var StormConfigSchema = z.object({
   $schema: z.string().trim().default("https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm.schema.json").optional().nullish().describe("The URL to the JSON schema file that describes the Storm configuration file"),
-  extends: z.string().trim().optional().describe("The path to a base JSON file to use as a configuration preset file"),
+  extends: ExtendsSchema.optional(),
   name: z.string().trim().toLowerCase().optional().describe("The name of the service/package/scope using this configuration"),
   namespace: z.string().trim().toLowerCase().optional().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)"),
+  repository: z.string().trim().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
   license: z.string().trim().default("Apache-2.0").describe("The license type of the package"),
   homepage: z.string().trim().url().default(STORM_DEFAULT_HOMEPAGE).describe("The homepage of the workspace"),
   docs: z.string().trim().url().default(STORM_DEFAULT_DOCS).describe("The base documentation site for the workspace"),
@@ -56663,12 +56665,10 @@ var COLOR_KEYS = [
 ];
 
 // ../config-tools/src/utilities/get-default-config.ts
-import { existsSync as existsSync2, readFileSync } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
+import { readFile } from "node:fs/promises";
 import { join as join3 } from "node:path";
 
-// ../config-tools/src/utilities/find-workspace-root.ts
-init_esm_shims();
-
 // ../config-tools/src/utilities/correct-paths.ts
 init_esm_shims();
 var import_devkit = __toESM(require_devkit(), 1);
@@ -56688,6 +56688,9 @@ var joinPaths = /* @__PURE__ */ __name((...paths) => {
   return correctPaths((0, import_devkit.joinPathFragments)(...paths.map((path) => correctPaths(path))));
 }, "joinPaths");
 
+// ../config-tools/src/utilities/find-workspace-root.ts
+init_esm_shims();
+
 // ../config-tools/src/utilities/find-up.ts
 init_esm_shims();
 import { existsSync } from "node:fs";
@@ -56790,17 +56793,15 @@ var DEFAULT_COLOR_CONFIG = {
     "negative": "#dc2626"
   }
 };
-var getDefaultConfig = /* @__PURE__ */ __name((root) => {
+var getDefaultConfig = /* @__PURE__ */ __name(async (root) => {
   let license = STORM_DEFAULT_LICENSE;
   let homepage = STORM_DEFAULT_HOMEPAGE;
-  let name;
-  let namespace;
-  let repository;
+  let name = void 0;
+  let namespace = void 0;
+  let repository = void 0;
   const workspaceRoot = findWorkspaceRoot(root);
   if (existsSync2(join3(workspaceRoot, "package.json"))) {
-    const file = readFileSync(join3(workspaceRoot, "package.json"), {
-      encoding: "utf8"
-    });
+    const file = await readFile(joinPaths(workspaceRoot, "package.json"), "utf8");
     if (file) {
       const packageJson = JSON.parse(file);
       if (packageJson.name) {
@@ -56809,8 +56810,12 @@ var getDefaultConfig = /* @__PURE__ */ __name((root) => {
       if (packageJson.namespace) {
         namespace = packageJson.namespace;
       }
-      if (packageJson.repository?.url) {
-        repository = packageJson.repository?.url;
+      if (packageJson.repository) {
+        if (typeof packageJson.repository === "string") {
+          repository = packageJson.repository;
+        } else if (packageJson.repository.url) {
+          repository = packageJson.repository.url;
+        }
       }
       if (packageJson.license) {
         license = packageJson.license;
@@ -57026,7 +57031,6 @@ var writeInfo = /* @__PURE__ */ __name((message, config) => getLogFn(LogLevel.IN
 var writeSuccess = /* @__PURE__ */ __name((message, config) => getLogFn(LogLevel.SUCCESS, config)(message), "writeSuccess");
 var writeDebug = /* @__PURE__ */ __name((message, config) => getLogFn(LogLevel.DEBUG, config)(message), "writeDebug");
 var writeTrace = /* @__PURE__ */ __name((message, config) => getLogFn(LogLevel.TRACE, config)(message), "writeTrace");
-var writeSystem = /* @__PURE__ */ __name((message, config) => getLogFn(LogLevel.ALL, config)(message), "writeSystem");
 var MAX_DEPTH = 4;
 var formatLogMessage = /* @__PURE__ */ __name((message, options = {}, depth2 = 0) => {
   if (depth2 > MAX_DEPTH) {
@@ -57087,6 +57091,9 @@ Stacktrace: ${error.stack}`, config);
   });
 }, "handleProcess");
 
+// ../config-tools/src/get-config.ts
+init_esm_shims();
+
 // ../config-tools/src/create-storm-config.ts
 init_esm_shims();
 
@@ -57099,7 +57106,7 @@ init_esm_shims();
 // ../../node_modules/.pnpm/c12@2.0.1/node_modules/c12/dist/shared/c12.B4fc1S0C.mjs
 init_esm_shims();
 import { existsSync as existsSync4, promises } from "node:fs";
-import { rm, readFile } from "node:fs/promises";
+import { rm, readFile as readFile2 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 
 // ../../node_modules/.pnpm/jiti@2.4.2/node_modules/jiti/lib/jiti.mjs
@@ -57126,7 +57133,7 @@ __name(createJiti, "createJiti");
 
 // ../../node_modules/.pnpm/rc9@2.1.2/node_modules/rc9/dist/index.mjs
 init_esm_shims();
-import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync, writeFileSync } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 import { homedir } from "node:os";
 
@@ -57361,7 +57368,7 @@ function parseFile(path, options) {
   if (!existsSync3(path)) {
     return {};
   }
-  return parse(readFileSync2(path, "utf8"), options);
+  return parse(readFileSync(path, "utf8"), options);
 }
 __name(parseFile, "parseFile");
 function read(options) {
@@ -58353,7 +58360,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   const configFileExt = extname(res.configFile) || "";
   if (configFileExt in ASYNC_LOADERS) {
     const asyncLoader = await ASYNC_LOADERS[configFileExt]();
-    const contents = await readFile(res.configFile, "utf8");
+    const contents = await readFile2(res.configFile, "utf8");
     res.config = asyncLoader(contents);
   } else {
     res.config = await options.jiti.import(res.configFile, {
@@ -58389,19 +58396,19 @@ var import_dotenv = __toESM(require_main(), 1);
 // ../config-tools/src/config-file/get-config-file.ts
 var getConfigFileByName = /* @__PURE__ */ __name(async (fileName, filePath, options = {}) => {
   const workspacePath = filePath || findWorkspaceRoot(filePath);
-  let config = await loadConfig({
-    cwd: workspacePath,
-    packageJson: true,
-    name: fileName,
-    envName: fileName?.toUpperCase(),
-    jitiOptions: {
-      debug: false,
-      fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
-    },
-    ...options
-  });
-  if (!config || Object.keys(config).length === 0) {
-    config = await loadConfig({
+  const configs = await Promise.all([
+    loadConfig({
+      cwd: workspacePath,
+      packageJson: true,
+      name: fileName,
+      envName: fileName?.toUpperCase(),
+      jitiOptions: {
+        debug: false,
+        fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
+      },
+      ...options
+    }),
+    loadConfig({
       cwd: workspacePath,
       packageJson: true,
       name: fileName,
@@ -58412,9 +58419,9 @@ var getConfigFileByName = /* @__PURE__ */ __name(async (fileName, filePath, opti
       },
       configFile: fileName,
       ...options
-    });
-  }
-  return config;
+    })
+  ]);
+  return defu(configs[0] ?? {}, configs[1] ?? {});
 }, "getConfigFileByName");
 var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames = []) => {
   const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
@@ -58422,7 +58429,7 @@ var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames
   let config = result.config;
   const configFile = result.configFile;
   if (config && configFile && Object.keys(config).length > 0) {
-    writeSystem(`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`, {
+    writeTrace(`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`, {
       logLevel: "all"
     });
   }
@@ -58430,7 +58437,7 @@ var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames
     const results = await Promise.all(additionalFileNames.map((fileName) => getConfigFileByName(fileName, workspacePath)));
     for (const result2 of results) {
       if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
-        writeSystem(`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
+        writeTrace(`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
           logLevel: "all"
         });
         config = defu(result2.config ?? {}, config ?? {});
@@ -58446,6 +58453,16 @@ var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames
 
 // ../config-tools/src/env/get-env.ts
 init_esm_shims();
+var getExtensionEnv = /* @__PURE__ */ __name((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;
+  }, {});
+}, "getExtensionEnv");
 var getConfigEnv = /* @__PURE__ */ __name(() => {
   const prefix = "STORM_";
   let config = {
@@ -58606,7 +58623,7 @@ var setExtensionEnv = /* @__PURE__ */ __name((extensionName, extension) => {
 var setConfigEnv = /* @__PURE__ */ __name((config) => {
   const prefix = "STORM_";
   if (config.extends) {
-    process.env[`${prefix}EXTENDS`] = config.extends;
+    process.env[`${prefix}EXTENDS`] = Array.isArray(config.extends) ? JSON.stringify(config.extends) : config.extends;
   }
   if (config.name) {
     process.env[`${prefix}NAME`] = config.name;
@@ -58836,30 +58853,69 @@ var setBaseThemeColorConfigEnv = /* @__PURE__ */ __name((prefix, config) => {
 }, "setBaseThemeColorConfigEnv");
 
 // ../config-tools/src/create-storm-config.ts
+var _extension_cache = /* @__PURE__ */ new WeakMap();
 var _static_cache = void 0;
-var loadStormConfig = /* @__PURE__ */ __name(async (workspaceRoot) => {
-  let config = {};
-  if (_static_cache?.data && _static_cache?.timestamp && _static_cache.timestamp >= Date.now() + 3e4) {
-    writeTrace(`Configuration cache hit - ${_static_cache.timestamp}`, _static_cache.data);
-    return _static_cache.data;
-  }
-  let _workspaceRoot = workspaceRoot;
-  if (!_workspaceRoot) {
-    _workspaceRoot = findWorkspaceRoot();
-  }
-  const configFile = await getConfigFile(_workspaceRoot);
-  if (!configFile) {
-    writeWarning("No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.json` file to the root of your workspace if it is not.\n", {
-      logLevel: "all"
-    });
+var createStormConfig = /* @__PURE__ */ __name(async (extensionName, schema, workspaceRoot, skipLogs = false) => {
+  let result;
+  if (!_static_cache?.data || !_static_cache?.timestamp || _static_cache.timestamp < Date.now() - 8e3) {
+    let _workspaceRoot = workspaceRoot;
+    if (!_workspaceRoot) {
+      _workspaceRoot = findWorkspaceRoot();
+    }
+    const configEnv = getConfigEnv();
+    const defaultConfig = await getDefaultConfig(_workspaceRoot);
+    const configFile = await getConfigFile(_workspaceRoot);
+    if (!configFile && !skipLogs) {
+      writeWarning("No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.json` file to the root of your workspace if it is not.\n", {
+        logLevel: "all"
+      });
+    }
+    result = await StormConfigSchema.parseAsync(defu(configEnv, configFile, defaultConfig));
+    result.workspaceRoot ??= _workspaceRoot;
+  } else {
+    result = _static_cache.data;
   }
-  config = defu(getConfigEnv(), configFile, getDefaultConfig(_workspaceRoot));
+  if (schema && extensionName) {
+    result.extensions = {
+      ...result.extensions,
+      [extensionName]: createConfigExtension(extensionName, schema)
+    };
+  }
+  _static_cache = {
+    timestamp: Date.now(),
+    data: result
+  };
+  return result;
+}, "createStormConfig");
+var createConfigExtension = /* @__PURE__ */ __name((extensionName, schema) => {
+  const extension_cache_key = {
+    extensionName
+  };
+  if (_extension_cache.has(extension_cache_key)) {
+    return _extension_cache.get(extension_cache_key);
+  }
+  let extension = getExtensionEnv(extensionName);
+  if (schema) {
+    extension = schema.parse(extension);
+  }
+  _extension_cache.set(extension_cache_key, extension);
+  return extension;
+}, "createConfigExtension");
+var loadStormConfig = /* @__PURE__ */ __name(async (workspaceRoot, skipLogs = false) => {
+  const config = await createStormConfig(void 0, void 0, workspaceRoot, skipLogs);
   setConfigEnv(config);
-  writeTrace(`\u2699\uFE0F  Using Storm configuration: 
+  if (!skipLogs) {
+    writeTrace(`\u2699\uFE0F  Using Storm configuration: 
 ${formatLogMessage(config)}`, config);
+  }
   return config;
 }, "loadStormConfig");
 
+// ../config-tools/src/get-config.ts
+var getConfig = /* @__PURE__ */ __name((workspaceRoot, skipLogs = false) => {
+  return loadStormConfig(workspaceRoot, skipLogs);
+}, "getConfig");
+
 export {
   joinPaths,
   findWorkspaceRootSafe,
@@ -58876,7 +58932,7 @@ export {
   exitWithError,
   exitWithSuccess,
   handleProcess,
-  loadStormConfig
+  getConfig
 };
 /*! Bundled license information: