@svadmin/core 0.34.2 → 0.36.0

package/src/useCan.ts

@@ -1,7 +1,7 @@
 // useCan — reactive permission check hook with TanStack Query integration
 
 import { createQuery } from '@tanstack/svelte-query';
-import { canAccessAsync, getAccessControlProvider } from './permissions.svelte';
+import { captureAdminContext } from './context.svelte';
 import type { Action, CanResult } from './permissions.svelte';
 
 export interface UseCanOptions {
@@ -32,11 +32,26 @@ export interface UseCanResult {
  * ```
  */
 export function useCan(options: () => UseCanOptions): UseCanResult {
+  const adminContext = captureAdminContext();
   const query = createQuery<CanResult>(() => {
     const opts = options();
+    const provider = adminContext.accessControlProvider;
     return {
-      queryKey: ['useCan', opts.resource, opts.action, opts.params, opts.meta] as const,
-      queryFn: () => canAccessAsync(opts.resource, opts.action, opts.params, opts.meta),
+      queryKey: adminContext.queryKeys(opts.resource).access.can(opts.resource, {
+        action: opts.action,
+        params: opts.params,
+        meta: opts.meta,
+      }),
+      queryFn: async () => {
+        if (!provider) return { can: true };
+        const result = await provider.can({
+          resource: opts.resource,
+          action: opts.action,
+          params: opts.params,
+          meta: adminContext.getProviderMeta(opts.resource, opts.meta),
+        });
+        return Array.isArray(result) ? (result[0] ?? { can: false }) : result;
+      },
       enabled: opts.queryOptions?.enabled ?? true,
       staleTime: opts.queryOptions?.staleTime ?? 5 * 60 * 1000,
     };
@@ -44,7 +59,7 @@ export function useCan(options: () => UseCanOptions): UseCanResult {
 
   return {
     get allowed() { 
-      const p = getAccessControlProvider();
+      const p = adminContext.accessControlProvider;
       if (!p) return true;
       return (query.data as CanResult | undefined)?.can ?? false; 
     },

package/src/utility-hooks.svelte.ts

@@ -2,6 +2,7 @@ import { useForm, type UseFormOptions } from './form-hooks.svelte';
 import { useQueryClient } from '@tanstack/svelte-query';
 import { useParsed } from './useParsed.svelte';
 import { captureAdminContext } from './context.svelte';
+import { dataQueryMatches } from './query-keys';
 import { getAdminOptions } from './options.svelte';
 import { t } from './i18n.svelte';
 import type { BaseRecord, HttpError, Filter, KnownResources, ResourceDefinition } from './types';
@@ -39,6 +40,7 @@ export function useModalForm<
   TError = HttpError,
 >(options: UseModalFormOptions<TVariables, TData, TError> = {} as UseModalFormOptions<TVariables, TData, TError>) {
   const queryClient = useQueryClient();
+  const adminContext = captureAdminContext();
   const formState = useForm<TVariables, TData, TError>(options);
   let visible = $state(options.defaultVisible ?? false);
 
@@ -57,11 +59,11 @@ export function useModalForm<
     visible = false;
     formState.reset();
     if (options.autoSave?.invalidateOnClose) {
-      const dpN = options.dataProviderName;
-      const dp = (q: { queryKey: readonly unknown[] }) => q.queryKey[0] === dpN;
-      queryClient.invalidateQueries({ predicate: (q) => dp(q) && q.queryKey[1] === formState.resource && (q.queryKey[2] === 'list' || q.queryKey[2] === 'infiniteList' || q.queryKey[2] === 'select') });
-      queryClient.invalidateQueries({ predicate: (q) => dp(q) && q.queryKey[1] === formState.resource && q.queryKey[2] === 'many' });
-      queryClient.invalidateQueries({ predicate: (q) => dp(q) && q.queryKey[1] === formState.resource && q.queryKey[2] === 'one' });
+      const resource = formState.resource;
+      const matcher = adminContext.queryKeyMatcher(resource, options.dataProviderName);
+      queryClient.invalidateQueries({
+        predicate: (q) => dataQueryMatches(q.queryKey, { ...matcher, resource }),
+      });
     }
   }
 
@@ -182,7 +184,33 @@ export function useRelation<TData extends BaseRecord = BaseRecord, TError = Http
 
 // ─── useNotification ────────────────────────────────────────
 export function useNotification() {
-  return { open: toast.info, success: toast.success, error: toast.error, warning: toast.warning };
+  const adminContext = captureAdminContext();
+
+  function sendToast(
+    type: 'success' | 'error' | 'warning' | 'info',
+    message: string,
+    duration?: number,
+    options?: { key?: string },
+  ): void {
+    const provider = adminContext.notificationProvider;
+    if (provider) {
+      provider.open({ type, message, key: options?.key });
+      return;
+    }
+    toast[type](message, duration, options);
+  }
+
+  return {
+    open: (message: string, duration?: number, options?: { key?: string }) =>
+      sendToast('info', message, duration, options),
+    success: (message: string, duration?: number, options?: { key?: string }) =>
+      sendToast('success', message, duration, options),
+    error: (message: string, duration?: number, options?: { key?: string }) =>
+      sendToast('error', message, duration, options),
+    warning: (message: string, duration?: number, options?: { key?: string }) =>
+      sendToast('warning', message, duration, options),
+    close: (key: string) => adminContext.notificationProvider?.close(key),
+  };
 }
 
 // ─── Field-specific hooks (refine-compatible) ─────────────────────