@webamoki/web-svelte 0.6.0 → 0.6.1

package/dist/server/form-handler.d.ts

@@ -1,32 +1,33 @@
 import { type SuperValidated } from 'sveltekit-superforms';
-import { type VirtualFormValidated } from './form-processor.js';
 /**
  * automatically handle database errors from catch.
  * used in form/action handling in page.server.ts
  */
-export declare function handleDbErrorForm<T extends Record<string, unknown>>(form: SuperValidated<T> | VirtualFormValidated<T>, message: string, err: unknown): import("@sveltejs/kit").ActionFailure<{
-    form: SuperValidated<T> | VirtualFormValidated<T>;
+export declare function handleDbErrorForm<T extends Record<string, unknown>>(form: SuperValidated<T>, message: string, err: unknown): import("@sveltejs/kit").ActionFailure<{
+    form: SuperValidated<T>;
 }>;
 /**
  * check if an error returned by a try catch is a duplicate value error in postgre
  */
 export declare function isDuplicateDbError(err: unknown): boolean;
-export declare function successMessage<T extends Record<string, unknown>>(form: SuperValidated<T> | VirtualFormValidated<T>, options?: {
+export declare function successMessage<T extends Record<string, unknown>>(form: SuperValidated<T>, options?: {
     showToast?: boolean;
     text?: string;
     data?: unknown;
-}): any;
-export declare function errorMessage<T extends Record<string, unknown>>(form: SuperValidated<T> | VirtualFormValidated<T>, options?: {
+}): {
+    form: SuperValidated<T, App.Superforms.Message, T>;
+} | import("@sveltejs/kit").ActionFailure<{
+    form: SuperValidated<T, App.Superforms.Message, T>;
+}>;
+export declare function errorMessage<T extends Record<string, unknown>>(form: SuperValidated<T>, options?: {
     showToast?: boolean;
     text?: string;
     data?: unknown;
-}): any;
-export declare function failFormValidation<T extends Record<string, unknown>>(form: SuperValidated<T> | {
-    valid: boolean;
-}): import("@sveltejs/kit").ActionFailure<{
-    message: string;
-}> | import("@sveltejs/kit").ActionFailure<{
-    form: SuperValidated<T> | {
-        valid: boolean;
-    };
+}): {
+    form: SuperValidated<T, App.Superforms.Message, T>;
+} | import("@sveltejs/kit").ActionFailure<{
+    form: SuperValidated<T, App.Superforms.Message, T>;
+}>;
+export declare function failFormValidation<T extends Record<string, unknown>>(form: SuperValidated<T>): import("@sveltejs/kit").ActionFailure<{
+    form: SuperValidated<T>;
 }>;

package/dist/server/form-handler.js

@@ -1,7 +1,5 @@
 import { DatabaseError } from 'pg';
 import { fail, message as superFormMessage } from 'sveltekit-superforms';
-import { FormError } from './form-processor.js';
-import { fail as failKit } from '@sveltejs/kit';
 /**
  * automatically handle database errors from catch.
  * used in form/action handling in page.server.ts
@@ -14,9 +12,6 @@ export function handleDbErrorForm(form, message, err) {
     console.error(`Unexpected Error ${message}:`, err);
     return fail(500, { form });
 }
-function isVirtualFormValidated(form) {
-    return 'virtual' in form && form.virtual;
-}
 /**
  * check if an error returned by a try catch is a duplicate value error in postgre
  */
@@ -30,9 +25,6 @@ export function successMessage(form, options) {
         text: options?.text ?? 'Success',
         data: options?.data
     };
-    if ('virtual' in form && form.virtual) {
-        return message;
-    }
     return superFormMessage(form, message);
 }
 export function errorMessage(form, options) {
@@ -42,16 +34,10 @@ export function errorMessage(form, options) {
         text: options?.text,
         data: options?.data
     };
-    if (isVirtualFormValidated(form)) {
-        return message;
-    }
     return superFormMessage(form, message);
 }
 export function failFormValidation(form) {
     if (form.valid)
         throw new Error('Invalid form passed');
-    if (form instanceof FormError) {
-        return failKit(400, { message: form.message });
-    }
     return fail(400, { form });
 }

package/dist/server/form-processor.d.ts

@@ -1,12 +1,2 @@
 import { type } from 'arktype';
-export declare class FormError {
-    message: string;
-    valid: false;
-    constructor(message: string);
-}
-export type VirtualFormValidated<T extends Record<string, unknown>> = {
-    data: T;
-    virtual: boolean;
-    valid: boolean;
-};
-export declare function processForm<S extends type.Any<Record<string, unknown>>>(request: Request, schema: S): Promise<FormError | import("sveltekit-superforms").SuperValidated<S["infer"], any, S["inferIn"]> | VirtualFormValidated<S["infer"]>>;
+export declare function processForm<S extends type.Any<Record<string, unknown>>>(request: Request, schema: S): Promise<import("sveltekit-superforms").SuperValidated<S["infer"], any, S["inferIn"]>>;

package/dist/server/form-processor.js

@@ -2,47 +2,6 @@ import { dateTransport } from '../utils/datetime/index.js';
 import { type } from 'arktype';
 import { superValidate } from 'sveltekit-superforms';
 import { arktype } from 'sveltekit-superforms/adapters';
-export class FormError {
-    message;
-    valid;
-    constructor(message) {
-        this.message = message;
-        this.valid = false;
-    }
-}
 export async function processForm(request, schema) {
-    let formData;
-    try {
-        formData = await request.formData();
-    }
-    catch (error) {
-        return new FormError(error instanceof Error ? error.message : 'Invalid form data');
-    }
-    if ('__superform_id' in formData) {
-        return await superValidate(request, arktype(schema), { transport: dateTransport });
-    }
-    try {
-        // Parse form data and extract the JSON string
-        const dataString = formData.get('data');
-        if (typeof dataString !== 'string') {
-            return new FormError('Missing or invalid data field');
-        }
-        // Parse the JSON string
-        const body = JSON.parse(dataString);
-        // Validate against the schema
-        const validated = schema(body);
-        // Check if validation failed
-        if (validated instanceof type.errors) {
-            return new FormError(validated.summary);
-        }
-        // Return validated data
-        return {
-            data: validated,
-            virtual: true,
-            valid: true
-        };
-    }
-    catch (error) {
-        return new FormError(error instanceof Error ? error.message : 'Invalid form data');
-    }
+    return await superValidate(request, arktype(schema), { transport: dateTransport });
 }

package/dist/utils/form/index.d.ts

@@ -4,6 +4,7 @@ export declare function prepareForm<S extends type.Any<Record<string, unknown>>>
     invalidateAll: boolean;
     resetForm: boolean;
     onSuccess: (form: Readonly<SuperValidated<S['infer'], App.Superforms.Message, S['infer']>>) => void;
+    onError: (form: Readonly<SuperValidated<S['infer'], App.Superforms.Message, S['infer']>>) => void;
 }>): {
     form: import("sveltekit-superforms").SuperForm<S["infer"], any>;
     data: import("sveltekit-superforms/client").SuperFormData<S["infer"]>;
@@ -14,6 +15,7 @@ export declare function prepareEmptyForm<S extends type.Any<Record<string, unkno
     invalidateAll: boolean;
     resetForm: boolean;
     onSuccess: (form: Readonly<SuperValidated<S['infer'], App.Superforms.Message, S['infer']>>) => void;
+    onError: (form: Readonly<SuperValidated<S['infer'], App.Superforms.Message, S['infer']>>) => void;
 }>): {
     form: import("sveltekit-superforms").SuperForm<S["infer"], any>;
     data: import("sveltekit-superforms/client").SuperFormData<S["infer"]>;

package/dist/utils/form/index.js

@@ -11,17 +11,17 @@ export function prepareForm(validated, schema, options) {
         transport: dateTransport,
         resetForm: options?.resetForm ?? true,
         onUpdated({ form }) {
-            if (form.valid) {
+            if (form.valid && form.message.success) {
                 options?.onSuccess?.(form);
-            }
-            const text = form.message?.text;
-            if (text === undefined || form.message?.showToast === false)
-                return;
-            if (form.message.success) {
-                toast.success(text);
+                if (form.message?.text && form.message?.showToast) {
+                    toast.success(form.message.text);
+                }
             }
             else {
-                toast.error(text);
+                options?.onError?.(form);
+                if (form.message?.text && form.message?.showToast) {
+                    toast.error(form.message.text);
+                }
             }
         },
         onError({ result }) {
@@ -42,17 +42,17 @@ export function prepareEmptyForm(schema, options) {
         transport: dateTransport,
         resetForm: options?.resetForm === undefined ? true : false,
         onUpdated({ form }) {
-            if (form.valid) {
+            if (form.valid && form.message.success) {
                 options?.onSuccess?.(form);
-            }
-            const text = form.message?.text;
-            if (text === undefined || form.message?.showToast === false)
-                return;
-            if (form.message.success) {
-                toast.success(text);
+                if (form.message?.text && form.message?.showToast) {
+                    toast.success(form.message.text);
+                }
             }
             else {
-                toast.error(text);
+                options?.onError?.(form);
+                if (form.message?.text && form.message?.showToast) {
+                    toast.error(form.message.text);
+                }
             }
         },
         onError({ result }) {

package/dist/utils/form/virtual-form.d.ts

@@ -1,9 +1,12 @@
 import { type } from 'arktype';
+import type { SuperValidated } from 'sveltekit-superforms/client';
+import type { Transport } from '@sveltejs/kit';
 export declare class VirtualForm<S extends type.Any<Record<string, unknown>>> {
     #private;
     constructor(schema: S, action: string, options?: {
         actionName?: string;
-        onSuccess?: (message: App.Superforms.Message) => void;
+        transport?: Transport;
+        onSuccess?: (form: Readonly<SuperValidated<S['infer'], App.Superforms.Message, S['infer']>>) => void;
         onError?: (message: App.Superforms.Message) => void;
     });
     submit(data: S['infer']): Promise<void>;

package/dist/utils/form/virtual-form.js

@@ -1,28 +1,14 @@
 import { type } from 'arktype';
 import { toast } from 'svelte-sonner';
 import { createSubscriber } from 'svelte/reactivity';
-function decodeMessage(json) {
-    const parsed = JSON.parse(json);
-    // Basic validation
-    if (!Array.isArray(parsed) || typeof parsed[0] !== 'object' || parsed[0] === null) {
-        throw new Error('Invalid encoded message format');
-    }
-    const schema = parsed[0];
-    // resolve an index into the parsed array
-    const resolve = (idx) => (idx >= 0 ? parsed[idx] : undefined);
-    const output = {};
-    // dynamically resolve each schema key
-    for (const key of Object.keys(schema)) {
-        const index = schema[key];
-        output[key] = resolve(index);
-    }
-    return output;
-}
+import { parse, stringify } from 'devalue';
+import { dateTransport } from '../datetime/index.js';
 export class VirtualForm {
     // state storage
     #isLoading = false;
     #url = '';
     #schema;
+    #transport;
     #onSuccess;
     #onError;
     // svelte reactive tracking
@@ -31,6 +17,7 @@ export class VirtualForm {
     constructor(schema, action, options = {}) {
         this.#url = `${action}${options.actionName ? '?/' + options.actionName : ''}`;
         this.#schema = schema;
+        this.#transport = options.transport ?? dateTransport;
         this.#onSuccess = options.onSuccess;
         this.#onError = options.onError;
         this.#subscribe = createSubscriber((update) => {
@@ -38,6 +25,50 @@ export class VirtualForm {
             return () => { };
         });
     }
+    // Apply transport encoding to data before sending
+    #encodeTransport(data) {
+        if (!this.#transport || typeof data !== 'object' || data === null) {
+            return data;
+        }
+        // Handle arrays
+        if (Array.isArray(data)) {
+            return data.map((item) => this.#encodeTransport(item));
+        }
+        // Try each transport encoder
+        for (const [key, encoder] of Object.entries(this.#transport)) {
+            const encoded = encoder.encode(data);
+            if (encoded !== false) {
+                return { __type: key, __value: encoded };
+            }
+        }
+        // Recursively encode nested objects
+        const result = {};
+        for (const [key, value] of Object.entries(data)) {
+            result[key] = this.#encodeTransport(value);
+        }
+        return result;
+    }
+    // Apply transport decoding to received data
+    #decodeTransport(data) {
+        if (!this.#transport || typeof data !== 'object' || data === null) {
+            return data;
+        }
+        // Handle arrays
+        if (Array.isArray(data)) {
+            return data.map((item) => this.#decodeTransport(item));
+        }
+        // Check if this is a transport-encoded value
+        const obj = data;
+        if (obj.__type && obj.__value && this.#transport[obj.__type]) {
+            return this.#transport[obj.__type].decode(obj.__value);
+        }
+        // Recursively decode nested objects
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+            result[key] = this.#decodeTransport(value);
+        }
+        return result;
+    }
     async submit(data) {
         this.#isLoading = true;
         this.#update();
@@ -54,9 +85,12 @@ export class VirtualForm {
             return;
         }
         try {
+            // Apply transport encoding before sending
+            const encodedData = this.#encodeTransport(validated);
             // Encode JSON as form data (like superforms does)
             const formData = new FormData();
-            formData.append('data', JSON.stringify(validated));
+            formData.append('__superform_id', '1');
+            formData.append('__superform_json', stringify(encodedData));
             const res = await fetch(this.#url, {
                 method: 'POST',
                 body: formData
@@ -69,17 +103,21 @@ export class VirtualForm {
                 this.#update();
                 return;
             }
-            const message = decodeMessage(result['data']);
-            const text = message?.text;
-            if (message.success) {
-                this.#onSuccess?.(message);
-                if (text && message?.showToast)
-                    toast.success(text);
+            // Parse and decode the response
+            const parsedData = parse(result['data']);
+            const decodedData = this.#decodeTransport(parsedData);
+            const form = decodedData['form'];
+            if (form.valid && form.message?.success) {
+                this.#onSuccess?.(form);
+                if (form.message.text && form.message.showToast) {
+                    toast.success(form.message.text);
+                }
             }
             else {
-                this.#onError?.(message);
-                if (text && message?.showToast)
-                    toast.error(text);
+                this.#onError?.(form.message);
+                if (form.message?.text && form.message?.showToast) {
+                    toast.error(form.message.text);
+                }
             }
         }
         catch (err) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "files": [
     "dist",
@@ -61,7 +61,7 @@
     "@lucide/svelte": "^0.553.0",
     "arktype": "^2.1.22",
     "svelte": "^5.43.6",
-    "sveltekit-superforms": "^2.27.1"
+    "sveltekit-superforms": "^2.28.1"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.7",
@@ -107,6 +107,7 @@
     "@sveltejs/adapter-auto": "^7.0.0",
     "arktype": "^2.1.26",
     "bits-ui": "^2.14.3",
+    "devalue": "^5.5.0",
     "drizzle-orm": "^0.44.7",
     "formsnap": "^2.0.1",
     "pg": "^8.16.3",