@plumile/router 0.1.28 → 0.1.31
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 +9 -126
- package/lib/esm/ResourcePage.d.ts +1 -0
- package/lib/esm/ResourcePage.d.ts.map +1 -1
- package/lib/esm/ResourcePage.js +4 -1
- package/lib/esm/builder.d.ts.map +1 -1
- package/lib/esm/builder.js +1 -1
- package/lib/esm/errors/HttpRedirect.d.ts.map +1 -1
- package/lib/esm/errors/HttpRedirect.js +1 -1
- package/lib/esm/errors/index.js +1 -1
- package/lib/esm/history/BrowserHistory.d.ts +7 -2
- package/lib/esm/history/BrowserHistory.d.ts.map +1 -1
- package/lib/esm/history/BrowserHistory.js +96 -18
- package/lib/esm/history/types.d.ts +8 -1
- package/lib/esm/history/types.d.ts.map +1 -1
- package/lib/esm/history/types.js +1 -1
- package/lib/esm/routing/Link.d.ts.map +1 -1
- package/lib/esm/routing/Link.js +16 -1
- package/lib/esm/routing/createRouter.d.ts +5 -9
- package/lib/esm/routing/createRouter.d.ts.map +1 -1
- package/lib/esm/routing/createRouter.js +354 -382
- package/lib/esm/routing/useAllQuery.d.ts.map +1 -1
- package/lib/esm/routing/useAllQuery.js +1 -1
- package/lib/esm/routing/useFilterDiagnostics.d.ts.map +1 -1
- package/lib/esm/routing/useFilterDiagnostics.js +1 -1
- package/lib/esm/routing/useFilters.d.ts +5 -0
- package/lib/esm/routing/useFilters.d.ts.map +1 -1
- package/lib/esm/routing/useFilters.js +4 -1
- package/lib/esm/routing/useNavigate.d.ts.map +1 -1
- package/lib/esm/routing/useNavigate.js +1 -1
- package/lib/esm/routing/useQuery.d.ts.map +1 -1
- package/lib/esm/routing/useQuery.js +1 -1
- package/lib/esm/routing/useQueryState.d.ts.map +1 -1
- package/lib/esm/routing/useQueryState.js +1 -1
- package/lib/esm/tools/buildCombinedSearch.d.ts.map +1 -1
- package/lib/esm/tools/buildCombinedSearch.js +1 -1
- package/lib/esm/tools.d.ts +6 -2
- package/lib/esm/tools.d.ts.map +1 -1
- package/lib/esm/tools.js +47 -2
- package/lib/esm/types.d.ts +47 -0
- package/lib/esm/types.d.ts.map +1 -1
- package/lib/esm/types.js +28 -2
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/ResourcePage.d.ts +1 -0
- package/lib/types/ResourcePage.d.ts.map +1 -1
- package/lib/types/builder.d.ts.map +1 -1
- package/lib/types/errors/HttpRedirect.d.ts.map +1 -1
- package/lib/types/history/BrowserHistory.d.ts +7 -2
- package/lib/types/history/BrowserHistory.d.ts.map +1 -1
- package/lib/types/history/types.d.ts +8 -1
- package/lib/types/history/types.d.ts.map +1 -1
- package/lib/types/routing/Link.d.ts.map +1 -1
- package/lib/types/routing/createRouter.d.ts +5 -9
- package/lib/types/routing/createRouter.d.ts.map +1 -1
- package/lib/types/routing/useAllQuery.d.ts.map +1 -1
- package/lib/types/routing/useFilterDiagnostics.d.ts.map +1 -1
- package/lib/types/routing/useFilters.d.ts +5 -0
- package/lib/types/routing/useFilters.d.ts.map +1 -1
- package/lib/types/routing/useNavigate.d.ts.map +1 -1
- package/lib/types/routing/useQuery.d.ts.map +1 -1
- package/lib/types/routing/useQueryState.d.ts.map +1 -1
- package/lib/types/tools/buildCombinedSearch.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/types.d.ts +47 -0
- package/lib/types/types.d.ts.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -39,8 +39,9 @@ This package is ESM-only. If your tooling expects CommonJS, enable ESM support (
|
|
|
39
39
|
|
|
40
40
|
- Getting started: [docs/index.md](../../docs/index.md)
|
|
41
41
|
- Relay integration walkthrough: [docs/router-relay.md](../../docs/router-relay.md)
|
|
42
|
-
- Devtools: [docs/devtools.md](../../docs/devtools.md)
|
|
43
42
|
- Examples: [EXAMPLES.md](./EXAMPLES.md)
|
|
43
|
+
- Migration strategies: [MIGRATION.md](./MIGRATION.md)
|
|
44
|
+
- DevTools extension usage: [docs/router-devtools-extension.md](../../docs/router-devtools-extension.md)
|
|
44
45
|
|
|
45
46
|
## Quick Start
|
|
46
47
|
|
|
@@ -135,29 +136,20 @@ function Navigation() {
|
|
|
135
136
|
| `useFilters(schema)` | `(schema) => [filters, actions]` | Read/mutate filters derived from the given schema; actions include `set`, `remove`, `merge`, `clear`. | `const [filters, actions] = useFilters(productFilters); actions.set('price', 'gt', 10);` |
|
|
136
137
|
| `useQuery()` | `() => Record<string, string | string[]>` | Raw query aggregation (legacy/simple use). | `const query = useQuery();` |
|
|
137
138
|
| `useQueryState(key, opts?)` | `(key, options?) => [value, setValue]` | Two-way binding for a single query parameter with default/replace options. | `const [page, setPage] = useQueryState('page', { defaultValue: 1 });` |
|
|
138
|
-
| `useFilterDiagnostics()` | `() => Diagnostic[]` | Surface parsing issues (unknown field/operator) for UI or
|
|
139
|
+
| `useFilterDiagnostics()` | `() => Diagnostic[]` | Surface parsing issues (unknown field/operator) for UI display or logging. | `const diagnostics = useFilterDiagnostics();` |
|
|
139
140
|
| `useAllQuery(opts?)` | `(options?) => QueryLike` | Access filters + raw query merged together, useful for debugging or incremental migrations. | `const all = useAllQuery();` |
|
|
140
141
|
|
|
141
|
-
## Devtools Overview
|
|
142
|
-
|
|
143
|
-
- Enable via `createRouter(routes, { devtools: { panel: true, global: true } })` (defaults: global on in dev, panel off).
|
|
144
|
-
- Global helper: `window.__PLUMILE_ROUTER__?.get()` returns the current route entry (filters, query, prepared data).
|
|
145
|
-
- Panel overlay toggled with `Alt+Shift+R` (configurable via `devtools.shortcut`).
|
|
146
|
-
- Use `subscribe` to watch navigation changes for logging or live debugging.
|
|
147
|
-
|
|
148
142
|
## API Reference
|
|
149
143
|
|
|
150
144
|
### Core Components
|
|
151
145
|
|
|
152
|
-
#### `createRouter(routes: Route[]
|
|
146
|
+
#### `createRouter(routes: Route[])`
|
|
153
147
|
|
|
154
148
|
Creates a router instance with the given route configuration.
|
|
155
149
|
|
|
156
150
|
**Parameters:**
|
|
157
151
|
|
|
158
152
|
- `routes`: Array of route definitions
|
|
159
|
-
- `options?`: Optional object
|
|
160
|
-
- `devtools?: boolean` Force enable/disable the global inspector. Defaults to enabled when `NODE_ENV !== 'production'`, disabled otherwise.
|
|
161
153
|
|
|
162
154
|
**Returns:**
|
|
163
155
|
|
|
@@ -374,126 +366,17 @@ const search = buildCombinedSearch({
|
|
|
374
366
|
|
|
375
367
|
Guideline: If you need to derive lightweight projections (e.g. `const { page } = typed`), you can still destructure; but avoid spreading into a new object if you rely on reference equality downstream.
|
|
376
368
|
|
|
377
|
-
####
|
|
369
|
+
#### Inspection & Debugging
|
|
378
370
|
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
Optionally you can enable an in‑page overlay panel for quick visual inspection:
|
|
371
|
+
Activez le bridge de debug en développement avec l’option `debug` :
|
|
382
372
|
|
|
383
373
|
```ts
|
|
384
|
-
createRouter(routes, {
|
|
385
|
-
devtools: { panel: true, global: true, shortcut: 'Alt+Shift+R' },
|
|
386
|
-
});
|
|
387
|
-
```
|
|
388
|
-
|
|
389
|
-
Devtools option forms:
|
|
390
|
-
|
|
391
|
-
- `devtools: true | false` (boolean) – legacy form, controls global only.
|
|
392
|
-
- `devtools: { global?: boolean; panel?: boolean; shortcut?: string }` – granular.
|
|
393
|
-
- `global` (default: NODE_ENV !== 'production') exposes `window.__PLUMILE_ROUTER__`.
|
|
394
|
-
- `panel` (default: false) mounts an overlay; closed with the close button or page reload.
|
|
395
|
-
- `shortcut` (default: `Alt+Shift+R`) toggles panel visibility.
|
|
396
|
-
|
|
397
|
-
The panel displays current path+search, variables, raw query aggregation, active schema, and parsed filters. It is intentionally framework‑agnostic (no React runtime cost) and uses a shadow root to minimize style collisions.
|
|
398
|
-
|
|
399
|
-
```js
|
|
400
|
-
window.__PLUMILE_ROUTER__.get(); // current RouteEntry
|
|
401
|
-
const unsub = window.__PLUMILE_ROUTER__.subscribe((entry) => {
|
|
402
|
-
console.log('filters', entry.filters);
|
|
403
|
-
});
|
|
404
|
-
```
|
|
405
|
-
|
|
406
|
-
This lets you introspect parsed queries & variables without adding debug code. Neither global nor panel is present in production unless explicitly forced with `devtools: { global: true, panel: true }` (discouraged).
|
|
407
|
-
|
|
408
|
-
##### Detailed Usage
|
|
409
|
-
|
|
410
|
-
The global is intentionally tiny to avoid coupling and bundle weight. It only appears when the devtools flag resolves truthy:
|
|
411
|
-
|
|
412
|
-
1. Explicit: `createRouter(routes, { devtools: true })`
|
|
413
|
-
2. Implicit heuristic: `NODE_ENV !== 'production'`
|
|
414
|
-
3. Disabled explicitly: `createRouter(routes, { devtools: false })`
|
|
415
|
-
|
|
416
|
-
Always guard in snippets that might be copied to production code:
|
|
417
|
-
|
|
418
|
-
```js
|
|
419
|
-
if (window.__PLUMILE_ROUTER__) {
|
|
420
|
-
console.log(window.__PLUMILE_ROUTER__.get());
|
|
421
|
-
}
|
|
422
|
-
```
|
|
423
|
-
|
|
424
|
-
`get()` returns the current `RouteEntry` (simplified shape):
|
|
425
|
-
|
|
426
|
-
```ts
|
|
427
|
-
type RouteEntry = {
|
|
428
|
-
location: Location; // window.location snapshot
|
|
429
|
-
route: { match; params; path } | null; // current matched route (or null)
|
|
430
|
-
preparedMatch: { routes: { prepared; render?; resourcePage? }[]; match }; // internal prepared tree
|
|
431
|
-
forceRerender: boolean; // indicates forced re-render situations
|
|
432
|
-
rawSearch: string; // '?page=2&price.gt=10'
|
|
433
|
-
query: Record<string, string | string[]>; // raw aggregated query params (for legacy/simple access)
|
|
434
|
-
filters: Record<string, any>; // unified parsed filters (implicit eq)
|
|
435
|
-
activeQuerySchema?: any; // active deepest schema (when present)
|
|
436
|
-
};
|
|
374
|
+
createRouter(routes, { debug: true });
|
|
437
375
|
```
|
|
438
376
|
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
1. Log every navigation with filters & params:
|
|
442
|
-
|
|
443
|
-
```js
|
|
444
|
-
const dev = window.__PLUMILE_ROUTER__;
|
|
445
|
-
if (dev) {
|
|
446
|
-
const off = dev.subscribe((e) => {
|
|
447
|
-
console.log('[router]', e.location.pathname + e.location.search, {
|
|
448
|
-
vars: e.route?.params,
|
|
449
|
-
filters: e.filters,
|
|
450
|
-
});
|
|
451
|
-
});
|
|
452
|
-
// later: off();
|
|
453
|
-
}
|
|
454
|
-
```
|
|
455
|
-
|
|
456
|
-
2. Inspect prepared data for the deepest route (last element):
|
|
457
|
-
|
|
458
|
-
```js
|
|
459
|
-
const entry = window.__PLUMILE_ROUTER__?.get();
|
|
460
|
-
const deepest = entry?.preparedMatch.routes.at(-1);
|
|
461
|
-
deepest?.prepared; // Prepared data returned by deepest prepare()
|
|
462
|
-
```
|
|
463
|
-
|
|
464
|
-
3. Quick diff watcher for query changes only:
|
|
465
|
-
|
|
466
|
-
```js
|
|
467
|
-
let last = window.__PLUMILE_ROUTER__?.get().rawSearch;
|
|
468
|
-
const off = window.__PLUMILE_ROUTER__?.subscribe((e) => {
|
|
469
|
-
if (e.rawSearch !== last) {
|
|
470
|
-
console.log('query changed', last, '=>', e.rawSearch, e.filters);
|
|
471
|
-
last = e.rawSearch;
|
|
472
|
-
}
|
|
473
|
-
});
|
|
474
|
-
```
|
|
475
|
-
|
|
476
|
-
4. Measuring parse performance (rough dev-only micro‑benchmark):
|
|
477
|
-
|
|
478
|
-
```js
|
|
479
|
-
const { get } = window.__PLUMILE_ROUTER__;
|
|
480
|
-
const before = performance.now();
|
|
481
|
-
for (let i = 0; i < 200; i++) get().filters; // use cache; ensures no GC
|
|
482
|
-
console.log('elapsed ms', performance.now() - before);
|
|
483
|
-
```
|
|
484
|
-
|
|
485
|
-
5. Safe optional chaining helper (copy/paste):
|
|
486
|
-
|
|
487
|
-
```js
|
|
488
|
-
const R = window.__PLUMILE_ROUTER__;
|
|
489
|
-
R && R.subscribe((e) => console.debug('[filters]', e.filters));
|
|
490
|
-
```
|
|
491
|
-
|
|
492
|
-
Unsubscribing: every `subscribe` returns a disposer function. Always call it if you set up long‑lived listeners in a debugging session to avoid memory leaks during hot reloads.
|
|
493
|
-
|
|
494
|
-
Extending: if you need more (e.g. trigger navigations) you can wrap `createRouter` in your app and attach additional methods to `window.__PLUMILE_ROUTER__` (e.g. `navigate: context.navigate`) — omitted by default to avoid accidental production reliance.
|
|
377
|
+
Cela expose `window.__PLUMILE_ROUTER__` avec `get()` et `subscribe()` (non présent en production).
|
|
495
378
|
|
|
496
|
-
|
|
379
|
+
Pour l’inspection visuelle (timeline, filtres, prepared data), installez la Plumile Router DevTools extension (voir [docs/router-devtools-extension.md](../../docs/router-devtools-extension.md)).
|
|
497
380
|
|
|
498
381
|
### Unified Query Schema & useFilters (Integration with @plumile/filter-query)
|
|
499
382
|
|
|
@@ -8,6 +8,7 @@ export declare class ResourcePage {
|
|
|
8
8
|
constructor(loader: ResourcePageLoader, moduleId: string);
|
|
9
9
|
load(): Promise<ResourcePageReturn>;
|
|
10
10
|
get(): ResourcePageReturn | undefined;
|
|
11
|
+
getModuleId(): string;
|
|
11
12
|
read(): ResourcePageReturn | Promise<ResourcePageReturn> | Error;
|
|
12
13
|
private __load;
|
|
13
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourcePage.d.ts","sourceRoot":"","sources":["../../src/ResourcePage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA2BzE,qBAAa,YAAY;IAEvB,OAAO,CAAC,OAAO,CAAe;IAG9B,OAAO,CAAC,QAAQ,CAAqB;IAGrC,OAAO,CAAC,SAAS,CAAqC;IAGtD,OAAO,CAAC,QAAQ,CAA4B;
|
|
1
|
+
{"version":3,"file":"ResourcePage.d.ts","sourceRoot":"","sources":["../../src/ResourcePage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA2BzE,qBAAa,YAAY;IAEvB,OAAO,CAAC,OAAO,CAAe;IAG9B,OAAO,CAAC,QAAQ,CAAqB;IAGrC,OAAO,CAAC,SAAS,CAAqC;IAGtD,OAAO,CAAC,QAAQ,CAA4B;IAG5C,OAAO,CAAC,UAAU,CAAS;gBAQR,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM;IAclD,IAAI,IAAI,OAAO,CAAC,kBAAkB,CAAC;IA8BzC,GAAG,IAAI,kBAAkB,GAAG,SAAS;IAWrC,WAAW,IAAI,MAAM;IAerB,IAAI,IAAI,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,KAAK;YAkBzD,MAAM;CAKrB;AAsBD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,YAAY,GAAG,IAAI,CAOrB"}
|
package/lib/esm/ResourcePage.js
CHANGED
|
@@ -37,6 +37,9 @@ export class ResourcePage {
|
|
|
37
37
|
}
|
|
38
38
|
return undefined;
|
|
39
39
|
}
|
|
40
|
+
getModuleId() {
|
|
41
|
+
return this.__moduleId;
|
|
42
|
+
}
|
|
40
43
|
read() {
|
|
41
44
|
if (this.__result != null) {
|
|
42
45
|
return this.__result;
|
|
@@ -61,4 +64,4 @@ export function getResourcePage(moduleId, loader) {
|
|
|
61
64
|
}
|
|
62
65
|
return resource;
|
|
63
66
|
}
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ResourcePage.js","sourceRoot":"","sources":["../../src/ResourcePage.tsx"],"names":[],"mappings":"AAQA,MAAM,eAAe,GAAG,IAAI,GAAG,EAAwB,CAAC;AAmBxD,MAAM,OAAO,YAAY;IAEf,OAAO,CAAe;IAGtB,QAAQ,CAAqB;IAG7B,SAAS,CAAqC;IAG9C,QAAQ,CAA4B;IAGpC,UAAU,CAAS;IAQ3B,YAAmB,MAA0B,EAAE,QAAgB;QAC7D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAQM,KAAK,CAAC,IAAI;QACf,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE;iBACpB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBAEf,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;oBAG3B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;gBACvB,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,MAAM,KAAK,CAAC;YACd,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;QAC3B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IASM,GAAG;QACR,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAKM,WAAW;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAaM,IAAI;QACT,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,OAAO,CAAC;QACrB,CAAC;aAAM,CAAC;YAEN,MAAM,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;IACH,CAAC;IAOO,KAAK,CAAC,MAAM;QAClB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAElC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;CACF;AAsBD,MAAM,UAAU,eAAe,CAC7B,QAAgB,EAChB,MAA0B;IAE1B,IAAI,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC9C,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import type { ResourcePageLoader, ResourcePageReturn } from './types.js';\n\n/**\n * A cache of resources to avoid loading the same module twice. This is important\n * because Webpack dynamic imports only expose an asynchronous API for loading\n * modules, so to be able to access already-loaded modules synchronously we\n * must have stored the previous result somewhere.\n */\nconst resourcePageMap = new Map<string, ResourcePage>();\n\n/**\n * A resource manager for lazy-loaded React components with Suspense integration.\n * This class handles the loading state, caching, and Suspense integration for\n * dynamically imported components.\n *\n * @example\n * ```typescript\n * const resource = new ResourcePage(\n *   () => import('./MyComponent'),\n *   'MyComponent'\n * );\n *\n * // In a React component with Suspense boundary:\n * const Component = resource.read();\n * return <Component />;\n * ```\n */\nexport class ResourcePage {\n  /** Error state if the resource failed to load */\n  private __error: Error | null;\n\n  /** Function to load the resource */\n  private __loader: ResourcePageLoader;\n\n  /** Promise representing the loading state */\n  private __promise: Promise<ResourcePageReturn> | null;\n\n  /** The loaded resource result */\n  private __result: ResourcePageReturn | null;\n\n  /** Unique identifier for this resource */\n  private __moduleId: string;\n\n  /**\n   * Creates a new ResourcePage instance.\n   *\n   * @param loader - Function that returns a Promise resolving to the component\n   * @param moduleId - Unique identifier for caching purposes\n   */\n  public constructor(loader: ResourcePageLoader, moduleId: string) {\n    this.__error = null;\n    this.__loader = loader;\n    this.__moduleId = moduleId;\n    this.__promise = null;\n    this.__result = null;\n  }\n\n  /**\n   * Loads the resource if not already loaded or loading.\n   * This method can be called multiple times safely - it will return the same promise.\n   *\n   * @returns Promise that resolves to the loaded component\n   */\n  public async load(): Promise<ResourcePageReturn> {\n    let promise = this.__promise;\n    if (promise == null) {\n      promise = this.__load()\n        .then((result) => {\n          // @ts-expect-error: OK\n          if (result.default != null) {\n            // @ts-expect-error: OK\n            // eslint-disable-next-line no-param-reassign\n            result = result.default;\n          }\n          this.__result = result;\n          return result;\n        })\n        .catch((error) => {\n          this.__error = error;\n          throw error;\n        });\n      this.__promise = promise;\n    }\n    return promise;\n  }\n\n  /**\n   * Returns the loaded component if available, undefined otherwise.\n   * This method can be used to check if the component is already loaded\n   * without triggering a load or throwing an error.\n   *\n   * @returns The loaded component or undefined if not yet loaded\n   */\n  public get(): ResourcePageReturn | undefined {\n    if (this.__result != null) {\n      return this.__result;\n    }\n\n    return undefined;\n  }\n\n  /**\n   * Returns the module identifier associated with this resource (debug helper).\n   */\n  public getModuleId(): string {\n    return this.__moduleId;\n  }\n\n  /**\n   * Reads the resource with React Suspense integration.\n   * This is the key method for integrating with React Suspense:\n   * - Returns the component if loaded\n   * - Throws an error if loading failed\n   * - Throws a Promise if still loading (Suspense will catch this)\n   *\n   * @returns The loaded component\n   * @throws Promise when loading (caught by Suspense)\n   * @throws Error when loading failed\n   */\n  public read(): ResourcePageReturn | Promise<ResourcePageReturn> | Error {\n    if (this.__result != null) {\n      return this.__result;\n    }\n\n    if (this.__error != null) {\n      throw this.__error;\n    } else {\n      // eslint-disable-next-line @typescript-eslint/only-throw-error\n      throw this.__promise;\n    }\n  }\n\n  /**\n   * Internal method to execute the loader function.\n   *\n   * @returns Promise resolving to the component\n   */\n  private async __load(): Promise<ResourcePageReturn> {\n    const { __loader: loader } = this;\n\n    return Promise.resolve(loader());\n  }\n}\n\n/**\n * Factory function to create or retrieve a cached ResourcePage instance.\n * This function implements a singleton pattern per moduleId to ensure that\n * the same component is not loaded multiple times.\n *\n * @param moduleId - Globally unique identifier for the resource used for caching\n * @param loader - Function that returns a Promise resolving to the component\n * @returns ResourcePage instance (cached if previously created)\n *\n * @example\n * ```typescript\n * // Create a resource for lazy loading\n * const resource = getResourcePage('UserProfile', () => import('./UserProfile'));\n * resource.load();\n *\n * // In a React component with Suspense boundary:\n * const UserProfile = resource.read();\n * return <UserProfile userId={userId} />;\n * ```\n */\nexport function getResourcePage(\n  moduleId: string,\n  loader: ResourcePageLoader,\n): ResourcePage | null {\n  let resource = resourcePageMap.get(moduleId);\n  if (resource == null) {\n    resource = new ResourcePage(loader, moduleId);\n    resourcePageMap.set(moduleId, resource);\n  }\n  return resource;\n}\n"]}
|
package/lib/esm/builder.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAS,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQ5E,qBAAa,SAAS,CAAC,OAAO,SAAS,SAAS;IAEvC,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,EAAE,QAAQ,EAAE,CAAC;IAGnB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAGtC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAOR,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC;CAOlD;
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAS,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQ5E,qBAAa,SAAS,CAAC,OAAO,SAAS,SAAS;IAEvC,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,EAAE,QAAQ,EAAE,CAAC;IAGnB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAGtC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAOR,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC;CAOlD;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAGxE;AASD,wBAAgB,UAAU,CACxB,WAAW,EAAE,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE,EACpC,YAAY,GAAE,QAAQ,EAAO,EAC7B,MAAM,SAAK,GACV,SAAS,CAAC,SAAS,CAAC,EAAE,CA8DxB;AAOD,wBAAgB,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,CAE3E"}
|
package/lib/esm/builder.js
CHANGED
|
@@ -68,4 +68,4 @@ export function buildRoute(routeConfig, parentRoutes = [], prefix = '') {
|
|
|
68
68
|
export function buildRoutes(routeConfig) {
|
|
69
69
|
return buildRoute(routeConfig);
|
|
70
70
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"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","sourcesContent":["import { match, type MatchFunction, type ParamData } from 'path-to-regexp';\n\nimport type { FlatRouteInput, Redirect, Route, AnyRoute } from './types.js';\n\n/**\n * Represents a flattened route with a compiled match function.\n * This is an internal representation used by the router to efficiently match URLs.\n *\n * @template TParams - Route parameter types extracted from the URL path\n */\nexport class FlatRoute<TParams extends ParamData> {\n  /** The URL path pattern for this route */\n  public path: string;\n\n  /** Nested routes that should be rendered within this route */\n  public routes: AnyRoute[];\n\n  /** Compiled function to match URL paths against this route pattern */\n  public matchFunction: MatchFunction<TParams>;\n\n  /** Optional redirect destination if this route should redirect */\n  public redirectTo?: string;\n\n  /**\n   * Creates a new FlatRoute instance.\n   *\n   * @param input - Configuration for the flat route\n   */\n  public constructor(input: FlatRouteInput<TParams>) {\n    const { matchFunction, path, redirectTo, routes } = input;\n    this.path = path;\n    this.redirectTo = redirectTo;\n    this.routes = routes;\n    this.matchFunction = matchFunction;\n  }\n}\n\n/** Narrow a route configuration to a redirect. */\nexport function isRedirect(route: AnyRoute | Redirect): route is Redirect {\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n  return (route as Redirect).to != null;\n}\n\n/**\n * Recursively flattens nested route definitions into `FlatRoute` entries.\n *\n * @param routeConfig - Route or redirect definitions to process.\n * @param parentRoutes - Accumulated parent routes for nesting context.\n * @param prefix - Current path prefix propagated from parents.\n */\nexport function buildRoute(\n  routeConfig: (AnyRoute | Redirect)[],\n  parentRoutes: AnyRoute[] = [],\n  prefix = '',\n): FlatRoute<ParamData>[] {\n  const flatRoutes: FlatRoute<ParamData>[] = [];\n\n  for (const route of routeConfig) {\n    const parts = [];\n    if (prefix !== '') {\n      parts.push(prefix);\n    }\n    if (route.path != null && route.path !== '' && route.path !== '/') {\n      let normalized = route.path;\n      if (normalized.startsWith('/')) {\n        normalized = normalized.slice(1);\n      }\n      parts.push(normalized);\n    }\n\n    const newPath = parts.join('/');\n\n    const { children } = route as Route<any, any, any>;\n\n    if (!isRedirect(route) && children != null) {\n      const routes = buildRoute(children, [...parentRoutes, route], newPath);\n      flatRoutes.push(...routes);\n      // eslint-disable-next-line no-continue\n      continue;\n    }\n\n    const matchFunction = match(`/${newPath}`, {\n      trailing: false,\n    });\n\n    let path = newPath;\n    if (!newPath.startsWith('/')) {\n      path = `/${newPath}`;\n    }\n\n    if (isRedirect(route)) {\n      let redirectTo = route.to;\n\n      if (!redirectTo.startsWith('/')) {\n        redirectTo = `${path}/${redirectTo}`;\n      }\n      flatRoutes.push(\n        new FlatRoute({\n          path,\n          redirectTo,\n          matchFunction,\n          routes: [...parentRoutes] as AnyRoute[],\n        }),\n      );\n    } else {\n      flatRoutes.push(\n        new FlatRoute({\n          path,\n          matchFunction,\n          routes: [...parentRoutes, route] as AnyRoute[],\n        }),\n      );\n    }\n  }\n\n  return flatRoutes;\n}\n\n/**\n * Top-level convenience to flatten a route configuration into `FlatRoute`s.\n *\n * @param routeConfig - Route definitions to flatten.\n */\nexport function buildRoutes(routeConfig: AnyRoute[]): FlatRoute<ParamData>[] {\n  return buildRoute(routeConfig);\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRedirect.d.ts","sourceRoot":"","sources":["../../../src/errors/HttpRedirect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HttpRedirect.d.ts","sourceRoot":"","sources":["../../../src/errors/HttpRedirect.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK;IAEtC,UAAU,EAAE,MAAM,CAAC;IAGnB,UAAU,EAAE,MAAM,CAAC;gBAQP,UAAU,EAAE,MAAM,EAAE,UAAU,SAAM;CAUxD"}
|
|
@@ -8,4 +8,4 @@ export default class HttpRedirect extends Error {
|
|
|
8
8
|
Object.setPrototypeOf(this, HttpRedirect.prototype);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cFJlZGlyZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2Vycm9ycy9IdHRwUmVkaXJlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsTUFBTSxDQUFDLE9BQU8sT0FBTyxZQUFhLFNBQVEsS0FBSztJQUV0QyxVQUFVLENBQVM7SUFHbkIsVUFBVSxDQUFTO0lBUTFCLFlBQW1CLFVBQWtCLEVBQUUsVUFBVSxHQUFHLEdBQUc7UUFDckQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBRXRCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBSTdCLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN0RCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyIvKiogRXJyb3IgdGhhdCBzaWduYWxzIGFuIEhUVFAgcmVkaXJlY3QgZnJvbSByb3V0ZSBsb2dpYy4gKi9cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEh0dHBSZWRpcmVjdCBleHRlbmRzIEVycm9yIHtcbiAgLyoqIFRoZSBVUkwgdG8gcmVkaXJlY3QgdG8gKi9cbiAgcHVibGljIHJlZGlyZWN0VG86IHN0cmluZztcblxuICAvKiogSFRUUCBzdGF0dXMgY29kZSBmb3IgdGhlIHJlZGlyZWN0ICgzMDEsIDMwMiwgZXRjLikgKi9cbiAgcHVibGljIHN0YXR1c0NvZGU6IG51bWJlcjtcblxuICAvKipcbiAgICogQ3JlYXRlcyBhIG5ldyBIdHRwUmVkaXJlY3QgZXJyb3IuXG4gICAqXG4gICAqIEBwYXJhbSByZWRpcmVjdFRvIC0gVGhlIFVSTCB0byByZWRpcmVjdCB0b1xuICAgKiBAcGFyYW0gc3RhdHVzQ29kZSAtIEhUVFAgc3RhdHVzIGNvZGUgKGRlZmF1bHRzIHRvIDMwMiBmb3IgdGVtcG9yYXJ5IHJlZGlyZWN0KVxuICAgKi9cbiAgcHVibGljIGNvbnN0cnVjdG9yKHJlZGlyZWN0VG86IHN0cmluZywgc3RhdHVzQ29kZSA9IDMwMikge1xuICAgIHN1cGVyKCdIdHRwUmVkaXJlY3QnKTtcblxuICAgIHRoaXMucmVkaXJlY3RUbyA9IHJlZGlyZWN0VG87XG4gICAgdGhpcy5zdGF0dXNDb2RlID0gc3RhdHVzQ29kZTtcblxuICAgIC8vIEZpeCBmb3IgaW5zdGFuY2VvZiBidWcgaW4gVHlwZVNjcmlwdDpcbiAgICAvLyBodHRwczovL3d3dy5kYW5ueWd1by5jb20vYmxvZy9ob3ctdG8tZml4LWluc3RhbmNlb2Ytbm90LXdvcmtpbmctZm9yLWN1c3RvbS1lcnJvcnMtaW4tdHlwZXNjcmlwdC9cbiAgICBPYmplY3Quc2V0UHJvdG90eXBlT2YodGhpcywgSHR0cFJlZGlyZWN0LnByb3RvdHlwZSk7XG4gIH1cbn1cbiJdfQ==
|
package/lib/esm/errors/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { default as HttpRedirect } from './HttpRedirect.js';
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZXJyb3JzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLElBQUksWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKiogUmUtZXhwb3J0IG9mIHRoZSBIdHRwUmVkaXJlY3QgZXJyb3IgaGVscGVyLiAqL1xuZXhwb3J0IHsgZGVmYXVsdCBhcyBIdHRwUmVkaXJlY3QgfSBmcm9tICcuL0h0dHBSZWRpcmVjdC5qcyc7XG4iXX0=
|
|
@@ -2,6 +2,9 @@ import type { History, HistoryListener, HistoryLocation } from './types.js';
|
|
|
2
2
|
export declare function createPath(location: HistoryLocation): string;
|
|
3
3
|
export default class BrowserHistory implements History {
|
|
4
4
|
private __listeners;
|
|
5
|
+
private __pendingDebugContext;
|
|
6
|
+
private __historyIndex;
|
|
7
|
+
private __currentIndex;
|
|
5
8
|
constructor();
|
|
6
9
|
get location(): Location;
|
|
7
10
|
init(): void;
|
|
@@ -9,8 +12,10 @@ export default class BrowserHistory implements History {
|
|
|
9
12
|
push(location: HistoryLocation): void;
|
|
10
13
|
unsubscribe(listener: HistoryListener): void;
|
|
11
14
|
subscribe(listener: HistoryListener): () => void;
|
|
12
|
-
private
|
|
13
|
-
private
|
|
15
|
+
private __notify;
|
|
16
|
+
private __consumePendingDebugContext;
|
|
14
17
|
private __subscribe;
|
|
18
|
+
private __handlePopstate;
|
|
19
|
+
private __ensureStateIndex;
|
|
15
20
|
}
|
|
16
21
|
//# sourceMappingURL=BrowserHistory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserHistory.d.ts","sourceRoot":"","sources":["../../../src/history/BrowserHistory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"BrowserHistory.d.ts","sourceRoot":"","sources":["../../../src/history/BrowserHistory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAEP,eAAe,EACf,eAAe,EAChB,MAAM,YAAY,CAAC;AAQpB,wBAAgB,UAAU,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAI5D;AAOD,MAAM,CAAC,OAAO,OAAO,cAAe,YAAW,OAAO;IAEpD,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,qBAAqB,CAAoC;IAEjE,OAAO,CAAC,cAAc,CAAK;IAE3B,OAAO,CAAC,cAAc,CAAK;;IAgB3B,IAAW,QAAQ,IAAI,QAAQ,CAU9B;IAKM,IAAI,IAAI,IAAI;IAUZ,GAAG,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IA+BpC,IAAI,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAiCrC,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAY5C,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAYvD,OAAO,CAAC,QAAQ,CAQd;IAEF,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,gBAAgB,CA2BtB;IAEF,OAAO,CAAC,kBAAkB;CA2B3B"}
|
|
@@ -4,8 +4,12 @@ export function createPath(location) {
|
|
|
4
4
|
}
|
|
5
5
|
export default class BrowserHistory {
|
|
6
6
|
__listeners = [];
|
|
7
|
+
__pendingDebugContext = null;
|
|
8
|
+
__historyIndex = 0;
|
|
9
|
+
__currentIndex = 0;
|
|
7
10
|
constructor() {
|
|
8
11
|
this.init();
|
|
12
|
+
this.__ensureStateIndex();
|
|
9
13
|
}
|
|
10
14
|
get location() {
|
|
11
15
|
return {
|
|
@@ -18,14 +22,40 @@ export default class BrowserHistory {
|
|
|
18
22
|
this.__subscribe();
|
|
19
23
|
}
|
|
20
24
|
set(location) {
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
25
|
+
const { debugContext, ...rest } = location;
|
|
26
|
+
const path = createPath(rest);
|
|
27
|
+
if (debugContext !== undefined) {
|
|
28
|
+
this.__pendingDebugContext = {
|
|
29
|
+
...debugContext,
|
|
30
|
+
historyIndex: this.__currentIndex,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
this.__pendingDebugContext = { historyIndex: this.__currentIndex };
|
|
35
|
+
}
|
|
36
|
+
window.history.replaceState({
|
|
37
|
+
__plumileRouterIndex: this.__currentIndex,
|
|
38
|
+
}, '', path);
|
|
39
|
+
this.__notify(true);
|
|
24
40
|
}
|
|
25
41
|
push(location) {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
this.
|
|
42
|
+
const { debugContext, ...rest } = location;
|
|
43
|
+
const path = createPath(rest);
|
|
44
|
+
this.__historyIndex += 1;
|
|
45
|
+
this.__currentIndex = this.__historyIndex;
|
|
46
|
+
if (debugContext !== undefined) {
|
|
47
|
+
this.__pendingDebugContext = {
|
|
48
|
+
...debugContext,
|
|
49
|
+
historyIndex: this.__currentIndex,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
this.__pendingDebugContext = { historyIndex: this.__currentIndex };
|
|
54
|
+
}
|
|
55
|
+
window.history.pushState({
|
|
56
|
+
__plumileRouterIndex: this.__currentIndex,
|
|
57
|
+
}, '', path);
|
|
58
|
+
this.__notify(false);
|
|
29
59
|
}
|
|
30
60
|
unsubscribe(listener) {
|
|
31
61
|
this.__listeners = this.__listeners.filter((item) => {
|
|
@@ -38,24 +68,72 @@ export default class BrowserHistory {
|
|
|
38
68
|
this.unsubscribe(listener);
|
|
39
69
|
};
|
|
40
70
|
}
|
|
41
|
-
|
|
71
|
+
__notify = (forceRerender) => {
|
|
42
72
|
setTimeout(() => {
|
|
43
73
|
const { location } = this;
|
|
74
|
+
const context = this.__consumePendingDebugContext();
|
|
44
75
|
this.__listeners.forEach((listener) => {
|
|
45
|
-
listener(location,
|
|
46
|
-
});
|
|
47
|
-
}, 0);
|
|
48
|
-
};
|
|
49
|
-
__doFire = (forceRerender = false) => {
|
|
50
|
-
setTimeout(() => {
|
|
51
|
-
const { location } = this;
|
|
52
|
-
this.__listeners.forEach((listener) => {
|
|
53
|
-
listener(location, forceRerender);
|
|
76
|
+
listener(location, forceRerender, context);
|
|
54
77
|
});
|
|
55
78
|
}, 0);
|
|
56
79
|
};
|
|
80
|
+
__consumePendingDebugContext() {
|
|
81
|
+
if (this.__pendingDebugContext == null) {
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
const context = this.__pendingDebugContext;
|
|
85
|
+
this.__pendingDebugContext = null;
|
|
86
|
+
return context;
|
|
87
|
+
}
|
|
57
88
|
__subscribe() {
|
|
58
|
-
window.addEventListener('popstate', this.
|
|
89
|
+
window.addEventListener('popstate', this.__handlePopstate);
|
|
90
|
+
}
|
|
91
|
+
__handlePopstate = (event) => {
|
|
92
|
+
let origin;
|
|
93
|
+
let historyIndex;
|
|
94
|
+
const state = event.state;
|
|
95
|
+
if (state != null && typeof state.__plumileRouterIndex === 'number') {
|
|
96
|
+
historyIndex = state.__plumileRouterIndex;
|
|
97
|
+
if (historyIndex < this.__currentIndex) {
|
|
98
|
+
origin = 'popstate-back';
|
|
99
|
+
}
|
|
100
|
+
else if (historyIndex > this.__currentIndex) {
|
|
101
|
+
origin = 'popstate-forward';
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
origin = 'popstate-unknown';
|
|
105
|
+
}
|
|
106
|
+
this.__currentIndex = historyIndex;
|
|
107
|
+
if (historyIndex > this.__historyIndex) {
|
|
108
|
+
this.__historyIndex = historyIndex;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
origin = 'external';
|
|
113
|
+
}
|
|
114
|
+
this.__pendingDebugContext = {
|
|
115
|
+
origin,
|
|
116
|
+
trigger: 'popstate',
|
|
117
|
+
historyIndex,
|
|
118
|
+
};
|
|
119
|
+
this.__notify(false);
|
|
120
|
+
};
|
|
121
|
+
__ensureStateIndex() {
|
|
122
|
+
const state = window.history.state;
|
|
123
|
+
if (state != null && typeof state.__plumileRouterIndex === 'number') {
|
|
124
|
+
this.__currentIndex = state.__plumileRouterIndex;
|
|
125
|
+
this.__historyIndex = state.__plumileRouterIndex;
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
const { pathname, search, hash } = window.location;
|
|
129
|
+
let targetUrl = `${pathname}${search}${hash}`;
|
|
130
|
+
if (typeof window.location.href === 'string' &&
|
|
131
|
+
window.location.href !== '') {
|
|
132
|
+
targetUrl = window.location.href;
|
|
133
|
+
}
|
|
134
|
+
window.history.replaceState({
|
|
135
|
+
__plumileRouterIndex: this.__currentIndex,
|
|
136
|
+
}, '', targetUrl);
|
|
59
137
|
}
|
|
60
138
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrowserHistory.js","sourceRoot":"","sources":["../../../src/history/BrowserHistory.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,UAAU,CAAC,QAAyB;IAClD,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC;IAEtD,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAOD,MAAM,CAAC,OAAO,OAAO,cAAc;IAEzB,WAAW,GAAsB,EAAE,CAAC;IAK5C;QACE,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAQD,IAAW,QAAQ;QAIjB,OAAO;YAEL,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;YAClC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;YAC9B,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;SACJ,CAAC;IAC3B,CAAC;IAKM,IAAI;QACT,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAQM,GAAG,CAAC,QAAyB;QAClC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAQM,IAAI,CAAC,QAAyB;QACnC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAOM,WAAW,CAAC,QAAyB;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAClD,OAAO,IAAI,KAAK,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAQM,SAAS,CAAC,QAAyB;QACxC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAMO,MAAM,GAAG,GAAS,EAAE;QAC1B,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;IAOM,QAAQ,GAAG,CAAC,aAAa,GAAG,KAAK,EAAE,EAAE;QAC3C,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;IAKM,WAAW;QACjB,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACF","sourcesContent":["import type { History, HistoryListener, HistoryLocation } from './types.js';\n\n/**\n * Creates a complete URL path from a HistoryLocation object.\n *\n * @param location - Location object containing pathname, search, and hash\n * @returns Complete path string combining all components\n */\nexport function createPath(location: HistoryLocation): string {\n  const { pathname, search = '', hash = '' } = location;\n\n  return `${pathname}${search}${hash}`;\n}\n\n/**\n * Browser history implementation using the HTML5 History API.\n * Manages browser navigation state and provides a consistent interface\n * for programmatic navigation and location change notifications.\n */\nexport default class BrowserHistory implements History {\n  /** Array of listeners for location changes */\n  private __listeners: HistoryListener[] = [];\n\n  /**\n   * Creates a new BrowserHistory instance and initializes event listeners.\n   */\n  public constructor() {\n    this.init();\n  }\n\n  /**\n   * Gets the current browser location.\n   *\n   * @returns Current window.location object\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public get location(): Location {\n    // Some test DOM environments (e.g. happy-dom) expose non-enumerable\n    // Location properties so a simple spread returns an empty object.\n    // Return an explicit plain object with the fields we rely on.\n    return {\n      // pathname/search/hash are sufficient for our router logic\n      pathname: window.location.pathname,\n      search: window.location.search,\n      hash: window.location.hash,\n    } as unknown as Location;\n  }\n\n  /**\n   * Initializes the history instance by setting up event listeners.\n   */\n  public init(): void {\n    this.__subscribe();\n  }\n\n  /**\n   * Replaces the current history entry with a new location.\n   * This updates the URL without creating a new history entry.\n   *\n   * @param location - New location to set\n   */\n  public set(location: HistoryLocation): void {\n    const path = createPath(location);\n\n    window.history.replaceState({}, '', path);\n    this.__doFire(true);\n  }\n\n  /**\n   * Navigates to a new location by pushing a new history entry.\n   * This creates a new entry in the browser's history stack.\n   *\n   * @param location - Location to navigate to\n   */\n  public push(location: HistoryLocation): void {\n    const path = createPath(location);\n\n    window.history.pushState({}, '', path);\n    this.__fire();\n  }\n\n  /**\n   * Removes a listener from the history change notifications.\n   *\n   * @param listener - Listener function to remove\n   */\n  public unsubscribe(listener: HistoryListener): void {\n    this.__listeners = this.__listeners.filter((item) => {\n      return item !== listener;\n    });\n  }\n\n  /**\n   * Subscribes to history changes.\n   *\n   * @param listener - Function to call when location changes\n   * @returns Unsubscribe function\n   */\n  public subscribe(listener: HistoryListener): () => void {\n    this.__listeners.push(listener);\n    return () => {\n      this.unsubscribe(listener);\n    };\n  }\n\n  /**\n   * Notifies all listeners of a location change.\n   * Uses setTimeout to ensure the notification happens after the current execution.\n   */\n  private __fire = (): void => {\n    setTimeout(() => {\n      const { location } = this;\n      this.__listeners.forEach((listener) => {\n        listener(location, false);\n      });\n    }, 0);\n  };\n\n  /**\n   * Notifies all listeners of a location change with optional force rerender.\n   *\n   * @param forceRerender - Whether to force a re-render\n   */\n  private __doFire = (forceRerender = false) => {\n    setTimeout(() => {\n      const { location } = this;\n      this.__listeners.forEach((listener) => {\n        listener(location, forceRerender);\n      });\n    }, 0);\n  };\n\n  /**\n   * Sets up the popstate event listener for browser back/forward navigation.\n   */\n  private __subscribe() {\n    window.addEventListener('popstate', this.__fire);\n  }\n}\n"]}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrowserHistory.js","sourceRoot":"","sources":["../../../src/history/BrowserHistory.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  History,\n  HistoryDebugContext,\n  HistoryListener,\n  HistoryLocation,\n} from './types.js';\n\n/**\n * Creates a complete URL path from a HistoryLocation object.\n *\n * @param location - Location object containing pathname, search, and hash\n * @returns Complete path string combining all components\n */\nexport function createPath(location: HistoryLocation): string {\n  const { pathname, search = '', hash = '' } = location;\n\n  return `${pathname}${search}${hash}`;\n}\n\n/**\n * Browser history implementation using the HTML5 History API.\n * Manages browser navigation state and provides a consistent interface\n * for programmatic navigation and location change notifications.\n */\nexport default class BrowserHistory implements History {\n  /** Array of listeners for location changes */\n  private __listeners: HistoryListener[] = [];\n  /** Debug metadata captured for the next notification */\n  private __pendingDebugContext: HistoryDebugContext | null = null;\n  /** Monotonic counter attached to pushState/replaceState */\n  private __historyIndex = 0;\n  /** Current index representing the active entry */\n  private __currentIndex = 0;\n\n  /**\n   * Creates a new BrowserHistory instance and initializes event listeners.\n   */\n  public constructor() {\n    this.init();\n    this.__ensureStateIndex();\n  }\n\n  /**\n   * Gets the current browser location.\n   *\n   * @returns Current window.location object\n   */\n  // eslint-disable-next-line class-methods-use-this\n  public get location(): Location {\n    // Some test DOM environments (e.g. happy-dom) expose non-enumerable\n    // Location properties so a simple spread returns an empty object.\n    // Return an explicit plain object with the fields we rely on.\n    return {\n      // pathname/search/hash are sufficient for our router logic\n      pathname: window.location.pathname,\n      search: window.location.search,\n      hash: window.location.hash,\n    } as unknown as Location;\n  }\n\n  /**\n   * Initializes the history instance by setting up event listeners.\n   */\n  public init(): void {\n    this.__subscribe();\n  }\n\n  /**\n   * Replaces the current history entry with a new location.\n   * This updates the URL without creating a new history entry.\n   *\n   * @param location - New location to set\n   */\n  public set(location: HistoryLocation): void {\n    const { debugContext, ...rest } = location as HistoryLocation & {\n      debugContext?: HistoryDebugContext;\n    };\n    const path = createPath(rest);\n\n    if (debugContext !== undefined) {\n      this.__pendingDebugContext = {\n        ...debugContext,\n        historyIndex: this.__currentIndex,\n      };\n    } else {\n      this.__pendingDebugContext = { historyIndex: this.__currentIndex };\n    }\n\n    window.history.replaceState(\n      {\n        __plumileRouterIndex: this.__currentIndex,\n      },\n      '',\n      path,\n    );\n    this.__notify(true);\n  }\n\n  /**\n   * Navigates to a new location by pushing a new history entry.\n   * This creates a new entry in the browser's history stack.\n   *\n   * @param location - Location to navigate to\n   */\n  public push(location: HistoryLocation): void {\n    const { debugContext, ...rest } = location as HistoryLocation & {\n      debugContext?: HistoryDebugContext;\n    };\n    const path = createPath(rest);\n\n    this.__historyIndex += 1;\n    this.__currentIndex = this.__historyIndex;\n\n    if (debugContext !== undefined) {\n      this.__pendingDebugContext = {\n        ...debugContext,\n        historyIndex: this.__currentIndex,\n      };\n    } else {\n      this.__pendingDebugContext = { historyIndex: this.__currentIndex };\n    }\n\n    window.history.pushState(\n      {\n        __plumileRouterIndex: this.__currentIndex,\n      },\n      '',\n      path,\n    );\n    this.__notify(false);\n  }\n\n  /**\n   * Removes a listener from the history change notifications.\n   *\n   * @param listener - Listener function to remove\n   */\n  public unsubscribe(listener: HistoryListener): void {\n    this.__listeners = this.__listeners.filter((item) => {\n      return item !== listener;\n    });\n  }\n\n  /**\n   * Subscribes to history changes.\n   *\n   * @param listener - Function to call when location changes\n   * @returns Unsubscribe function\n   */\n  public subscribe(listener: HistoryListener): () => void {\n    this.__listeners.push(listener);\n    return () => {\n      this.unsubscribe(listener);\n    };\n  }\n\n  /**\n   * Notifies all listeners of a location change.\n   *\n   * Uses setTimeout to ensure the notification happens after the current execution.\n   */\n  private __notify = (forceRerender: boolean): void => {\n    setTimeout(() => {\n      const { location } = this;\n      const context = this.__consumePendingDebugContext();\n      this.__listeners.forEach((listener) => {\n        listener(location, forceRerender, context);\n      });\n    }, 0);\n  };\n\n  private __consumePendingDebugContext(): HistoryDebugContext | undefined {\n    if (this.__pendingDebugContext == null) {\n      return undefined;\n    }\n    const context = this.__pendingDebugContext;\n    this.__pendingDebugContext = null;\n    return context;\n  }\n\n  /**\n   * Sets up the popstate event listener for browser back/forward navigation.\n   */\n  private __subscribe() {\n    window.addEventListener('popstate', this.__handlePopstate);\n  }\n\n  private __handlePopstate = (event: PopStateEvent): void => {\n    let origin: string | undefined;\n    let historyIndex: number | undefined;\n    const state = event.state as { __plumileRouterIndex?: number } | null;\n    if (state != null && typeof state.__plumileRouterIndex === 'number') {\n      historyIndex = state.__plumileRouterIndex;\n      if (historyIndex < this.__currentIndex) {\n        origin = 'popstate-back';\n      } else if (historyIndex > this.__currentIndex) {\n        origin = 'popstate-forward';\n      } else {\n        origin = 'popstate-unknown';\n      }\n      this.__currentIndex = historyIndex;\n      if (historyIndex > this.__historyIndex) {\n        this.__historyIndex = historyIndex;\n      }\n    } else {\n      origin = 'external';\n    }\n\n    this.__pendingDebugContext = {\n      origin,\n      trigger: 'popstate',\n      historyIndex,\n    };\n    this.__notify(false);\n  };\n\n  private __ensureStateIndex(): void {\n    const state = window.history.state as {\n      __plumileRouterIndex?: number;\n    } | null;\n    if (state != null && typeof state.__plumileRouterIndex === 'number') {\n      this.__currentIndex = state.__plumileRouterIndex;\n      this.__historyIndex = state.__plumileRouterIndex;\n      return;\n    }\n\n    const { pathname, search, hash } = window.location;\n    let targetUrl = `${pathname}${search}${hash}`;\n    if (\n      typeof window.location.href === 'string' &&\n      window.location.href !== ''\n    ) {\n      targetUrl = window.location.href;\n    }\n\n    window.history.replaceState(\n      {\n        __plumileRouterIndex: this.__currentIndex,\n      },\n      '',\n      targetUrl,\n    );\n  }\n}\n"]}
|
|
@@ -1,12 +1,19 @@
|
|
|
1
|
-
export type
|
|
1
|
+
export type HistoryDebugContext = {
|
|
2
|
+
origin?: string;
|
|
3
|
+
trigger?: string;
|
|
4
|
+
historyIndex?: number;
|
|
5
|
+
};
|
|
6
|
+
export type HistoryListener = (location: Location, forceRerender: boolean, debugContext?: HistoryDebugContext) => void;
|
|
2
7
|
export type HistoryLocation = {
|
|
3
8
|
hash?: string;
|
|
4
9
|
pathname: string;
|
|
5
10
|
search?: string;
|
|
11
|
+
debugContext?: HistoryDebugContext;
|
|
6
12
|
};
|
|
7
13
|
export interface History {
|
|
8
14
|
init: () => void;
|
|
9
15
|
subscribe: (listener: HistoryListener) => () => void;
|
|
10
16
|
push: (location: HistoryLocation) => void;
|
|
17
|
+
set: (location: HistoryLocation) => void;
|
|
11
18
|
}
|
|
12
19
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/history/types.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,eAAe,GAAG,CAC5B,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/history/types.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAC5B,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,mBAAmB,KAC/B,IAAI,CAAC;AAMV,MAAM,MAAM,eAAe,GAAG;IAE5B,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,QAAQ,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC,CAAC;AAMF,MAAM,WAAW,OAAO;IAEtB,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB,SAAS,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,MAAM,IAAI,CAAC;IAErD,IAAI,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;IAE1C,GAAG,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;CAC1C"}
|
package/lib/esm/history/types.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaGlzdG9yeS90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDYWxsYmFjayBmdW5jdGlvbiBmb3IgaGlzdG9yeSBjaGFuZ2VzLlxuICogQ2FsbGVkIHdoZW5ldmVyIHRoZSBicm93c2VyIGxvY2F0aW9uIGNoYW5nZXMuXG4gKlxuICogQHBhcmFtIGxvY2F0aW9uIC0gVGhlIG5ldyBicm93c2VyIGxvY2F0aW9uXG4gKiBAcGFyYW0gZm9yY2VSZXJlbmRlciAtIFdoZXRoZXIgdG8gZm9yY2UgYSByZS1yZW5kZXIgZXZlbiBpZiB0aGUgcGF0aCBpcyB0aGUgc2FtZVxuICovXG5leHBvcnQgdHlwZSBIaXN0b3J5RGVidWdDb250ZXh0ID0ge1xuICBvcmlnaW4/OiBzdHJpbmc7XG4gIHRyaWdnZXI/OiBzdHJpbmc7XG4gIGhpc3RvcnlJbmRleD86IG51bWJlcjtcbn07XG5cbmV4cG9ydCB0eXBlIEhpc3RvcnlMaXN0ZW5lciA9IChcbiAgbG9jYXRpb246IExvY2F0aW9uLFxuICBmb3JjZVJlcmVuZGVyOiBib29sZWFuLFxuICBkZWJ1Z0NvbnRleHQ/OiBIaXN0b3J5RGVidWdDb250ZXh0LFxuKSA9PiB2b2lkO1xuXG4vKipcbiAqIFJlcHJlc2VudHMgYSBsb2NhdGlvbiBmb3IgaGlzdG9yeSBuYXZpZ2F0aW9uLlxuICogVGhpcyBpcyBhIHN1YnNldCBvZiB0aGUgYnJvd3NlcidzIExvY2F0aW9uIGludGVyZmFjZS5cbiAqL1xuZXhwb3J0IHR5cGUgSGlzdG9yeUxvY2F0aW9uID0ge1xuICAvKiogVVJMIGhhc2ggKGZyYWdtZW50IGlkZW50aWZpZXIpICovXG4gIGhhc2g/OiBzdHJpbmc7XG4gIC8qKiBVUkwgcGF0aG5hbWUgKi9cbiAgcGF0aG5hbWU6IHN0cmluZztcbiAgLyoqIFVSTCBzZWFyY2ggcGFyYW1ldGVycyAqL1xuICBzZWFyY2g/OiBzdHJpbmc7XG4gIC8qKiBPcHRpb25hbCBkZWJ1ZyBtZXRhZGF0YSBwcm9wYWdhdGVkIHRocm91Z2ggbmF2aWdhdGlvbiBldmVudHMgKi9cbiAgZGVidWdDb250ZXh0PzogSGlzdG9yeURlYnVnQ29udGV4dDtcbn07XG5cbi8qKlxuICogSW50ZXJmYWNlIGZvciBoaXN0b3J5IG1hbmFnZW1lbnQgaW1wbGVtZW50YXRpb25zLlxuICogUHJvdmlkZXMgbWV0aG9kcyBmb3IgbmF2aWdhdGlvbiBhbmQgbGlzdGVuaW5nIHRvIGxvY2F0aW9uIGNoYW5nZXMuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgSGlzdG9yeSB7XG4gIC8qKiBJbml0aWFsaXplIHRoZSBoaXN0b3J5IGluc3RhbmNlICovXG4gIGluaXQ6ICgpID0+IHZvaWQ7XG4gIC8qKiBTdWJzY3JpYmUgdG8gbG9jYXRpb24gY2hhbmdlcyAqL1xuICBzdWJzY3JpYmU6IChsaXN0ZW5lcjogSGlzdG9yeUxpc3RlbmVyKSA9PiAoKSA9PiB2b2lkO1xuICAvKiogTmF2aWdhdGUgdG8gYSBuZXcgbG9jYXRpb24gKi9cbiAgcHVzaDogKGxvY2F0aW9uOiBIaXN0b3J5TG9jYXRpb24pID0+IHZvaWQ7XG4gIC8qKiBSZXBsYWNlIHRoZSBjdXJyZW50IGhpc3RvcnkgZW50cnkgKi9cbiAgc2V0OiAobG9jYXRpb246IEhpc3RvcnlMb2NhdGlvbikgPT4gdm9pZDtcbn1cbiJdfQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/routing/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,KAAK,yBAAyB,EAE9B,KAAK,SAAS,EAIf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/routing/Link.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,KAAK,yBAAyB,EAE9B,KAAK,SAAS,EAIf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAc3E,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAmBT;AAKD,KAAK,KAAK,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IAE7E,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,EAAE,SAAS,CAAC;IAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAErD,OAAO,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAErD,WAAW,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAEzD,MAAM,CAAC,EAAE,yBAAyB,CAAC;IAEnC,EAAE,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;IAE9B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAyBF,QAAA,MAAM,IAAI,0GAsLR,CAAC;AAEH,eAAe,IAAI,CAAC"}
|