@plumile/router 0.1.14 → 0.1.18
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 +87 -422
- package/lib/esm/builder.d.ts +5 -5
- package/lib/esm/builder.d.ts.map +1 -1
- package/lib/esm/builder.js +1 -1
- package/lib/esm/index.d.ts +0 -4
- package/lib/esm/index.d.ts.map +1 -1
- package/lib/esm/index.js +1 -5
- package/lib/esm/routing/Link.d.ts +3 -3
- package/lib/esm/routing/Link.d.ts.map +1 -1
- package/lib/esm/routing/Link.js +3 -8
- package/lib/esm/routing/RouteComponentWrapper.d.ts +6 -5
- package/lib/esm/routing/RouteComponentWrapper.d.ts.map +1 -1
- package/lib/esm/routing/RouteComponentWrapper.js +1 -1
- package/lib/esm/routing/RouterRenderer.d.ts.map +1 -1
- package/lib/esm/routing/RouterRenderer.js +1 -1
- package/lib/esm/routing/createRouter.d.ts +5 -6
- package/lib/esm/routing/createRouter.d.ts.map +1 -1
- package/lib/esm/routing/createRouter.js +458 -444
- package/lib/esm/routing/index.d.ts +2 -6
- package/lib/esm/routing/index.d.ts.map +1 -1
- package/lib/esm/routing/index.js +3 -7
- package/lib/esm/routing/useAllQuery.d.ts +7 -0
- package/lib/esm/routing/useAllQuery.d.ts.map +1 -0
- package/lib/esm/routing/useAllQuery.js +31 -0
- package/lib/esm/routing/useFilterDiagnostics.d.ts +2 -0
- package/lib/esm/routing/useFilterDiagnostics.d.ts.map +1 -0
- package/lib/esm/routing/useFilterDiagnostics.js +11 -0
- package/lib/esm/routing/useFilters.d.ts +16 -0
- package/lib/esm/routing/useFilters.d.ts.map +1 -0
- package/lib/esm/routing/useFilters.js +83 -0
- package/lib/esm/routing/useNavigate.d.ts +2 -9
- package/lib/esm/routing/useNavigate.d.ts.map +1 -1
- package/lib/esm/routing/useNavigate.js +1 -1
- package/lib/esm/routing/useQueryState.d.ts +1 -1
- package/lib/esm/routing/useQueryState.d.ts.map +1 -1
- package/lib/esm/routing/useQueryState.js +2 -2
- package/lib/esm/routing/useTypedQuery.js +1 -1
- package/lib/esm/tools/buildCombinedSearch.d.ts +11 -0
- package/lib/esm/tools/buildCombinedSearch.d.ts.map +1 -0
- package/lib/esm/tools/buildCombinedSearch.js +28 -0
- package/lib/esm/tools/buildSearch.d.ts +2 -8
- package/lib/esm/tools/buildSearch.d.ts.map +1 -1
- package/lib/esm/tools/buildSearch.js +12 -216
- package/lib/esm/tools.d.ts +6 -2
- package/lib/esm/tools.d.ts.map +1 -1
- package/lib/esm/tools.js +1 -1
- package/lib/esm/type-tests/routes-inference.test-d.d.ts +2 -0
- package/lib/esm/type-tests/routes-inference.test-d.d.ts.map +1 -0
- package/lib/esm/type-tests/routes-inference.test-d.js +49 -0
- package/lib/esm/types.d.ts +64 -38
- 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 +5 -5
- package/lib/types/builder.d.ts.map +1 -1
- package/lib/types/index.d.ts +0 -4
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/routing/Link.d.ts +3 -3
- package/lib/types/routing/Link.d.ts.map +1 -1
- package/lib/types/routing/RouteComponentWrapper.d.ts +6 -5
- package/lib/types/routing/RouteComponentWrapper.d.ts.map +1 -1
- package/lib/types/routing/RouterRenderer.d.ts.map +1 -1
- package/lib/types/routing/createRouter.d.ts +5 -6
- package/lib/types/routing/createRouter.d.ts.map +1 -1
- package/lib/types/routing/index.d.ts +2 -6
- package/lib/types/routing/index.d.ts.map +1 -1
- package/lib/types/routing/useAllQuery.d.ts +7 -0
- package/lib/types/routing/useAllQuery.d.ts.map +1 -0
- package/lib/types/routing/useFilterDiagnostics.d.ts +2 -0
- package/lib/types/routing/useFilterDiagnostics.d.ts.map +1 -0
- package/lib/types/routing/useFilters.d.ts +16 -0
- package/lib/types/routing/useFilters.d.ts.map +1 -0
- package/lib/types/routing/useNavigate.d.ts +2 -9
- package/lib/types/routing/useNavigate.d.ts.map +1 -1
- package/lib/types/routing/useQueryState.d.ts +1 -1
- package/lib/types/routing/useQueryState.d.ts.map +1 -1
- package/lib/types/tools/buildCombinedSearch.d.ts +11 -0
- package/lib/types/tools/buildCombinedSearch.d.ts.map +1 -0
- package/lib/types/tools/buildSearch.d.ts +2 -8
- package/lib/types/tools/buildSearch.d.ts.map +1 -1
- package/lib/types/tools.d.ts +6 -2
- package/lib/types/tools.d.ts.map +1 -1
- package/lib/types/type-tests/routes-inference.test-d.d.ts +2 -0
- package/lib/types/type-tests/routes-inference.test-d.d.ts.map +1 -0
- package/lib/types/types.d.ts +64 -38
- package/lib/types/types.d.ts.map +1 -1
- package/package.json +6 -5
- package/lib/esm/routing/devtools.d.ts +0 -21
- package/lib/esm/routing/devtools.d.ts.map +0 -1
- package/lib/esm/routing/devtools.js +0 -690
- package/lib/esm/routing/filters.d.ts +0 -97
- package/lib/esm/routing/filters.d.ts.map +0 -1
- package/lib/esm/routing/filters.js +0 -557
- package/lib/esm/routing/useActiveFilters.d.ts +0 -9
- package/lib/esm/routing/useActiveFilters.d.ts.map +0 -1
- package/lib/esm/routing/useActiveFilters.js +0 -38
- package/lib/esm/routing/useFilterState.d.ts +0 -10
- package/lib/esm/routing/useFilterState.d.ts.map +0 -1
- package/lib/esm/routing/useFilterState.js +0 -14
- package/lib/esm/routing/useNavigateWithQuery.d.ts +0 -15
- package/lib/esm/routing/useNavigateWithQuery.d.ts.map +0 -1
- package/lib/esm/routing/useNavigateWithQuery.js +0 -95
- package/lib/esm/routing/useQueryObject.d.ts +0 -18
- package/lib/esm/routing/useQueryObject.d.ts.map +0 -1
- package/lib/esm/routing/useQueryObject.js +0 -107
- package/lib/esm/routing/useStableRefEquality.d.ts +0 -5
- package/lib/esm/routing/useStableRefEquality.d.ts.map +0 -1
- package/lib/esm/routing/useStableRefEquality.js +0 -47
- package/lib/types/routing/devtools.d.ts +0 -21
- package/lib/types/routing/devtools.d.ts.map +0 -1
- package/lib/types/routing/filters.d.ts +0 -97
- package/lib/types/routing/filters.d.ts.map +0 -1
- package/lib/types/routing/useActiveFilters.d.ts +0 -9
- package/lib/types/routing/useActiveFilters.d.ts.map +0 -1
- package/lib/types/routing/useFilterState.d.ts +0 -10
- package/lib/types/routing/useFilterState.d.ts.map +0 -1
- package/lib/types/routing/useNavigateWithQuery.d.ts +0 -15
- package/lib/types/routing/useNavigateWithQuery.d.ts.map +0 -1
- package/lib/types/routing/useQueryObject.d.ts +0 -18
- package/lib/types/routing/useQueryObject.d.ts.map +0 -1
- package/lib/types/routing/useStableRefEquality.d.ts +0 -5
- package/lib/types/routing/useStableRefEquality.d.ts.map +0 -1
|
@@ -1,230 +1,26 @@
|
|
|
1
|
-
import { buildFiltersQuery, OPERATOR_PRIORITY, } from '../routing/filters.js';
|
|
2
1
|
function serializeValue(descriptor, value) {
|
|
3
2
|
return descriptor.serialize(value);
|
|
4
3
|
}
|
|
5
4
|
export function buildSearch(query, schema, opts) {
|
|
6
|
-
|
|
7
|
-
opts.filters !== undefined &&
|
|
8
|
-
opts.filterSchema !== undefined;
|
|
9
|
-
if (query == null && !hasFilters) {
|
|
5
|
+
if (query == null)
|
|
10
6
|
return '';
|
|
11
|
-
}
|
|
12
|
-
|
|
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);
|
|
7
|
+
const { omitDefaults = false, sortKeys = true } = opts ?? {};
|
|
8
|
+
let keys = Object.keys(query);
|
|
143
9
|
if (sortKeys) {
|
|
144
10
|
if (schema != null) {
|
|
145
11
|
const schemaKeys = Object.keys(schema);
|
|
146
|
-
const
|
|
12
|
+
const ordered = [];
|
|
147
13
|
for (const sk of schemaKeys) {
|
|
148
|
-
if (Object.prototype.hasOwnProperty.call(
|
|
149
|
-
|
|
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
|
-
}
|
|
14
|
+
if (Object.prototype.hasOwnProperty.call(query, sk)) {
|
|
15
|
+
ordered.push(sk);
|
|
173
16
|
}
|
|
174
17
|
}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
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);
|
|
18
|
+
for (const k of keys) {
|
|
19
|
+
if (!schemaKeys.includes(k)) {
|
|
20
|
+
ordered.push(k);
|
|
225
21
|
}
|
|
226
22
|
}
|
|
227
|
-
keys =
|
|
23
|
+
keys = ordered;
|
|
228
24
|
}
|
|
229
25
|
else {
|
|
230
26
|
keys.sort();
|
|
@@ -232,7 +28,7 @@ export function buildSearch(query, schema, opts) {
|
|
|
232
28
|
}
|
|
233
29
|
const parts = [];
|
|
234
30
|
for (const key of keys) {
|
|
235
|
-
const value =
|
|
31
|
+
const value = query[key];
|
|
236
32
|
if (value == null) {
|
|
237
33
|
}
|
|
238
34
|
else {
|
|
@@ -261,4 +57,4 @@ export function buildSearch(query, schema, opts) {
|
|
|
261
57
|
return '';
|
|
262
58
|
return `?${parts.join('&')}`;
|
|
263
59
|
}
|
|
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"]}
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRTZWFyY2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbHMvYnVpbGRTZWFyY2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsU0FBUyxjQUFjLENBQ3JCLFVBQWdDLEVBQ2hDLEtBQWM7SUFFZCxPQUFPLFVBQVUsQ0FBQyxTQUFTLENBQUMsS0FBWSxDQUFDLENBQUM7QUFDNUMsQ0FBQztBQUdELE1BQU0sVUFBVSxXQUFXLENBQ3pCLEtBQXNDLEVBQ3RDLE1BQStCLEVBQy9CLElBQXFEO0lBRXJELElBQUksS0FBSyxJQUFJLElBQUk7UUFBRSxPQUFPLEVBQUUsQ0FBQztJQUM3QixNQUFNLEVBQUUsWUFBWSxHQUFHLEtBQUssRUFBRSxRQUFRLEdBQUcsSUFBSSxFQUFFLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUM3RCxJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzlCLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixJQUFJLE1BQU0sSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUVuQixNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3ZDLE1BQU0sT0FBTyxHQUFhLEVBQUUsQ0FBQztZQUM3QixLQUFLLE1BQU0sRUFBRSxJQUFJLFVBQVUsRUFBRSxDQUFDO2dCQUM1QixJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztvQkFDcEQsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDbkIsQ0FBQztZQUNILENBQUM7WUFDRCxLQUFLLE1BQU0sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUNyQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO29CQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNsQixDQUFDO1lBQ0gsQ0FBQztZQUNELElBQUksR0FBRyxPQUFPLENBQUM7UUFDakIsQ0FBQzthQUFNLENBQUM7WUFDTixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDZCxDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sS0FBSyxHQUFhLEVBQUUsQ0FBQztJQUMzQixLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6QixJQUFJLEtBQUssSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUVwQixDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sVUFBVSxHQUFHLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pDLElBQUksVUFBVSxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUN2QixNQUFNLFNBQVMsR0FDYixVQUFVLENBQUMsVUFBVSxJQUFJLEtBQUssS0FBSyxVQUFVLENBQUMsWUFBWSxDQUFDO2dCQUM3RCxNQUFNLFdBQVcsR0FBRyxZQUFZLElBQUksU0FBUyxDQUFDO2dCQUM5QyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7b0JBQ2pCLE1BQU0sTUFBTSxHQUFHLGNBQWMsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7b0JBQ2pELE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTt3QkFDbkIsS0FBSyxDQUFDLElBQUksQ0FDUixHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQzlELENBQUM7b0JBQ0osQ0FBQyxDQUFDLENBQUM7Z0JBQ0wsQ0FBQztZQUNILENBQUM7aUJBQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2hDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtvQkFDbEIsS0FBSyxDQUFDLElBQUksQ0FDUixHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQzlELENBQUM7Z0JBQ0osQ0FBQyxDQUFDLENBQUM7WUFDTCxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sS0FBSyxDQUFDLElBQUksQ0FDUixHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQ2xFLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQztRQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2xDLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7QUFDL0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUXVlcnlTY2hlbWEsIFF1ZXJ5RGVzY3JpcHRvciB9IGZyb20gJy4uL3R5cGVzLmpzJztcblxuLyoqIFNlcmlhbGl6ZSBhIHNpbmdsZSB2YWx1ZSB3aXRoIGl0cyBkZXNjcmlwdG9yICovXG5mdW5jdGlvbiBzZXJpYWxpemVWYWx1ZShcbiAgZGVzY3JpcHRvcjogUXVlcnlEZXNjcmlwdG9yPGFueT4sXG4gIHZhbHVlOiB1bmtub3duLFxuKTogc3RyaW5nW10ge1xuICByZXR1cm4gZGVzY3JpcHRvci5zZXJpYWxpemUodmFsdWUgYXMgYW55KTtcbn1cblxuLyoqIFNlcmlhbGl6ZSBhIHF1ZXJ5IG9iamVjdCB1c2luZyBhbiBvcHRpb25hbCBzY2hlbWEgKi9cbmV4cG9ydCBmdW5jdGlvbiBidWlsZFNlYXJjaChcbiAgcXVlcnk6IFJlY29yZDxzdHJpbmcsIGFueT4gfCB1bmRlZmluZWQsXG4gIHNjaGVtYTogUXVlcnlTY2hlbWEgfCB1bmRlZmluZWQsXG4gIG9wdHM/OiB7IG9taXREZWZhdWx0cz86IGJvb2xlYW47IHNvcnRLZXlzPzogYm9vbGVhbiB9LFxuKTogc3RyaW5nIHtcbiAgaWYgKHF1ZXJ5ID09IG51bGwpIHJldHVybiAnJztcbiAgY29uc3QgeyBvbWl0RGVmYXVsdHMgPSBmYWxzZSwgc29ydEtleXMgPSB0cnVlIH0gPSBvcHRzID8/IHt9O1xuICBsZXQga2V5cyA9IE9iamVjdC5rZXlzKHF1ZXJ5KTtcbiAgaWYgKHNvcnRLZXlzKSB7XG4gICAgaWYgKHNjaGVtYSAhPSBudWxsKSB7XG4gICAgICAvLyBPcmRlciBrZXlzIGJhc2VkIG9uIHNjaGVtYSBkZWNsYXJhdGlvbiBvcmRlciwgdGhlbiBhcHBlbmQgYW55IGV4dHJhIGtleXNcbiAgICAgIGNvbnN0IHNjaGVtYUtleXMgPSBPYmplY3Qua2V5cyhzY2hlbWEpO1xuICAgICAgY29uc3Qgb3JkZXJlZDogc3RyaW5nW10gPSBbXTtcbiAgICAgIGZvciAoY29uc3Qgc2sgb2Ygc2NoZW1hS2V5cykge1xuICAgICAgICBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKHF1ZXJ5LCBzaykpIHtcbiAgICAgICAgICBvcmRlcmVkLnB1c2goc2spO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgICBmb3IgKGNvbnN0IGsgb2Yga2V5cykge1xuICAgICAgICBpZiAoIXNjaGVtYUtleXMuaW5jbHVkZXMoaykpIHtcbiAgICAgICAgICBvcmRlcmVkLnB1c2goayk7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIGtleXMgPSBvcmRlcmVkO1xuICAgIH0gZWxzZSB7XG4gICAgICBrZXlzLnNvcnQoKTtcbiAgICB9XG4gIH1cbiAgY29uc3QgcGFydHM6IHN0cmluZ1tdID0gW107XG4gIGZvciAoY29uc3Qga2V5IG9mIGtleXMpIHtcbiAgICBjb25zdCB2YWx1ZSA9IHF1ZXJ5W2tleV07XG4gICAgaWYgKHZhbHVlID09IG51bGwpIHtcbiAgICAgIC8vIHNraXAgbnVsbGlzaCB2YWx1ZXNcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgZGVzY3JpcHRvciA9IHNjaGVtYT8uW2tleV07XG4gICAgICBpZiAoZGVzY3JpcHRvciAhPSBudWxsKSB7XG4gICAgICAgIGNvbnN0IGlzRGVmYXVsdCA9XG4gICAgICAgICAgZGVzY3JpcHRvci5oYXNEZWZhdWx0ICYmIHZhbHVlID09PSBkZXNjcmlwdG9yLmRlZmF1bHRWYWx1ZTtcbiAgICAgICAgY29uc3Qgc2tpcERlZmF1bHQgPSBvbWl0RGVmYXVsdHMgJiYgaXNEZWZhdWx0O1xuICAgICAgICBpZiAoIXNraXBEZWZhdWx0KSB7XG4gICAgICAgICAgY29uc3QgdmFsdWVzID0gc2VyaWFsaXplVmFsdWUoZGVzY3JpcHRvciwgdmFsdWUpO1xuICAgICAgICAgIHZhbHVlcy5mb3JFYWNoKCh2KSA9PiB7XG4gICAgICAgICAgICBwYXJ0cy5wdXNoKFxuICAgICAgICAgICAgICBgJHtlbmNvZGVVUklDb21wb25lbnQoa2V5KX09JHtlbmNvZGVVUklDb21wb25lbnQoU3RyaW5nKHYpKX1gLFxuICAgICAgICAgICAgKTtcbiAgICAgICAgICB9KTtcbiAgICAgICAgfVxuICAgICAgfSBlbHNlIGlmIChBcnJheS5pc0FycmF5KHZhbHVlKSkge1xuICAgICAgICB2YWx1ZS5mb3JFYWNoKCh2KSA9PiB7XG4gICAgICAgICAgcGFydHMucHVzaChcbiAgICAgICAgICAgIGAke2VuY29kZVVSSUNvbXBvbmVudChrZXkpfT0ke2VuY29kZVVSSUNvbXBvbmVudChTdHJpbmcodikpfWAsXG4gICAgICAgICAgKTtcbiAgICAgICAgfSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBwYXJ0cy5wdXNoKFxuICAgICAgICAgIGAke2VuY29kZVVSSUNvbXBvbmVudChrZXkpfT0ke2VuY29kZVVSSUNvbXBvbmVudChTdHJpbmcodmFsdWUpKX1gLFxuICAgICAgICApO1xuICAgICAgfVxuICAgIH1cbiAgfVxuICBpZiAocGFydHMubGVuZ3RoID09PSAwKSByZXR1cm4gJyc7XG4gIHJldHVybiBgPyR7cGFydHMuam9pbignJicpfWA7XG59XG4iXX0=
|
package/lib/esm/tools.d.ts
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import type { ParamData } from 'path-to-regexp';
|
|
2
|
-
import type { PrepareResult, PreparedMatch, Route, RouterMatchedRoute } from './types.js';
|
|
2
|
+
import type { PrepareResult, PreparedMatch, Route, RouterMatchedRoute, QuerySchema, InferQuery } from './types.js';
|
|
3
3
|
import type { FlatRoute } from './builder.js';
|
|
4
4
|
export declare function getMatchedRoute<TParams extends ParamData>(routes: FlatRoute<TParams>[], location: Location): RouterMatchedRoute<TParams> | null;
|
|
5
5
|
export declare function prepareMatch<TParams extends ParamData>(match: RouterMatchedRoute<TParams> | null, query?: Record<string, unknown>): PreparedMatch<TParams>;
|
|
6
|
-
export declare function r<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData, TQuery = unknown>(route: Route<TPrepared, TVariables,
|
|
6
|
+
export declare function r<TPrepared extends PrepareResult = PrepareResult, TVariables extends ParamData = ParamData, TQuery extends Record<string, unknown> = Record<string, unknown>, TSchema extends QuerySchema | undefined = undefined>(route: (TSchema extends QuerySchema ? Omit<Route<TPrepared, TVariables, InferQuery<TSchema>>, 'query'> & {
|
|
7
|
+
query: TSchema;
|
|
8
|
+
} : Route<TPrepared, TVariables, TQuery>) & {
|
|
9
|
+
query?: TSchema;
|
|
10
|
+
}): Route<TPrepared, TVariables, TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery>;
|
|
7
11
|
//# sourceMappingURL=tools.d.ts.map
|
package/lib/esm/tools.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,KAAK,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,KAAK,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACX,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAW9C,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,EAC5B,QAAQ,EAAE,QAAQ,GACjB,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,CAepC;AAUD,wBAAgB,YAAY,CAAC,OAAO,SAAS,SAAS,EACpD,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,IAAI,EACzC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,aAAa,CAAC,OAAO,CAAC,CAmDxB;AAwBD,wBAAgB,CAAC,CACf,SAAS,SAAS,aAAa,GAAG,aAAa,EAC/C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,OAAO,SAAS,WAAW,GAAG,SAAS,GAAG,SAAS,EAEnD,KAAK,EAAE,CAAC,OAAO,SAAS,WAAW,GAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;IACjE,KAAK,EAAE,OAAO,CAAC;CAChB,GACD,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9D,KAAK,CACN,SAAS,EACT,UAAU,EACV,OAAO,SAAS,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,CAC3D,CAMA"}
|
package/lib/esm/tools.js
CHANGED
|
@@ -56,4 +56,4 @@ export function prepareMatch(match, query) {
|
|
|
56
56
|
export function r(route) {
|
|
57
57
|
return route;
|
|
58
58
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,eAAe,CAC7B,MAA4B,EAC5B,QAAkB;IAElB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;YAC/B,OAAO;gBACL,KAAK;gBACL,KAAK;gBACL,IAAI;gBACJ,MAAM;aACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAUD,MAAM,UAAU,YAAY,CAC1B,KAAyC,EACzC,KAA+B;IAM/B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO;YACL,KAAK;YACL,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;IAEjC,MAAM,MAAM,GAAyB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QAEtD,IAAI,SAAkB,CAAC;QACvB,IAAI,QAAmC,CAAC;QAExC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,QAAQ,GAAG,OAAO,CAAC;gBACjB,KAAK;gBACL,YAAY;gBACZ,YAAY;gBAEZ,SAAS,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE;gBAC9B,KAAK,EAAE,KAAK,IAAI,EAAE;aACnB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;gBAEtB,YAAY,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;QACD,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,IAAI;YAC3C,MAAM;YACN,YAAY;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC;AAwBD,MAAM,UAAU,CAAC,CAMf,KAI+D;IAM/D,OAAO,KAIN,CAAC;AACJ,CAAC","sourcesContent":["import type { ParamData } from 'path-to-regexp';\n\nimport type {\n  PrepareResult,\n  PreparedMatch,\n  PreparedMatchRoute,\n  Route,\n  RouterMatchedRoute,\n  QuerySchema,\n  InferQuery,\n} from './types.js';\n\nimport type { FlatRoute } from './builder.js';\n\n/**\n * Finds the first route that matches the given location.\n * Iterates through all routes and returns the first match found.\n *\n * @template TParams - Route parameter types extracted from the URL path\n * @param routes - Array of flat routes to search through\n * @param location - Browser location object containing pathname to match\n * @returns The matched route with extracted parameters, or null if no match\n */\nexport function getMatchedRoute<TParams extends ParamData>(\n  routes: FlatRoute<TParams>[],\n  location: Location,\n): RouterMatchedRoute<TParams> | null {\n  for (const route of routes) {\n    const match = route.matchFunction(location.pathname);\n    if (match !== false) {\n      const { path, params } = match;\n      return {\n        match,\n        route,\n        path,\n        params,\n      };\n    }\n  }\n\n  return null;\n}\n\n/**\n * Prepares a matched route for rendering by loading components and executing prepare functions.\n * This function processes the route hierarchy and loads any required data or components.\n *\n * @template TParams - Route parameter types extracted from the URL path\n * @param match - The matched route to prepare, or null if no route matched\n * @returns Prepared match with loaded components and data ready for rendering\n */\nexport function prepareMatch<TParams extends ParamData>(\n  match: RouterMatchedRoute<TParams> | null,\n  query?: Record<string, unknown>,\n): PreparedMatch<TParams> {\n  // NOTE: Runtime retains a generic PreparedResult; type-level narrowing is achieved externally\n  // through the route union and PreparedAccess helpers. We intentionally avoid injecting\n  // generic parameters here to keep runtime lightweight while still enabling compile-time\n  // discrimination in userland via createRouter generics.\n  if (match == null) {\n    return {\n      match,\n      routes: [],\n    };\n  }\n\n  const matchedRoute = match.route;\n\n  const routes: PreparedMatchRoute[] = match.route.routes.map((route) => {\n    const { path, prepare, resourcePage, render } = route;\n\n    let Component: unknown;\n    let prepared: PrepareResult | undefined;\n\n    if (prepare != null) {\n      prepared = prepare({\n        match,\n        matchedRoute,\n        resourcePage,\n        // Fix Object.create(null) issue in path-to-regexp\n        variables: { ...match.params },\n        query: query ?? {},\n      });\n    }\n\n    if (resourcePage != null) {\n      Component = resourcePage.get();\n      if (Component == null) {\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        resourcePage.load(); // eagerly load\n      }\n    }\n    return {\n      path,\n      prepared,\n      redirectTo: matchedRoute.redirectTo ?? null,\n      render,\n      resourcePage,\n    };\n  });\n\n  return {\n    match,\n    routes,\n  };\n}\n\n/**\n * Type helper function for creating strongly-typed route definitions.\n * This function doesn't modify the route, it just provides TypeScript type inference.\n *\n * @template TPrepared - The type of prepared data returned by the route's prepare function\n * @template TVariables - Route parameter types extracted from the URL path\n * @param route - The route configuration to type\n * @returns The same route with proper TypeScript types\n *\n * @example\n * ```typescript\n * const userRoute = r<{ user: User }, { id: string }>({\n *   path: '/users/:id',\n *   prepare: ({ variables }) => fetchUser(variables.id),\n * });\n * ```\n */\n/**\n * Route helper with conditional query schema inference. If a `query` schema object is present,\n * the resulting route's third generic parameter is inferred from descriptor map; otherwise it\n * falls back to the provided generic (default Record<string,unknown>).\n */\nexport function r<\n  TPrepared extends PrepareResult = PrepareResult,\n  TVariables extends ParamData = ParamData,\n  TQuery extends Record<string, unknown> = Record<string, unknown>,\n  TSchema extends QuerySchema | undefined = undefined,\n>(\n  route: (TSchema extends QuerySchema\n    ? Omit<Route<TPrepared, TVariables, InferQuery<TSchema>>, 'query'> & {\n        query: TSchema;\n      }\n    : Route<TPrepared, TVariables, TQuery>) & { query?: TSchema },\n): Route<\n  TPrepared,\n  TVariables,\n  TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery\n> {\n  return route as unknown as Route<\n    TPrepared,\n    TVariables,\n    TSchema extends QuerySchema ? InferQuery<TSchema> : TQuery\n  >;\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routes-inference.test-d.d.ts","sourceRoot":"","sources":["../../../src/type-tests/routes-inference.test-d.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { r, q, createRouter } from '../index.js';
|
|
2
|
+
const schema = { page: q.number() };
|
|
3
|
+
const plansRoute = r({
|
|
4
|
+
path: '/plans',
|
|
5
|
+
query: schema,
|
|
6
|
+
prepare: () => {
|
|
7
|
+
return { plansLoaded: true };
|
|
8
|
+
},
|
|
9
|
+
});
|
|
10
|
+
const userRoute = r({
|
|
11
|
+
path: '/users/:id',
|
|
12
|
+
prepare: ({ variables }) => {
|
|
13
|
+
return { userId: variables.id };
|
|
14
|
+
},
|
|
15
|
+
});
|
|
16
|
+
const searchRoute = r({
|
|
17
|
+
path: '/search',
|
|
18
|
+
query: { q: q.string() },
|
|
19
|
+
prepare: ({ query }) => {
|
|
20
|
+
return { term: query.q };
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
const { context } = createRouter([plansRoute, userRoute, searchRoute]);
|
|
24
|
+
const entry = context.get();
|
|
25
|
+
function __consume(_v) {
|
|
26
|
+
}
|
|
27
|
+
if (entry.route?.path === '/plans') {
|
|
28
|
+
const typed = entry.typedQuery;
|
|
29
|
+
if (typed != null) {
|
|
30
|
+
__consume(typed.page);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (entry.route?.path === '/users/:id') {
|
|
34
|
+
const prepared = entry.preparedMatch.routes.find((r) => {
|
|
35
|
+
return r.path === '/users/:id';
|
|
36
|
+
})?.prepared;
|
|
37
|
+
if (prepared != null) {
|
|
38
|
+
__consume(prepared.userId);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (entry.route?.path === '/search') {
|
|
42
|
+
const p = entry.preparedMatch.routes.find((r) => {
|
|
43
|
+
return r.path === '/search';
|
|
44
|
+
})?.prepared;
|
|
45
|
+
if (p != null) {
|
|
46
|
+
__consume(p.term);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVzLWluZmVyZW5jZS50ZXN0LWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHlwZS10ZXN0cy9yb3V0ZXMtaW5mZXJlbmNlLnRlc3QtZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxZQUFZLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHakQsTUFBTSxNQUFNLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFXLENBQUM7QUFFN0MsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLElBQUksRUFBRSxRQUFRO0lBQ2QsS0FBSyxFQUFFLE1BQU07SUFDYixPQUFPLEVBQUUsR0FBRyxFQUFFO1FBQ1osT0FBTyxFQUFFLFdBQVcsRUFBRSxJQUFhLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFxQztJQUN0RCxJQUFJLEVBQUUsWUFBWTtJQUNsQixPQUFPLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUU7UUFDekIsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDbEMsQ0FBQztDQUNGLENBQUMsQ0FBQztBQUVILE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBQztJQUNwQixJQUFJLEVBQUUsU0FBUztJQUNmLEtBQUssRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQVc7SUFDakMsT0FBTyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1FBQ3JCLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQzNCLENBQUM7Q0FDRixDQUFDLENBQUM7QUFFSCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsWUFBWSxDQUFDLENBQUMsVUFBVSxFQUFFLFNBQVMsRUFBRSxXQUFXLENBQVUsQ0FBQyxDQUFDO0FBR2hGLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUc1QixTQUFTLFNBQVMsQ0FBSSxFQUFLO0FBRTNCLENBQUM7QUFDRCxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUUsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO0lBQ25DLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxVQUEyQyxDQUFDO0lBQ2hFLElBQUksS0FBSyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2xCLFNBQVMsQ0FBcUIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7QUFDSCxDQUFDO0FBQ0QsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksS0FBSyxZQUFZLEVBQUUsQ0FBQztJQUN2QyxNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNyRCxPQUFPLENBQUMsQ0FBQyxJQUFJLEtBQUssWUFBWSxDQUFDO0lBQ2pDLENBQUMsQ0FBQyxFQUFFLFFBQTBDLENBQUM7SUFDL0MsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFLENBQUM7UUFDckIsU0FBUyxDQUFTLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNyQyxDQUFDO0FBQ0gsQ0FBQztBQUNELElBQUksS0FBSyxDQUFDLEtBQUssRUFBRSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7SUFDcEMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDOUMsT0FBTyxDQUFDLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQztJQUM5QixDQUFDLENBQUMsRUFBRSxRQUFvRCxDQUFDO0lBQ3pELElBQUksQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2QsU0FBUyxDQUFxQixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEMsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByLCBxLCBjcmVhdGVSb3V0ZXIgfSBmcm9tICcuLi9pbmRleC5qcyc7XG5cbi8vIEJhc2ljIHF1ZXJ5IHNjaGVtYVxuY29uc3Qgc2NoZW1hID0geyBwYWdlOiBxLm51bWJlcigpIH0gYXMgY29uc3Q7XG5cbmNvbnN0IHBsYW5zUm91dGUgPSByKHtcbiAgcGF0aDogJy9wbGFucycsXG4gIHF1ZXJ5OiBzY2hlbWEsXG4gIHByZXBhcmU6ICgpID0+IHtcbiAgICByZXR1cm4geyBwbGFuc0xvYWRlZDogdHJ1ZSBhcyBjb25zdCB9O1xuICB9LFxufSk7XG5cbmNvbnN0IHVzZXJSb3V0ZSA9IHI8eyB1c2VySWQ6IHN0cmluZyB9LCB7IGlkOiBzdHJpbmcgfT4oe1xuICBwYXRoOiAnL3VzZXJzLzppZCcsXG4gIHByZXBhcmU6ICh7IHZhcmlhYmxlcyB9KSA9PiB7XG4gICAgcmV0dXJuIHsgdXNlcklkOiB2YXJpYWJsZXMuaWQgfTtcbiAgfSxcbn0pO1xuXG5jb25zdCBzZWFyY2hSb3V0ZSA9IHIoe1xuICBwYXRoOiAnL3NlYXJjaCcsXG4gIHF1ZXJ5OiB7IHE6IHEuc3RyaW5nKCkgfSBhcyBjb25zdCxcbiAgcHJlcGFyZTogKHsgcXVlcnkgfSkgPT4ge1xuICAgIHJldHVybiB7IHRlcm06IHF1ZXJ5LnEgfTtcbiAgfSxcbn0pO1xuXG5jb25zdCB7IGNvbnRleHQgfSA9IGNyZWF0ZVJvdXRlcihbcGxhbnNSb3V0ZSwgdXNlclJvdXRlLCBzZWFyY2hSb3V0ZV0gYXMgY29uc3QpO1xuXG4vLyBOYXJyb3dpbmcgdGVzdHMgKGNvbXBpbGUtdGltZSBvbmx5KVxuY29uc3QgZW50cnkgPSBjb250ZXh0LmdldCgpO1xuLyoqIE5vLW9wIHNpbmsgdG8gZm9yY2UgdHlwZSBldmFsdWF0aW9uIHdpdGhvdXQgcnVudGltZSB1c2FnZSAqL1xuLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby11bnVzZWQtdmFyc1xuZnVuY3Rpb24gX19jb25zdW1lPFQ+KF92OiBUKTogdm9pZCB7XG4gIC8qIG5vb3AgKi9cbn1cbmlmIChlbnRyeS5yb3V0ZT8ucGF0aCA9PT0gJy9wbGFucycpIHtcbiAgY29uc3QgdHlwZWQgPSBlbnRyeS50eXBlZFF1ZXJ5IGFzIHsgcGFnZT86IG51bWJlciB9IHwgdW5kZWZpbmVkO1xuICBpZiAodHlwZWQgIT0gbnVsbCkge1xuICAgIF9fY29uc3VtZTxudW1iZXIgfCB1bmRlZmluZWQ+KHR5cGVkLnBhZ2UpO1xuICB9XG59XG5pZiAoZW50cnkucm91dGU/LnBhdGggPT09ICcvdXNlcnMvOmlkJykge1xuICBjb25zdCBwcmVwYXJlZCA9IGVudHJ5LnByZXBhcmVkTWF0Y2gucm91dGVzLmZpbmQoKHIpID0+IHtcbiAgICByZXR1cm4gci5wYXRoID09PSAnL3VzZXJzLzppZCc7XG4gIH0pPy5wcmVwYXJlZCBhcyB7IHVzZXJJZDogc3RyaW5nIH0gfCB1bmRlZmluZWQ7XG4gIGlmIChwcmVwYXJlZCAhPSBudWxsKSB7XG4gICAgX19jb25zdW1lPHN0cmluZz4ocHJlcGFyZWQudXNlcklkKTtcbiAgfVxufVxuaWYgKGVudHJ5LnJvdXRlPy5wYXRoID09PSAnL3NlYXJjaCcpIHtcbiAgY29uc3QgcCA9IGVudHJ5LnByZXBhcmVkTWF0Y2gucm91dGVzLmZpbmQoKHIpID0+IHtcbiAgICByZXR1cm4gci5wYXRoID09PSAnL3NlYXJjaCc7XG4gIH0pPy5wcmVwYXJlZCBhcyB7IHRlcm06IHN0cmluZyB8IHVuZGVmaW5lZCB9IHwgdW5kZWZpbmVkO1xuICBpZiAocCAhPSBudWxsKSB7XG4gICAgX19jb25zdW1lPHN0cmluZyB8IHVuZGVmaW5lZD4ocC50ZXJtKTtcbiAgfVxufVxuIl19
|
package/lib/esm/types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ComponentType, ReactElement, ReactNode, JSX } from 'react';
|
|
2
|
+
import type { Schema as FilterSchema, InferFilters as InferFilterResult, Diagnostic as FilterDiagnostic } from '@plumile/filter-query';
|
|
2
3
|
import type { Match, MatchFunction, ParamData } from 'path-to-regexp';
|
|
3
4
|
import type { FlatRoute } from './builder.js';
|
|
4
5
|
import type { ResourcePage } from './ResourcePage.js';
|
|
@@ -16,16 +17,16 @@ export type RouterMatchedRoute<TVariables extends ParamData> = {
|
|
|
16
17
|
route: FlatRoute<TVariables>;
|
|
17
18
|
};
|
|
18
19
|
export type RouteReactComponent<TProps = Record<string, unknown>> = (props: TProps) => JSX.Element | null;
|
|
19
|
-
export type RouteRenderOpts<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData> = {
|
|
20
|
+
export type RouteRenderOpts<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
|
|
20
21
|
children: ReactNode;
|
|
21
22
|
Component?: RouteReactComponent;
|
|
22
23
|
prepared: TPrepared | undefined;
|
|
23
24
|
preparedRoute: PreparedMatchRoute;
|
|
24
25
|
route: FlatRoute<TVariables> | null;
|
|
25
26
|
rawQuery: Record<string, string | string[]>;
|
|
26
|
-
query:
|
|
27
|
+
query: TQueryShape;
|
|
27
28
|
};
|
|
28
|
-
export type RouteRender<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData> = (opts: RouteRenderOpts<TPrepared, TVariables>) => ReactElement
|
|
29
|
+
export type RouteRender<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = (opts: RouteRenderOpts<TPrepared, TVariables, TQueryShape>) => ReactElement | null;
|
|
29
30
|
export type PreparedMatchRoute = {
|
|
30
31
|
path?: string;
|
|
31
32
|
prepared: PrepareResult | undefined;
|
|
@@ -44,7 +45,9 @@ export type RouteEntry<TVariables extends ParamData> = {
|
|
|
44
45
|
forceRerender: boolean;
|
|
45
46
|
rawSearch?: string;
|
|
46
47
|
query: Record<string, string | string[]>;
|
|
47
|
-
typedQuery?:
|
|
48
|
+
typedQuery?: Record<string, unknown>;
|
|
49
|
+
filters?: Record<string, unknown>;
|
|
50
|
+
filterDiagnostics?: FilterDiagnostic[];
|
|
48
51
|
};
|
|
49
52
|
export type QueryDescriptor<T> = {
|
|
50
53
|
__type: T;
|
|
@@ -69,33 +72,30 @@ export type Redirect = {
|
|
|
69
72
|
status?: RouterRedirectStatus;
|
|
70
73
|
};
|
|
71
74
|
export type PrepareResult = Record<string, any>;
|
|
72
|
-
export type PrepareParams<TVariables extends ParamData,
|
|
75
|
+
export type PrepareParams<TVariables extends ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
|
|
73
76
|
match: RouterMatchedRoute<TVariables>;
|
|
74
77
|
matchedRoute: FlatRoute<TVariables>;
|
|
75
78
|
resourcePage?: ResourcePage | null;
|
|
76
79
|
variables: TVariables;
|
|
77
|
-
query:
|
|
80
|
+
query: TQueryShape;
|
|
78
81
|
};
|
|
79
|
-
export type RoutePrepare<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData,
|
|
80
|
-
export type Route<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData,
|
|
81
|
-
children?: (Route<
|
|
82
|
+
export type RoutePrepare<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = (params: PrepareParams<TVariables, TQueryShape>) => TPrepared;
|
|
83
|
+
export type Route<TPrepared extends PrepareResult, TVariables extends ParamData = ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
|
|
84
|
+
children?: (Route<PrepareResult> | Redirect)[];
|
|
82
85
|
resourcePage?: ResourcePage | null;
|
|
83
86
|
path?: string;
|
|
84
|
-
prepare?: RoutePrepare<TPrepared, TVariables,
|
|
85
|
-
render?: RouteRender<TPrepared, TVariables>;
|
|
87
|
+
prepare?: RoutePrepare<TPrepared, TVariables, TQueryShape>;
|
|
88
|
+
render?: RouteRender<TPrepared, TVariables, TQueryShape>;
|
|
86
89
|
query?: QuerySchema;
|
|
87
|
-
filterSchema?:
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
export type RouteComponentProps<TVariables extends ParamData> = {
|
|
93
|
-
children: ReactElement<any>;
|
|
94
|
-
routerContext: RoutingContextType<TVariables>;
|
|
90
|
+
filterSchema?: FilterSchema;
|
|
91
|
+
};
|
|
92
|
+
export type RouteComponentProps<TVariables extends ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
|
|
93
|
+
children: ReactElement;
|
|
94
|
+
routerContext: RoutingContextType<TVariables, TQueryShape>;
|
|
95
95
|
route: Route<any, any>;
|
|
96
96
|
};
|
|
97
97
|
export type SubscribeCallback<TVariables extends ParamData> = (nextEntry: RouteEntry<TVariables>) => void;
|
|
98
|
-
export type RoutingContextType<TVariables extends ParamData> = {
|
|
98
|
+
export type RoutingContextType<TVariables extends ParamData, TQueryShape extends Record<string, unknown> = Record<string, unknown>> = {
|
|
99
99
|
history: BrowserHistory;
|
|
100
100
|
get: () => RouteEntry<TVariables>;
|
|
101
101
|
preloadCode: (pathname: string) => void;
|
|
@@ -103,27 +103,53 @@ export type RoutingContextType<TVariables extends ParamData> = {
|
|
|
103
103
|
subscribe: (callback: SubscribeCallback<TVariables>) => () => void;
|
|
104
104
|
navigate: (opts: {
|
|
105
105
|
pathname?: string;
|
|
106
|
-
query?:
|
|
106
|
+
query?: TQueryShape;
|
|
107
|
+
filters?: Record<string, unknown>;
|
|
107
108
|
replace?: boolean;
|
|
108
|
-
filters?: Record<string, any>;
|
|
109
|
-
filterSchema?: {
|
|
110
|
-
__defined: true;
|
|
111
|
-
schema: Record<string, any>;
|
|
112
|
-
};
|
|
113
|
-
batch?: boolean;
|
|
114
|
-
immediate?: boolean;
|
|
115
109
|
}) => void;
|
|
116
|
-
resolveFilterSchema: (pathname: string) => {
|
|
117
|
-
__defined: true;
|
|
118
|
-
schema: Record<string, any>;
|
|
119
|
-
} | undefined;
|
|
120
|
-
currentMergedFilterSchema: () => {
|
|
121
|
-
__defined: true;
|
|
122
|
-
schema: Record<string, any>;
|
|
123
|
-
} | undefined;
|
|
124
110
|
};
|
|
125
111
|
export type ResourcePageReturn = {
|
|
126
|
-
default: ComponentType<
|
|
127
|
-
} | ComponentType<
|
|
112
|
+
default: ComponentType<unknown>;
|
|
113
|
+
} | ComponentType<unknown>;
|
|
128
114
|
export type ResourcePageLoader = () => Promise<ResourcePageReturn>;
|
|
115
|
+
export type InferFilters<S extends FilterSchema | undefined> = S extends FilterSchema ? InferFilterResult<S> : Record<string, never>;
|
|
116
|
+
export type { FilterSchema };
|
|
117
|
+
export type AnyRoute = Route<any, any, any>;
|
|
118
|
+
export type PreparedOf<R> = R extends Route<infer P, any, any> ? P : never;
|
|
119
|
+
export type VariablesOf<R> = R extends Route<any, infer V, any> ? V : never;
|
|
120
|
+
export type QueryShapeOf<R> = R extends Route<any, any, infer Q> ? Q : never;
|
|
121
|
+
export type PathOf<R> = R extends {
|
|
122
|
+
path?: infer P;
|
|
123
|
+
} ? P extends string ? P : never : never;
|
|
124
|
+
export type PathsOf<Routes extends readonly AnyRoute[]> = PathOf<Routes[number]>;
|
|
125
|
+
export type PreparedMap<Routes extends readonly AnyRoute[]> = {
|
|
126
|
+
[K in PathsOf<Routes>]: PreparedOf<Extract<Routes[number], {
|
|
127
|
+
path?: K;
|
|
128
|
+
}>> | undefined;
|
|
129
|
+
};
|
|
130
|
+
export type QueryShapeMap<Routes extends readonly AnyRoute[]> = {
|
|
131
|
+
[K in PathsOf<Routes>]: QueryShapeOf<Extract<Routes[number], {
|
|
132
|
+
path?: K;
|
|
133
|
+
}>>;
|
|
134
|
+
};
|
|
135
|
+
export interface PreparedAccess<Routes extends readonly AnyRoute[]> {
|
|
136
|
+
getPrepared: <P extends PathsOf<Routes>>(path: P) => PreparedMap<Routes>[P];
|
|
137
|
+
getTypedQuery: <P extends PathsOf<Routes>>(path: P) => QueryShapeMap<Routes>[P] | undefined;
|
|
138
|
+
}
|
|
139
|
+
export type NavigateInputForPath<Routes extends readonly AnyRoute[], P extends PathsOf<Routes>> = {
|
|
140
|
+
pathname: P;
|
|
141
|
+
query?: QueryShapeMap<Routes>[P];
|
|
142
|
+
filters?: Record<string, unknown>;
|
|
143
|
+
replace?: boolean;
|
|
144
|
+
};
|
|
145
|
+
export type NavigateInputUntyped = {
|
|
146
|
+
pathname?: string;
|
|
147
|
+
query?: Record<string, any>;
|
|
148
|
+
filters?: Record<string, any>;
|
|
149
|
+
replace?: boolean;
|
|
150
|
+
};
|
|
151
|
+
export interface NavigateOverloads<Routes extends readonly AnyRoute[]> {
|
|
152
|
+
<P extends PathsOf<Routes>>(opts: NavigateInputForPath<Routes, P>): void;
|
|
153
|
+
(opts: NavigateInputUntyped): void;
|
|
154
|
+
}
|
|
129
155
|
//# sourceMappingURL=types.d.ts.map
|