@azure-net/kit 3.0.3 → 3.0.5

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

@@ -1,15 +1,23 @@
 import type { RequestErrors } from '../../delivery/schema/index.js';
 import type { AsyncActionResponse } from '../../index.js';
-type InitialData<FormData> = Partial<FormData> | Promise<Partial<FormData>> | (() => Partial<FormData> | Promise<Partial<FormData>>);
-export interface FormConfig<FormData, Response> {
-    initialData?: InitialData<FormData>;
+type InitialData<FormData, Initial extends Partial<FormData>> = Initial | Promise<Initial> | (() => Initial | Promise<Initial>);
+type PathRequiredShape<T, P extends string> = P extends `${infer Head}.${infer Tail}` ? Head extends keyof T ? {
+    [K in Head]-?: PathRequiredShape<NonNullable<T[K]>, Tail>;
+} : unknown : P extends keyof T ? {
+    [K in P]-?: NonNullable<T[K]>;
+} : unknown;
+type UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends (arg: infer I) => void ? I : never;
+type RequiredByPaths<T, P extends string> = [P] extends [never] ? {} : UnionToIntersection<PathRequiredShape<T, P>>;
+export interface FormConfig<FormData, Response, Initial extends Partial<FormData> = Partial<FormData>, RequiredPath extends string = never> {
+    initialData?: InitialData<FormData, Initial>;
+    required?: readonly RequiredPath[];
     onSuccess?: (response: Response) => Promise<void> | void;
     onError?: () => Promise<void> | void;
-    beforeSubmit?: (form: ActiveFormController<FormData>, abort: () => void) => Promise<void> | void;
+    beforeSubmit?: (form: ActiveFormController<FormData, RequiredPath>, abort: () => void) => Promise<void> | void;
     waitForInitialData?: boolean;
 }
-export interface ActiveForm<FormData, Response, Custom> {
-    data: Partial<FormData>;
+export interface ActiveForm<FormData, Response, Custom, RequiredPath extends string = never> {
+    data: Partial<FormData> & RequiredByPaths<FormData, RequiredPath>;
     errors: RequestErrors<FormData>;
     submit: () => Promise<AsyncActionResponse<Response, FormData, Custom>>;
     reset: (toInitial?: boolean) => void;
@@ -17,8 +25,8 @@ export interface ActiveForm<FormData, Response, Custom> {
     dirty: boolean;
     ready: Promise<Partial<FormData>>;
 }
-export interface ActiveFormController<FormData> {
-    data: Partial<FormData>;
+export interface ActiveFormController<FormData, RequiredPath extends string = never> {
+    data: Partial<FormData> & RequiredByPaths<FormData, RequiredPath>;
     errors: RequestErrors<FormData>;
     reset: (toInitial?: boolean) => void;
 }
@@ -31,5 +39,5 @@ type ExtractFromSubmit<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"], ExtractFromSubmit<SubmitReturn>["response"]>) => ActiveForm<ExtractFromSubmit<SubmitReturn>["formData"], ExtractFromSubmit<SubmitReturn>["response"], ExtractFromSubmit<SubmitReturn>["custom"]>;
+export declare const createActiveForm: <SubmitReturn extends Promise<AsyncActionResponse<unknown, unknown, unknown>>, RequiredPath extends string = never>(onSubmit: (formData: Partial<ExtractFromSubmit<SubmitReturn>["formData"]>) => SubmitReturn, config?: FormConfig<ExtractFromSubmit<SubmitReturn>["formData"], ExtractFromSubmit<SubmitReturn>["response"], Partial<ExtractFromSubmit<SubmitReturn>["formData"]>, RequiredPath>) => ActiveForm<ExtractFromSubmit<SubmitReturn>["formData"], ExtractFromSubmit<SubmitReturn>["response"], ExtractFromSubmit<SubmitReturn>["custom"], RequiredPath>;
 export {};

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

@@ -1,9 +1,14 @@
 export type AsyncStatus = 'idle' | 'pending' | 'success' | 'error';
+export type AsyncSignalSource = 'auto' | 'manual' | 'global';
 export interface AsyncSignalOptions<TData, TError = Error> {
     server?: boolean;
     immediate?: boolean;
     watch?: (() => unknown)[];
-    initialData?: TData;
+    initialData?: TData | (() => TData);
+    beforeSend?: (meta: {
+        initial: boolean;
+        source: AsyncSignalSource;
+    }) => void | Promise<void>;
     onSuccess?: (data: TData) => void | Promise<void>;
     onError?: (error: TError) => void | Promise<void>;
     key?: string;

package/dist/core/svelte/AsyncSignal/AsyncSignal.svelte.js

@@ -25,7 +25,7 @@ const createAsyncSignalManager = () => {
         if (instances) {
             const instance = instances.get(key);
             try {
-                await instance?.();
+                await instance?.('global');
             }
             catch {
                 return;
@@ -35,7 +35,7 @@ const createAsyncSignalManager = () => {
     const refreshAll = async () => {
         if (instances) {
             try {
-                await Promise.all(instances.values().map((val) => val()));
+                await Promise.all(instances.values().map((val) => val('global')));
             }
             catch {
                 return;
@@ -47,18 +47,25 @@ const createAsyncSignalManager = () => {
 const asyncSignalManager = createAsyncSignalManager();
 export const createAsyncSignal = (handler, options = {}) => {
     const { server = false, immediate = true, watch = [], initialData = undefined, key } = options;
-    let data = $state(initialData);
+    const resolvedInitialData = typeof initialData === 'function' ? initialData() : initialData;
+    let data = $state(resolvedInitialData);
     let error = $state();
     let status = $state('idle');
     const pending = $derived(status === 'pending');
     let abortController = null;
     let currentPromise = null;
     let currentRunId = 0;
-    const run = async (runId) => {
+    let started = false;
+    const run = async (runId, source) => {
+        const initial = !started;
+        started = true;
         if (abortController) {
             abortController.abort();
         }
         abortController = new AbortController();
+        if (options.beforeSend) {
+            await options.beforeSend({ initial, source });
+        }
         status = 'pending';
         error = undefined;
         try {
@@ -90,22 +97,27 @@ export const createAsyncSignal = (handler, options = {}) => {
             }
         }
     };
-    const start = () => {
+    const start = (source) => {
+        if (currentPromise) {
+            return currentPromise;
+        }
         const runId = ++currentRunId;
-        const localPromise = run(runId);
+        const localPromise = run(runId, source);
         currentPromise = localPromise;
         return localPromise;
     };
     const execute = async () => {
-        if (status === 'pending' && currentPromise) {
+        if (currentPromise) {
             await currentPromise;
             return;
         }
-        await start();
+        await start('manual');
     };
     if (EnvironmentUtil.isBrowser) {
         const signalKey = key ?? asyncSignalManager.generateKey();
-        asyncSignalManager.register(signalKey, () => execute());
+        asyncSignalManager.register(signalKey, (source) => {
+            return start(source);
+        });
         $effect(() => {
             return () => {
                 asyncSignalManager.unregister(signalKey);
@@ -120,7 +132,7 @@ export const createAsyncSignal = (handler, options = {}) => {
                     return;
                 }
                 if (!isFirst) {
-                    void execute();
+                    void start('auto');
                 }
                 isFirst = false;
             });
@@ -129,11 +141,11 @@ export const createAsyncSignal = (handler, options = {}) => {
     if (immediate) {
         if (EnvironmentUtil.isServer && server) {
             untrack(() => {
-                void execute();
+                void start('auto');
             });
         }
         else if (EnvironmentUtil.isBrowser) {
-            void execute();
+            void start('auto');
         }
     }
     return {
@@ -152,7 +164,7 @@ export const createAsyncSignal = (handler, options = {}) => {
         get ready() {
             if (currentPromise)
                 return currentPromise;
-            return start();
+            return start('auto');
         },
         execute,
         refresh: execute,

package/package.json

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