silgi 0.37.19 → 0.37.21

package/dist/cli/build.mjs

@@ -1,7 +1,7 @@
 import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
-import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
+import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, asyncRuntimeStorage, autoImportTypes } from 'silgi';
 import { isPresents, addTemplate, addCoreFile, genEnsureSafeVar, writeFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, addImports, baseHeaderBannerComment, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, toArray, isDirectory } from 'silgi/kit';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
@@ -1457,6 +1457,10 @@ async function createSilgiCLI(config = {}, opts = {}) {
     },
     adapters: {}
   };
+  globalThis.__silgi__ = globalThis.__silgi__ || {};
+  globalThis.__silgi__.useRuntimeConfig = function() {
+    return silgi?.options?.runtimeConfig || {};
+  };
   if (silgi.options.adapters && Object.keys(silgi.options.adapters)?.length > 0) {
     for (const [key, value] of Object.entries(silgi.options.adapters)) {
       silgi.adapters[key] = value;
@@ -1487,6 +1491,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     await framework(silgi);
   }
   await writeScanFiles(silgi);
+  asyncRuntimeStorage.set(silgi.options.runtimeConfig);
   silgi.storage = await createStorageCLI(silgi);
   silgi.hooks.hook("close", async () => {
     await silgi.storage.dispose();
@@ -1523,6 +1528,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
   }
   await registerModuleExportScan(silgi);
   await writeScanFiles(silgi);
+  asyncRuntimeStorage.set(silgi.options.runtimeConfig);
   return silgi;
 }
 

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.37.19";
+const version = "0.37.21";
 const packageJson = {
 	version: version};
 

package/dist/cli/prepare.mjs

@@ -70,10 +70,6 @@ const command$1 = defineCommand({
       throw new Error("Silgi is not initialized");
     }
     const commands = silgi.options.commands;
-    globalThis.__silgi__ = globalThis.__silgi__ || {};
-    globalThis.__silgi__.useRuntimeConfig = function() {
-      return silgi?.options?.runtimeConfig || {};
-    };
     const tags = args.tag?.split(",").map((t) => t.trim());
     const silgiConfig = await loadOptions({});
     await prepareEnv(silgiConfig);

package/dist/core/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, ServiceSetup, CustomRequestInit, SilgiRuntimeContext, AllPrefixes, NamespacesForPrefix, RoutesForPrefixAndNamespace, MethodSchemas, MergeAll, ServiceMethods, SilgiRuntimeShareds, RouteConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase } from 'silgi/types';
+import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, ServiceSetup, CustomRequestInit, SilgiRuntimeContext, AllPrefixes, NamespacesForPrefix, RoutesForPrefixAndNamespace, MethodSchemas, MergeAll, ServiceMethods, SilgiRuntimeShareds, RouteConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
@@ -278,6 +278,34 @@ declare function tryUseSilgiCLI(): SilgiCLI | null;
 
 declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
+/** async local storage for the name of the current silgi instance */
+declare const asyncRuntimeStorage: UseContext<SilgiRuntimeConfig>;
+/** Direct access to the silgi context with asyncLocalStorage - see https://github.com/unjs/unctx. */
+declare const getRuntimeCtx: () => SilgiRuntimeConfig | null;
+/**
+ * Get access to silgi instance.
+ *
+ * Throws an error if silgi instance is unavailable.
+ * @example
+ * ```js
+ * const runtime = useRuntime()
+ * ```
+ */
+declare function useRuntime(): SilgiRuntimeConfig;
+/**
+ * Get access to Runtime instance.
+ *
+ * Returns null if Runtime instance is unavailable.
+ * @example
+ * ```js
+ * const runtime = tryUseRuntime()
+ * if (runtime) {
+ *  // Do something
+ * }
+ * ```
+ */
+declare function tryUseRuntime(): SilgiRuntimeConfig | null;
+
 declare const autoImportTypes: string[];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage };
