@svadmin/core 0.69.3 → 0.70.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { definedOptions } from './defined-options';
2
2
  import { createListQuery } from './query-hooks.svelte';
3
3
  import { decodeBaseRecord, type RecordDecoder } from './record-decoder';
4
+ import { matchClientFilter } from './client-filter';
4
5
  import { readURLState,writeURLState } from './url-sync';
5
6
  import { captureContractContext } from './contract-context.svelte';
6
7
  import { getAdminOptions } from './options.svelte';
@@ -61,7 +62,9 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
61
62
  pageSize: urlState.pageSize??initPagination.pageSize,
62
63
  });
63
64
  }
64
- if(urlState.sortField) {
65
+ if(urlState.sorters?.length) {
66
+ initSorters=urlState.sorters;
67
+ } else if(urlState.sortField) {
65
68
  initSorters=[{ field: urlState.sortField,order: urlState.sortOrder??'asc' }];
66
69
  }
67
70
  if(urlState.filters) {
@@ -82,7 +85,7 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
82
85
  ? pagination
83
86
  :{ current: 1,pageSize: 999999,mode: paginationMode });
84
87
 
85
- const tableQueryInfo=createListQuery(() => {
88
+ const tableQueryInfo=createListQuery<TQueryFnData>(() => {
86
89
  const currentOpts=getOptions();
87
90
  const { meta,syncWithLocation: _swl,dataProviderName,pagination: _p,sorters: _s,filters: _f,...restOptions }=currentOpts;
88
91
  return {
@@ -94,7 +97,7 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
94
97
  dataProviderName,
95
98
  }),
96
99
  ...restOptions
97
- };
100
+ } as UseListOptions<TQueryFnData>;
98
101
  }, getDecoder);
99
102
 
100
103
  const query=tableQueryInfo;
