@azure-net/kit 1.0.3 → 1.0.4

package/dist/core/svelte/ActiveForm/ActiveForm.svelte.d.ts

@@ -5,12 +5,22 @@ export interface FormConfig<FormData> {
     onSuccess?: () => Promise<void> | void;
     onError?: () => Promise<void> | void;
 }
-export interface ActiveForm<FormData, Response> {
+export interface ActiveForm<FormData, Response, Custom> {
     data: Partial<FormData>;
     errors: RequestErrors<FormData>;
-    submit: () => Promise<AsyncActionResponse<Response, FormData>>;
-    reset: () => void;
+    submit: () => Promise<AsyncActionResponse<Response, FormData, Custom>>;
+    reset: (toInitial?: boolean) => void;
     pending: boolean;
     dirty: boolean;
 }
-export declare const createActiveForm: <FormData, Response = unknown>(onSubmit: (formData: Partial<FormData>) => Promise<AsyncActionResponse<Response, FormData>>, config?: FormConfig<FormData>) => ActiveForm<FormData, Response>;
+type ExtractResponse<T> = T extends AsyncActionResponse<infer R, unknown, unknown> ? R : never;
+type ExtractFormData<T> = T extends AsyncActionResponse<unknown, infer D, unknown> ? D : never;
+type ExtractCustom<T> = T extends AsyncActionResponse<unknown, unknown, infer C> ? C : never;
+type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+type ExtractFromSubmit<T> = {
+    response: ExtractResponse<UnwrapPromise<T>>;
+    formData: ExtractFormData<UnwrapPromise<T>>;
+    custom: ExtractCustom<UnwrapPromise<T>>;
+};
+export declare const createActiveForm: <SubmitReturn extends Promise<AsyncActionResponse<unknown, unknown, unknown>>>(onSubmit: (formData: Partial<ExtractFromSubmit<SubmitReturn>["formData"]>) => SubmitReturn, config?: FormConfig<ExtractFromSubmit<SubmitReturn>["formData"]>) => ActiveForm<ExtractFromSubmit<SubmitReturn>["formData"], ExtractFromSubmit<SubmitReturn>["response"], ExtractFromSubmit<SubmitReturn>["custom"]>;
+export {};

package/dist/core/svelte/ActiveForm/ActiveForm.svelte.js

@@ -7,18 +7,22 @@ export const createActiveForm = (onSubmit, config) => {
     const dirty = $derived(JSON.stringify(formData) !== JSON.stringify(initial));
     const submit = async () => {
         pending = true;
-        const result = await onSubmit(formData);
-        if (result.error?.fields) {
-            formErrors = result.error?.fields;
+        try {
+            const result = await onSubmit(formData);
+            if (result.error?.fields) {
+                formErrors = result.error.fields;
+            }
+            if (result.success) {
+                await config?.onSuccess?.();
+            }
+            else {
+                await config?.onError?.();
+            }
+            return result;
         }
-        pending = false;
-        if (result.success) {
-            await config?.onSuccess?.();
+        finally {
+            pending = false;
         }
-        else {
-            await config?.onError?.();
-        }
-        return result;
     };
     const reset = (toInitial = false) => {
         formData = toInitial ? ObjectUtil.deepClone(initial) : {};
@@ -28,6 +32,9 @@ export const createActiveForm = (onSubmit, config) => {
         get data() {
             return formData;
         },
+        set data(value) {
+            formData = value;
+        },
         get errors() {
             return formErrors;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/kit",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "files": [
     "dist",
     "!dist/**/*.test.*",