@sourceregistry/sveltekit-enhance 1.1.0 → 1.1.2

package/README.md

@@ -9,7 +9,7 @@ Use `@sourceregistry/sveltekit-enhance` to build cleaner actions, loads, methods
 
 ## Why teams use this
 
-- Standardize server-side guard logic across routes.
+- Standardize server-side context logic across routes.
 - Reduce repetitive request parsing and validation code.
 - Keep middleware-like behavior explicit and composable.
 - Improve observability with correlation IDs on every response.
@@ -29,7 +29,7 @@ The package provides an `enhance` wrapper for:
 - `enhance.method(...)`
 - `enhance.handle(...)`
 
-Each wrapper accepts one or more guard functions and merges their outputs into a typed `guard` object.
+Each wrapper accepts one or more context functions and merges their outputs into a typed `context` object.
 
 ## Quick start
 
@@ -40,13 +40,13 @@ import {Auth, FeatureFlag, form} from '@sourceregistry/sveltekit-enhance';
 
 export const actions = {
   save: enhance.action(
-    async ({request, guard}) => {
+    async ({request, context}) => {
       const data = await request.formData();
       const email = form.string$(data, 'email');
 
       return {
         ok: true,
-        token: guard.token,
+        token: context.token,
         email
       };
     },

package/dist/helpers/form.d.ts

@@ -53,7 +53,7 @@ declare const createContext: (data: FormData) => {
     date$: (name: string, parser?: (formdata: FormData, name: string) => number | string | Date) => Date;
     process: <T, R>(name: string, parser: ((formdata: FormData, name: string) => T) | ((name: string) => T), processor: (val: T, name: string) => R) => R;
     number: (name: string) => number | undefined;
-    number$: (name: string) => number | undefined;
+    number$: (name: string) => number;
     boolean: (name: string) => boolean | undefined;
     boolean$: (name: string) => boolean;
     json: <T = unknown, F = T>(name: string, transformer?: (val: F) => T) => T | undefined;
@@ -102,7 +102,7 @@ export declare function string$(formdata: FormData, name: string): string;
  */
 export declare function pattern$(formdata: FormData, name: string, pattern: string | RegExp): string;
 export declare function number(formdata: FormData, name: string): number | undefined;
-export declare function number$(formdata: FormData, name: string): number | undefined;
+export declare function number$(formdata: FormData, name: string): number;
 export declare function boolean(formdata: FormData, name: string): boolean | undefined;
 export declare function boolean$(formdata: FormData, name: string): boolean;
 export declare function date(formdata: FormData, name: string, parser?: (formdata: FormData, name: string) => number | string | Date | undefined): Date | undefined;
@@ -190,7 +190,7 @@ export declare const schema: <const T extends AnyValidator>(validator: T, option
         readonly date$: (name: string, parser?: (formdata: FormData, name: string) => number | string | Date) => Date;
         readonly process: <T_1, R>(name: string, parser: ((formdata: FormData, name: string) => T_1) | ((name: string) => T_1), processor: (val: T_1, name: string) => R) => R;
         readonly number: (name: string) => number | undefined;
-        readonly number$: (name: string) => number | undefined;
+        readonly number$: (name: string) => number;
         readonly boolean: (name: string) => boolean | undefined;
         readonly boolean$: (name: string) => boolean;
         readonly json: <T_1 = unknown, F = T_1>(name: string, transformer?: (val: F) => T_1) => T_1 | undefined;
@@ -270,7 +270,7 @@ export declare const Form: {
             readonly date$: (name: string, parser?: (formdata: FormData, name: string) => number | string | Date) => Date;
             readonly process: <T_1, R>(name: string, parser: ((formdata: FormData, name: string) => T_1) | ((name: string) => T_1), processor: (val: T_1, name: string) => R) => R;
             readonly number: (name: string) => number | undefined;
-            readonly number$: (name: string) => number | undefined;
+            readonly number$: (name: string) => number;
             readonly boolean: (name: string) => boolean | undefined;
             readonly boolean$: (name: string) => boolean;
             readonly json: <T_1 = unknown, F = T_1>(name: string, transformer?: (val: F) => T_1) => T_1 | undefined;

package/dist/helpers/form.js

@@ -133,7 +133,7 @@ export function number(formdata, name) {
 export function number$(formdata, name) {
     const _number = number(formdata, name);
     if (_number === undefined) {
-        fail(400, { targets: [name], message: `${name} is required` });
+        return fail(400, { targets: [name], message: `${name} is required` });
     }
     return _number;
 }
@@ -425,7 +425,7 @@ export function selector$(formData, cases, useArray = false) {
         if ('$error' in cases) {
             cases?.['$error']?.('Unable to find value');
         }
-        fail(400, { targets: Object.keys(cases), message: `Unable to find value` });
+        return fail(400, { targets: Object.keys(cases), message: `Unable to find value` });
     }
     return result;
 }

package/dist/index.d.ts

@@ -21,7 +21,7 @@ export type EnhanceInput<CallType extends EnhanceCallType = EnhanceCallType, Par
     get errorHandlers(): EnhanceErrorHandler[];
 } & (CallType extends 'handle' ? {
     get responseHandlers(): EnhanceResponseHandler[];
-    resolve: (event?: RequestEvent) => never;
+    resolve: (event?: RequestEvent, opts?: ResolveOptions) => MaybePromise<Response>;
     readonly event: RequestEvent;
 } : CallType extends 'load' ? {
     parent: ServerLoadEvent<Params, ParentData, RouteId>['parent'];

package/dist/index.js

@@ -118,6 +118,7 @@ handle, ...contexts) => {
 };
 export const handle = (handle, ...contexts) => async (input) => {
     let combined = {};
+    let resolved = false;
     const contextInput = Object.assign(input.event, {
         __errorHandlers__: [],
         __responseHandler__: [],
@@ -129,24 +130,71 @@ export const handle = (handle, ...contexts) => async (input) => {
         get responseHandlers() {
             return this.__responseHandler__;
         },
-        resolve: (event = input.event) => {
-            throw input.resolve(event);
+        resolve: (event = input.event, opts) => {
+            resolved = true;
+            return apply_handle(contexts.length, event, opts);
         },
         get event() {
             return input.event;
         }
     });
-    for (const context of contexts) {
+    const merge_options = (parent_options, options) => {
+        const transformPageChunk = async ({ html, done }) => {
+            if (options?.transformPageChunk) {
+                html = (await options.transformPageChunk({ html, done })) ?? '';
+            }
+            if (parent_options?.transformPageChunk) {
+                html = (await parent_options.transformPageChunk({ html, done })) ?? '';
+            }
+            return html;
+        };
+        return {
+            transformPageChunk,
+            filterSerializedResponseHeaders: parent_options?.filterSerializedResponseHeaders ??
+                options?.filterSerializedResponseHeaders,
+            preload: parent_options?.preload ?? options?.preload
+        };
+    };
+    const apply_handle = async (i, event, parent_options) => {
+        if (i < contexts.length) {
+            const context = contexts[i];
+            const previous_resolve = contextInput.resolve;
+            contextInput.resolve = (next_event = event, options) => {
+                resolved = true;
+                return apply_handle(i + 1, next_event, merge_options(parent_options, options));
+            };
+            try {
+                resolved = false;
+                const result = await context(contextInput);
+                if (result instanceof Response)
+                    return result;
+                if (resolved) {
+                    throw new Error('enhance.handle context called resolve but did not return its response');
+                }
+                combined = Object.assign(combined, result);
+                return apply_handle(i + 1, event, parent_options);
+            }
+            catch (e) {
+                return EnhanceErrorHandle(e, contextInput);
+            }
+            finally {
+                contextInput.resolve = previous_resolve;
+            }
+        }
         try {
-            const result = await context(contextInput);
-            combined = Object.assign(combined, result);
+            return await handle({
+                ...input,
+                context: combined,
+                event,
+                resolve: (next_event, options) => input.resolve(next_event, merge_options(parent_options, options))
+            });
         }
         catch (e) {
             return EnhanceErrorHandle(e, contextInput);
         }
-    }
+    };
     try {
-        const response = await handle(Object.assign(input, { context: combined }));
+        const response = await apply_handle(0, input.event);
         if (contextInput.responseHandlers.length > 0) {
             for (const responseHandler of contextInput.responseHandlers) {
                 await responseHandler({ event: contextInput, response });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourceregistry/sveltekit-enhance",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Composable enhance and form utilities for SvelteKit actions, loads, methods, and hooks.",
   "author": "A.P.A. Slaa (a.p.a.slaa@projectsource.nl)",
   "scripts": {