@@ -130,8 +133,7 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
130
133
  writeURLState({
131
134
  page: pagination.current,
132
135
  pageSize: pagination.pageSize,
133
- sortField: currentSorters[0]?.field,
134
- sortOrder: currentSorters[0]?.order,
136
+ sorters: currentSorters,
135
137
  ...definedOptions({
136
138
  filters: currentFilters
137
139
  })
@@ -149,13 +151,13 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
149
151
  if(newPageSize!==pagination.pageSize) {
150
152
  pagination={ ...pagination,pageSize: newPageSize };
151
153
  }
152
- if(urlState.sortField) {
153
- const newSorter: Sort={ field: urlState.sortField,order: urlState.sortOrder??'asc' };
154
- if(JSON.stringify([newSorter])!==JSON.stringify(currentSorters)) {
155
- currentSorters=[newSorter];
156
- }
157
- } else if(currentSorters.length>0) {
158
- currentSorters=[];
154
+ const nextSorters=urlState.sorters?.length
155
+ ? urlState.sorters
156
+ : urlState.sortField
157
+ ? [{ field: urlState.sortField,order: urlState.sortOrder??'asc' }]
158
+ : [];
159
+ if(JSON.stringify(nextSorters)!==JSON.stringify(currentSorters)) {
160
+ currentSorters=nextSorters;
159
161
  }
160
162
  if(urlState.filters&&JSON.stringify(urlState.filters)!==JSON.stringify(currentFilters)) {
161
163
  currentFilters=urlState.filters;
@@ -176,9 +178,13 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
176
178
  const params=new URLSearchParams();
177
179
  if(pagination.current) params.set('page',String(pagination.current));
178
180
  if(pagination.pageSize) params.set('pageSize',String(pagination.pageSize));
179
- if(currentSorters[0]) {
180
- params.set('sort',currentSorters[0].field);
181
- params.set('order',currentSorters[0].order);
181
+ if(currentSorters.length>0) {
182
+ const first=currentSorters[0];
183
+ if(first) {
184
+ params.set('sorters',JSON.stringify(currentSorters));
185
+ params.set('sort',first.field);
186
+ params.set('order',first.order);
187
+ }
182
188
  }
183
189
  if(currentFilters.length>0) {
184
190
  params.set('filters',JSON.stringify(currentFilters));
@@ -228,63 +234,7 @@ export function createTableQuery<TQueryFnData extends BaseRecord>(
228
234
  }
229
235
  const activeFilters=filtersMode==='off'? effectiveFilters:[];
230
236
  if(activeFilters.length>0) {
231
- function matchesFilter(item: Record<string,unknown>,f: Filter): boolean {
232
- if(!('field' in f)) {
233
- if(f.operator==='and') return f.value.every(sub => matchesFilter(item,sub));
234
- if(f.operator==='or') return f.value.length===0||f.value.some(sub => matchesFilter(item,sub));
235
- return true;
236
- }
237
- const val=item[f.field];
238
- const fv=f.value;
239
- switch(f.operator) {
240
- case 'null': return val==null;
241
- case 'nnull': return val!=null;
242
- default: break;
243
- }
244
- if(fv==null||fv==='') return true;
245
- switch(f.operator) {
246
- case 'eq': return val==fv;
247
- case 'ne': return val!=fv;
248
- case 'eqs': return Object.is(val, fv);
249
- case 'nes': return !Object.is(val, fv);
250
- case 'lt': return typeof val==='number'&&typeof fv==='number'&&val<fv;
251
- case 'gt': return typeof val==='number'&&typeof fv==='number'&&val>fv;
252
- case 'lte': return typeof val==='number'&&typeof fv==='number'&&val<=fv;
253
- case 'gte': return typeof val==='number'&&typeof fv==='number'&&val>=fv;
254
- case 'in': return !Array.isArray(fv)||fv.length===0||fv.includes(val);
255
- case 'nin': return !Array.isArray(fv)||fv.length===0||!fv.includes(val);
256
- case 'ina': return Array.isArray(val)&&Array.isArray(fv)&&fv.every(item => val.includes(item));
257
- case 'nina': return Array.isArray(val)&&Array.isArray(fv)&&fv.some(item => !val.includes(item));
258
- case 'contains': return typeof val==='string'&&typeof fv==='string'&&val.includes(fv);
259
- case 'ncontains': return typeof val==='string'&&typeof fv==='string'&&!val.includes(fv);
260
- case 'containss': return typeof val==='string'&&typeof fv==='string'&&val.includes(fv);
261
- case 'ncontainss': return typeof val==='string'&&typeof fv==='string'&&!val.includes(fv);
262
- case 'startswith': return typeof val==='string'&&typeof fv==='string'&&val.startsWith(fv);
263
- case 'nstartswith': return typeof val==='string'&&typeof fv==='string'&&!val.startsWith(fv);
264
- case 'startswiths': return typeof val==='string'&&typeof fv==='string'&&val.startsWith(fv);
265
- case 'nstartswiths': return typeof val==='string'&&typeof fv==='string'&&!val.startsWith(fv);
266
- case 'endswith': return typeof val==='string'&&typeof fv==='string'&&val.endsWith(fv);
267
- case 'nendswith': return typeof val==='string'&&typeof fv==='string'&&!val.endsWith(fv);
268
- case 'endswiths': return typeof val==='string'&&typeof fv==='string'&&val.endsWith(fv);
269
- case 'nendswiths': return typeof val==='string'&&typeof fv==='string'&&!val.endsWith(fv);
270
- case 'between': {
271
- if(!Array.isArray(fv)||fv.length!==2) return true;
272
- const [min,max]: unknown[]=fv;
273
- return typeof val==='number'&&typeof min==='number'&&typeof max==='number'
274
- &&val>=min&&val<=max;
275
- }
276
- case 'nbetween': {
277
- if(!Array.isArray(fv)||fv.length!==2) return true;
278
- const [min,max]: unknown[]=fv;
279
- return typeof val==='number'&&typeof min==='number'&&typeof max==='number'
280
- &&(val<min||val>max);
281
- }
282
- default: return true;
283
- }
284
- }
285
- sorted=sorted.filter((item) => {
286
- return activeFilters.every(f => matchesFilter(item,f));
287
- });
237
+ sorted=sorted.filter((item) => activeFilters.every((filter) => matchClientFilter(item,filter)));
288
238
  }
289
239
  if(paginationMode==='off') return sorted;
290
240
  const start=((pagination.current??1)-1)*(pagination.pageSize??10);
@@ -83,7 +83,9 @@ export class TableState {
83
83
  pageSize: urlState.pageSize??initPagination.pageSize,
84
84
  });
85
85
  }
86
- if(urlState.sortField) {
86
+ if(urlState.sorters?.length) {
87
+ initSorters=urlState.sorters;
88
+ } else if(urlState.sortField) {
87
89
  initSorters=[{ field: urlState.sortField,order: urlState.sortOrder??'asc' }];
88
90
  }
89
91
  if(urlState.filters) {
@@ -114,8 +116,7 @@ export class TableState {
114
116
  writeURLState({
115
117
  page: this.pagination.current,
116
118
  pageSize: this.pagination.pageSize,
117
- sortField: this.currentSorters[0]?.field,
118
- sortOrder: this.currentSorters[0]?.order,
119
+ sorters: this.currentSorters,
119
120
  ...definedOptions({
120
121
  filters: this.currentFilters
121
122
  })
package/src/url-sync.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Filter, LogicalFilter } from './types';
1
+ import type { Filter, LogicalFilter, Sort } from './types';
2
2
  import { isCrudFieldOperator } from './types';
3
3
  import { captureAdminContext } from './context.svelte';
4
4
  import type { AdminContextAccessor } from './context.svelte';
@@ -59,6 +59,27 @@ function parseFilters(value: string): Filter[] | undefined {
59
59
  }
60
60
  }
61
61
 
62
+ const MAX_SORTERS = 16;
63
+
64
+ function parseSorters(value: string): Sort[] | undefined {
65
+ try {
66
+ const parsed: unknown = JSON.parse(value);
67
+ if (!Array.isArray(parsed) || parsed.length === 0 || parsed.length > MAX_SORTERS) return undefined;
68
+ const sorters: Sort[] = [];
69
+ for (const entry of parsed) {
70
+ if (!isRecord(entry) || Object.keys(entry).some((key) => key !== 'field' && key !== 'order')) return undefined;
71
+ const field = entry['field'];
72
+ const order = entry['order'];
73
+ if (typeof field !== 'string' || field.trim().length === 0 || field.length > 256) return undefined;
74
+ if (order !== 'asc' && order !== 'desc') return undefined;
75
+ sorters.push({ field, order });
76
+ }
77
+ return sorters;
78
+ } catch {
79
+ return undefined;
80
+ }
81
+ }
82
+
62
83
  function positiveIntegerParam(value: string | undefined, max: number): string | undefined {
63
84
  if (!value || !/^\d+$/.test(value)) return undefined;
64
85
  const parsed = Number(value);
@@ -73,13 +94,21 @@ export function sanitizeListQueryParams(params: Record<string, string>): Record<
73
94
  const result: Record<string, string> = {};
74
95
  const page = positiveIntegerParam(params['page'], 1_000_000);
75
96
  const pageSize = positiveIntegerParam(params['pageSize'], 1_000);
97
+ const sorters = params['sorters'] ? parseSorters(params['sorters']) : undefined;
76
98
  const sort = params['sort']?.trim();
77
99
  const search = params['q'];
78
100
  const filters = params['filters'] ? parseFilters(params['filters']) : undefined;
79
101
 
80
102
  if (page) result['page'] = page;
81
103
  if (pageSize) result['pageSize'] = pageSize;
82
- if (sort && sort.length <= 256) {
104
+ if (sorters?.length) {
105
+ const first = sorters[0];
106
+ if (first) {
107
+ result['sorters'] = JSON.stringify(sorters);
108
+ result['sort'] = first.field;
109
+ result['order'] = first.order;
110
+ }
111
+ } else if (sort && sort.length <= 256) {
83
112
  result['sort'] = sort;
84
113
  if (params['order'] === 'asc' || params['order'] === 'desc') result['order'] = params['order'];
85
114
  }
@@ -105,6 +134,7 @@ export function appendListQueryFromPath(path: string, currentPath: string): stri
105
134
  export interface URLState {
106
135
  page?: number;
107
136
  pageSize?: number;
137
+ sorters?: Sort[];
108
138
  sortField?: string;
109
139
  sortOrder?: 'asc' | 'desc';
110
140
  search?: string;
@@ -126,11 +156,24 @@ export function readURLState(adminContext: AdminContextAccessor = captureAdminCo
126
156
  const pageSize = params['pageSize'];
127
157
  if (pageSize) { const n = parseInt(pageSize, 10); if (!isNaN(n) && n > 0) state.pageSize = n; }
128
158
 
129
- const sortField = params['sort'];
130
- if (sortField) state.sortField = sortField;
131
-
132
- const sortOrder = params['order'];
133
- if (sortOrder === 'asc' || sortOrder === 'desc') state.sortOrder = sortOrder;
159
+ const sorters = params['sorters'] ? parseSorters(params['sorters']) : undefined;
160
+ if (sorters?.length) {
161
+ const first = sorters[0];
162
+ state.sorters = sorters;
163
+ if (first) {
164
+ state.sortField = first.field;
165
+ state.sortOrder = first.order;
166
+ }
167
+ } else {
168
+ const sortField = params['sort'];
169
+ const sortOrder = params['order'];
170
+ if (sortField) {
171
+ state.sortField = sortField;
172
+ const order = sortOrder === 'desc' ? 'desc' : 'asc';
173
+ state.sorters = [{ field: sortField, order }];
174
+ }
175
+ if (sortOrder === 'asc' || sortOrder === 'desc') state.sortOrder = sortOrder;
176
+ }
134
177
 
135
178
  const search = params['q'];
136
179
  if (search) state.search = search;
@@ -170,14 +213,28 @@ export function writeURLState(
170
213
  else delete params['pageSize'];
171
214
  }
172
215
 
173
- if ('sortField' in state) {
174
- if (state.sortField) params['sort'] = state.sortField;
175
- else delete params['sort'];
176
- }
216
+ if ('sorters' in state) {
217
+ const sorters = state.sorters ?? [];
218
+ const first = sorters[0];
219
+ if (sorters.length > 0 && first) {
220
+ params['sorters'] = JSON.stringify(sorters);
221
+ params['sort'] = first.field;
222
+ params['order'] = first.order;
223
+ } else {
224
+ delete params['sorters'];
225
+ delete params['sort'];
226
+ delete params['order'];
227
+ }
228
+ } else {
229
+ if ('sortField' in state) {
230
+ if (state.sortField) params['sort'] = state.sortField;
231
+ else delete params['sort'];
232
+ }
177
233
 
178
- if ('sortOrder' in state) {
179
- if (state.sortOrder) params['order'] = state.sortOrder;
180
- else delete params['order'];
234
+ if ('sortOrder' in state) {
235
+ if (state.sortOrder) params['order'] = state.sortOrder;
236
+ else delete params['order'];
237
+ }
181
238
  }
182
239
 
183
240
  if ('search' in state) {
@@ -3,8 +3,7 @@ import { useParsed } from './useParsed.svelte';
3
3
  import { captureAdminContext } from './context.svelte';
4
4
  import { getAdminOptions } from './options.svelte';
5
5
  import { t } from './i18n.svelte';
6
- import type { BaseRecord,HttpError,Filter,KnownResources,ResourceDefinition } from './types';
7
- import { useList } from './query-hooks.svelte';
6
+ import type { BaseRecord,ResourceDefinition } from './types';
8
7
  import { toast } from './toast.svelte';
9
8
  import { createSelectQuery as useSelectImpl, type UseSelectOptions } from './select-query.svelte';
10
9
  import { decodeBaseRecord } from './record-decoder';
@@ -171,23 +170,6 @@ export function useBreadcrumb() {
171
170
  return { get items() { return items; } };
172
171
  }
173
172
 
174
- // ─── useRelation ───────────────────────────────────────────
175
-
176
- export interface UseRelationOptions<_TData extends BaseRecord=BaseRecord,_TError=HttpError> {
177
- resource: KnownResources;
178
- id?: string|number;
179
- pagination?: { current?: number; pageSize?: number };
180
- sorters?: { field: string; order: 'asc'|'desc' }[];
181
- filters?: Filter[];
182
- queryOptions?: { enabled?: boolean; staleTime?: number };
183
- }
184
-
185
- export function useRelation(options: UseRelationOptions) {
186
- return useList({
187
- ...options
188
- });
189
- }
190
-
191
173
  // ─── useNotification ────────────────────────────────────────
192
174
  export function useNotification() {
193
175
  const adminContext=captureAdminContext();