@svadmin/core 0.31.0 → 0.32.1

package/src/url-sync.ts

@@ -1,7 +1,44 @@
 import type { Filter } from './types';
-import { getRouterProvider } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
+import type { AdminContextAccessor } from './context.svelte';
 import { getAdminOptions } from './options.svelte';
 
+const CRUD_OPERATORS = new Set([
+  'eq', 'ne', 'lt', 'gt', 'lte', 'gte',
+  'contains', 'ncontains', 'startswith', 'endswith',
+  'in', 'nin', 'null', 'nnull', 'between', 'nbetween',
+]);
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isFilter(value: unknown, depth: number, budget: { remaining: number }): value is Filter {
+  if (depth > 20 || budget.remaining-- <= 0 || !isRecord(value)) return false;
+
+  if (typeof value.field === 'string') {
+    return value.field.trim().length > 0
+      && typeof value.operator === 'string'
+      && CRUD_OPERATORS.has(value.operator)
+      && 'value' in value;
+  }
+
+  return (value.operator === 'and' || value.operator === 'or')
+    && Array.isArray(value.value)
+    && value.value.every((entry) => isFilter(entry, depth + 1, budget));
+}
+
+function parseFilters(value: string): Filter[] | undefined {
+  try {
+    const parsed: unknown = JSON.parse(value);
+    if (!Array.isArray(parsed)) return undefined;
+    const budget = { remaining: 200 };
+    return parsed.every((entry) => isFilter(entry, 0, budget)) ? parsed : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 export interface URLState {
   page?: number;
   pageSize?: number;
@@ -11,9 +48,9 @@ export interface URLState {
   filters?: Filter[];
 }
 
-export function readURLState(): URLState {
+export function readURLState(adminContext: AdminContextAccessor = captureAdminContext()): URLState {
   if (typeof window === 'undefined') return {};
-  const rp = getRouterProvider();
+  const rp = adminContext.routerProvider;
   if (!rp) return {};
 
   const { params } = rp.parse();
@@ -36,17 +73,19 @@ export function readURLState(): URLState {
 
   const filtersRaw = params['filters'];
   if (filtersRaw) {
-    try {
-      state.filters = JSON.parse(filtersRaw);
-    } catch { /* ignore invalid json */ }
+    const filters = parseFilters(filtersRaw);
+    if (filters) state.filters = filters;
   }
 
   return state;
 }
 
-export function writeURLState(state: URLState): void {
+export function writeURLState(
+  state: URLState,
+  adminContext: AdminContextAccessor = captureAdminContext(),
+): void {
   if (typeof window === 'undefined') return;
-  const rp = getRouterProvider();
+  const rp = adminContext.routerProvider;
   if (!rp) return;
 
   const current = rp.parse();

package/src/useParsed.svelte.ts

@@ -1,9 +1,8 @@
-/* eslint-disable svelte/prefer-svelte-reactivity */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // useParsed — parse current URL hash into structured route info
 
-import { currentPath, registerRouterSync } from './router';
-import { getResources } from './context.svelte';
+import { registerRouterSync } from './router';
+import { captureAdminContext } from './context.svelte';
 
 interface ParsedRoute {
   resource?: string;
@@ -16,13 +15,13 @@ interface ParsedRoute {
   parentParams: Record<string, string>;
 }
 
-let globalPath = $state('/');
+let routeVersion = $state(0);
 
 export function resetGlobalPath(): void {
-  globalPath = typeof window !== 'undefined' ? currentPath() : '/';
+  routeVersion++;
 }
 export function syncGlobalPath(): void {
-  if (typeof window !== 'undefined') globalPath = currentPath();
+  routeVersion++;
 }
 
 /** 简单的英文名词单数化，处理常见复数模式（-ies, -ses, -es, -s） */
@@ -37,11 +36,10 @@ function singularize(word: string): string {
 registerRouterSync(syncGlobalPath);
 
 if (typeof window !== 'undefined') {
-  globalPath = currentPath();
   if (!(window as any).__svadminParsedInit) {
     (window as any).__svadminParsedInit = true;
-    window.addEventListener('hashchange', () => { globalPath = currentPath(); });
-    window.addEventListener('popstate', () => { globalPath = currentPath(); });
+    window.addEventListener('hashchange', syncGlobalPath);
+    window.addEventListener('popstate', syncGlobalPath);
   }
 }
 
@@ -58,10 +56,17 @@ if (typeof window !== 'undefined') {
  *   // parsed.parentParams contains nested route params such as teamId
  */
 export function useParsed(): ParsedRoute {
-  const resources = $derived((() => { try { return getResources(); } catch { return []; } })());
+  const adminContext = captureAdminContext();
+  const resources = $derived(adminContext.resources);
+  const activePath = $derived.by(() => {
+    // Any router navigation increments routeVersion. Each tree then asks its
+    // captured provider for its own path instead of consuming a global router.
+    void routeVersion;
+    return adminContext.currentPath();
+  });
 
   const parsed = $derived.by(() => {
-    const p = globalPath;
+    const p = activePath;
     const result: ParsedRoute = { params: {}, parentParams: {} };
 
     // Parse query params from hash

package/src/utility-hooks.svelte.ts

@@ -1,12 +1,11 @@
-/* eslint-disable svelte/prefer-svelte-reactivity */
-import { useForm, type UseFormOptions, type UseFormReturn } from './form-hooks.svelte';
+import { useForm, type UseFormOptions } from './form-hooks.svelte';
 import { useQueryClient } from '@tanstack/svelte-query';
 import { useParsed } from './useParsed.svelte';
-import { getResource, getResources } from './context.svelte';
+import { captureAdminContext } from './context.svelte';
 import { getAdminOptions } from './options.svelte';
 import { t } from './i18n.svelte';
 import type { BaseRecord, HttpError, Filter, KnownResources, ResourceDefinition } from './types';
-import { useList, type UseListOptions } from './query-hooks.svelte';
+import { useList } from './query-hooks.svelte';
 import { toast } from './toast.svelte';
 import type { UseSelectOptions } from './hooks.svelte';
 import { useSelect as useSelectImpl } from './hooks.svelte';
@@ -89,11 +88,12 @@ export interface MenuConfig {
 }
 
 export function useMenu() {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
 
   const menuItems = $derived.by<MenuConfig[]>(() => {
     const adminOptions = getAdminOptions();
-    const resources = getResources();
+    const resources = adminContext.resources;
     let items: MenuConfig[] = resources
       .filter((r: ResourceDefinition) => r.showInMenu !== false)
       .map((r: ResourceDefinition): MenuConfig => ({
@@ -125,6 +125,7 @@ export interface BreadcrumbItem {
 }
 
 export function useBreadcrumb() {
+  const adminContext = captureAdminContext();
   const parsed = useParsed();
   
   const items = $derived.by<BreadcrumbItem[]>(() => {
@@ -132,7 +133,7 @@ export function useBreadcrumb() {
     if (!parsed.resource) return list;
 
     try {
-      const res = getResource(parsed.resource);
+      const res = adminContext.getResource(parsed.resource);
       const chain: { label: string; link: string; icon?: string }[] = [];
       let current: typeof res | undefined = res;
       const visited = new Set<string>();
@@ -140,7 +141,7 @@ export function useBreadcrumb() {
         if (visited.has(current.name)) break;
         visited.add(current.name);
         chain.unshift({ label: current.label || current.name, link: `/${current.name}`, icon: current.icon });
-        current = current.parentName ? getResource(current.parentName) : undefined;
+        current = current.parentName ? adminContext.getResource(current.parentName) : undefined;
       }
       list.push(...chain);