@sourceregistry/sveltekit-enhance 1.0.1 → 1.1.1

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

@@ -1,13 +1,13 @@
 import { type Action, type ActionResult, type Cookies, type Handle, type RequestEvent, type ResolveOptions, type ServerLoadEvent } from '@sveltejs/kit';
 import type { RouteId as AppRouteId, LayoutParams as AppLayoutParams } from '$app/types';
 export type MaybePromise<T> = T | Promise<T>;
-export type EnhanceErrorHandler = <T = any>(err: unknown) => MaybePromise<T> | undefined | never | void;
+export type EnhanceErrorHandler = <T = any>(err: unknown) => MaybePromise<T | Response | undefined | never | void>;
 export type EnhanceResponseHandler = (input: {
     event: RequestEvent;
     response: Response;
 }) => MaybePromise<unknown>;
 export type EnhanceCallType = 'handle' | 'load' | 'method' | 'action';
-export type EnhanceInput<CallType extends EnhanceCallType = EnhanceCallType, Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | null = AppRouteId | null, ParentData extends Record<string, any> = Record<string, any>> = {
+export type EnhanceInput<CallType extends EnhanceCallType = EnhanceCallType, Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | string | null = AppRouteId | string | null, ParentData extends Record<string, any> = Record<string, any>> = {
     cookies: Cookies;
     params: Params;
     route: {
@@ -28,8 +28,8 @@ export type EnhanceInput<CallType extends EnhanceCallType = EnhanceCallType, Par
     depends: ServerLoadEvent<Params, ParentData, RouteId>['depends'];
     untrack: ServerLoadEvent<Params, ParentData, RouteId>['untrack'];
 } : object);
-export type EnhanceFunction<CallType extends EnhanceCallType = EnhanceCallType, Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | null = AppRouteId | null, EnhanceReturn = any> = (event: EnhanceInput<CallType, Params, RouteId>) => MaybePromise<EnhanceReturn>;
-export type EnhanceAction<Params extends AppLayoutParams<'/'>, OutputData extends Record<string, any> | void, RouteId extends AppRouteId | null, EnhanceReturn extends ActionResult | never | any = ActionResult> = (event: RequestEvent<Params, RouteId> & {
+export type EnhanceFunction<CallType extends EnhanceCallType = EnhanceCallType, Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | string | null = AppRouteId | string | null, EnhanceReturn = any> = (event: EnhanceInput<CallType, Params, RouteId>) => MaybePromise<EnhanceReturn>;
+export type EnhanceAction<Params extends AppLayoutParams<'/'>, OutputData extends Record<string, any> | void, RouteId extends AppRouteId | string | null, EnhanceReturn extends ActionResult | never | any = ActionResult> = (event: RequestEvent<Params, RouteId> & {
     context: EnhanceReturn;
 }) => MaybePromise<OutputData>;
 export type EnhanceLoad<Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, ParentData extends Record<string, any> = Record<string, any>, OutputData extends Record<string, any> | void = Record<string, any> | void, RouteId extends AppRouteId | null = AppRouteId | null, EnhanceReturn extends never | any = any> = (event: ServerLoadEvent<Params, ParentData, RouteId> & {
@@ -44,14 +44,14 @@ export type EnhanceHandle<EnhanceReturn extends never | any = any> = (input: {
 export type EnhanceMethod<Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | null = AppRouteId | null, EnhanceReturn extends never | any = any> = (event: RequestEvent<Params, RouteId> & {
     context: EnhanceReturn;
 }) => MaybePromise<Response>;
-export declare const action: <Params extends AppLayoutParams<"/"> = AppLayoutParams<"/">, OutputData extends Record<string, any> | void = Record<string, any> | void, RouteId extends AppRouteId | null = AppRouteId | null, const Enhances extends readonly EnhanceFunction<"action", Params, RouteId, object>[] = readonly EnhanceFunction<"action", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(action: EnhanceAction<Params, OutputData, RouteId, EnhanceReturn>, ...enhances: [...Enhances]) => Action<Params, OutputData, RouteId>;
+export declare const action: <Params extends AppLayoutParams<"/"> = AppLayoutParams<"/">, OutputData extends Record<string, any> | void = Record<string, any> | void, RouteId extends AppRouteId | string | null = AppRouteId | string | null, const Enhances extends readonly EnhanceFunction<"action", Params, RouteId, object>[] = readonly EnhanceFunction<"action", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(action: EnhanceAction<Params, OutputData, RouteId, EnhanceReturn>, ...enhances: [...Enhances]) => Action<Params, OutputData, RouteId>;
 export declare const load: <Params extends AppLayoutParams<"/"> = AppLayoutParams<"/">, ParentData extends Record<string, any> = Record<string, any>, OutputData extends Record<string, any> | void = Record<string, any> | void, RouteId extends AppRouteId | null = AppRouteId | null, const Enhances extends readonly EnhanceFunction<"load", Params, RouteId, object>[] = readonly EnhanceFunction<"load", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(load: EnhanceLoad<Params, ParentData, OutputData, RouteId, EnhanceReturn>, ...contexts: [...Enhances]) => (event: ServerLoadEvent<Params, ParentData, RouteId>) => Promise<OutputData>;
-export declare const method: <Params extends AppLayoutParams<"/"> = AppLayoutParams<"/">, RouteId extends AppRouteId | null = AppRouteId | null, const Enhances extends readonly EnhanceFunction<"method", Params, RouteId, object>[] = readonly EnhanceFunction<"method", Params, RouteId, object>[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceMethod<Params, RouteId, EnhanceReturn>, ...contexts: [...Enhances]) => (event: RequestEvent<Params, RouteId>) => Promise<Response>;
+export declare const method: <Params extends AppLayoutParams<"/"> = AppLayoutParams<"/">, RouteId extends AppRouteId | string | null = AppRouteId | string | null, const Enhances extends readonly EnhanceFunction<"method", Params, RouteId, object>[] = readonly EnhanceFunction<"method", Params, RouteId, object>[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceMethod<Params, RouteId, EnhanceReturn>, ...contexts: [...Enhances]) => (event: RequestEvent<Params, RouteId>) => Promise<Response>;
 export declare const handle: <const Enhances extends readonly EnhanceFunction<"handle">[] = readonly EnhanceFunction<"handle">[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceHandle<EnhanceReturn>, ...contexts: [...Enhances]) => Handle;
 export declare const enhance: {
-    action: <Params extends AppLayoutParams<"/"> = Record<string, string>, OutputData extends Record<string, any> | void = void | Record<string, any>, RouteId extends AppRouteId | null = string | null, const Enhances extends readonly EnhanceFunction<"action", Params, RouteId, object>[] = readonly EnhanceFunction<"action", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(action: EnhanceAction<Params, OutputData, RouteId, EnhanceReturn>, ...enhances: Enhances) => Action<Params, OutputData, RouteId>;
+    action: <Params extends AppLayoutParams<"/"> = Record<string, string>, OutputData extends Record<string, any> | void = void | Record<string, any>, RouteId extends AppRouteId | string | null = string | null, const Enhances extends readonly EnhanceFunction<"action", Params, RouteId, object>[] = readonly EnhanceFunction<"action", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(action: EnhanceAction<Params, OutputData, RouteId, EnhanceReturn>, ...enhances: Enhances) => Action<Params, OutputData, RouteId>;
     load: <Params extends AppLayoutParams<"/"> = Record<string, string>, ParentData extends Record<string, any> = Record<string, any>, OutputData extends Record<string, any> | void = void | Record<string, any>, RouteId extends AppRouteId | null = string | null, const Enhances extends readonly EnhanceFunction<"load", Params, RouteId, object>[] = readonly EnhanceFunction<"load", Params, RouteId, object>[], EnhanceReturn extends ConcatReturnTypes<Enhances> = ConcatReturnTypes<Enhances>>(load: EnhanceLoad<Params, ParentData, OutputData, RouteId, EnhanceReturn>, ...contexts: Enhances) => (event: ServerLoadEvent<Params, ParentData, RouteId>) => Promise<OutputData>;
-    method: <Params extends AppLayoutParams<"/"> = Record<string, string>, RouteId extends AppRouteId | null = string | null, const Enhances extends readonly EnhanceFunction<"method", Params, RouteId, object>[] = readonly EnhanceFunction<"method", Params, RouteId, object>[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceMethod<Params, RouteId, EnhanceReturn>, ...contexts: Enhances) => (event: RequestEvent<Params, RouteId>) => Promise<Response>;
+    method: <Params extends AppLayoutParams<"/"> = Record<string, string>, RouteId extends AppRouteId | string | null = string | null, const Enhances extends readonly EnhanceFunction<"method", Params, RouteId, object>[] = readonly EnhanceFunction<"method", Params, RouteId, object>[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceMethod<Params, RouteId, EnhanceReturn>, ...contexts: Enhances) => (event: RequestEvent<Params, RouteId>) => Promise<Response>;
     handle: <const Enhances extends readonly EnhanceFunction<"handle">[] = readonly EnhanceFunction<"handle", Record<string, string>, string | null, any>[], EnhanceReturn extends Awaited<ConcatReturnTypes<Enhances>> = Awaited<ConcatReturnTypes<Enhances>>>(handle: EnhanceHandle<EnhanceReturn>, ...contexts: Enhances) => Handle;
 };
 export type Enhancers<Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>, RouteId extends AppRouteId | null = AppRouteId | null, EnhanceReturn extends never | any = any> = Record<string, EnhanceFunction<EnhanceCallType, Params, RouteId, EnhanceReturn>>;

package/dist/index.js

@@ -25,8 +25,13 @@ const EnhanceErrorHandle = async (e, contextInput) => {
     }
     throw e;
 };
-export const action = (action, ...enhances) => async (event) => {
+export const action = (action, ...enhances
+// @ts-expect-error relax the route_id when integrating with libraries
+) => 
+// @ts-expect-error relax the route_id when integrating with libraries
+async (event) => {
     let combined = {};
+    // @ts-expect-error relax the route_id when integrating with libraries
     const input = Object.assign(event, {
         __errorHandlers__: [],
         isAction: false,
@@ -79,9 +84,13 @@ export const load = (load, ...contexts) => {
         }
     };
 };
-export const method = (handle, ...contexts) => {
+export const method = (
+// @ts-expect-error this is to relax the typing around external integrations
+handle, ...contexts) => {
+    // @ts-expect-error this is to relax the typing around external integrations
     return async (event) => {
         let combined = {};
+        // @ts-expect-error this is to relax the typing around external integrations
         const contextInput = Object.assign(event, {
             __errorHandlers__: [],
             isAction: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourceregistry/sveltekit-enhance",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "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": {