silgi 0.23.10 → 0.23.11

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.23.10";
+const version = "0.23.11";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/prepare.mjs

@@ -1628,7 +1628,6 @@ async function scanDir(silgi, dir, name) {
 
 async function createSilgiCLI(config = {}, opts = {}) {
   const options = await loadOptions(config, opts);
-  await prepareEnv(options);
   const hooks = createHooks();
   const silgi = {
     modulesURIs: {},
@@ -1655,6 +1654,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     },
     routeRules: void 0
   };
+  await prepareEnv(options);
   const routeRules = createRouteRules();
   routeRules.importRules(options.routeRules ?? {});
   silgi.routeRules = routeRules;
@@ -1746,7 +1746,7 @@ async function prepareConfigs(silgi) {
   await silgi.callHook("prepare:configs.ts", _data);
   const importData = [
     "import type { SilgiRuntimeOptions, SilgiRuntimeConfig, SilgiOptions } from 'silgi/types'",
-    "import { useSilgiRuntimeConfig } from 'silgi/kit'",
+    "import { useSilgiRuntimeConfig } from 'silgi/runtime/internal/config'",
     "",
     `export const runtimeConfig: Partial<SilgiRuntimeConfig> = ${genObjectFromRawEntries(
       Object.entries(_data.runtimeConfig).map(([key, value]) => [key, genEnsureSafeVar(value)]),

package/dist/kit/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, EnvOptions, SilgiRuntimeConfig, SilgiEvents, SilgiTemplate, ResolvedSilgiTemplate } from 'silgi/types';
+import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
 import { Buffer } from 'node:buffer';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
@@ -106,15 +106,6 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
-/**
- * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
- *
- * This mirrors the runtime behavior of Nitro.
- */
-declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvents, inlineRuntimeConfig?: Record<string, any>): SilgiRuntimeConfig;
-declare function initRuntimeConfig(envOptions?: EnvOptions, inlineRuntimeConfig?: Record<string, any>): Readonly<Record<string, any>>;
-declare function applyEnv(obj: Record<string, any>, opts: EnvOptions, parentKey?: string): Record<string, any>;
-
 /**
  * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
@@ -158,4 +149,4 @@ declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolea
 declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 
-export { MODE_RE, addTemplate, applyEnv, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/kit/index.d.ts

@@ -1,4 +1,4 @@
-import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, EnvOptions, SilgiRuntimeConfig, SilgiEvents, SilgiTemplate, ResolvedSilgiTemplate } from 'silgi/types';
+import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, ServiceParseModule, SilgiPreset, SilgiPresetMeta, SilgiTemplate, ResolvedSilgiTemplate, SilgiEvents } from 'silgi/types';
 import { Buffer } from 'node:buffer';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
@@ -106,15 +106,6 @@ interface Resolver {
 declare function createResolver(base: string | URL): Resolver;
 declare function resolveSilgiModule(base: string, paths: string[]): Promise<string[]>;
 
-/**
- * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
- *
- * This mirrors the runtime behavior of Nitro.
- */
-declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvents, inlineRuntimeConfig?: Record<string, any>): SilgiRuntimeConfig;
-declare function initRuntimeConfig(envOptions?: EnvOptions, inlineRuntimeConfig?: Record<string, any>): Readonly<Record<string, any>>;
-declare function applyEnv(obj: Record<string, any>, opts: EnvOptions, parentKey?: string): Record<string, any>;
-
 /**
  * Renders given template during build into the virtual file system (and optionally to disk in the project `buildDir`)
  */
@@ -158,4 +149,4 @@ declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolea
 declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 
-export { MODE_RE, addTemplate, applyEnv, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/kit/index.mjs

@@ -1,4 +1,4 @@
-import { tryUseSilgiCLI, useSilgiCLI, useSilgi, tryUseSilgi } from 'silgi/core';
+import { tryUseSilgiCLI, useSilgiCLI, useSilgi } from 'silgi/core';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp from 'node:fs/promises';
@@ -8,14 +8,12 @@ import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
 import { genString, genObjectFromRaw, genObjectFromValues, genObjectFromRawEntries } from 'knitwork';
 import { hash as hash$1 } from 'ohash';
-import { camelCase, snakeCase } from 'scule';
+import { camelCase } from 'scule';
 import { defu } from 'defu';
 import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { withLeadingSlash } from 'ufo';
 import { existsSync, promises } from 'node:fs';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
-import destr from 'destr';
-import { klona } from 'klona';
 import { hash as hash$2 } from 'silgi/kit';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
@@ -359,105 +357,6 @@ async function resolveSilgiModule(base, paths) {
   return resolved;
 }
 
-const silgiRuntimeConfig = process.env.RUNTIME_CONFIG;
-const envOptions = {
-  prefix: "NITRO_",
-  altPrefix: silgiRuntimeConfig?.nitro.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
-  silgiPrefix: "SILGI_",
-  envExpansion: silgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
-};
-let _sharedRuntimeConfig = _deepFreeze(
-  applyEnv(klona(silgiRuntimeConfig ?? {}), envOptions)
-);
-function useSilgiRuntimeConfig(event, inlineRuntimeConfig = {}) {
-  const silgi = tryUseSilgi();
-  if (!silgi) {
-    if (globalThis.$silgiSharedRuntimeConfig) {
-      inlineRuntimeConfig = globalThis.$silgiSharedRuntimeConfig;
-      if (inlineRuntimeConfig && !event) {
-        return inlineRuntimeConfig;
-      }
-    }
-    if (!silgiRuntimeConfig) {
-      _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
-    }
-    if (!event) {
-      return _sharedRuntimeConfig;
-    }
-    const runtimeConfig2 = klona(silgiRuntimeConfig);
-    applyEnv(runtimeConfig2, envOptions);
-    return runtimeConfig2;
-  }
-  if (!silgiRuntimeConfig) {
-    _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
-  }
-  if (!event) {
-    return _sharedRuntimeConfig;
-  }
-  const runtimeConfig = klona(silgiRuntimeConfig);
-  applyEnv(runtimeConfig, envOptions);
-  return runtimeConfig;
-}
-function initRuntimeConfig(envOptions2 = {}, inlineRuntimeConfig = {}) {
-  const finalEnvOptions = {
-    prefix: "NITRO_",
-    altPrefix: inlineRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
-    silgiPrefix: "SILGI_",
-    envExpansion: inlineRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false,
-    ...envOptions2
-  };
-  return _deepFreeze(
-    applyEnv(klona(inlineRuntimeConfig), finalEnvOptions)
-  );
-}
-function getEnv(key, opts, env = process.env) {
-  const envKey = snakeCase(key).toUpperCase();
-  return destr(
-    env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey] ?? env[opts.silgiPrefix + envKey]
-  );
-}
-function _isObject(input) {
-  return typeof input === "object" && !Array.isArray(input);
-}
-function applyEnv(obj, opts, parentKey = "") {
-  for (const key in obj) {
-    const subKey = parentKey ? `${parentKey}_${key}` : key;
-    const envValue = getEnv(subKey, opts);
-    if (_isObject(obj[key])) {
-      if (_isObject(envValue)) {
-        obj[key] = { ...obj[key], ...envValue };
-        applyEnv(obj[key], opts, subKey);
-      } else if (envValue === void 0) {
-        applyEnv(obj[key], opts, subKey);
-      } else {
-        obj[key] = envValue ?? obj[key];
-      }
-    } else {
-      obj[key] = envValue ?? obj[key];
-    }
-    if (opts.envExpansion && typeof obj[key] === "string") {
-      obj[key] = _expandFromEnv(obj[key]);
-    }
-  }
-  return obj;
-}
-const envExpandRx = /\{\{([^{}]*)\}\}/g;
-function _expandFromEnv(value, env = process.env) {
-  return value.replace(envExpandRx, (match, key) => {
-    return env[key] || match;
-  });
-}
-function _deepFreeze(object) {
-  const propNames = Object.getOwnPropertyNames(object);
-  for (const name of propNames) {
-    const value = object[name];
-    if (value && typeof value === "object") {
-      _deepFreeze(value);
-    }
-  }
-  return Object.freeze(object);
-}
-
 const RELATIVE_RE = /^([^.])/;
 function relativeWithDot(from, to) {
   return relative(from, to).replace(RELATIVE_RE, "./$1") || ".";
@@ -627,4 +526,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, addTemplate, applyEnv, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, baseHeaderBannerComment, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/runtime/internal/config.d.ts

@@ -0,0 +1,10 @@
+import type { EnvOptions, SilgiEvents, SilgiRuntimeConfig } from 'silgi/types';
+/**
+ * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
+ *
+ * This mirrors the runtime behavior of Nitro.
+ */
+export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvents, inlineRuntimeConfig?: Record<string, any>): SilgiRuntimeConfig;
+export declare function initRuntimeConfig(envOptions?: EnvOptions, inlineRuntimeConfig?: Record<string, any>): Readonly<Record<string, any>>;
+export declare function updateRuntimeConfig(runtimeConfig: Record<string, unknown>): void;
+export declare function applyEnv(obj: Record<string, any>, opts: EnvOptions, parentKey?: string): Record<string, any>;

package/dist/runtime/internal/config.mjs

@@ -0,0 +1,110 @@
+import defu from "defu";
+import destr from "destr";
+import { klona } from "klona";
+import { snakeCase } from "scule";
+import { tryUseSilgi, useSilgi } from "silgi/core";
+const silgiRuntimeConfig = process.env.RUNTIME_CONFIG;
+const envOptions = {
+  prefix: "NITRO_",
+  altPrefix: silgiRuntimeConfig?.nitro.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+  silgiPrefix: "SILGI_",
+  envExpansion: silgiRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
+};
+let _sharedRuntimeConfig = _deepFreeze(
+  applyEnv(klona(silgiRuntimeConfig ?? {}), envOptions)
+);
+export function useSilgiRuntimeConfig(event, inlineRuntimeConfig = {}) {
+  const silgi = tryUseSilgi();
+  if (!silgi) {
+    if (globalThis.$silgiSharedRuntimeConfig) {
+      inlineRuntimeConfig = globalThis.$silgiSharedRuntimeConfig;
+      if (inlineRuntimeConfig && !event) {
+        return inlineRuntimeConfig;
+      }
+    }
+    if (!silgiRuntimeConfig) {
+      _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
+    }
+    if (!event) {
+      return _sharedRuntimeConfig;
+    }
+    const runtimeConfig2 = klona(silgiRuntimeConfig);
+    applyEnv(runtimeConfig2, envOptions);
+    return runtimeConfig2;
+  }
+  if (!silgiRuntimeConfig) {
+    _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
+  }
+  if (!event) {
+    return _sharedRuntimeConfig;
+  }
+  const runtimeConfig = klona(silgiRuntimeConfig);
+  applyEnv(runtimeConfig, envOptions);
+  return runtimeConfig;
+}
+export function initRuntimeConfig(envOptions2 = {}, inlineRuntimeConfig = {}) {
+  const finalEnvOptions = {
+    prefix: "NITRO_",
+    altPrefix: inlineRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+    silgiPrefix: "SILGI_",
+    envExpansion: inlineRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false,
+    ...envOptions2
+  };
+  return _deepFreeze(
+    applyEnv(klona(inlineRuntimeConfig), finalEnvOptions)
+  );
+}
+export function updateRuntimeConfig(runtimeConfig) {
+  const nuxt = useSilgi();
+  Object.assign(nuxt.options.nitro.runtimeConfig, defu(runtimeConfig, nuxt.options.nitro.runtimeConfig));
+  try {
+  } catch {
+  }
+}
+function getEnv(key, opts, env = process.env) {
+  const envKey = snakeCase(key).toUpperCase();
+  return destr(
+    env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey] ?? env[opts.silgiPrefix + envKey]
+  );
+}
+function _isObject(input) {
+  return typeof input === "object" && !Array.isArray(input);
+}
+export function applyEnv(obj, opts, parentKey = "") {
+  for (const key in obj) {
+    const subKey = parentKey ? `${parentKey}_${key}` : key;
+    const envValue = getEnv(subKey, opts);
+    if (_isObject(obj[key])) {
+      if (_isObject(envValue)) {
+        obj[key] = { ...obj[key], ...envValue };
+        applyEnv(obj[key], opts, subKey);
+      } else if (envValue === void 0) {
+        applyEnv(obj[key], opts, subKey);
+      } else {
+        obj[key] = envValue ?? obj[key];
+      }
+    } else {
+      obj[key] = envValue ?? obj[key];
+    }
+    if (opts.envExpansion && typeof obj[key] === "string") {
+      obj[key] = _expandFromEnv(obj[key]);
+    }
+  }
+  return obj;
+}
+const envExpandRx = /\{\{([^{}]*)\}\}/g;
+function _expandFromEnv(value, env = process.env) {
+  return value.replace(envExpandRx, (match, key) => {
+    return env[key] || match;
+  });
+}
+function _deepFreeze(object) {
+  const propNames = Object.getOwnPropertyNames(object);
+  for (const name of propNames) {
+    const value = object[name];
+    if (value && typeof value === "object") {
+      _deepFreeze(value);
+    }
+  }
+  return Object.freeze(object);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.23.10",
+  "version": "0.23.11",
   "private": false,
   "sideEffects": false,
   "exports": {