silgi 0.37.23 → 0.37.25

package/dist/cli/build.mjs

@@ -1641,17 +1641,13 @@ async function prepareConfigs(silgi) {
       ""
     )}`,
     "",
-    "const runtime = useSilgiRuntimeConfig(undefined, runtimeConfig)",
+    "export const localRuntimeConfig = useSilgiRuntimeConfig(undefined, runtimeConfig)",
     ""
   ];
   delete _data.runtimeConfig;
   importData.push(`export const cliConfigs: Partial<SilgiRuntimeOptions & SilgiOptions> = ${genObjectFromRawEntries(
     Object.entries(_data).map(
       ([key, value]) => [key, genEnsureSafeVar(value)]
-    ).concat(
-      [
-        ["runtimeConfig", "runtime"]
-      ]
     )
   )}`);
   importData.unshift(...baseHeaderBannerComment);

package/dist/cli/index.mjs

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

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

@@ -1,6 +1,6 @@
 import type { EnvOptions, SilgiEvent, SilgiRuntimeConfig } from 'silgi/types';
-export declare function updateEnvOptions(): EnvOptions;
-export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent): SilgiRuntimeConfig;
+export declare function updateEnvOptions(runtime: SilgiRuntimeConfig): EnvOptions;
+export declare function useSilgiRuntimeConfig<T extends SilgiRuntimeConfig>(event?: SilgiEvent, localRuntimeConfig?: SilgiRuntimeConfig): 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

@@ -3,44 +3,58 @@ import destr from "destr";
 import { klona } from "klona";
 import { snakeCase } from "scule";
 import { asyncRuntimeStorage, useRuntime, useSilgi } from "silgi";
-export function updateEnvOptions() {
-  const runtime = useRuntime();
+export function updateEnvOptions(runtime) {
   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) {
+let inlineRuntimeConfig;
+function sharedRuntimeConfig(runtime) {
+  if (inlineRuntimeConfig) {
+    return inlineRuntimeConfig;
+  }
+  inlineRuntimeConfig = _deepFreeze(
+    applyEnv(klona(runtime ?? {}), updateEnvOptions(runtime))
+  );
+  if (asyncRuntimeStorage.tryUse()) {
+    asyncRuntimeStorage.unset();
+    asyncRuntimeStorage.set(inlineRuntimeConfig);
+  } else {
+    asyncRuntimeStorage.set(inlineRuntimeConfig);
+  }
+  return inlineRuntimeConfig;
+}
+export function useSilgiRuntimeConfig(event, localRuntimeConfig) {
+  if (localRuntimeConfig) {
+    return sharedRuntimeConfig(localRuntimeConfig);
+  }
   const runtime = useRuntime();
   if (!event) {
-    return runtime;
+    return sharedRuntimeConfig(runtime);
   }
-  if (event.context.nitro.runtimeConfig) {
-    return event.context.nitro.runtimeConfig;
+  if (event.context.silgi.runtimeConfig) {
+    return event.context.silgi.runtimeConfig;
   }
   const runtimeConfig = klona(runtime);
-  const envOptions = updateEnvOptions();
+  const envOptions = updateEnvOptions(runtime);
   applyEnv(runtimeConfig, envOptions);
-  event.context.nitro.runtimeConfig = runtimeConfig;
+  event.context.silgi.runtimeConfig = runtimeConfig;
   return runtimeConfig;
 }
-export function initRuntimeConfig(envOptions = {}, inlineRuntimeConfig = {}) {
+export function initRuntimeConfig(envOptions = {}, inlineRuntimeConfig2 = {}) {
   const finalEnvOptions = {
     prefix: "NITRO_",
-    altPrefix: inlineRuntimeConfig?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+    altPrefix: inlineRuntimeConfig2?.nitro?.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
     silgiPrefix: "SILGI_",
-    envExpansion: inlineRuntimeConfig?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false,
+    envExpansion: inlineRuntimeConfig2?.nitro?.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false,
     ...envOptions
   };
   return _deepFreeze(
-    applyEnv(klona(inlineRuntimeConfig), finalEnvOptions)
+    applyEnv(klona(inlineRuntimeConfig2), finalEnvOptions)
   );
 }
 export function updateRuntimeConfig(runtimeConfig) {

package/dist/types/index.d.mts

@@ -340,180 +340,6 @@ type SilgiFetchOptions<P extends AllPaths | (string & {}), BasePath extends keyo
 } & Omit<FetchOptions, 'method' | 'body' | 'params'>;
 type SilgiFetchClient = <P extends AllPaths | (string & {}), BasePath extends keyof SilgiRouterTypes = TrimAfterFourSlashes<P> extends keyof SilgiRouterTypes ? TrimAfterFourSlashes<P> : never, M extends keyof SilgiRouterTypes[BasePath] = keyof SilgiRouterTypes[BasePath]>(url: BasePath, options?: SilgiFetchOptions<P, BasePath, M>) => Promise<FetchResponse<SilgiRouterTypes[BasePath][M]['output']>>;
 
-interface SilgiAppPlugin {
-    (silgi: Silgi): Promise<void> | void;
-}
-
-interface CapturedErrorContext {
-    event?: SilgiEvent;
-    [key: string]: unknown;
-}
-type CaptureError = (silgi: Silgi, error: Error, context: CapturedErrorContext) => void;
-
-/**
- * The listeners to Silgi
- */
-interface SilgiRuntimeHooks {
-    /**
-     * Called after Silgi initialization, when the Silgi instance is ready to work.
-     * @param silgi The configured Silgi object
-     * @returns Promise
-     */
-    'ready': (silgi: Silgi) => HookResult;
-    /**
-     * Called when silgi instance is gracefully closing.
-     * @param silgi The configured silgi object
-     * @returns Promise
-     */
-    'close': (silgi: Silgi) => HookResult;
-    'request:on': (event: SilgiEvent) => HookResult;
-    'fetch:before': (context: ModuleHookContext) => HookResult;
-    'fetch:after': (context: ModuleHookContext) => HookResult;
-    'fetch:error': (context: ModuleHookContext) => HookResult;
-    'fetch:finally': (context: Omit<ModuleHookContext, 'event'>) => HookResult;
-    'error': CaptureError;
-}
-
-type ServiceMethods<Schema extends SilgiSchema$1, Path extends keyof Schema, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
-    [M in keyof Schema[Path]]?: ServiceSetup<Schema, Path, M, Resolved, HiddenParameters>;
-};
-/**
- * Yardımcı tipler
- */
-type InferInput<T> = T extends StandardSchemaV1 ? StandardSchemaV1.InferInput<T> : unknown;
-type InferOutput<T> = T extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<T> : unknown;
-type ServiceHandlerParameters<S, R extends keyof S, M extends keyof S[R]> = S[R][M] extends {
-    pathParams?: infer P;
-} ? S[R][M] extends {
-    queryParams?: infer Q;
-} ? (P extends undefined ? object : {
-    path: InferInput<P>;
-}) & (Q extends undefined ? object : {
-    query: InferInput<Q>;
-}) : (P extends undefined ? object : {
-    path: InferInput<P>;
-}) : S[R][M] extends {
-    queryParams?: infer Q;
-} ? (Q extends undefined ? object : {
-    query: InferInput<Q>;
-}) : object;
-/**
- * Route ve method'a göre input, output, params çıkarımı
- */
-type ServiceHandlerInput<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route], HiddenParameters extends boolean = false> = (Schema[Route][Method] extends {
-    input?: infer I;
-} ? {
-    args: InferInput<I>;
-} : unknown) & (HiddenParameters extends false ? (keyof ServiceHandlerParameters<Schema, Route, Method> extends never ? unknown : {
-    parameters: ServiceHandlerParameters<Schema, Route, Method>;
-}) : unknown);
-type ServiceHandlerOutput<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route]> = Schema[Route][Method] extends {
-    output?: infer O;
-} ? InferOutput<O> : unknown;
-type ServiceHandlerSource<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route]> = Schema[Route][Method] extends {
-    source?: infer S;
-} ? InferInput<S> : unknown;
-/**
- * Handler fonksiyon tipi
- *
- * Resolved = false  -> handler(input, shared, event, source) // all required
- * Resolved = true -> handler(input, shared?, event?, source?) // only input required
- */
-type ServiceHandler<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route], Resolved extends boolean = false, HiddenParameters extends boolean = false> = Resolved extends true ? (input: ServiceHandlerInput<Schema, Route, Method, HiddenParameters>, shared?: SilgiRuntimeShareds$1, event?: SilgiEvent$1, source?: ServiceHandlerSource<Schema, Route, Method>) => Promise<ServiceHandlerOutput<Schema, Route, Method>> : (input: ServiceHandlerInput<Schema, Route, Method, HiddenParameters>, shared: SilgiRuntimeShareds$1, event: SilgiEvent$1, source: ServiceHandlerSource<Schema, Route, Method>) => Promise<ServiceHandlerOutput<Schema, Route, Method>>;
-/**
- * Servis setup tipi
- */
-interface ServiceSetup<Schema extends SilgiSchema$1 = SilgiSchema$1, Route extends keyof Schema = keyof Schema, Method extends keyof Schema[Route] = keyof Schema[Route], Resolved extends boolean = false, HiddenParameters extends boolean = false> {
-    handler: ServiceHandler<Schema, Route, Method, Resolved, HiddenParameters>;
-    routerRule?: RouteConfigService$1;
-    modules?: Partial<SilgiRuntimeActions$1>;
-    storage?: StorageConfig$1<ServiceHandlerInput<Schema, Route, Method, HiddenParameters>>;
-}
-/**
- * Represents a fully resolved service definition that maps route paths
- * to their method handlers and configurations.
- *
- * This interface is designed to be compatible with the structure created
- * by the createService function.
- */
-interface ResolvedServiceDefinition {
-    [routePath: string]: {
-        [method: string]: {
-            handler: (...args: any[]) => Promise<any>;
-            modules?: Partial<SilgiRuntimeActions$1>;
-            storage?: StorageConfig$1<any>;
-        };
-    };
-}
-/**
- * SilgiURL tipi
- */
-interface SilgiURL {
-    namespaceName: string;
-    prefixName: string;
-    methodName: string;
-    path: string;
-    raw: string;
-    pathParams?: Record<string, string | undefined>;
-    queryParams?: Record<string, string>;
-}
-
-type CustomDriverName = string & {
-    _custom?: any;
-};
-interface StorageMounts {
-    [path: string]: {
-        driver: BuiltinDriverName | CustomDriverName;
-        [option: string]: any;
-    };
-}
-interface SilgiStorageBase {
-}
-type StorageKeyGenerator<TInput> = (input: TInput) => string | Promise<string>;
-interface StorageConfig<TInput> {
-    options: TransactionOptions;
-    base: 'memory' | keyof SilgiStorageBase;
-    key?: StorageKeyGenerator<TInput>;
-    scope?: 'request' | 'global';
-}
-interface StorageKeyParams<TInput = unknown> {
-    url: SilgiURL;
-    input: TInput;
-    requestId?: string;
-    keyGenerator?: StorageKeyGenerator<TInput>;
-    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
-}
-
-interface SilgiRuntimeDefaultConfig {
-    silgi?: {
-        envPrefix?: string;
-        envExpansion?: boolean;
-    };
-}
-interface SilgiRuntimeConfig extends SilgiRuntimeDefaultConfig {
-}
-interface SilgiOptions {
-    consolaOptions?: Partial<ConsolaOptions>;
-    present: PresetNameInput;
-    hooks: Partial<SilgiRuntimeHooks & DefaultHooks>;
-    /**
-     * Set to `true` to enable debug mode.
-     *
-     * At the moment, it prints out hook names and timings on the server, and logs hook arguments as well in the browser.
-     *
-     * @default false
-     */
-    debug: boolean;
-    storage: StorageMounts;
-    putStorage?: Storage<StorageValue>;
-    runtimeConfig: SilgiRuntimeConfig & {
-        [key: string]: any;
-    };
-    captureError: CaptureError;
-    adapters: Record<string, Adapter<Record<string, any>, TablesSchema, InferModelTypes<TablesSchema>>>;
-    [key: string]: any;
-}
-
 /**
  * Main interface containing all route definitions.
  * Example:
@@ -653,6 +479,116 @@ interface ResolvedSchemaDefinition {
     };
 }
 
+type ServiceMethods<Schema extends SilgiSchema$1, Path extends keyof Schema, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
+    [M in keyof Schema[Path]]?: ServiceSetup<Schema, Path, M, Resolved, HiddenParameters>;
+};
+/**
+ * Yardımcı tipler
+ */
+type InferInput<T> = T extends StandardSchemaV1 ? StandardSchemaV1.InferInput<T> : unknown;
+type InferOutput<T> = T extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<T> : unknown;
+type ServiceHandlerParameters<S, R extends keyof S, M extends keyof S[R]> = S[R][M] extends {
+    pathParams?: infer P;
+} ? S[R][M] extends {
+    queryParams?: infer Q;
+} ? (P extends undefined ? object : {
+    path: InferInput<P>;
+}) & (Q extends undefined ? object : {
+    query: InferInput<Q>;
+}) : (P extends undefined ? object : {
+    path: InferInput<P>;
+}) : S[R][M] extends {
+    queryParams?: infer Q;
+} ? (Q extends undefined ? object : {
+    query: InferInput<Q>;
+}) : object;
+/**
+ * Route ve method'a göre input, output, params çıkarımı
+ */
+type ServiceHandlerInput<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route], HiddenParameters extends boolean = false> = (Schema[Route][Method] extends {
+    input?: infer I;
+} ? {
+    args: InferInput<I>;
+} : unknown) & (HiddenParameters extends false ? (keyof ServiceHandlerParameters<Schema, Route, Method> extends never ? unknown : {
+    parameters: ServiceHandlerParameters<Schema, Route, Method>;
+}) : unknown);
+type ServiceHandlerOutput<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route]> = Schema[Route][Method] extends {
+    output?: infer O;
+} ? InferOutput<O> : unknown;
+type ServiceHandlerSource<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route]> = Schema[Route][Method] extends {
+    source?: infer S;
+} ? InferInput<S> : unknown;
+/**
+ * Handler fonksiyon tipi
+ *
+ * Resolved = false  -> handler(input, shared, event, source) // all required
+ * Resolved = true -> handler(input, shared?, event?, source?) // only input required
+ */
+type ServiceHandler<Schema extends SilgiSchema$1, Route extends keyof Schema, Method extends keyof Schema[Route], Resolved extends boolean = false, HiddenParameters extends boolean = false> = Resolved extends true ? (input: ServiceHandlerInput<Schema, Route, Method, HiddenParameters>, shared?: SilgiRuntimeShareds$1, event?: SilgiEvent$1, source?: ServiceHandlerSource<Schema, Route, Method>) => Promise<ServiceHandlerOutput<Schema, Route, Method>> : (input: ServiceHandlerInput<Schema, Route, Method, HiddenParameters>, shared: SilgiRuntimeShareds$1, event: SilgiEvent$1, source: ServiceHandlerSource<Schema, Route, Method>) => Promise<ServiceHandlerOutput<Schema, Route, Method>>;
+/**
+ * Servis setup tipi
+ */
+interface ServiceSetup<Schema extends SilgiSchema$1 = SilgiSchema$1, Route extends keyof Schema = keyof Schema, Method extends keyof Schema[Route] = keyof Schema[Route], Resolved extends boolean = false, HiddenParameters extends boolean = false> {
+    handler: ServiceHandler<Schema, Route, Method, Resolved, HiddenParameters>;
+    routerRule?: RouteConfigService$1;
+    modules?: Partial<SilgiRuntimeActions$1>;
+    storage?: StorageConfig$1<ServiceHandlerInput<Schema, Route, Method, HiddenParameters>>;
+}
+/**
+ * Represents a fully resolved service definition that maps route paths
+ * to their method handlers and configurations.
+ *
+ * This interface is designed to be compatible with the structure created
+ * by the createService function.
+ */
+interface ResolvedServiceDefinition {
+    [routePath: string]: {
+        [method: string]: {
+            handler: (...args: any[]) => Promise<any>;
+            modules?: Partial<SilgiRuntimeActions$1>;
+            storage?: StorageConfig$1<any>;
+        };
+    };
+}
+/**
+ * SilgiURL tipi
+ */
+interface SilgiURL {
+    namespaceName: string;
+    prefixName: string;
+    methodName: string;
+    path: string;
+    raw: string;
+    pathParams?: Record<string, string | undefined>;
+    queryParams?: Record<string, string>;
+}
+
+type CustomDriverName = string & {
+    _custom?: any;
+};
+interface StorageMounts {
+    [path: string]: {
+        driver: BuiltinDriverName | CustomDriverName;
+        [option: string]: any;
+    };
+}
+interface SilgiStorageBase {
+}
+type StorageKeyGenerator<TInput> = (input: TInput) => string | Promise<string>;
+interface StorageConfig<TInput> {
+    options: TransactionOptions;
+    base: 'memory' | keyof SilgiStorageBase;
+    key?: StorageKeyGenerator<TInput>;
+    scope?: 'request' | 'global';
+}
+interface StorageKeyParams<TInput = unknown> {
+    url: SilgiURL;
+    input: TInput;
+    requestId?: string;
+    keyGenerator?: StorageKeyGenerator<TInput>;
+    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
+}
+
 interface SilgiRuntimeShareds extends SilgiRuntimeSharedsExtend {
     storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
     runtimeConfig: SilgiRuntimeConfig;
@@ -727,6 +663,70 @@ type CustomRequestInit<Schema extends SilgiSchema = SilgiSchema, Route extends k
     pathParams?: unknown;
 });
 
+interface SilgiAppPlugin {
+    (silgi: Silgi): Promise<void> | void;
+}
+
+interface CapturedErrorContext {
+    event?: SilgiEvent;
+    [key: string]: unknown;
+}
+type CaptureError = (silgi: Silgi, error: Error, context: CapturedErrorContext) => void;
+
+/**
+ * The listeners to Silgi
+ */
+interface SilgiRuntimeHooks {
+    /**
+     * Called after Silgi initialization, when the Silgi instance is ready to work.
+     * @param silgi The configured Silgi object
+     * @returns Promise
+     */
+    'ready': (silgi: Silgi) => HookResult;
+    /**
+     * Called when silgi instance is gracefully closing.
+     * @param silgi The configured silgi object
+     * @returns Promise
+     */
+    'close': (silgi: Silgi) => HookResult;
+    'request:on': (event: SilgiEvent) => HookResult;
+    'fetch:before': (context: ModuleHookContext) => HookResult;
+    'fetch:after': (context: ModuleHookContext) => HookResult;
+    'fetch:error': (context: ModuleHookContext) => HookResult;
+    'fetch:finally': (context: Omit<ModuleHookContext, 'event'>) => HookResult;
+    'error': CaptureError;
+}
+
+interface SilgiRuntimeDefaultConfig {
+    silgi?: {
+        envPrefix?: string;
+        envExpansion?: boolean;
+    };
+}
+interface SilgiRuntimeConfig extends SilgiRuntimeDefaultConfig {
+}
+interface SilgiOptions {
+    consolaOptions?: Partial<ConsolaOptions>;
+    present: PresetNameInput;
+    hooks: Partial<SilgiRuntimeHooks & DefaultHooks>;
+    /**
+     * Set to `true` to enable debug mode.
+     *
+     * At the moment, it prints out hook names and timings on the server, and logs hook arguments as well in the browser.
+     *
+     * @default false
+     */
+    debug: boolean;
+    storage: StorageMounts;
+    putStorage?: Storage<StorageValue>;
+    runtimeConfig: SilgiRuntimeConfig & {
+        [key: string]: any;
+    };
+    captureError: CaptureError;
+    adapters: Record<string, Adapter<Record<string, any>, TablesSchema, InferModelTypes<TablesSchema>>>;
+    [key: string]: any;
+}
+
 interface ExtendContext {
 }
 interface SilgiRuntimeContext extends Record<string, any> {
@@ -740,6 +740,9 @@ interface SilgiRuntimeContext extends Record<string, any> {
     sessions?: Record<string, Session>;
     clientAddress?: string;
     source?: any;
+    silgi: {
+        runtimeConfig?: SilgiRuntimeConfig;
+    };
 }
 /**
  * Bu nitrojs, h3 event or request context.

package/package.json

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