+export { SilgiError, asyncRuntimeStorage, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, tryUseSilgiCLI, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -2,7 +2,8 @@ import { createConsola } from 'consola';
 import { defu } from 'defu';
 import { createHooks } from 'hookable';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { getContext } from 'unctx';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { createContext, getContext } from 'unctx';
 import { Buffer } from 'node:buffer';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig } from 'silgi/runtime';
@@ -10,6 +11,22 @@ import { createStorage as createStorage$1, builtinDrivers, prefixStorage } from
 import { FastURL, FastResponse } from 'srvx';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
 
+const asyncRuntimeStorage = createContext({
+  asyncContext: true,
+  AsyncLocalStorage
+});
+const getRuntimeCtx = () => asyncRuntimeStorage.tryUse();
+function useRuntime() {
+  const instance = asyncRuntimeStorage.tryUse();
+  if (!instance) {
+    throw new Error("Runtime instance is unavailable!");
+  }
+  return instance;
+}
+function tryUseRuntime() {
+  return asyncRuntimeStorage.tryUse();
+}
+
 const silgiCtx = getContext("silgi");
 function useSilgi() {
   const instance = silgiCtx.tryUse();
@@ -282,10 +299,7 @@ async function createSilgi(config) {
     captureError: config.captureError ?? (() => {
     })
   };
-  globalThis.__silgi__ = globalThis.__silgi__ || {};
-  globalThis.__silgi__.useRuntimeConfig = function() {
-    return silgi?.options?.runtimeConfig || {};
-  };
+  asyncRuntimeStorage.set(silgi.options.runtimeConfig);
   if (!silgi.router) {
     silgi.router = createRouter();
   }
@@ -973,4 +987,4 @@ const autoImportTypes = [
   "ExtractQueryParamsFromURI"
 ];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, useSilgi, useSilgiStorage };
+export { SilgiError, asyncRuntimeStorage, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, useRuntime, useSilgi, useSilgiStorage };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, asyncRuntimeStorage, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, tryUseSilgiCLI, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
 import 'silgi/types';
 import '@standard-schema/spec';
 import 'unstorage';

package/dist/index.mjs

@@ -1,9 +1,10 @@
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, useSilgi, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, asyncRuntimeStorage, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getRuntimeCtx, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseRuntime, tryUseSilgi, useRuntime, useSilgi, useSilgiStorage } from './core/index.mjs';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from './_chunks/silgiApp.mjs';
 import 'consola';
 import 'defu';
 import 'hookable';
 import 'rou3';
+import 'node:async_hooks';
 import 'unctx';
 import 'node:buffer';
 import 'klona';

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

@@ -1,9 +1,5 @@
 import type { EnvOptions, SilgiEvent, SilgiRuntimeConfig } from 'silgi/types';
-/**
- * Access 'resolved' Nuxt runtime configuration, with values updated from environment.
- *
- * This mirrors the runtime behavior of Nitro.
- */
+export declare function updateEnvOptions(): EnvOptions;
 export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent, 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;

package/dist/runtime/internal/config.mjs

@@ -2,62 +2,42 @@ import { defu } from "defu";
 import destr from "destr";
 import { klona } from "klona";
 import { snakeCase } from "scule";
