@azure-net/kit 3.9.1 → 3.9.3

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

@@ -1,7 +1,7 @@
 import { untrack } from 'svelte';
-import { EnvironmentUtil } from '@azure-net/tools';
+import { BROWSER } from '@azure-net/tools/environment';
 const createAsyncSignalManager = () => {
-    const instances = EnvironmentUtil.isBrowser ? new Map() : undefined;
+    const instances = BROWSER ? new Map() : undefined;
     const generateUid = () => {
         return Math.random().toString(36).substring(2, 9);
     };
@@ -46,7 +46,7 @@ const createAsyncSignalManager = () => {
 };
 const asyncSignalManager = createAsyncSignalManager();
 export const createAsyncSignal = (handler, options = {}) => {
-    const { server = false, immediate = true, watch = [], initialData = undefined, key } = options;
+    const { server = false, immediate = true, initialData = undefined, key } = options;
     const resolvedInitialData = typeof initialData === 'function' ? initialData() : initialData;
     let data = $state(resolvedInitialData);
     let error = $state();
@@ -59,24 +59,29 @@ export const createAsyncSignal = (handler, options = {}) => {
     const run = async (runId, source) => {
         const initial = !started;
         started = true;
-        if (abortController) {
-            abortController.abort();
+        const prevController = abortController;
+        if (prevController) {
+            prevController.abort();
         }
-        abortController = new AbortController();
+        const localController = new AbortController();
+        abortController = localController;
         if (options.beforeSend) {
             await options.beforeSend({ initial, source });
         }
+        if (runId !== currentRunId || abortController !== localController || localController.signal.aborted) {
+            return undefined;
+        }
         status = 'pending';
         error = undefined;
         try {
-            const result = await handler(abortController.signal);
-            if (abortController.signal.aborted) {
+            const result = await handler(localController.signal);
+            if (runId !== currentRunId || abortController !== localController || localController.signal.aborted) {
                 return undefined;
             }
             data = result;
             status = 'success';
             if (options.onSuccess) {
-                options.onSuccess(result);
+                await options.onSuccess(result);
             }
             return result;
         }
@@ -84,10 +89,13 @@ export const createAsyncSignal = (handler, options = {}) => {
             if (err instanceof Error && err.name === 'AbortError') {
                 return undefined;
             }
+            if (runId !== currentRunId || abortController !== localController || localController.signal.aborted) {
+                return undefined;
+            }
             error = err;
             status = 'error';
             if (options.onError) {
-                options.onError(err);
+                await options.onError(err);
             }
             return undefined;
         }
@@ -98,9 +106,6 @@ export const createAsyncSignal = (handler, options = {}) => {
         }
     };
     const start = (source) => {
-        if (currentPromise) {
-            return currentPromise;
-        }
         const runId = ++currentRunId;
         const localPromise = run(runId, source);
         currentPromise = localPromise;
@@ -113,7 +118,7 @@ export const createAsyncSignal = (handler, options = {}) => {
         }
         await start('manual');
     };
-    if (EnvironmentUtil.isBrowser) {
+    if (BROWSER) {
         const signalKey = key ?? asyncSignalManager.generateKey();
         const callback = (source) => start(source);
         asyncSignalManager.register(signalKey, callback);
@@ -122,28 +127,14 @@ export const createAsyncSignal = (handler, options = {}) => {
                 asyncSignalManager.unregister(signalKey, callback);
             };
         });
-        if (watch.length > 0) {
-            let isFirst = true;
-            $effect(() => {
-                watch.forEach((dep) => dep());
-                if (isFirst && !immediate) {
-                    isFirst = false;
-                    return;
-                }
-                if (!isFirst) {
-                    void start('auto');
-                }
-                isFirst = false;
-            });
-        }
     }
     if (immediate) {
-        if (EnvironmentUtil.isServer && server) {
+        if (!BROWSER && server) {
             untrack(() => {
                 void start('auto');
             });
         }
-        else if (EnvironmentUtil.isBrowser) {
+        else if (BROWSER) {
             void start('auto');
         }
     }

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

@@ -1,20 +1,19 @@
-export type QuerySignal = {
-    refresh: () => Promise<void>;
-};
+export interface QueryOnChangeContext<T extends Record<string, unknown>> {
+    snapshot: T;
+    changedKeys: (keyof T)[];
+    signal: AbortSignal;
+}
+export interface QueryOnChangeOptions<T extends Record<string, unknown>> {
+    include: (keyof T)[];
+    handler: (ctx: QueryOnChangeContext<T>) => Promise<void> | void;
+}
 export interface CreateQueryOptions<T extends Record<string, unknown>> {
-    initial: T;
-    signal?: QuerySignal;
-    excludeKeys?: (keyof T)[];
-    debounceMs?: number;
-    autoRefresh?: boolean;
+    onChange?: QueryOnChangeOptions<T>;
 }
 export interface QueryController<T extends Record<string, unknown>> {
     data: T;
-    patch: (values: Partial<T>) => void;
-    set: <K extends keyof T>(key: K, value: T[K]) => void;
     reset: () => void;
     snapshot: () => T;
     initial: () => T;
-    attachSignal: (signal?: QuerySignal) => void;
 }
-export declare const createQuery: <T extends Record<string, unknown>>(options: CreateQueryOptions<T>) => QueryController<T>;
+export declare const createQuery: <T extends Record<string, unknown>>(initialValue: T, options?: CreateQueryOptions<T>) => QueryController<T>;

package/dist/core/svelte/Query/Query.svelte.js

@@ -1,72 +1,63 @@
 import { ObjectUtil } from '@azure-net/tools';
 import { untrack } from 'svelte';
-export const createQuery = (options) => {
-    const { initial: initialValue, signal: initialSignal, excludeKeys, debounceMs = 0, autoRefresh = true } = options;
+export const createQuery = (initialValue, options) => {
     const baseInitial = ObjectUtil.deepClone(initialValue);
-    let signal = initialSignal;
     let data = $state(ObjectUtil.deepClone(baseInitial));
-    const resolveKeys = () => {
-        const keys = Object.keys(baseInitial).slice();
-        if (excludeKeys?.length) {
-            return keys.filter((key) => !excludeKeys.includes(key));
-        }
-        return keys;
-    };
-    const keys = resolveKeys();
-    let isFirstRun = true;
-    let debounceTimer = null;
+    const includeKeys = options?.onChange?.include ?? [];
+    const hasWatch = Boolean(options?.onChange?.handler) && includeKeys.length > 0;
     const lastValues = new Map();
-    const scheduleRefresh = () => {
-        if (!signal)
-            return;
-        if (debounceTimer)
-            clearTimeout(debounceTimer);
-        if (debounceMs > 0) {
-            debounceTimer = setTimeout(() => {
-                untrack(() => {
-                    void signal?.refresh();
-                });
-            }, debounceMs);
-        }
-        else {
-            untrack(() => {
-                void signal?.refresh();
-            });
-        }
-    };
-    if (autoRefresh) {
+    let onChangeController = null;
+    let onChangeRunId = 0;
+    if (hasWatch) {
+        includeKeys.forEach((key) => {
+            lastValues.set(key, data[key]);
+        });
         $effect(() => {
-            let hasChanged = false;
-            keys.forEach((key) => {
+            const changedKeys = [];
+            includeKeys.forEach((key) => {
                 const nextValue = data[key];
                 if (!Object.is(lastValues.get(key), nextValue)) {
-                    hasChanged = true;
+                    changedKeys.push(key);
                     lastValues.set(key, nextValue);
                 }
             });
-            if (isFirstRun) {
-                isFirstRun = false;
+            if (!changedKeys.length)
                 return;
-            }
-            if (hasChanged) {
-                scheduleRefresh();
-            }
+            const previousController = onChangeController;
+            if (previousController)
+                previousController.abort();
+            const localController = new AbortController();
+            onChangeController = localController;
+            const localRunId = ++onChangeRunId;
+            const run = async () => {
+                await options.onChange.handler({
+                    changedKeys,
+                    signal: localController.signal,
+                    snapshot: ObjectUtil.deepClone(data)
+                });
+            };
+            untrack(() => {
+                void run()
+                    .catch(() => undefined)
+                    .finally(() => {
+                    if (onChangeRunId === localRunId && onChangeController === localController) {
+                        onChangeController = null;
+                    }
+                });
+            });
+        });
+        $effect(() => {
+            return () => {
+                if (onChangeController)
+                    onChangeController.abort();
+            };
         });
     }
-    const patch = (values) => {
-        data = { ...data, ...values };
-    };
-    const set = (key, value) => {
-        data = { ...data, [key]: value };
-    };
     const reset = () => {
         data = ObjectUtil.deepClone(baseInitial);
     };
     const snapshot = () => ObjectUtil.deepClone(data);
     const initial = () => ObjectUtil.deepClone(baseInitial);
-    const attachSignal = (nextSignal) => {
-        signal = nextSignal;
-    };
     return {
         get data() {
             return data;
@@ -74,11 +65,8 @@ export const createQuery = (options) => {
         set data(value) {
             data = value;
         },
-        patch,
-        set,
         reset,
         snapshot,
-        initial,
-        attachSignal
+        initial
     };
 };

package/dist/core/ui/scrollTo/index.js

@@ -1,6 +1,6 @@
-import { EnvironmentUtil } from '@azure-net/tools';
+import { BROWSER } from '@azure-net/tools/environment';
 export const scrollTo = (nodeOrName, offset = 220) => {
-    if (EnvironmentUtil.isBrowser) {
+    if (BROWSER) {
         setTimeout(() => { }, 1);
         let element;
         if (typeof nodeOrName === 'string') {

package/dist/edges/index.d.ts

@@ -1 +1 @@
-export { createPresenter, createPresenterFactory, createStore, createStoreFactory, batch, transaction, __withEdgesUniversalLoad } from '@azure-net/edges';
+export { clearCache, createPresenter, createPresenterFactory, createStore, createStoreFactory, batch, transaction, __withEdgesUniversalLoad } from '@azure-net/edges';

package/dist/edges/index.js

@@ -1 +1 @@
-export { createPresenter, createPresenterFactory, createStore, createStoreFactory, batch, transaction, __withEdgesUniversalLoad } from '@azure-net/edges';
+export { clearCache, createPresenter, createPresenterFactory, createStore, createStoreFactory, batch, transaction, __withEdgesUniversalLoad } from '@azure-net/edges';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-net/kit",
-  "version": "3.9.1",
+  "version": "3.9.3",
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -22,12 +22,16 @@
       "svelte": "./dist/core/constants/index.js"
     },
     "./infra": {
-      "types": "./dist/core/infra/index.d.ts",
-      "svelte": "./dist/core/infra/index.js"
+      "types": "./dist/core/infra.d.ts",
+      "svelte": "./dist/core/infra.js"
     },
-    "./schema": {
-      "types": "./dist/core/delivery/schema/rules/index.d.ts",
-      "svelte": "./dist/core/delivery/schema/rules/index.js"
+    "./delivery": {
+      "types": "./dist/core/delivery.d.ts",
+      "svelte": "./dist/core/delivery.js"
+    },
+    "./errors": {
+      "types": "./dist/core/errors.d.ts",
+      "svelte": "./dist/core/errors.js"
     },
     "./edges": {
       "types": "./dist/edges/index.d.ts",
@@ -106,9 +110,9 @@
     "svelte"
   ],
   "dependencies": {
-    "@azure-net/edges": "^1.2.0",
-    "@azure-net/edges-translations": "^1.2.0",
-    "@azure-net/tools": "^1.2.0"
+    "@azure-net/edges": "^1.2.2",
+    "@azure-net/edges-translations": "^1.2.2",
+    "@azure-net/tools": "^1.2.2"
   },
   "scripts": {
     "dev": "vite dev",

package/dist/core/delivery/serverAction/CreateServerAction.d.ts

@@ -1,15 +0,0 @@
-import { error, fail, redirect, type RequestEvent } from '@sveltejs/kit';
-type NoConflict<I, D> = {
-    [K in keyof I]: K extends keyof D ? never : I[K];
-};
-type Deps = {
-    context: RequestEvent;
-    utils: {
-        fail: typeof fail;
-        redirect: typeof redirect;
-        error: typeof error;
-    };
-};
-export declare const createServerAction: <T, I extends Record<string, unknown> = Record<string, unknown>>(factory: (args: Deps & NoConflict<I, Deps>) => T, inject?: I) => (() => T);
-export declare const createServerActionFactory: <I extends Record<string, unknown>>(inject: I) => <T>(factory: (args: Deps & NoConflict<I, Deps>) => T) => () => T;
-export {};

package/dist/core/delivery/serverAction/CreateServerAction.js

@@ -1,22 +0,0 @@
-import { RequestContext } from '../../../edges/context/index.js';
-import { error, fail, redirect } from '@sveltejs/kit';
-import { EnvironmentUtil } from '@azure-net/tools';
-export const createServerAction = (factory, inject) => {
-    return () => {
-        if (EnvironmentUtil.isBrowser) {
-            throw Error('Do not use actions on client side');
-        }
-        const context = RequestContext.current().event;
-        const deps = {
-            context,
-            utils: { fail, redirect, error },
-            ...inject
-        };
-        return factory(deps);
-    };
-};
-export const createServerActionFactory = (inject) => {
-    return function createInjectedServerAction(factory) {
-        return createServerAction(factory, inject);
-    };
-};

package/dist/core/delivery/serverAction/index.d.ts

@@ -1 +0,0 @@
-export * from './CreateServerAction.js';

package/dist/core/delivery/serverAction/index.js

@@ -1 +0,0 @@
-export * from './CreateServerAction.js';