@saolabs/client 1.6.0 → 1.7.1
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/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/src/core/bootstrap/bundle.d.ts +1 -1
- package/dist/src/core/bootstrap/bundle.d.ts.map +1 -1
- package/dist/src/core/bootstrap/bundle.js +14 -1
- package/dist/src/core/bootstrap/bundle.js.map +1 -1
- package/dist/src/core/contracts/BundleInterface.d.ts +5 -0
- package/dist/src/core/contracts/BundleInterface.d.ts.map +1 -1
- package/dist/src/core/contracts/RouterInterface.d.ts +2 -0
- package/dist/src/core/contracts/RouterInterface.d.ts.map +1 -1
- package/dist/src/core/contracts/ViewManagerInterface.d.ts +2 -0
- package/dist/src/core/contracts/ViewManagerInterface.d.ts.map +1 -1
- package/dist/src/core/routers/ClientMiddleware.d.ts +45 -0
- package/dist/src/core/routers/ClientMiddleware.d.ts.map +1 -0
- package/dist/src/core/routers/ClientMiddleware.js +113 -0
- package/dist/src/core/routers/ClientMiddleware.js.map +1 -0
- package/dist/src/core/routers/Router.d.ts +6 -0
- package/dist/src/core/routers/Router.d.ts.map +1 -1
- package/dist/src/core/routers/Router.js +61 -5
- package/dist/src/core/routers/Router.js.map +1 -1
- package/dist/src/core/view/ViewController.d.ts +2 -0
- package/dist/src/core/view/ViewController.d.ts.map +1 -1
- package/dist/src/core/view/ViewController.js +3 -0
- package/dist/src/core/view/ViewController.js.map +1 -1
- package/dist/src/core/view/ViewManager.d.ts +2 -0
- package/dist/src/core/view/ViewManager.d.ts.map +1 -1
- package/dist/src/core/view/ViewManager.js +23 -0
- package/dist/src/core/view/ViewManager.js.map +1 -1
- package/index.ts +3 -0
- package/package.json +1 -1
- package/src/core/bootstrap/bundle.ts +10 -1
- package/src/core/contracts/BundleInterface.ts +5 -0
- package/src/core/contracts/RouterInterface.ts +2 -0
- package/src/core/contracts/ViewManagerInterface.ts +2 -0
- package/src/core/routers/ClientMiddleware.ts +124 -0
- package/src/core/routers/Router.ts +56 -5
- package/src/core/view/ViewController.ts +3 -0
- package/src/core/view/ViewManager.ts +23 -0
package/dist/index.d.ts
CHANGED
|
@@ -37,6 +37,8 @@ export type { ViewUserConfig } from './src/core/view/View.js';
|
|
|
37
37
|
export { ResourceScope } from './src/core/view/ResourceScope.js';
|
|
38
38
|
export type { WatchCallback, WatchContext, WatchOptions, Cleanup } from './src/core/view/ResourceScope.js';
|
|
39
39
|
export { Router, ActiveRoute, useRoute, useParams, useQuery } from './src/core/routers/Router.js';
|
|
40
|
+
export { authMiddleware, guestMiddleware } from './src/core/routers/ClientMiddleware.js';
|
|
41
|
+
export type { ClientMiddlewareContext, ClientMiddlewareResult, ClientMiddleware, ClientMiddlewareHandler, ClientMiddlewareRef, ClientMiddlewareConfig, AuthMiddlewareOptions } from './src/core/routers/ClientMiddleware.js';
|
|
40
42
|
export { Reactive } from './src/core/elements/Reactive.js';
|
|
41
43
|
export { Block } from './src/core/elements/Block.js';
|
|
42
44
|
export { BlockOutlet } from './src/core/elements/BlockOutlet.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACtG,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAIrI,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxG,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAC3G,YAAY,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAGjG,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,YAAY,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACpF,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACjG,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAGjE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC7E,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGvG,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACnH,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAG3G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -35,6 +35,7 @@ export { View, ViewController, ViewManager, ViewState, StateManager, LoopContext
|
|
|
35
35
|
export { ResourceScope } from './src/core/view/ResourceScope.js';
|
|
36
36
|
// Router
|
|
37
37
|
export { Router, ActiveRoute, useRoute, useParams, useQuery } from './src/core/routers/Router.js';
|
|
38
|
+
export { authMiddleware, guestMiddleware } from './src/core/routers/ClientMiddleware.js';
|
|
38
39
|
// Elements
|
|
39
40
|
export { Reactive } from './src/core/elements/Reactive.js';
|
|
40
41
|
export { Block } from './src/core/elements/Block.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM;AACN,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAE7D,uCAAuC;AACvC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAGtG,kFAAkF;AAClF,iFAAiF;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAIxG,WAAW;AACX,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAG5E,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEjG,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAEjE,gDAAgD;AAChD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAG7E,cAAc;AACd,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEnH,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGjE,SAAS;AACT,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,6 @@ export declare function mergeBundles(bundles: Array<SaolaBundle | null | undefin
|
|
|
40
40
|
* site chạy bằng view gốc, còn hơn trắng trang.
|
|
41
41
|
*/
|
|
42
42
|
export declare function loadBundles(urls: string[] | null | undefined, opts?: MergeOptions): Promise<MergedBundles>;
|
|
43
|
-
/**
|
|
43
|
+
/** Register middleware before any boot hook can navigate; then run the bundle hooks. */
|
|
44
44
|
export declare function bootBundles(merged: MergedBundles, app: ApplicationInterface): void;
|
|
45
45
|
//# sourceMappingURL=bundle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../../src/core/bootstrap/bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGhG;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,CAE7D;AAmCD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,IAAI,GAAE,YAAiB,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../../src/core/bootstrap/bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGhG;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,CAE7D;AAmCD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,IAAI,GAAE,YAAiB,GAAG,aAAa,CA4CnH;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,GAAE,YAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyCpH;AAED,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,oBAAoB,GAAG,IAAI,CAgBlF"}
|
|
@@ -101,6 +101,8 @@ export function mergeBundles(bundles, opts = {}) {
|
|
|
101
101
|
Object.assign(out.helpers, bundle.helpers);
|
|
102
102
|
if (bundle.views)
|
|
103
103
|
Object.assign(out.views, bundle.views);
|
|
104
|
+
if (bundle.middleware)
|
|
105
|
+
(out.middleware ?? (out.middleware = [])).push(bundle.middleware);
|
|
104
106
|
for (const [group, map] of [['services', bundle.services], ['helpers', bundle.helpers], ['views', bundle.views]]) {
|
|
105
107
|
for (const key of Object.keys(map ?? {}))
|
|
106
108
|
owners.set(`${group}:${key}`, name);
|
|
@@ -161,8 +163,19 @@ export async function loadBundles(urls, opts = {}) {
|
|
|
161
163
|
}
|
|
162
164
|
return merged;
|
|
163
165
|
}
|
|
164
|
-
/**
|
|
166
|
+
/** Register middleware before any boot hook can navigate; then run the bundle hooks. */
|
|
165
167
|
export function bootBundles(merged, app) {
|
|
168
|
+
const installed = [];
|
|
169
|
+
try {
|
|
170
|
+
for (const middleware of merged.middleware ?? [])
|
|
171
|
+
installed.push(app.Router.useMiddleware(middleware));
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
// A malformed or duplicate policy must not silently boot an unguarded app.
|
|
175
|
+
for (const off of installed.reverse())
|
|
176
|
+
off();
|
|
177
|
+
throw error;
|
|
178
|
+
}
|
|
166
179
|
for (const boot of merged.boots) {
|
|
167
180
|
try {
|
|
168
181
|
boot(app);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../../src/core/bootstrap/bundle.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../../src/core/bootstrap/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ApplicationInterface } from "./ApplicationInterface.js";
|
|
2
2
|
import type { ServiceProviderInterface } from "./ServiceProviderInterface.js";
|
|
3
|
+
import type { ClientMiddlewareConfig } from "../routers/ClientMiddleware.js";
|
|
3
4
|
/** Factory view mà registry nhận: đồng bộ, hoặc lazy trả Promise<module>. */
|
|
4
5
|
export type ViewFactory = ((...args: any[]) => any) | (() => Promise<any>);
|
|
5
6
|
/**
|
|
@@ -18,6 +19,8 @@ export interface SaolaBundle {
|
|
|
18
19
|
services?: Record<string, any>;
|
|
19
20
|
/** { tên: fn } → gộp vào App.Helper. */
|
|
20
21
|
helpers?: Record<string, any>;
|
|
22
|
+
/** Project route middleware, registered automatically before bundle boot and Router start. */
|
|
23
|
+
middleware?: ClientMiddlewareConfig;
|
|
21
24
|
/** { 'dot.path': factory } → View.setViewRegistry(). Nạp sau ĐÈ nạp trước. */
|
|
22
25
|
views?: Record<string, ViewFactory>;
|
|
23
26
|
/**
|
|
@@ -59,6 +62,8 @@ export interface MergedBundles {
|
|
|
59
62
|
helpers: Record<string, any>;
|
|
60
63
|
views: Record<string, ViewFactory>;
|
|
61
64
|
boots: Array<(app: ApplicationInterface) => void>;
|
|
65
|
+
/** Optional for compatibility with previously materialized bundle manifests. */
|
|
66
|
+
middleware?: ClientMiddlewareConfig[];
|
|
62
67
|
/** Tên (hoặc URL) của bundle đã nạp được. */
|
|
63
68
|
loaded: string[];
|
|
64
69
|
/** [url, thông điệp lỗi] — nạp hỏng thì bỏ qua, KHÔNG làm sập boot. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundleInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/BundleInterface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"BundleInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/BundleInterface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE7E,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAE3E;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IACxB,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qFAAqF;IACrF,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,8FAA8F;IAC9F,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,sFAAsF;IACtF,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,uDAAuD;IACvD,IAAI,CAAC,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,GAAG;IACnC,OAAO,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,CAAC,CAAC;CAC7C;AAED,wFAAwF;AACxF,MAAM,WAAW,YAAY;IACzB,yEAAyE;IACzE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,uGAAuG;IACvG,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gGAAgG;IAChG,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IAClD,2FAA2F;IAC3F,aAAa,CAAC,EAAE,WAAW,CAAC;CAC/B;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,CAAC,wBAAwB,GAAG,GAAG,CAAC,EAAE,CAAC;IAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,CAAC,CAAC;IAClD,gFAAgF;IAChF,UAAU,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACtC,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,uEAAuE;IACvE,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACnC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ViewManagerInterface } from "./ViewManagerInterface.js";
|
|
2
|
+
import type { ClientMiddlewareConfig } from '../routers/ClientMiddleware.js';
|
|
2
3
|
export type RouterNavigationType = 'push' | 'pop';
|
|
3
4
|
export type RouterMode = 'history' | 'hash';
|
|
4
5
|
export interface RouteInterface {
|
|
@@ -48,6 +49,7 @@ export interface RouterInterface {
|
|
|
48
49
|
getCurrentRoute(): ActiveRouteInterface | null;
|
|
49
50
|
/** Navigation guards */
|
|
50
51
|
beforeEach(guard: (to: ActiveRouteInterface, from: ActiveRouteInterface, urlPath: string) => boolean | Promise<boolean>): this;
|
|
52
|
+
useMiddleware(config: ClientMiddlewareConfig): () => void;
|
|
51
53
|
/** Đăng ký hook sau điều hướng; trả về hàm huỷ đăng ký. Nhiều hook cùng sống được. */
|
|
52
54
|
afterEach(hook: (to: ActiveRouteInterface, from: ActiveRouteInterface) => void): () => void;
|
|
53
55
|
/** Start listening to URL changes */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/RouterInterface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"RouterInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/RouterInterface.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,8 @@ export interface ViewManagerInterface {
|
|
|
19
19
|
setViewRegistry(registry: Record<string, ((...args: any[]) => any) | (() => Promise<any>)>): void;
|
|
20
20
|
/** Register a single view module */
|
|
21
21
|
registerView(name: string, loader: ((...args: any[]) => any) | (() => Promise<any>)): void;
|
|
22
|
+
/** Static middleware aliases for a routed view, available before factory execution. */
|
|
23
|
+
getViewMiddleware?(name: string): readonly string[];
|
|
22
24
|
/** Initialize with optional config */
|
|
23
25
|
init(config?: {
|
|
24
26
|
container?: HTMLElement | string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewManagerInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/ViewManagerInterface.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ViewManagerInterface.d.ts","sourceRoot":"","sources":["../../../../src/core/contracts/ViewManagerInterface.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { ApplicationInterface } from '../contracts/ApplicationInterface.js';
|
|
2
|
+
import type { ActiveRoute, Route, Router } from './Router.js';
|
|
3
|
+
export interface ClientMiddlewareContext {
|
|
4
|
+
app: ApplicationInterface;
|
|
5
|
+
router: Router;
|
|
6
|
+
to: Route;
|
|
7
|
+
from: ActiveRoute | null;
|
|
8
|
+
/** Complete local destination, including query and fragment. */
|
|
9
|
+
url: string;
|
|
10
|
+
signal: AbortSignal;
|
|
11
|
+
}
|
|
12
|
+
export type ClientMiddlewareResult = void | boolean | {
|
|
13
|
+
redirect: string;
|
|
14
|
+
replace?: boolean;
|
|
15
|
+
};
|
|
16
|
+
export type ClientMiddleware = (context: ClientMiddlewareContext, ...parameters: string[]) => ClientMiddlewareResult | Promise<ClientMiddlewareResult>;
|
|
17
|
+
export type ClientMiddlewareHandler = ClientMiddleware | {
|
|
18
|
+
handle: ClientMiddleware;
|
|
19
|
+
};
|
|
20
|
+
export type ClientMiddlewareRef = string | ClientMiddlewareHandler;
|
|
21
|
+
export interface ClientMiddlewareConfig {
|
|
22
|
+
aliases?: Record<string, ClientMiddlewareHandler>;
|
|
23
|
+
groups?: Record<string, readonly ClientMiddlewareRef[]>;
|
|
24
|
+
global?: readonly ClientMiddlewareRef[];
|
|
25
|
+
/** Optional project-only assignment by exact route name. */
|
|
26
|
+
routes?: Record<string, readonly ClientMiddlewareRef[]>;
|
|
27
|
+
}
|
|
28
|
+
/** Per-router registry. Projects register configuration through bootstrap, not the builder. */
|
|
29
|
+
export declare class ClientMiddlewareRegistry {
|
|
30
|
+
private configs;
|
|
31
|
+
register(config: ClientMiddlewareConfig): () => void;
|
|
32
|
+
has(route: Route): boolean;
|
|
33
|
+
clear(): void;
|
|
34
|
+
run(context: ClientMiddlewareContext): Promise<ClientMiddlewareResult>;
|
|
35
|
+
private assertHandler;
|
|
36
|
+
/** A middleware that ignores AbortSignal must not hold up a newer navigation. */
|
|
37
|
+
private waitForResult;
|
|
38
|
+
}
|
|
39
|
+
export interface AuthMiddlewareOptions {
|
|
40
|
+
redirect: string | ((context: ClientMiddlewareContext) => string);
|
|
41
|
+
guard?: string;
|
|
42
|
+
}
|
|
43
|
+
export declare function authMiddleware(options: AuthMiddlewareOptions): ClientMiddleware;
|
|
44
|
+
export declare function guestMiddleware(options: AuthMiddlewareOptions): ClientMiddleware;
|
|
45
|
+
//# sourceMappingURL=ClientMiddleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClientMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/core/routers/ClientMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAC,WAAW,EAAE,KAAK,EAAE,MAAM,EAAC,MAAM,aAAa,CAAC;AAE5D,MAAM,WAAW,uBAAuB;IACpC,GAAG,EAAE,oBAAoB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,KAAK,CAAC;IACV,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,gEAAgE;IAChE,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;CACvB;AACD,MAAM,MAAM,sBAAsB,GAAG,IAAI,GAAG,OAAO,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAC,CAAC;AAC5F,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,uBAAuB,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,KAAK,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACvJ,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GAAG;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAC,CAAC;AACpF,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,uBAAuB,CAAC;AACnE,MAAM,WAAW,sBAAsB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,mBAAmB,EAAE,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACxC,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,mBAAmB,EAAE,CAAC,CAAC;CAC3D;AAED,+FAA+F;AAC/F,qBAAa,wBAAwB;IACjC,OAAO,CAAC,OAAO,CAAqC;IAEpD,QAAQ,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,IAAI;IAmBpD,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAC1B,KAAK,IAAI,IAAI;IAEP,GAAG,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAsC5E,OAAO,CAAC,aAAa;IAMrB,iFAAiF;IACjF,OAAO,CAAC,aAAa;CASxB;AAED,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,uBAAuB,KAAK,MAAM,CAAC,CAAC;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,gBAAgB,CAK/E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,qBAAqB,GAAG,gBAAgB,CAKhF"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/** Per-router registry. Projects register configuration through bootstrap, not the builder. */
|
|
2
|
+
export class ClientMiddlewareRegistry {
|
|
3
|
+
constructor() {
|
|
4
|
+
this.configs = new Set();
|
|
5
|
+
}
|
|
6
|
+
register(config) {
|
|
7
|
+
const names = new Set();
|
|
8
|
+
for (const current of [...this.configs, config]) {
|
|
9
|
+
for (const name of [...Object.keys(current.aliases ?? {}), ...Object.keys(current.groups ?? {})]) {
|
|
10
|
+
if (!/^[A-Za-z_][\w.-]*$/.test(name) || names.has(name))
|
|
11
|
+
throw new Error(`Duplicate or invalid client middleware alias: ${name}`);
|
|
12
|
+
names.add(name);
|
|
13
|
+
}
|
|
14
|
+
for (const handler of Object.values(current.aliases ?? {}))
|
|
15
|
+
this.assertHandler(handler);
|
|
16
|
+
}
|
|
17
|
+
const installed = {
|
|
18
|
+
aliases: { ...config.aliases },
|
|
19
|
+
groups: Object.fromEntries(Object.entries(config.groups ?? {}).map(([name, refs]) => [name, [...refs]])),
|
|
20
|
+
global: [...config.global ?? []],
|
|
21
|
+
routes: Object.fromEntries(Object.entries(config.routes ?? {}).map(([name, refs]) => [name, [...refs]])),
|
|
22
|
+
};
|
|
23
|
+
this.configs.add(installed);
|
|
24
|
+
return () => { this.configs.delete(installed); };
|
|
25
|
+
}
|
|
26
|
+
has(route) { return this.configs.size > 0 || route.meta?.middleware !== undefined; }
|
|
27
|
+
clear() { this.configs.clear(); }
|
|
28
|
+
async run(context) {
|
|
29
|
+
const aliases = Object.create(null);
|
|
30
|
+
const groups = Object.create(null);
|
|
31
|
+
const global = [], local = [];
|
|
32
|
+
for (const config of this.configs) {
|
|
33
|
+
Object.assign(aliases, config.aliases);
|
|
34
|
+
Object.assign(groups, config.groups);
|
|
35
|
+
global.push(...config.global ?? []);
|
|
36
|
+
local.push(...(context.to.name ? config.routes?.[context.to.name] ?? [] : []));
|
|
37
|
+
}
|
|
38
|
+
const declared = context.to.meta?.middleware ?? [];
|
|
39
|
+
if (!Array.isArray(declared))
|
|
40
|
+
throw new TypeError('Route meta.middleware must be an array.');
|
|
41
|
+
const pipeline = [];
|
|
42
|
+
const expand = (ref, stack = []) => {
|
|
43
|
+
if (typeof ref !== 'string') {
|
|
44
|
+
this.assertHandler(ref);
|
|
45
|
+
pipeline.push({ handler: ref, parameters: [] });
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const colon = ref.indexOf(':');
|
|
49
|
+
const name = colon < 0 ? ref : ref.slice(0, colon);
|
|
50
|
+
const parameters = colon < 0 ? [] : ref.slice(colon + 1).split(',');
|
|
51
|
+
if (Object.prototype.hasOwnProperty.call(groups, name)) {
|
|
52
|
+
if (parameters.length || stack.includes(name))
|
|
53
|
+
throw new Error(`Invalid or recursive client middleware group: ${[...stack, name].join(' -> ')}`);
|
|
54
|
+
for (const child of groups[name])
|
|
55
|
+
expand(child, [...stack, name]);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
if (!Object.prototype.hasOwnProperty.call(aliases, name))
|
|
59
|
+
throw new Error(`Unknown client middleware: ${name}`);
|
|
60
|
+
pipeline.push({ handler: aliases[name], parameters });
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
for (const ref of [...global, ...declared, ...local])
|
|
64
|
+
expand(ref);
|
|
65
|
+
for (const { handler, parameters } of pipeline) {
|
|
66
|
+
if (context.signal.aborted)
|
|
67
|
+
return false;
|
|
68
|
+
const result = await this.waitForResult(typeof handler === 'function' ? handler(context, ...parameters) : handler.handle(context, ...parameters), context.signal);
|
|
69
|
+
if (context.signal.aborted)
|
|
70
|
+
return false;
|
|
71
|
+
if (result === false)
|
|
72
|
+
return false;
|
|
73
|
+
if (result && typeof result === 'object' && typeof result.redirect === 'string')
|
|
74
|
+
return result;
|
|
75
|
+
if (result !== undefined && result !== true)
|
|
76
|
+
throw new TypeError('Client middleware must return true, false, void or {redirect}.');
|
|
77
|
+
}
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
80
|
+
assertHandler(handler) {
|
|
81
|
+
if (typeof handler !== 'function' && (!handler || typeof handler.handle !== 'function')) {
|
|
82
|
+
throw new TypeError('Client middleware must be a function or an instance with handle(context).');
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/** A middleware that ignores AbortSignal must not hold up a newer navigation. */
|
|
86
|
+
waitForResult(value, signal) {
|
|
87
|
+
return new Promise((resolve, reject) => {
|
|
88
|
+
const abort = () => { signal.removeEventListener('abort', abort); resolve(false); };
|
|
89
|
+
if (signal.aborted) {
|
|
90
|
+
Promise.resolve(value).catch(() => { });
|
|
91
|
+
resolve(false);
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
95
|
+
Promise.resolve(value).then(result => { signal.removeEventListener('abort', abort); resolve(result); }, error => { signal.removeEventListener('abort', abort); reject(error); });
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
export function authMiddleware(options) {
|
|
100
|
+
return (context, guard = options.guard) => {
|
|
101
|
+
if (context.app.Auth.guard(guard).check())
|
|
102
|
+
return true;
|
|
103
|
+
return { redirect: typeof options.redirect === 'function' ? options.redirect(context) : options.redirect };
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
export function guestMiddleware(options) {
|
|
107
|
+
return (context, guard = options.guard) => {
|
|
108
|
+
if (context.app.Auth.guard(guard).guest())
|
|
109
|
+
return true;
|
|
110
|
+
return { redirect: typeof options.redirect === 'function' ? options.redirect(context) : options.redirect };
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=ClientMiddleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ClientMiddleware.js","sourceRoot":"","sources":["../../../../src/core/routers/ClientMiddleware.ts"],"names":[],"mappings":"AAwBA,+FAA+F;AAC/F,MAAM,OAAO,wBAAwB;IAArC;QACY,YAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IA8ExD,CAAC;IA5EG,QAAQ,CAAC,MAA8B;QACnC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YAC9C,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/F,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,IAAI,EAAE,CAAC,CAAC;gBAClI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,SAAS,GAAG;YACd,OAAO,EAAE,EAAC,GAAG,MAAM,CAAC,OAAO,EAAC;YAC5B,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACxG,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;YAChC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3G,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5B,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,GAAG,CAAC,KAAY,IAAa,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC;IACpG,KAAK,KAAW,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAEvC,KAAK,CAAC,GAAG,CAAC,OAAgC;QACtC,MAAM,OAAO,GAA4C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAmD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnF,MAAM,MAAM,GAA0B,EAAE,EAAE,KAAK,GAA0B,EAAE,CAAC;QAC5E,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;QAC7F,MAAM,QAAQ,GAAoE,EAAE,CAAC;QACrF,MAAM,MAAM,GAAG,CAAC,GAAwB,EAAE,QAAkB,EAAE,EAAE,EAAE;YAC9D,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,OAAO,EAAC,GAAG,EAAE,UAAU,EAAC,EAAE,EAAC,CAAC,CAAC;gBAAC,OAAO;YAAC,CAAC;YAC9G,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpE,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBACrD,IAAI,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACjJ,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC;oBAAE,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;gBAChH,QAAQ,CAAC,IAAI,CAAC,EAAC,OAAO,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAC,CAAC,CAAC;YACvD,CAAC;QACL,CAAC,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAClE,KAAK,MAAM,EAAC,OAAO,EAAE,UAAU,EAAC,IAAI,QAAQ,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CACnC,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9H,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;YACzC,IAAI,MAAM,KAAK,KAAK;gBAAE,OAAO,KAAK,CAAC;YACnC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;gBAAE,OAAO,MAAM,CAAC;YAC/F,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;gBAAE,MAAM,IAAI,SAAS,CAAC,gEAAgE,CAAC,CAAC;QACvI,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,aAAa,CAAC,OAAgB;QAClC,IAAI,OAAO,OAAO,KAAK,UAAU,IAAI,CAAC,CAAC,OAAO,IAAI,OAAQ,OAAe,CAAC,MAAM,KAAK,UAAU,CAAC,EAAE,CAAC;YAC/F,MAAM,IAAI,SAAS,CAAC,2EAA2E,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,iFAAiF;IACzE,aAAa,CAAC,KAA+D,EAAE,MAAmB;QACtG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,KAAK,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAAC,OAAO;YAAC,CAAC;YACvF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAC,IAAI,EAAC,IAAI,EAAC,CAAC,CAAC;YACrD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAClG,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAOD,MAAM,UAAU,cAAc,CAAC,OAA8B;IACzD,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,EAAE;QACtC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC;QACvD,OAAO,EAAC,QAAQ,EAAE,OAAO,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAC,CAAC;IAC7G,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAA8B;IAC1D,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,EAAE;QACtC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC;QACvD,OAAO,EAAC,QAAQ,EAAE,OAAO,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAC,CAAC;IAC7G,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
* - Browser back/forward handling
|
|
15
15
|
*/
|
|
16
16
|
import type { ViewManagerInterface } from "../contracts/ViewManagerInterface.js";
|
|
17
|
+
import { type ClientMiddlewareConfig } from './ClientMiddleware.js';
|
|
17
18
|
export interface RouteDefinition {
|
|
18
19
|
/** URL pattern: '/users/{id}', '/posts/{page?}' */
|
|
19
20
|
path: string;
|
|
@@ -104,6 +105,9 @@ export declare class Router {
|
|
|
104
105
|
/** Navigation guards */
|
|
105
106
|
private _beforeEach;
|
|
106
107
|
private navigationGuards;
|
|
108
|
+
private middleware;
|
|
109
|
+
private middlewareAbort;
|
|
110
|
+
private middlewareRedirects;
|
|
107
111
|
/**
|
|
108
112
|
* NHIỀU hook, không phải một.
|
|
109
113
|
*
|
|
@@ -181,6 +185,8 @@ export declare class Router {
|
|
|
181
185
|
beforeEach(guard: NavigationGuard): this;
|
|
182
186
|
/** Add a disposable guard without replacing the host's beforeEach guard. */
|
|
183
187
|
addNavigationGuard(guard: NavigationGuard): () => void;
|
|
188
|
+
/** Register project aliases/groups/global middleware. Returns a disposer. */
|
|
189
|
+
useMiddleware(config: ClientMiddlewareConfig): () => void;
|
|
184
190
|
/** Đăng ký hook chạy sau mỗi lần điều hướng. Trả về hàm HUỶ đăng ký. */
|
|
185
191
|
afterEach(hook: AfterNavigationHook): () => void;
|
|
186
192
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../../src/core/routers/Router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../../src/core/routers/Router.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@
|
|
|
13
13
|
* - Route caching (pattern match + ActiveRoute)
|
|
14
14
|
* - Browser back/forward handling
|
|
15
15
|
*/
|
|
16
|
+
import { app as application } from '../helpers/app.js';
|
|
17
|
+
import { ClientMiddlewareRegistry } from './ClientMiddleware.js';
|
|
16
18
|
// ─── ActiveRoute ────────────────────────────────────────────────
|
|
17
19
|
export class ActiveRoute {
|
|
18
20
|
constructor(route, urlPath, params = {}, query = {}, fragment = '', uri) {
|
|
@@ -85,6 +87,9 @@ export class Router {
|
|
|
85
87
|
/** Navigation guards */
|
|
86
88
|
this._beforeEach = null;
|
|
87
89
|
this.navigationGuards = new Set();
|
|
90
|
+
this.middleware = new ClientMiddlewareRegistry();
|
|
91
|
+
this.middlewareAbort = null;
|
|
92
|
+
this.middlewareRedirects = 0;
|
|
88
93
|
/**
|
|
89
94
|
* NHIỀU hook, không phải một.
|
|
90
95
|
*
|
|
@@ -207,6 +212,9 @@ export class Router {
|
|
|
207
212
|
const { children, ...own } = route;
|
|
208
213
|
const path = Router.joinRoutePath(parentPath, route.path ?? '');
|
|
209
214
|
const meta = { ...parentMeta, ...(route.meta ?? {}) };
|
|
215
|
+
if (parentMeta.middleware && route.meta?.middleware) {
|
|
216
|
+
meta.middleware = [...parentMeta.middleware, ...route.meta.middleware];
|
|
217
|
+
}
|
|
210
218
|
const flatChildren = children && children.length
|
|
211
219
|
? this.flattenRouteTree(children, path, meta)
|
|
212
220
|
: [];
|
|
@@ -235,7 +243,9 @@ export class Router {
|
|
|
235
243
|
}
|
|
236
244
|
for (const route of this.flattenRouteTree(routes)) {
|
|
237
245
|
const component = route.component || route.view || '';
|
|
238
|
-
|
|
246
|
+
// Preserve legacy flattened option keys while keeping the named route
|
|
247
|
+
// and its actual meta object available to middleware and guards.
|
|
248
|
+
this.addRoute(route.path, component, { ...route.meta, name: route.name, meta: route.meta });
|
|
239
249
|
if (route.name) {
|
|
240
250
|
this.addRouteConfig(route);
|
|
241
251
|
}
|
|
@@ -282,6 +292,8 @@ export class Router {
|
|
|
282
292
|
this.navigationGuards.add(guard);
|
|
283
293
|
return () => { this.navigationGuards.delete(guard); };
|
|
284
294
|
}
|
|
295
|
+
/** Register project aliases/groups/global middleware. Returns a disposer. */
|
|
296
|
+
useMiddleware(config) { return this.middleware.register(config); }
|
|
285
297
|
/** Đăng ký hook chạy sau mỗi lần điều hướng. Trả về hàm HUỶ đăng ký. */
|
|
286
298
|
afterEach(hook) {
|
|
287
299
|
this.afterHooks.add(hook);
|
|
@@ -416,7 +428,7 @@ export class Router {
|
|
|
416
428
|
return;
|
|
417
429
|
}
|
|
418
430
|
const initialPath = this.mode === 'history'
|
|
419
|
-
? (window.location.pathname + window.location.search)
|
|
431
|
+
? (window.location.pathname + window.location.search + window.location.hash)
|
|
420
432
|
: (window.location.hash.substring(1) || this.defaultRoute);
|
|
421
433
|
// Set initial active route (without mounting view)
|
|
422
434
|
this.setActiveRouteForPath(initialPath);
|
|
@@ -439,6 +451,7 @@ export class Router {
|
|
|
439
451
|
* Stop the router — remove event listeners.
|
|
440
452
|
*/
|
|
441
453
|
stop() {
|
|
454
|
+
this.middlewareAbort?.abort();
|
|
442
455
|
window.removeEventListener('popstate', this._handlePopState);
|
|
443
456
|
window.removeEventListener('hashchange', this._handlePopState);
|
|
444
457
|
document.removeEventListener('click', this._handleAutoNavigation);
|
|
@@ -519,6 +532,7 @@ export class Router {
|
|
|
519
532
|
this.routeCache.clear();
|
|
520
533
|
this._beforeEach = null;
|
|
521
534
|
this.navigationGuards.clear();
|
|
535
|
+
this.middleware.clear();
|
|
522
536
|
this.afterHooks.clear();
|
|
523
537
|
this.currentRoute = null;
|
|
524
538
|
this.liveRegion?.remove();
|
|
@@ -559,7 +573,10 @@ export class Router {
|
|
|
559
573
|
* Đang navigate dở → ghi nhận request MỚI NHẤT, xử lý sau khi xong
|
|
560
574
|
* (không drop im lặng như trước).
|
|
561
575
|
*/
|
|
562
|
-
requestNavigation(path, type) {
|
|
576
|
+
requestNavigation(path, type, middlewareRedirect = false) {
|
|
577
|
+
this.middlewareAbort?.abort();
|
|
578
|
+
if (!middlewareRedirect)
|
|
579
|
+
this.middlewareRedirects = 0;
|
|
563
580
|
const request = { id: ++this.navigationSequence, path, type };
|
|
564
581
|
if (this.isNavigating) {
|
|
565
582
|
this.pendingNavigation = request;
|
|
@@ -578,6 +595,8 @@ export class Router {
|
|
|
578
595
|
this.isNavigating = true;
|
|
579
596
|
// Khai ngoài try: `finally` phải nhả được kể cả khi render ném giữa chừng.
|
|
580
597
|
let releaseHeight = () => { };
|
|
598
|
+
const middlewareAbort = new AbortController();
|
|
599
|
+
this.middlewareAbort = middlewareAbort;
|
|
581
600
|
try {
|
|
582
601
|
const { pathname, queryString, fragment } = this.splitLocation(path);
|
|
583
602
|
const normalizedPath = this.normalizePath(pathname);
|
|
@@ -592,10 +611,41 @@ export class Router {
|
|
|
592
611
|
console.warn(`[Router] No route matched: ${path}`);
|
|
593
612
|
return;
|
|
594
613
|
}
|
|
595
|
-
const { route, params } = match;
|
|
614
|
+
const { route: matchedRoute, params } = match;
|
|
615
|
+
let route = matchedRoute;
|
|
596
616
|
const from = this.currentRoute;
|
|
617
|
+
const viewName = route.component || route.view;
|
|
618
|
+
const vm = this.viewManager ?? this.App?.View;
|
|
619
|
+
const viewMiddleware = viewName ? vm?.getViewMiddleware?.(viewName) ?? [] : [];
|
|
620
|
+
if (viewMiddleware.length) {
|
|
621
|
+
const declared = route.meta?.middleware ?? [];
|
|
622
|
+
if (!Array.isArray(declared))
|
|
623
|
+
throw new TypeError('Route meta.middleware must be an array.');
|
|
624
|
+
route = { ...route, meta: { ...route.meta, middleware: [...declared, ...viewMiddleware] } };
|
|
625
|
+
}
|
|
597
626
|
// Create ActiveRoute
|
|
598
627
|
const activeRoute = new ActiveRoute(route, normalizedPath, params, query, fragment, uri);
|
|
628
|
+
// Run before any page fetch, factory, mount/hydration or history commit.
|
|
629
|
+
if (this.middleware.has(route)) {
|
|
630
|
+
const result = await this.middleware.run({ app: this.App ?? application(), router: this,
|
|
631
|
+
to: { ...route, params, query }, from, url: path, signal: middlewareAbort.signal });
|
|
632
|
+
if (middlewareAbort.signal.aborted || requestId !== this.navigationSequence)
|
|
633
|
+
return;
|
|
634
|
+
if (result !== true) {
|
|
635
|
+
if (type === 'pop')
|
|
636
|
+
this.restoreUrlAfterFailedPop(from);
|
|
637
|
+
if (result && typeof result === 'object') {
|
|
638
|
+
const url = new URL(result.redirect, window.location.origin);
|
|
639
|
+
if (url.origin !== window.location.origin || url.username || url.password)
|
|
640
|
+
throw new Error('Client middleware redirects must stay on the current origin.');
|
|
641
|
+
const destination = url.pathname + url.search + url.hash;
|
|
642
|
+
if (destination === path || ++this.middlewareRedirects > 8)
|
|
643
|
+
throw new Error('Client middleware redirect loop.');
|
|
644
|
+
this.requestNavigation(destination, result.replace === false ? 'push' : 'replace', true);
|
|
645
|
+
}
|
|
646
|
+
return;
|
|
647
|
+
}
|
|
648
|
+
}
|
|
599
649
|
// Before guard — chạy TRƯỚC khi đụng vào history: guard chặn thì URL giữ nguyên
|
|
600
650
|
if (this._beforeEach) {
|
|
601
651
|
const allow = await this._beforeEach(route, from, normalizedPath);
|
|
@@ -686,9 +736,15 @@ export class Router {
|
|
|
686
736
|
}
|
|
687
737
|
}
|
|
688
738
|
catch (error) {
|
|
689
|
-
|
|
739
|
+
if (!middlewareAbort.signal.aborted) {
|
|
740
|
+
if (type === 'pop')
|
|
741
|
+
this.restoreUrlAfterFailedPop(this.currentRoute);
|
|
742
|
+
console.error('[Router] Navigation error:', error);
|
|
743
|
+
}
|
|
690
744
|
}
|
|
691
745
|
finally {
|
|
746
|
+
if (this.middlewareAbort === middlewareAbort)
|
|
747
|
+
this.middlewareAbort = null;
|
|
692
748
|
releaseHeight();
|
|
693
749
|
this.isNavigating = false;
|
|
694
750
|
if (requestId === this.navigationSequence)
|