silgi 0.14.3 → 0.14.4

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.14.3";
+const version = "0.14.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/core/index.d.mts

@@ -257,6 +257,6 @@ declare function useSilgiCLI(): SilgiCLI;
  */
 declare function tryUseSilgiCLI(): SilgiCLI | null;
 
-declare function storageMount<T extends StorageValue = StorageValue>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
+declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
 export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SilgiError, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, silgiCLICtx, silgiCtx, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.d.ts

@@ -257,6 +257,6 @@ declare function useSilgiCLI(): SilgiCLI;
  */
 declare function tryUseSilgiCLI(): SilgiCLI | null;
 
-declare function storageMount<T extends StorageValue = StorageValue>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
+declare function storageMount<T extends Storage = Storage>(silgi?: Silgi): (base: keyof SilgiStorageBase, driver: Parameters<Storage['mount']>[1]) => T;
 
 export { type BaseError, ErrorCategory, ErrorFactory, type ErrorMetadata, ErrorSeverity, HttpStatus, SilgiError, createSchema, createService, createShared, createSilgi, createStorage, getEvent, getEventContext, isBaseError, mergeSchemas, mergeServices, mergeShared, parseURI, silgiCLICtx, silgiCtx, storageMount, tryUseSilgi, tryUseSilgiCLI, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -558,19 +558,16 @@ async function execute(uriString, input, event, source, queryParams) {
     let cached = false;
     let result;
     const handler = silgiCtx.scannedHandlers.get(operation.uri);
-    if (event) {
-      await silgiCtx.callHook("event:before", event, handler);
-    }
     if (!handler) {
       throw ErrorFactory.create({
-        message: "Action not found",
+        message: "execute not found",
         httpStatus: HttpStatus.NOT_FOUND,
         context: {
           uri: uriString
         }
       });
     }
-    await silgiCtx.callHook("action:before", {
+    await silgiCtx.callHook("execute:before", {
       operation,
       input,
       event,
@@ -600,7 +597,7 @@ async function execute(uriString, input, event, source, queryParams) {
       );
       success = true;
     }
-    await silgiCtx.callHook("action:after", {
+    await silgiCtx.callHook("execute:after", {
       operation,
       input,
       event,
@@ -617,7 +614,7 @@ async function execute(uriString, input, event, source, queryParams) {
     }
     return result;
   } catch (err) {
-    await silgiCtx.callHook("action:error", {
+    await silgiCtx.callHook("execute:error", {
       input,
       event,
       source,
@@ -728,6 +725,10 @@ function tryUseSilgiCLI() {
 function storageMount(silgi) {
   const _silgi = silgi || useSilgi();
   return (base, driver) => {
+    const existingStorage = _silgi.storage.getMount(base);
+    if (existingStorage) {
+      return existingStorage.driver;
+    }
     const storage = _silgi.storage.mount(base, driver);
     return storage;
   };

package/dist/kit/index.d.mts

@@ -94,9 +94,7 @@ declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedS
  */
 declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
 
-declare function useRequest(event: SilgiEvents): false | (IncomingMessage & {
-    originalUrl?: string;
-});
+declare function useRequest(event: SilgiEvents): IncomingMessage;
 declare function getIpAddress(event: SilgiEvents): string | false;
 /**
  * Extract the client's IP address from request headers with high accuracy

package/dist/kit/index.d.ts

@@ -94,9 +94,7 @@ declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedS
  */
 declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
 
-declare function useRequest(event: SilgiEvents): false | (IncomingMessage & {
-    originalUrl?: string;
-});
+declare function useRequest(event: SilgiEvents): IncomingMessage;
 declare function getIpAddress(event: SilgiEvents): string | false;
 /**
  * Extract the client's IP address from request headers with high accuracy

package/dist/kit/index.mjs

@@ -418,7 +418,7 @@ function useRequest(event) {
   if (silgi.options.present === "nuxt" || silgi.options.present === "nitro" || silgi.options.present === "h3") {
     return event.node.req;
   }
-  return false;
+  return event;
 }
 function getIpAddress(event) {
   const silgi = useSilgi();

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.14.3";
+const version = "0.14.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.14.3";
+const version = "0.14.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/runtime/internal/nitro.mjs

@@ -13,6 +13,10 @@ export default async function addNitroApp(silgiCtx = useSilgi()) {
       } else {
         newPath = `${event.path}?method=${event.method}`;
       }
+      await silgiCtx.callHook("event:init", event, {
+        path: newPath,
+        queryParams: query
+      });
       const data = await silgiConnect.execute(newPath, {
         ...body
       }, void 0, query);

package/dist/types/index.d.mts

@@ -800,15 +800,71 @@ interface EnvOptions {
     envExpansion?: boolean;
 }
 
-interface SilgiAppPlugin {
-    (silgi: Silgi): Promise<void> | void;
+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> {
+    operation: SilgiOperation;
+    input: TInput;
+    requestId?: string;
+    keyGenerator?: StorageKeyGenerator<TInput>;
+    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
 }
 
-interface CapturedErrorContext {
-    event?: SilgiEvents;
-    [key: string]: unknown;
+interface SilgiRuntimeShareds extends SilgiRuntimeSharedExtends {
+    storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
+    silgi: SilgiFunction;
+    runtimeConfig: SilgiRuntimeConfig;
+}
+interface SilgiRuntimeSharedExtends {
+}
+interface ExtendShared {
+}
+
+type EventHandlerResponse<T = undefined> = T extends undefined ? void : void | T | Promise<T>;
+type MethodHandlerType<T> = {
+    [Action in keyof T]: T[Action] extends Record<string, any> ? {
+        [Method in keyof T[Action]]?: {
+            default?: {
+                input?: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
+                    parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
+                };
+                output?: StandardSchemaV1.InferInput<T[Action][Method]['output']>;
+                source?: StandardSchemaV1.InferInput<T[Action][Method]['source']>;
+            };
+            handler: (input: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
+                parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
+            }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<T[Action][Method]['source']>) => EventHandlerResponse<StandardSchemaV1.InferOutput<T[Action][Method]['output']>>;
+            modules?: Partial<SilgiRuntimeActions>;
+            storage?: StorageConfig<T[Action][Method]['input']>;
+        };
+    } : never;
+};
+interface ResolvedMethodHandlerType {
+    input?: Partial<BaseSchemaType<any>>;
+    output: Partial<BaseSchemaType<any>>;
+    handler: (input: StandardSchemaV1.InferInput<any> & {
+        parameters: any;
+    }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
+    modules?: Partial<SilgiRuntimeActions>;
+    storage?: StorageConfig<StandardSchemaV1.InferInput<any>>;
+    execute: (input: StandardSchemaV1.InferInput<any>, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
 }
-type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 
 type SilgiServiceInterface<T extends BaseSchemaType<StandardSchemaV1>> = {
     [Action in keyof T]: T[Action] extends Record<string, any> ? {
@@ -889,71 +945,15 @@ interface SilgiConfig extends Partial<Omit<Silgi, 'options'>>, Partial<SilgiRunt
 }
 type SilgiFunction = typeof silgi;
 
-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> {
-    operation: SilgiOperation;
-    input: TInput;
-    requestId?: string;
-    keyGenerator?: StorageKeyGenerator<TInput>;
-    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
-}
-
-interface SilgiRuntimeShareds extends SilgiRuntimeSharedExtends {
-    storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
-    silgi: SilgiFunction;
-    runtimeConfig: SilgiRuntimeConfig;
-}
-interface SilgiRuntimeSharedExtends {
-}
-interface ExtendShared {
+interface SilgiAppPlugin {
+    (silgi: Silgi): Promise<void> | void;
 }
 
-type EventHandlerResponse<T = undefined> = T extends undefined ? void : void | T | Promise<T>;
-type MethodHandlerType<T> = {
-    [Action in keyof T]: T[Action] extends Record<string, any> ? {
-        [Method in keyof T[Action]]?: {
-            default?: {
-                input?: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
-                    parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
-                };
-                output?: StandardSchemaV1.InferInput<T[Action][Method]['output']>;
-                source?: StandardSchemaV1.InferInput<T[Action][Method]['source']>;
-            };
-            handler: (input: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
-                parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
-            }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<T[Action][Method]['source']>) => EventHandlerResponse<StandardSchemaV1.InferOutput<T[Action][Method]['output']>>;
-            modules?: Partial<SilgiRuntimeActions>;
-            storage?: StorageConfig<T[Action][Method]['input']>;
-        };
-    } : never;
-};
-interface ResolvedMethodHandlerType {
-    input?: Partial<BaseSchemaType<any>>;
-    output: Partial<BaseSchemaType<any>>;
-    handler: (input: StandardSchemaV1.InferInput<any> & {
-        parameters: any;
-    }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
-    modules?: Partial<SilgiRuntimeActions>;
-    storage?: StorageConfig<StandardSchemaV1.InferInput<any>>;
-    execute: (input: StandardSchemaV1.InferInput<any>, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
+interface CapturedErrorContext {
+    event?: SilgiEvents;
+    [key: string]: unknown;
 }
+type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 
 /**
  * The listeners to Silgi
@@ -972,13 +972,13 @@ interface SilgiRuntimeHooks {
      */
     'close': (silgi: Silgi) => HookResult;
     'app:setup:start': (silgi: Silgi) => HookResult;
-    'action:before': (context: ModuleHookContext) => HookResult;
-    'action:after': (context: ModuleHookContext) => HookResult;
-    'action:error': (context: ModuleHookContext) => HookResult;
-    'action:finally': (context: ModuleHookContext) => HookResult;
-    'event:before': (event: SilgiEvents, handler: ResolvedMethodHandlerType | undefined, options?: {
-        handlerSkipped: boolean;
-        throwErrors: boolean;
+    'execute:before': (context: ModuleHookContext) => HookResult;
+    'execute:after': (context: ModuleHookContext) => HookResult;
+    'execute:error': (context: ModuleHookContext) => HookResult;
+    'execute:finally': (context: ModuleHookContext) => HookResult;
+    'event:init': (event: SilgiEvents, data: {
+        path: string;
+        queryParams?: Record<string, string>;
     }) => HookResult;
     'error': CaptureError;
 }

package/dist/types/index.d.ts

@@ -800,15 +800,71 @@ interface EnvOptions {
     envExpansion?: boolean;
 }
 
-interface SilgiAppPlugin {
-    (silgi: Silgi): Promise<void> | void;
+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> {
+    operation: SilgiOperation;
+    input: TInput;
+    requestId?: string;
+    keyGenerator?: StorageKeyGenerator<TInput>;
+    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
 }
 
-interface CapturedErrorContext {
-    event?: SilgiEvents;
-    [key: string]: unknown;
+interface SilgiRuntimeShareds extends SilgiRuntimeSharedExtends {
+    storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
+    silgi: SilgiFunction;
+    runtimeConfig: SilgiRuntimeConfig;
+}
+interface SilgiRuntimeSharedExtends {
+}
+interface ExtendShared {
+}
+
+type EventHandlerResponse<T = undefined> = T extends undefined ? void : void | T | Promise<T>;
+type MethodHandlerType<T> = {
+    [Action in keyof T]: T[Action] extends Record<string, any> ? {
+        [Method in keyof T[Action]]?: {
+            default?: {
+                input?: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
+                    parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
+                };
+                output?: StandardSchemaV1.InferInput<T[Action][Method]['output']>;
+                source?: StandardSchemaV1.InferInput<T[Action][Method]['source']>;
+            };
+            handler: (input: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
+                parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
+            }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<T[Action][Method]['source']>) => EventHandlerResponse<StandardSchemaV1.InferOutput<T[Action][Method]['output']>>;
+            modules?: Partial<SilgiRuntimeActions>;
+            storage?: StorageConfig<T[Action][Method]['input']>;
+        };
+    } : never;
+};
+interface ResolvedMethodHandlerType {
+    input?: Partial<BaseSchemaType<any>>;
+    output: Partial<BaseSchemaType<any>>;
+    handler: (input: StandardSchemaV1.InferInput<any> & {
+        parameters: any;
+    }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
+    modules?: Partial<SilgiRuntimeActions>;
+    storage?: StorageConfig<StandardSchemaV1.InferInput<any>>;
+    execute: (input: StandardSchemaV1.InferInput<any>, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
 }
-type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 
 type SilgiServiceInterface<T extends BaseSchemaType<StandardSchemaV1>> = {
     [Action in keyof T]: T[Action] extends Record<string, any> ? {
@@ -889,71 +945,15 @@ interface SilgiConfig extends Partial<Omit<Silgi, 'options'>>, Partial<SilgiRunt
 }
 type SilgiFunction = typeof silgi;
 
-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> {
-    operation: SilgiOperation;
-    input: TInput;
-    requestId?: string;
-    keyGenerator?: StorageKeyGenerator<TInput>;
-    storageOptions?: Pick<StorageConfig<TInput>, 'base' | 'options' | 'scope'>;
-}
-
-interface SilgiRuntimeShareds extends SilgiRuntimeSharedExtends {
-    storage: <T extends StorageValue = StorageValue>(base: StorageConfig<T>['base']) => Storage<T>;
-    silgi: SilgiFunction;
-    runtimeConfig: SilgiRuntimeConfig;
-}
-interface SilgiRuntimeSharedExtends {
-}
-interface ExtendShared {
+interface SilgiAppPlugin {
+    (silgi: Silgi): Promise<void> | void;
 }
 
-type EventHandlerResponse<T = undefined> = T extends undefined ? void : void | T | Promise<T>;
-type MethodHandlerType<T> = {
-    [Action in keyof T]: T[Action] extends Record<string, any> ? {
-        [Method in keyof T[Action]]?: {
-            default?: {
-                input?: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
-                    parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
-                };
-                output?: StandardSchemaV1.InferInput<T[Action][Method]['output']>;
-                source?: StandardSchemaV1.InferInput<T[Action][Method]['source']>;
-            };
-            handler: (input: StandardSchemaV1.InferInput<T[Action][Method]['input']> & {
-                parameters: StandardSchemaV1.InferInput<T[Action][Method]['pathParams']> & StandardSchemaV1.InferInput<T[Action][Method]['queryParams']>;
-            }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<T[Action][Method]['source']>) => EventHandlerResponse<StandardSchemaV1.InferOutput<T[Action][Method]['output']>>;
-            modules?: Partial<SilgiRuntimeActions>;
-            storage?: StorageConfig<T[Action][Method]['input']>;
-        };
-    } : never;
-};
-interface ResolvedMethodHandlerType {
-    input?: Partial<BaseSchemaType<any>>;
-    output: Partial<BaseSchemaType<any>>;
-    handler: (input: StandardSchemaV1.InferInput<any> & {
-        parameters: any;
-    }, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
-    modules?: Partial<SilgiRuntimeActions>;
-    storage?: StorageConfig<StandardSchemaV1.InferInput<any>>;
-    execute: (input: StandardSchemaV1.InferInput<any>, shared: SilgiRuntimeShareds, event: SilgiEvents, source: StandardSchemaV1.InferInput<any>) => Promise<StandardSchemaV1.InferInput<any>>;
+interface CapturedErrorContext {
+    event?: SilgiEvents;
+    [key: string]: unknown;
 }
+type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 
 /**
  * The listeners to Silgi
@@ -972,13 +972,13 @@ interface SilgiRuntimeHooks {
      */
     'close': (silgi: Silgi) => HookResult;
     'app:setup:start': (silgi: Silgi) => HookResult;
-    'action:before': (context: ModuleHookContext) => HookResult;
-    'action:after': (context: ModuleHookContext) => HookResult;
-    'action:error': (context: ModuleHookContext) => HookResult;
-    'action:finally': (context: ModuleHookContext) => HookResult;
-    'event:before': (event: SilgiEvents, handler: ResolvedMethodHandlerType | undefined, options?: {
-        handlerSkipped: boolean;
-        throwErrors: boolean;
+    'execute:before': (context: ModuleHookContext) => HookResult;
+    'execute:after': (context: ModuleHookContext) => HookResult;
+    'execute:error': (context: ModuleHookContext) => HookResult;
+    'execute:finally': (context: ModuleHookContext) => HookResult;
+    'event:init': (event: SilgiEvents, data: {
+        path: string;
+        queryParams?: Record<string, string>;
     }) => HookResult;
     'error': CaptureError;
 }

package/package.json

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