@plumile/router 0.1.11 → 0.1.13
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.
- package/README.md +755 -1
- package/lib/esm/builder.d.ts.map +1 -1
- package/lib/esm/builder.js +10 -3
- package/lib/esm/eslint-rules/index.d.ts +2 -0
- package/lib/esm/eslint-rules/index.d.ts.map +1 -0
- package/lib/esm/eslint-rules/index.js +2 -0
- package/lib/esm/eslint-rules/no-direct-window-location-search.d.ts +4 -0
- package/lib/esm/eslint-rules/no-direct-window-location-search.d.ts.map +1 -0
- package/lib/esm/eslint-rules/no-direct-window-location-search.js +48 -0
- package/lib/esm/history/BrowserHistory.d.ts.map +1 -1
- package/lib/esm/history/BrowserHistory.js +4 -2
- package/lib/esm/index.d.ts +5 -0
- package/lib/esm/index.d.ts.map +1 -1
- package/lib/esm/index.js +6 -1
- package/lib/esm/routing/Link.d.ts +1 -0
- package/lib/esm/routing/Link.d.ts.map +1 -1
- package/lib/esm/routing/Link.js +35 -4
- package/lib/esm/routing/RouteComponentWrapper.d.ts.map +1 -1
- package/lib/esm/routing/RouteComponentWrapper.js +7 -2
- package/lib/esm/routing/createRouter.d.ts +8 -1
- package/lib/esm/routing/createRouter.d.ts.map +1 -1
- package/lib/esm/routing/createRouter.js +540 -17
- package/lib/esm/routing/devtools.d.ts +20 -0
- package/lib/esm/routing/devtools.d.ts.map +1 -0
- package/lib/esm/routing/devtools.js +678 -0
- package/lib/esm/routing/filters.d.ts +97 -0
- package/lib/esm/routing/filters.d.ts.map +1 -0
- package/lib/esm/routing/filters.js +557 -0
- package/lib/esm/routing/index.d.ts +10 -0
- package/lib/esm/routing/index.d.ts.map +1 -1
- package/lib/esm/routing/index.js +11 -1
- package/lib/esm/routing/useActiveFilters.d.ts +9 -0
- package/lib/esm/routing/useActiveFilters.d.ts.map +1 -0
- package/lib/esm/routing/useActiveFilters.js +38 -0
- package/lib/esm/routing/useFilterState.d.ts +10 -0
- package/lib/esm/routing/useFilterState.d.ts.map +1 -0
- package/lib/esm/routing/useFilterState.js +14 -0
- package/lib/esm/routing/useNavigate.d.ts +13 -0
- package/lib/esm/routing/useNavigate.d.ts.map +1 -0
- package/lib/esm/routing/useNavigate.js +11 -0
- package/lib/esm/routing/useNavigateWithQuery.d.ts +15 -0
- package/lib/esm/routing/useNavigateWithQuery.d.ts.map +1 -0
- package/lib/esm/routing/useNavigateWithQuery.js +95 -0
- package/lib/esm/routing/useQuery.d.ts +2 -0
- package/lib/esm/routing/useQuery.d.ts.map +1 -0
- package/lib/esm/routing/useQuery.js +9 -0
- package/lib/esm/routing/useQueryObject.d.ts +18 -0
- package/lib/esm/routing/useQueryObject.d.ts.map +1 -0
- package/lib/esm/routing/useQueryObject.js +107 -0
- package/lib/esm/routing/useQueryState.d.ts +13 -0
- package/lib/esm/routing/useQueryState.d.ts.map +1 -0
- package/lib/esm/routing/useQueryState.js +80 -0
- package/lib/esm/routing/useStableRefEquality.d.ts +5 -0
- package/lib/esm/routing/useStableRefEquality.d.ts.map +1 -0
- package/lib/esm/routing/useStableRefEquality.js +47 -0
- package/lib/esm/routing/useTypedQuery.d.ts +2 -0
- package/lib/esm/routing/useTypedQuery.d.ts.map +1 -0
- package/lib/esm/routing/useTypedQuery.js +36 -0
- package/lib/esm/tools/buildSearch.d.ts +12 -0
- package/lib/esm/tools/buildSearch.d.ts.map +1 -0
- package/lib/esm/tools/buildSearch.js +264 -0
- package/lib/esm/tools/query-dsl.d.ts +28 -0
- package/lib/esm/tools/query-dsl.d.ts.map +1 -0
- package/lib/esm/tools/query-dsl.js +250 -0
- package/lib/esm/tools/query.d.ts +2 -0
- package/lib/esm/tools/query.d.ts.map +1 -0
- package/lib/esm/tools/query.js +43 -0
- package/lib/esm/tools.d.ts +2 -2
- package/lib/esm/tools.d.ts.map +1 -1
- package/lib/esm/tools.js +3 -2
- package/lib/esm/type-tests/query-infer.test-d.d.ts +2 -0
- package/lib/esm/type-tests/query-infer.test-d.d.ts.map +1 -0
- package/lib/esm/type-tests/query-infer.test-d.js +49 -0
- package/lib/esm/types.d.ts +47 -4
- package/lib/esm/types.d.ts.map +1 -1
- package/lib/esm/types.js +1 -1
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/builder.d.ts.map +1 -1
- package/lib/types/eslint-rules/index.d.ts +2 -0
- package/lib/types/eslint-rules/index.d.ts.map +1 -0
- package/lib/types/eslint-rules/no-direct-window-location-search.d.ts +4 -0
- package/lib/types/eslint-rules/no-direct-window-location-search.d.ts.map +1 -0
- package/lib/types/history/BrowserHistory.d.ts.map +1 -1
- package/lib/types/index.d.ts +5 -0
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/routing/Link.d.ts +1 -0
- package/lib/types/routing/Link.d.ts.map +1 -1
- package/lib/types/routing/RouteComponentWrapper.d.ts.map +1 -1
- package/lib/types/routing/createRouter.d.ts +8 -1
- package/lib/types/routing/createRouter.d.ts.map +1 -1
- package/lib/types/routing/devtools.d.ts +20 -0
- package/lib/types/routing/devtools.d.ts.map +1 -0
- package/lib/types/routing/filters.d.ts +97 -0
- package/lib/types/routing/filters.d.ts.map +1 -0
- package/lib/types/routing/index.d.ts +10 -0
- package/lib/types/routing/index.d.ts.map +1 -1
- package/lib/types/routing/useActiveFilters.d.ts +9 -0
- package/lib/types/routing/useActiveFilters.d.ts.map +1 -0
- package/lib/types/routing/useFilterState.d.ts +10 -0
- package/lib/types/routing/useFilterState.d.ts.map +1 -0
- package/lib/types/routing/useNavigate.d.ts +13 -0
- package/lib/types/routing/useNavigate.d.ts.map +1 -0
- package/lib/types/routing/useNavigateWithQuery.d.ts +15 -0
- package/lib/types/routing/useNavigateWithQuery.d.ts.map +1 -0
- package/lib/types/routing/useQuery.d.ts +2 -0
- package/lib/types/routing/useQuery.d.ts.map +1 -0
- package/lib/types/routing/useQueryObject.d.ts +18 -0
- package/lib/types/routing/useQueryObject.d.ts.map +1 -0
- package/lib/types/routing/useQueryState.d.ts +13 -0
- package/lib/types/routing/useQueryState.d.ts.map +1 -0
- package/lib/types/routing/useStableRefEquality.d.ts +5 -0
- package/lib/types/routing/useStableRefEquality.d.ts.map +1 -0
- package/lib/types/routing/useTypedQuery.d.ts +2 -0
- package/lib/types/routing/useTypedQuery.d.ts.map +1 -0
- package/lib/types/tools/buildSearch.d.ts +12 -0
- package/lib/types/tools/buildSearch.d.ts.map +1 -0
- package/lib/types/tools/query-dsl.d.ts +28 -0
- package/lib/types/tools/query-dsl.d.ts.map +1 -0
- package/lib/types/tools/query.d.ts +2 -0
- package/lib/types/tools/query.d.ts.map +1 -0
- package/lib/types/tools.d.ts +2 -2
- package/lib/types/tools.d.ts.map +1 -1
- package/lib/types/type-tests/query-infer.test-d.d.ts +2 -0
- package/lib/types/type-tests/query-infer.test-d.d.ts.map +1 -0
- package/lib/types/types.d.ts +47 -4
- package/lib/types/types.d.ts.map +1 -1
- package/package.json +7 -7
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { useRef } from 'react';
|
|
2
|
+
export function shallowEqual(a, b) {
|
|
3
|
+
if (Object.is(a, b))
|
|
4
|
+
return true;
|
|
5
|
+
if (typeof a !== 'object' ||
|
|
6
|
+
a === null ||
|
|
7
|
+
typeof b !== 'object' ||
|
|
8
|
+
b === null) {
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
if (Array.isArray(a) && Array.isArray(b)) {
|
|
12
|
+
if (a.length !== b.length)
|
|
13
|
+
return false;
|
|
14
|
+
for (let i = 0; i < a.length; i += 1) {
|
|
15
|
+
if (!Object.is(a[i], b[i]))
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
if (Array.isArray(a) || Array.isArray(b))
|
|
21
|
+
return false;
|
|
22
|
+
const aKeys = Object.keys(a);
|
|
23
|
+
const bKeys = Object.keys(b);
|
|
24
|
+
if (aKeys.length !== bKeys.length)
|
|
25
|
+
return false;
|
|
26
|
+
for (const k of aKeys) {
|
|
27
|
+
if (!Object.prototype.hasOwnProperty.call(b, k))
|
|
28
|
+
return false;
|
|
29
|
+
const av = a[k];
|
|
30
|
+
const bv = b[k];
|
|
31
|
+
if (!Object.is(av, bv))
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
export function useStableRefEquality(value, isEqual = shallowEqual) {
|
|
37
|
+
const ref = useRef(undefined);
|
|
38
|
+
if (ref.current === undefined) {
|
|
39
|
+
ref.current = { v: value };
|
|
40
|
+
}
|
|
41
|
+
else if (!isEqual(ref.current.v, value)) {
|
|
42
|
+
ref.current = { v: value };
|
|
43
|
+
}
|
|
44
|
+
return ref.current.v;
|
|
45
|
+
}
|
|
46
|
+
export default useStableRefEquality;
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlU3RhYmxlUmVmRXF1YWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGluZy91c2VTdGFibGVSZWZFcXVhbGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sT0FBTyxDQUFDO0FBSy9CLE1BQU0sVUFBVSxZQUFZLENBQUMsQ0FBVSxFQUFFLENBQVU7SUFDakQsSUFBSSxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7UUFBRSxPQUFPLElBQUksQ0FBQztJQUNqQyxJQUNFLE9BQU8sQ0FBQyxLQUFLLFFBQVE7UUFDckIsQ0FBQyxLQUFLLElBQUk7UUFDVixPQUFPLENBQUMsS0FBSyxRQUFRO1FBQ3JCLENBQUMsS0FBSyxJQUFJLEVBQ1YsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDekMsSUFBSSxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxNQUFNO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDeEMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQUUsT0FBTyxLQUFLLENBQUM7UUFDM0MsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ3ZELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBNEIsQ0FBQyxDQUFDO0lBQ3hELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBNEIsQ0FBQyxDQUFDO0lBQ3hELElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxLQUFLLENBQUMsTUFBTTtRQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ2hELEtBQUssTUFBTSxDQUFDLElBQUksS0FBSyxFQUFFLENBQUM7UUFDdEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDOUQsTUFBTSxFQUFFLEdBQUksQ0FBNkIsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM3QyxNQUFNLEVBQUUsR0FBSSxDQUE2QixDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUM7WUFBRSxPQUFPLEtBQUssQ0FBQztJQUN2QyxDQUFDO0lBQ0QsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDO0FBUUQsTUFBTSxVQUFVLG9CQUFvQixDQUNsQyxLQUFRLEVBQ1IsVUFBeUIsWUFBNkI7SUFFdEQsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUF1QixTQUFTLENBQUMsQ0FBQztJQUNwRCxJQUFJLEdBQUcsQ0FBQyxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDOUIsR0FBRyxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQztJQUM3QixDQUFDO1NBQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQzFDLEdBQUcsQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7QUFDdkIsQ0FBQztBQUVELGVBQWUsb0JBQW9CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyB1c2VSZWYgfSBmcm9tICdyZWFjdCc7XG5cbmV4cG9ydCB0eXBlIEVxdWFsaXR5Rm48VD4gPSAoYTogVCwgYjogVCkgPT4gYm9vbGVhbjtcblxuLyoqIERlZmF1bHQgc2hhbGxvdyBlcXVhbGl0eSBmb3IgcGxhaW4gb2JqZWN0cyAvIGFycmF5czsgcHJpbWl0aXZlcyB2aWEgPT09ICovXG5leHBvcnQgZnVuY3Rpb24gc2hhbGxvd0VxdWFsKGE6IHVua25vd24sIGI6IHVua25vd24pOiBib29sZWFuIHtcbiAgaWYgKE9iamVjdC5pcyhhLCBiKSkgcmV0dXJuIHRydWU7XG4gIGlmIChcbiAgICB0eXBlb2YgYSAhPT0gJ29iamVjdCcgfHxcbiAgICBhID09PSBudWxsIHx8XG4gICAgdHlwZW9mIGIgIT09ICdvYmplY3QnIHx8XG4gICAgYiA9PT0gbnVsbFxuICApIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgaWYgKEFycmF5LmlzQXJyYXkoYSkgJiYgQXJyYXkuaXNBcnJheShiKSkge1xuICAgIGlmIChhLmxlbmd0aCAhPT0gYi5sZW5ndGgpIHJldHVybiBmYWxzZTtcbiAgICBmb3IgKGxldCBpID0gMDsgaSA8IGEubGVuZ3RoOyBpICs9IDEpIHtcbiAgICAgIGlmICghT2JqZWN0LmlzKGFbaV0sIGJbaV0pKSByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIHJldHVybiB0cnVlO1xuICB9XG4gIGlmIChBcnJheS5pc0FycmF5KGEpIHx8IEFycmF5LmlzQXJyYXkoYikpIHJldHVybiBmYWxzZTtcbiAgY29uc3QgYUtleXMgPSBPYmplY3Qua2V5cyhhIGFzIFJlY29yZDxzdHJpbmcsIHVua25vd24+KTtcbiAgY29uc3QgYktleXMgPSBPYmplY3Qua2V5cyhiIGFzIFJlY29yZDxzdHJpbmcsIHVua25vd24+KTtcbiAgaWYgKGFLZXlzLmxlbmd0aCAhPT0gYktleXMubGVuZ3RoKSByZXR1cm4gZmFsc2U7XG4gIGZvciAoY29uc3QgayBvZiBhS2V5cykge1xuICAgIGlmICghT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKGIsIGspKSByZXR1cm4gZmFsc2U7XG4gICAgY29uc3QgYXYgPSAoYSBhcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPilba107XG4gICAgY29uc3QgYnYgPSAoYiBhcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPilba107XG4gICAgaWYgKCFPYmplY3QuaXMoYXYsIGJ2KSkgcmV0dXJuIGZhbHNlO1xuICB9XG4gIHJldHVybiB0cnVlO1xufVxuXG4vKipcbiAqIHVzZVN0YWJsZVJlZkVxdWFsaXR5XG4gKiBSZXR1cm5zIGEgc3RhYmxlIHJlZmVyZW5jZSB0aGF0IG9ubHkgdXBkYXRlcyB3aGVuIGVxdWFsaXR5IGNoZWNrIGZhaWxzLlxuICogLSBDaGVhcCBzaGFsbG93IGNvbXBhcmUgYnkgZGVmYXVsdCB0byBhdm9pZCBkZWVwIHRyYXZlcnNhbCBjb3N0LlxuICogLSBQcm92aWRlIGEgY3VzdG9tIGVxdWFsaXR5IGZ1bmN0aW9uIGZvciBkb21haW4gc3BlY2lmaWMgc2VtYW50aWNzIChlLmcuIGRlZXAgY29tcGFyZSwgc3Vic2V0IGtleXMpXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB1c2VTdGFibGVSZWZFcXVhbGl0eTxUPihcbiAgdmFsdWU6IFQsXG4gIGlzRXF1YWw6IEVxdWFsaXR5Rm48VD4gPSBzaGFsbG93RXF1YWwgYXMgRXF1YWxpdHlGbjxUPixcbik6IFQge1xuICBjb25zdCByZWYgPSB1c2VSZWY8eyB2OiBUIH0gfCB1bmRlZmluZWQ+KHVuZGVmaW5lZCk7XG4gIGlmIChyZWYuY3VycmVudCA9PT0gdW5kZWZpbmVkKSB7XG4gICAgcmVmLmN1cnJlbnQgPSB7IHY6IHZhbHVlIH07XG4gIH0gZWxzZSBpZiAoIWlzRXF1YWwocmVmLmN1cnJlbnQudiwgdmFsdWUpKSB7XG4gICAgcmVmLmN1cnJlbnQgPSB7IHY6IHZhbHVlIH07XG4gIH1cbiAgcmV0dXJuIHJlZi5jdXJyZW50LnY7XG59XG5cbmV4cG9ydCBkZWZhdWx0IHVzZVN0YWJsZVJlZkVxdWFsaXR5O1xuIl19
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useTypedQuery.d.ts","sourceRoot":"","sources":["../../../src/routing/useTypedQuery.ts"],"names":[],"mappings":"AAqBA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,CAmCtD"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { useContext } from 'react';
|
|
2
|
+
import RoutingContext from './RoutingContext.js';
|
|
3
|
+
export default function useTypedQuery() {
|
|
4
|
+
const ctx = useContext(RoutingContext);
|
|
5
|
+
if (ctx == null)
|
|
6
|
+
return {};
|
|
7
|
+
const entry = ctx.get();
|
|
8
|
+
let schema;
|
|
9
|
+
const matched = entry.route;
|
|
10
|
+
if (matched != null) {
|
|
11
|
+
const collected = [];
|
|
12
|
+
for (const r of matched.route.routes) {
|
|
13
|
+
const maybe = r.query;
|
|
14
|
+
if (maybe !== null &&
|
|
15
|
+
typeof maybe === 'object' &&
|
|
16
|
+
Object.values(maybe).some((v) => {
|
|
17
|
+
if (v == null || typeof v !== 'object')
|
|
18
|
+
return false;
|
|
19
|
+
if (!('parse' in v))
|
|
20
|
+
return false;
|
|
21
|
+
const candidate = v;
|
|
22
|
+
return typeof candidate.parse === 'function';
|
|
23
|
+
})) {
|
|
24
|
+
collected.push(maybe);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
if (collected.length > 0)
|
|
28
|
+
schema = collected.at(-1);
|
|
29
|
+
}
|
|
30
|
+
const value = entry.typedQuery ?? entry.query;
|
|
31
|
+
if (schema != null) {
|
|
32
|
+
return value;
|
|
33
|
+
}
|
|
34
|
+
return value;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlVHlwZWRRdWVyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yb3V0aW5nL3VzZVR5cGVkUXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUNuQyxPQUFPLGNBQWMsTUFBTSxxQkFBcUIsQ0FBQztBQW9CakQsTUFBTSxDQUFDLE9BQU8sVUFBVSxhQUFhO0lBQ25DLE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN2QyxJQUFJLEdBQUcsSUFBSSxJQUFJO1FBQUUsT0FBTyxFQUFTLENBQUM7SUFDbEMsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBR3hCLElBQUksTUFBK0IsQ0FBQztJQUNwQyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDO0lBQzVCLElBQUksT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3BCLE1BQU0sU0FBUyxHQUFrQixFQUFFLENBQUM7UUFDcEMsS0FBSyxNQUFNLENBQUMsSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ3JDLE1BQU0sS0FBSyxHQUFJLENBQW9DLENBQUMsS0FBSyxDQUFDO1lBQzFELElBQ0UsS0FBSyxLQUFLLElBQUk7Z0JBQ2QsT0FBTyxLQUFLLEtBQUssUUFBUTtnQkFFekIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFnQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7b0JBQ3pELElBQUksQ0FBQyxJQUFJLElBQUksSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRO3dCQUFFLE9BQU8sS0FBSyxDQUFDO29CQUNyRCxJQUFJLENBQUMsQ0FBQyxPQUFPLElBQUssQ0FBNkIsQ0FBQzt3QkFBRSxPQUFPLEtBQUssQ0FBQztvQkFDL0QsTUFBTSxTQUFTLEdBQUcsQ0FBd0IsQ0FBQztvQkFDM0MsT0FBTyxPQUFPLFNBQVMsQ0FBQyxLQUFLLEtBQUssVUFBVSxDQUFDO2dCQUMvQyxDQUFDLENBQUMsRUFDRixDQUFDO2dCQUNELFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBb0IsQ0FBQyxDQUFDO1lBQ3ZDLENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxTQUFTLENBQUMsTUFBTSxHQUFHLENBQUM7WUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsVUFBVSxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUM7SUFFOUMsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFLENBQUM7UUFDbkIsT0FBTyxLQUEwRCxDQUFDO0lBQ3BFLENBQUM7SUFDRCxPQUFPLEtBQVUsQ0FBQztBQUNwQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdXNlQ29udGV4dCB9IGZyb20gJ3JlYWN0JztcbmltcG9ydCBSb3V0aW5nQ29udGV4dCBmcm9tICcuL1JvdXRpbmdDb250ZXh0LmpzJztcbmltcG9ydCB0eXBlIHsgUXVlcnlTY2hlbWEsIEluZmVyUXVlcnkgfSBmcm9tICcuLi90eXBlcy5qcyc7XG5cbi8qKlxuICogSG9vayByZXR1cm5pbmcgdGhlIHR5cGVkIHF1ZXJ5IG9iamVjdCBjb21wdXRlZCBmcm9tIHRoZSBtYXRjaGVkIHJvdXRlIHNjaGVtYSAoaWYgYW55KS5cbiAqIEZhbGxzIGJhY2sgdG8gdGhlIHJhdyBxdWVyeSB3aGVuIG5vIHNjaGVtYSBpcyBkZWZpbmVkLlxuICpcbiAqIFVzYWdlIHdpdGggZXhwbGljaXQgdHlwaW5nICh1bnRpbCBhdXRvbWF0aWMgaW5mZXJlbmNlIGlzIGFkZGVkKTpcbiAqICAgY29uc3QgcSA9IHVzZVR5cGVkUXVlcnk8eyBwYWdlPzogbnVtYmVyOyB0YWc/OiBzdHJpbmcgfT4oKTtcbiAqL1xuLy8gSW50ZXJuYWwgdXRpbGl0eTogaWYgc2NoZW1hIFMgcHJvdmlkZWQgcmV0dXJuIGl0cyBpbmZlcnJlZCBxdWVyeSwgZWxzZSBmYWxsYmFjay5cbnR5cGUgSW5mZXJPckZhbGxiYWNrPFMsIEZhbGxiYWNrPiA9IFMgZXh0ZW5kcyBRdWVyeVNjaGVtYVxuICA/IEluZmVyUXVlcnk8Uz5cbiAgOiBGYWxsYmFjaztcblxuLyoqXG4gKiBSZXR1cm5zIHRoZSB0eXBlZCBxdWVyeSBvYmplY3QuIElmIG5vIHNjaGVtYSBpcyBwcmVzZW50IGZhbGxzIGJhY2sgdG8gcmF3IHF1ZXJ5LlxuICogR2VuZXJpYyBUIGNhbiBiZSBwcm92aWRlZCBmb3IgZXhwbGljaXQgdHlwaW5nOyBvdGhlcndpc2UgYSBiZXN04oCRZWZmb3J0IHJ1bnRpbWUgY2FzdFxuICogaXMgYXBwbGllZCB3aGVuIGEgc2NoZW1hIGlzIGRldGVjdGVkLlxuICovXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB1c2VUeXBlZFF1ZXJ5PFQgPSB1bmtub3duPigpOiBUIHtcbiAgY29uc3QgY3R4ID0gdXNlQ29udGV4dChSb3V0aW5nQ29udGV4dCk7XG4gIGlmIChjdHggPT0gbnVsbCkgcmV0dXJuIHt9IGFzIGFueTtcbiAgY29uc3QgZW50cnkgPSBjdHguZ2V0KCk7XG5cbiAgLy8gUnVudGltZSBleHRyYWN0aW9uIG9mIGRlZXBlc3Qgc2NoZW1hIChtaXJyb3JzIGxvZ2ljIGluIGNyZWF0ZVJvdXRlcilcbiAgbGV0IHNjaGVtYTogUXVlcnlTY2hlbWEgfCB1bmRlZmluZWQ7XG4gIGNvbnN0IG1hdGNoZWQgPSBlbnRyeS5yb3V0ZTtcbiAgaWYgKG1hdGNoZWQgIT0gbnVsbCkge1xuICAgIGNvbnN0IGNvbGxlY3RlZDogUXVlcnlTY2hlbWFbXSA9IFtdO1xuICAgIGZvciAoY29uc3QgciBvZiBtYXRjaGVkLnJvdXRlLnJvdXRlcykge1xuICAgICAgY29uc3QgbWF5YmUgPSAociBhcyB1bmtub3duIGFzIHsgcXVlcnk/OiB1bmtub3duIH0pLnF1ZXJ5O1xuICAgICAgaWYgKFxuICAgICAgICBtYXliZSAhPT0gbnVsbCAmJlxuICAgICAgICB0eXBlb2YgbWF5YmUgPT09ICdvYmplY3QnICYmXG4gICAgICAgIC8vIEhldXJpc3RpYzogYXQgbGVhc3Qgb25lIHByb3BlcnR5IHdob3NlIHZhbHVlIGxvb2tzIGxpa2UgYSBkZXNjcmlwdG9yIChoYXMgcGFyc2UgZm4pXG4gICAgICAgIE9iamVjdC52YWx1ZXMobWF5YmUgYXMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4pLnNvbWUoKHYpID0+IHtcbiAgICAgICAgICBpZiAodiA9PSBudWxsIHx8IHR5cGVvZiB2ICE9PSAnb2JqZWN0JykgcmV0dXJuIGZhbHNlO1xuICAgICAgICAgIGlmICghKCdwYXJzZScgaW4gKHYgYXMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4pKSkgcmV0dXJuIGZhbHNlO1xuICAgICAgICAgIGNvbnN0IGNhbmRpZGF0ZSA9IHYgYXMgeyBwYXJzZT86IHVua25vd24gfTtcbiAgICAgICAgICByZXR1cm4gdHlwZW9mIGNhbmRpZGF0ZS5wYXJzZSA9PT0gJ2Z1bmN0aW9uJztcbiAgICAgICAgfSlcbiAgICAgICkge1xuICAgICAgICBjb2xsZWN0ZWQucHVzaChtYXliZSBhcyBRdWVyeVNjaGVtYSk7XG4gICAgICB9XG4gICAgfVxuICAgIGlmIChjb2xsZWN0ZWQubGVuZ3RoID4gMCkgc2NoZW1hID0gY29sbGVjdGVkLmF0KC0xKTtcbiAgfVxuXG4gIGNvbnN0IHZhbHVlID0gZW50cnkudHlwZWRRdWVyeSA/PyBlbnRyeS5xdWVyeTtcbiAgLy8gQ2FzdCB0byBpbmZlcnJlZCBzaGFwZSBvbmx5IGlmIHNjaGVtYSBub24tbnVsbFxuICBpZiAoc2NoZW1hICE9IG51bGwpIHtcbiAgICByZXR1cm4gdmFsdWUgYXMgSW5mZXJPckZhbGxiYWNrPHR5cGVvZiBzY2hlbWEsIFQ+IGFzIHVua25vd24gYXMgVDtcbiAgfVxuICByZXR1cm4gdmFsdWUgYXMgVDtcbn1cbiJdfQ==
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { QuerySchema } from '../types.js';
|
|
2
|
+
import { type DefinedFilterSchema, type InferFilters } from '../routing/filters.js';
|
|
3
|
+
export interface BuildSearchOptions<F extends DefinedFilterSchema<any> | undefined = any> {
|
|
4
|
+
omitDefaults?: boolean;
|
|
5
|
+
sortKeys?: boolean;
|
|
6
|
+
filters?: F extends DefinedFilterSchema<any> ? InferFilters<F['schema']> : any;
|
|
7
|
+
filterSchema?: F;
|
|
8
|
+
omitEmptyFilters?: boolean;
|
|
9
|
+
pruneEmptyFilterOperators?: boolean;
|
|
10
|
+
}
|
|
11
|
+
export declare function buildSearch(query: Record<string, any> | undefined, schema: QuerySchema | undefined, opts?: BuildSearchOptions): string;
|
|
12
|
+
//# sourceMappingURL=buildSearch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildSearch.d.ts","sourceRoot":"","sources":["../../../src/tools/buildSearch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAW/B,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,mBAAmB,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,GAAG;IAEpD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,CAAC,SAAS,mBAAmB,CAAC,GAAG,CAAC,GACxC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GACzB,GAAG,CAAC;IAER,YAAY,CAAC,EAAE,CAAC,CAAC;IAEjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAQD,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACtC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,IAAI,CAAC,EAAE,kBAAkB,GACxB,MAAM,CAyQR"}
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { buildFiltersQuery, OPERATOR_PRIORITY, } from '../routing/filters.js';
|
|
2
|
+
function serializeValue(descriptor, value) {
|
|
3
|
+
return descriptor.serialize(value);
|
|
4
|
+
}
|
|
5
|
+
export function buildSearch(query, schema, opts) {
|
|
6
|
+
const hasFilters = opts !== undefined &&
|
|
7
|
+
opts.filters !== undefined &&
|
|
8
|
+
opts.filterSchema !== undefined;
|
|
9
|
+
if (query == null && !hasFilters) {
|
|
10
|
+
return '';
|
|
11
|
+
}
|
|
12
|
+
const { omitDefaults = false, sortKeys = true, filters, filterSchema, omitEmptyFilters = true, pruneEmptyFilterOperators = true, } = opts ?? {};
|
|
13
|
+
let workingQuery = {};
|
|
14
|
+
if (query != null) {
|
|
15
|
+
workingQuery = { ...query };
|
|
16
|
+
}
|
|
17
|
+
if (hasFilters && filterSchema !== undefined && filters !== undefined) {
|
|
18
|
+
let emptySchema = false;
|
|
19
|
+
if (filterSchema !== undefined && filterSchema !== null) {
|
|
20
|
+
const inner = filterSchema
|
|
21
|
+
.schema;
|
|
22
|
+
let keys = [];
|
|
23
|
+
if (inner !== undefined) {
|
|
24
|
+
keys = Object.keys(inner);
|
|
25
|
+
}
|
|
26
|
+
if (keys.length === 0) {
|
|
27
|
+
emptySchema = true;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
let effectiveFilters = filters;
|
|
31
|
+
if (pruneEmptyFilterOperators) {
|
|
32
|
+
const pruned = {};
|
|
33
|
+
for (const [field, ops] of Object.entries(filters)) {
|
|
34
|
+
if (ops != null && typeof ops === 'object') {
|
|
35
|
+
const nextOps = {};
|
|
36
|
+
for (const [op, value] of Object.entries(ops)) {
|
|
37
|
+
if (value == null) {
|
|
38
|
+
}
|
|
39
|
+
else if (op === 'between') {
|
|
40
|
+
if (Array.isArray(value)) {
|
|
41
|
+
const clean = [];
|
|
42
|
+
for (const t of value) {
|
|
43
|
+
if (Array.isArray(t) && t.length === 2) {
|
|
44
|
+
clean.push(t);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (clean.length > 0)
|
|
48
|
+
nextOps[op] = clean;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
else if (Array.isArray(value)) {
|
|
52
|
+
if (value.length > 0)
|
|
53
|
+
nextOps[op] = value.slice();
|
|
54
|
+
}
|
|
55
|
+
else if (typeof value === 'boolean') {
|
|
56
|
+
nextOps[op] = value;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
if (Object.keys(nextOps).length > 0) {
|
|
60
|
+
pruned[field] = nextOps;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
effectiveFilters = pruned;
|
|
65
|
+
}
|
|
66
|
+
if (!emptySchema) {
|
|
67
|
+
workingQuery = buildFiltersQuery(filterSchema, workingQuery, effectiveFilters);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
const flat = {};
|
|
71
|
+
for (const [field, ops] of Object.entries(effectiveFilters)) {
|
|
72
|
+
if (ops !== undefined && ops !== null && typeof ops === 'object') {
|
|
73
|
+
for (const [op, value] of Object.entries(ops)) {
|
|
74
|
+
if (value === undefined || value === null) {
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
const key = `${field}.${op}`;
|
|
78
|
+
if (op === 'exists' && typeof value === 'boolean') {
|
|
79
|
+
if (value) {
|
|
80
|
+
flat[key] = 'true';
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
flat[key] = 'false';
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
else if (op === 'between') {
|
|
87
|
+
const ranges = value;
|
|
88
|
+
for (const r of ranges) {
|
|
89
|
+
if (Array.isArray(r) && r.length === 2) {
|
|
90
|
+
const a = r[0];
|
|
91
|
+
const b = r[1];
|
|
92
|
+
const pair = [String(a), String(b)];
|
|
93
|
+
const existing = flat[key];
|
|
94
|
+
if (existing === undefined) {
|
|
95
|
+
flat[key] = pair;
|
|
96
|
+
}
|
|
97
|
+
else if (Array.isArray(existing)) {
|
|
98
|
+
flat[key] = [...existing, ...pair];
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
flat[key] = [existing, ...pair];
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
else if (Array.isArray(value)) {
|
|
107
|
+
for (const v of value) {
|
|
108
|
+
const sv = String(v);
|
|
109
|
+
const existing = flat[key];
|
|
110
|
+
if (existing === undefined) {
|
|
111
|
+
flat[key] = sv;
|
|
112
|
+
}
|
|
113
|
+
else if (Array.isArray(existing)) {
|
|
114
|
+
existing.push(sv);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
flat[key] = [existing, sv];
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
workingQuery = { ...workingQuery, ...flat };
|
|
126
|
+
}
|
|
127
|
+
if (omitEmptyFilters) {
|
|
128
|
+
const next = {};
|
|
129
|
+
for (const [k, v] of Object.entries(workingQuery)) {
|
|
130
|
+
if (Array.isArray(v) && v.length === 0) {
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
next[k] = v;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
workingQuery = next;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (Object.keys(workingQuery).length === 0) {
|
|
140
|
+
return '';
|
|
141
|
+
}
|
|
142
|
+
let keys = Object.keys(workingQuery);
|
|
143
|
+
if (sortKeys) {
|
|
144
|
+
if (schema != null) {
|
|
145
|
+
const schemaKeys = Object.keys(schema);
|
|
146
|
+
const schemaOrdered = [];
|
|
147
|
+
for (const sk of schemaKeys) {
|
|
148
|
+
if (Object.prototype.hasOwnProperty.call(workingQuery, sk)) {
|
|
149
|
+
schemaOrdered.push(sk);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
const filterKeys = [];
|
|
153
|
+
const otherKeys = [];
|
|
154
|
+
if (filterSchema != null) {
|
|
155
|
+
const fsSchema = filterSchema.schema;
|
|
156
|
+
const fieldSet = new Set(Object.keys(fsSchema));
|
|
157
|
+
for (const k of keys) {
|
|
158
|
+
if (!schemaKeys.includes(k)) {
|
|
159
|
+
const dot = k.indexOf('.');
|
|
160
|
+
if (dot > 0) {
|
|
161
|
+
const field = k.slice(0, dot);
|
|
162
|
+
if (fieldSet.has(field)) {
|
|
163
|
+
filterKeys.push(k);
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
otherKeys.push(k);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
otherKeys.push(k);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
for (const k of keys) {
|
|
177
|
+
if (!schemaKeys.includes(k))
|
|
178
|
+
otherKeys.push(k);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
otherKeys.sort();
|
|
182
|
+
const grouped = {};
|
|
183
|
+
for (const fk of filterKeys) {
|
|
184
|
+
const dot = fk.indexOf('.');
|
|
185
|
+
let field = fk;
|
|
186
|
+
if (dot > 0) {
|
|
187
|
+
field = fk.slice(0, dot);
|
|
188
|
+
}
|
|
189
|
+
grouped[field] ??= [];
|
|
190
|
+
{
|
|
191
|
+
const existing = grouped[field];
|
|
192
|
+
if (Array.isArray(existing)) {
|
|
193
|
+
existing.push(fk);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
const orderedFields = Object.keys(grouped).sort();
|
|
198
|
+
const orderedFilterKeys = [];
|
|
199
|
+
for (const field of orderedFields) {
|
|
200
|
+
const ops = grouped[field];
|
|
201
|
+
if (ops !== undefined) {
|
|
202
|
+
ops.sort((a, b) => {
|
|
203
|
+
const opA = a.slice(a.indexOf('.') + 1);
|
|
204
|
+
const opB = b.slice(b.indexOf('.') + 1);
|
|
205
|
+
const ia = OPERATOR_PRIORITY.indexOf(opA);
|
|
206
|
+
const ib = OPERATOR_PRIORITY.indexOf(opB);
|
|
207
|
+
let sa = ia;
|
|
208
|
+
if (sa === -1)
|
|
209
|
+
sa = 999;
|
|
210
|
+
let sb = ib;
|
|
211
|
+
if (sb === -1)
|
|
212
|
+
sb = 999;
|
|
213
|
+
if (sa < sb)
|
|
214
|
+
return -1;
|
|
215
|
+
if (sa > sb)
|
|
216
|
+
return 1;
|
|
217
|
+
if (opA < opB)
|
|
218
|
+
return -1;
|
|
219
|
+
if (opA > opB)
|
|
220
|
+
return 1;
|
|
221
|
+
return 0;
|
|
222
|
+
});
|
|
223
|
+
for (const ok of ops)
|
|
224
|
+
orderedFilterKeys.push(ok);
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
keys = [...schemaOrdered, ...otherKeys, ...orderedFilterKeys];
|
|
228
|
+
}
|
|
229
|
+
else {
|
|
230
|
+
keys.sort();
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
const parts = [];
|
|
234
|
+
for (const key of keys) {
|
|
235
|
+
const value = workingQuery[key];
|
|
236
|
+
if (value == null) {
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
const descriptor = schema?.[key];
|
|
240
|
+
if (descriptor != null) {
|
|
241
|
+
const isDefault = descriptor.hasDefault && value === descriptor.defaultValue;
|
|
242
|
+
const skipDefault = omitDefaults && isDefault;
|
|
243
|
+
if (!skipDefault) {
|
|
244
|
+
const values = serializeValue(descriptor, value);
|
|
245
|
+
values.forEach((v) => {
|
|
246
|
+
parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(v))}`);
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
else if (Array.isArray(value)) {
|
|
251
|
+
value.forEach((v) => {
|
|
252
|
+
parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(v))}`);
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
else {
|
|
256
|
+
parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
if (parts.length === 0)
|
|
261
|
+
return '';
|
|
262
|
+
return `?${parts.join('&')}`;
|
|
263
|
+
}
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"buildSearch.js","sourceRoot":"","sources":["../../../src/tools/buildSearch.ts"],"names":[],"mappings":"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","sourcesContent":["import type { QuerySchema, QueryDescriptor } from '../types.js';\nimport {\n  buildFiltersQuery,\n  OPERATOR_PRIORITY,\n  type DefinedFilterSchema,\n  type InferFilters,\n} from '../routing/filters.js';\n\n/** Serialize a single value with its descriptor */\nfunction serializeValue(\n  descriptor: QueryDescriptor<any>,\n  value: unknown,\n): string[] {\n  return descriptor.serialize(value as any);\n}\n\n/** Serialize a query object using an optional schema */\nexport interface BuildSearchOptions<\n  F extends DefinedFilterSchema<any> | undefined = any,\n> {\n  omitDefaults?: boolean;\n  sortKeys?: boolean;\n  /** Structured filters object (already parsed) to merge */\n  filters?: F extends DefinedFilterSchema<any>\n    ? InferFilters<F['schema']>\n    : any;\n  /** Filter schema wrapper (required if filters provided) */\n  filterSchema?: F;\n  /** When true, omit empty filter operator sets entirely */\n  omitEmptyFilters?: boolean;\n  /** Prune empty operator arrays / invalid tuples recursively before serialization (defaults true) */\n  pruneEmptyFilterOperators?: boolean;\n}\n\n/**\n * Build a search string from (typed) query + optional structured filters.\n * - Applies omitDefaults for schema-backed query keys.\n * - Serializes filters via buildFiltersQuery then merges.\n * - Deterministic key ordering (schema order then extras) when sortKeys enabled.\n */\nexport function buildSearch(\n  query: Record<string, any> | undefined,\n  schema: QuerySchema | undefined,\n  opts?: BuildSearchOptions,\n): string {\n  const hasFilters =\n    opts !== undefined &&\n    opts.filters !== undefined &&\n    opts.filterSchema !== undefined;\n  if (query == null && !hasFilters) {\n    return '';\n  }\n  const {\n    omitDefaults = false,\n    sortKeys = true,\n    filters,\n    filterSchema,\n    omitEmptyFilters = true,\n    pruneEmptyFilterOperators = true,\n  } = opts ?? {};\n  let workingQuery: Record<string, any> = {};\n  if (query != null) {\n    workingQuery = { ...query };\n  }\n  if (hasFilters && filterSchema !== undefined && filters !== undefined) {\n    let emptySchema = false;\n    if (filterSchema !== undefined && filterSchema !== null) {\n      const inner = (filterSchema as { schema?: Record<string, unknown> })\n        .schema;\n      let keys: string[] = [];\n      if (inner !== undefined) {\n        keys = Object.keys(inner);\n      }\n      if (keys.length === 0) {\n        emptySchema = true;\n      }\n    }\n    let effectiveFilters: any = filters;\n    if (pruneEmptyFilterOperators) {\n      // Deep clone & prune empty arrays / between tuples length!=2 / exists undefined\n      const pruned: Record<string, any> = {};\n      for (const [field, ops] of Object.entries(\n        filters as Record<string, any>,\n      )) {\n        if (ops != null && typeof ops === 'object') {\n          const nextOps: Record<string, any> = {};\n          for (const [op, value] of Object.entries(ops)) {\n            if (value == null) {\n              // skip nullish\n            } else if (op === 'between') {\n              if (Array.isArray(value)) {\n                const clean: [any, any][] = [];\n                for (const t of value) {\n                  if (Array.isArray(t) && t.length === 2) {\n                    clean.push(t as [any, any]);\n                  }\n                }\n                if (clean.length > 0) nextOps[op] = clean;\n              }\n            } else if (Array.isArray(value)) {\n              if (value.length > 0) nextOps[op] = value.slice();\n            } else if (typeof value === 'boolean') {\n              nextOps[op] = value; // exists\n            }\n          }\n          if (Object.keys(nextOps).length > 0) {\n            pruned[field] = nextOps;\n          }\n        }\n      }\n      effectiveFilters = pruned;\n    }\n    if (!emptySchema) {\n      workingQuery = buildFiltersQuery(\n        filterSchema,\n        workingQuery,\n        effectiveFilters as unknown as any,\n      );\n    } else {\n      // Fallback: direct flatten field.op for provided operators\n      const flat: Record<string, any> = {};\n      for (const [field, ops] of Object.entries(\n        effectiveFilters as Record<string, any>,\n      )) {\n        if (ops !== undefined && ops !== null && typeof ops === 'object') {\n          for (const [op, value] of Object.entries(\n            ops as Record<string, unknown>,\n          )) {\n            if (value === undefined || value === null) {\n              // skip nullish\n            } else {\n              const key = `${field}.${op}`;\n              if (op === 'exists' && typeof value === 'boolean') {\n                if (value) {\n                  flat[key] = 'true';\n                } else {\n                  flat[key] = 'false';\n                }\n              } else if (op === 'between') {\n                const ranges = value as unknown[];\n                for (const r of ranges) {\n                  if (Array.isArray(r) && r.length === 2) {\n                    const a = r[0];\n                    const b = r[1];\n                    const pair = [String(a), String(b)];\n                    const existing = flat[key];\n                    if (existing === undefined) {\n                      flat[key] = pair;\n                    } else if (Array.isArray(existing)) {\n                      flat[key] = [...existing, ...pair];\n                    } else {\n                      flat[key] = [existing, ...pair];\n                    }\n                  }\n                }\n              } else if (Array.isArray(value)) {\n                for (const v of value) {\n                  const sv = String(v);\n                  const existing = flat[key];\n                  if (existing === undefined) {\n                    flat[key] = sv;\n                  } else if (Array.isArray(existing)) {\n                    existing.push(sv);\n                  } else {\n                    flat[key] = [existing, sv];\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n      workingQuery = { ...workingQuery, ...flat };\n    }\n    if (omitEmptyFilters) {\n      const next: Record<string, any> = {};\n      for (const [k, v] of Object.entries(workingQuery)) {\n        if (Array.isArray(v) && v.length === 0) {\n          // skip empty array filter key\n        } else {\n          next[k] = v;\n        }\n      }\n      workingQuery = next;\n    }\n  }\n  if (Object.keys(workingQuery).length === 0) {\n    return '';\n  }\n  let keys = Object.keys(workingQuery);\n  if (sortKeys) {\n    if (schema != null) {\n      const schemaKeys = Object.keys(schema);\n      const schemaOrdered: string[] = [];\n      for (const sk of schemaKeys) {\n        if (Object.prototype.hasOwnProperty.call(workingQuery, sk)) {\n          schemaOrdered.push(sk);\n        }\n      }\n      const filterKeys: string[] = [];\n      const otherKeys: string[] = [];\n      if (filterSchema != null) {\n        const fsSchema: Record<string, unknown> = (\n          filterSchema as {\n            schema: Record<string, unknown>;\n          }\n        ).schema;\n        const fieldSet = new Set(Object.keys(fsSchema));\n        for (const k of keys) {\n          if (!schemaKeys.includes(k)) {\n            const dot = k.indexOf('.');\n            if (dot > 0) {\n              const field = k.slice(0, dot);\n              if (fieldSet.has(field)) {\n                filterKeys.push(k);\n              } else {\n                otherKeys.push(k);\n              }\n            } else {\n              otherKeys.push(k);\n            }\n          }\n        }\n      } else {\n        for (const k of keys) {\n          if (!schemaKeys.includes(k)) otherKeys.push(k);\n        }\n      }\n      // Deduplicate already accounted schema keys from others\n      // Order non-filter extras alphabetically\n      otherKeys.sort();\n      // Only implemented ordering: after-query\n      const grouped: Record<string, string[]> = {};\n      for (const fk of filterKeys) {\n        const dot = fk.indexOf('.');\n        let field = fk;\n        if (dot > 0) {\n          field = fk.slice(0, dot);\n        }\n        grouped[field] ??= [];\n        {\n          const existing = grouped[field];\n          if (Array.isArray(existing)) {\n            existing.push(fk);\n          }\n        }\n      }\n      const orderedFields = Object.keys(grouped).sort();\n      const orderedFilterKeys: string[] = [];\n      for (const field of orderedFields) {\n        const ops = grouped[field];\n        if (ops !== undefined) {\n          ops.sort((a, b) => {\n            const opA = a.slice(a.indexOf('.') + 1);\n            const opB = b.slice(b.indexOf('.') + 1);\n            const ia = OPERATOR_PRIORITY.indexOf(opA as any);\n            const ib = OPERATOR_PRIORITY.indexOf(opB as any);\n            let sa = ia;\n            if (sa === -1) sa = 999;\n            let sb = ib;\n            if (sb === -1) sb = 999;\n            if (sa < sb) return -1;\n            if (sa > sb) return 1;\n            if (opA < opB) return -1;\n            if (opA > opB) return 1;\n            return 0;\n          });\n          for (const ok of ops) orderedFilterKeys.push(ok);\n        }\n      }\n      keys = [...schemaOrdered, ...otherKeys, ...orderedFilterKeys];\n    } else {\n      keys.sort();\n    }\n  }\n  const parts: string[] = [];\n  for (const key of keys) {\n    const value = workingQuery[key];\n    if (value == null) {\n      // skip nullish values\n    } else {\n      const descriptor = schema?.[key];\n      if (descriptor != null) {\n        const isDefault =\n          descriptor.hasDefault && value === descriptor.defaultValue;\n        const skipDefault = omitDefaults && isDefault;\n        if (!skipDefault) {\n          const values = serializeValue(descriptor, value);\n          values.forEach((v) => {\n            parts.push(\n              `${encodeURIComponent(key)}=${encodeURIComponent(String(v))}`,\n            );\n          });\n        }\n      } else if (Array.isArray(value)) {\n        value.forEach((v) => {\n          parts.push(\n            `${encodeURIComponent(key)}=${encodeURIComponent(String(v))}`,\n          );\n        });\n      } else {\n        parts.push(\n          `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`,\n        );\n      }\n    }\n  }\n  if (parts.length === 0) return '';\n  return `?${parts.join('&')}`;\n}\n"]}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { QueryDescriptor, QuerySchema, InferQuery } from '../types.js';
|
|
2
|
+
declare function stringDesc(): QueryDescriptor<string>;
|
|
3
|
+
declare function numberDesc(): QueryDescriptor<number>;
|
|
4
|
+
declare function booleanDesc(): QueryDescriptor<boolean>;
|
|
5
|
+
declare function enumDesc<T extends string>(...values: T[]): QueryDescriptor<T>;
|
|
6
|
+
declare function arrayOf<T>(inner: QueryDescriptor<T>): QueryDescriptor<T[]>;
|
|
7
|
+
declare function optional<T>(d: QueryDescriptor<T>): QueryDescriptor<T | undefined>;
|
|
8
|
+
declare function withDefault<T>(d: QueryDescriptor<T>, value: T): QueryDescriptor<T>;
|
|
9
|
+
declare function emptyAsUndefined(d: QueryDescriptor<string>): QueryDescriptor<string>;
|
|
10
|
+
declare function custom<T>(handlers: {
|
|
11
|
+
parse: (values: string[]) => T | undefined;
|
|
12
|
+
serialize: (value: T) => string[];
|
|
13
|
+
}): QueryDescriptor<T>;
|
|
14
|
+
export declare const q: {
|
|
15
|
+
string: typeof stringDesc;
|
|
16
|
+
number: typeof numberDesc;
|
|
17
|
+
boolean: typeof booleanDesc;
|
|
18
|
+
enum: typeof enumDesc;
|
|
19
|
+
array: typeof arrayOf;
|
|
20
|
+
optional: typeof optional;
|
|
21
|
+
default: typeof withDefault;
|
|
22
|
+
emptyAsUndefined: typeof emptyAsUndefined;
|
|
23
|
+
custom: typeof custom;
|
|
24
|
+
};
|
|
25
|
+
export declare function parseTypedQuery<S extends QuerySchema | undefined>(schema: S, raw: Record<string, string | string[]>): S extends QuerySchema ? InferQuery<Exclude<S, undefined>> : typeof raw;
|
|
26
|
+
export declare function parseSearch<S extends QuerySchema | undefined>(schema: S, search: string): S extends QuerySchema ? InferQuery<Exclude<S, undefined>> : Record<string, string | string[]>;
|
|
27
|
+
export {};
|
|
28
|
+
//# sourceMappingURL=query-dsl.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-dsl.d.ts","sourceRoot":"","sources":["../../../src/tools/query-dsl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAuB5E,iBAAS,UAAU,IAAI,eAAe,CAAC,MAAM,CAAC,CAS7C;AAGD,iBAAS,UAAU,IAAI,eAAe,CAAC,MAAM,CAAC,CAa7C;AAGD,iBAAS,WAAW,IAAI,eAAe,CAAC,OAAO,CAAC,CAkB/C;AAGD,iBAAS,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAYtE;AAGD,iBAAS,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAgBnE;AAGD,iBAAS,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,GAAG,SAAS,CAAC,CAE1E;AAGD,iBAAS,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAE3E;AAGD,iBAAS,gBAAgB,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,CAS7E;AAGD,iBAAS,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC;IAC3C,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC;CACnC,GAAG,eAAe,CAAC,CAAC,CAAC,CAKrB;AAED,eAAO,MAAM,CAAC;;;;;;;;;;CAUb,CAAC;AAGF,wBAAgB,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,SAAS,EAC/D,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACrC,CAAC,SAAS,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,GAAG,OAAO,GAAG,CAgGxE;AAGD,wBAAgB,WAAW,CAAC,CAAC,SAAS,WAAW,GAAG,SAAS,EAC3D,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,GACb,CAAC,SAAS,WAAW,GACpB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,GACjC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAcpC"}
|