-import { tryUseSilgi, useSilgi } from "silgi";
-let _inlineSilgiRuntimeConfig = globalThis.__silgi__?.useRuntimeConfig?.() || globalThis._silgi_runtime || process.env.RUNTIME_CONFIG;
-let envOptions = {
-  prefix: "NITRO_",
-  altPrefix: _inlineSilgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
-  silgiPrefix: "SILGI_",
-  envExpansion: _inlineSilgiRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
-};
-let _sharedRuntimeConfig = _deepFreeze(
-  applyEnv(klona(_inlineSilgiRuntimeConfig ?? {}), envOptions)
-);
+import { asyncRuntimeStorage, useRuntime, useSilgi } from "silgi";
+export function updateEnvOptions() {
+  const runtime = useRuntime();
+  const envOptions = {
+    prefix: "NITRO_",
+    altPrefix: runtime?.silgi?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+    silgiPrefix: "SILGI_",
+    envExpansion: runtime?.silgi?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
+  };
+  const _sharedRuntimeConfig = _deepFreeze(
+    applyEnv(klona(runtime ?? {}), envOptions)
+  );
+  asyncRuntimeStorage.set(_sharedRuntimeConfig);
+  return envOptions;
+}
 export function useSilgiRuntimeConfig(event, inlineRuntimeConfig = {}) {
-  if (!_inlineSilgiRuntimeConfig) {
-    _inlineSilgiRuntimeConfig = globalThis.__silgi__?.useRuntimeConfig?.();
-    envOptions = {
-      prefix: "NITRO_",
-      altPrefix: _inlineSilgiRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
-      silgiPrefix: "SILGI_",
-      envExpansion: _inlineSilgiRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
-    };
-    _sharedRuntimeConfig = _deepFreeze(
-      applyEnv(klona(_inlineSilgiRuntimeConfig ?? {}), envOptions)
-    );
-  }
-  const silgi = tryUseSilgi();
-  if (!silgi) {
-    if (globalThis._silgi_runtime) {
-      inlineRuntimeConfig = globalThis._silgi_runtime;
-    }
-    if (!_inlineSilgiRuntimeConfig) {
-      _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
-    }
-    if (!event) {
-      return _sharedRuntimeConfig;
-    }
-    const runtimeConfig2 = klona(_inlineSilgiRuntimeConfig);
-    applyEnv(runtimeConfig2, envOptions);
-    return runtimeConfig2;
-  }
-  if (!_inlineSilgiRuntimeConfig) {
-    _sharedRuntimeConfig = initRuntimeConfig(envOptions, inlineRuntimeConfig);
-  }
+  const runtime = useRuntime();
   if (!event) {
-    return _sharedRuntimeConfig;
+    return runtime;
+  }
+  if (event.context.nitro.runtimeConfig) {
+    return event.context.nitro.runtimeConfig;
   }
-  const runtimeConfig = klona(_inlineSilgiRuntimeConfig);
+  const runtimeConfig = klona(runtime);
+  const envOptions = updateEnvOptions();
   applyEnv(runtimeConfig, envOptions);
+  event.context.nitro.runtimeConfig = runtimeConfig;
   return runtimeConfig;
 }
-export function initRuntimeConfig(envOptions2 = {}, inlineRuntimeConfig = {}) {
+export function initRuntimeConfig(envOptions = {}, 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
+    ...envOptions
   };
   return _deepFreeze(
     applyEnv(klona(inlineRuntimeConfig), finalEnvOptions)

package/dist/types/index.d.mts

@@ -484,7 +484,13 @@ interface StorageKeyParams<TInput = unknown> {
     storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
 }
 
-interface SilgiRuntimeConfig {
+interface SilgiRuntimeDefaultConfig {
+    silgi?: {
+        envPrefix?: string;
+        envExpansion?: boolean;
+    };
+}
+interface SilgiRuntimeConfig extends SilgiRuntimeDefaultConfig {
 }
 interface SilgiOptions {
     consolaOptions?: Partial<ConsolaOptions>;
@@ -1198,4 +1204,4 @@ interface GraphQLJSON {
     references: any;
 }
 
-export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, GraphQLJSON, HTTPMethod, HookResult, HttpMethod, LoadConfigOptions, MergeAll, MergedSilgiSchema, MethodSchemas, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, RouteConfig, RouteConfigService, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceHandlerOutput, ServiceHandlerSource, ServiceMethods, ServiceSetup, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };
+export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, GraphQLJSON, HTTPMethod, HookResult, HttpMethod, LoadConfigOptions, MergeAll, MergedSilgiSchema, MethodSchemas, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, RouteConfig, RouteConfigService, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceHandlerOutput, ServiceHandlerSource, ServiceMethods, ServiceSetup, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIDynamicConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeActions, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeDefaultConfig, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };

package/package.json

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