kiru 0.53.0 → 0.54.0-preview.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/components/derive.d.ts +1 -1
- package/dist/components/derive.d.ts.map +1 -1
- package/dist/components/derive.js +3 -2
- package/dist/components/derive.js.map +1 -1
- package/dist/dom.d.ts.map +1 -1
- package/dist/dom.js +6 -2
- package/dist/dom.js.map +1 -1
- package/dist/globals.d.ts +1 -1
- package/dist/globals.d.ts.map +1 -1
- package/dist/globals.js.map +1 -1
- package/dist/hooks/usePromise.d.ts +2 -1
- package/dist/hooks/usePromise.d.ts.map +1 -1
- package/dist/hooks/usePromise.js +31 -62
- package/dist/hooks/usePromise.js.map +1 -1
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/router/client/index.d.ts +4 -2
- package/dist/router/client/index.d.ts.map +1 -1
- package/dist/router/client/index.js +59 -13
- package/dist/router/client/index.js.map +1 -1
- package/dist/router/constants.d.ts +2 -0
- package/dist/router/constants.d.ts.map +1 -0
- package/dist/router/constants.js +2 -0
- package/dist/router/constants.js.map +1 -0
- package/dist/router/context.d.ts +2 -0
- package/dist/router/context.d.ts.map +1 -1
- package/dist/router/context.js +5 -1
- package/dist/router/context.js.map +1 -1
- package/dist/router/fileRouterController.d.ts +2 -0
- package/dist/router/fileRouterController.d.ts.map +1 -1
- package/dist/router/fileRouterController.js +195 -107
- package/dist/router/fileRouterController.js.map +1 -1
- package/dist/router/globals.d.ts +3 -0
- package/dist/router/globals.d.ts.map +1 -1
- package/dist/router/globals.js +3 -0
- package/dist/router/globals.js.map +1 -1
- package/dist/router/guard.d.ts +17 -0
- package/dist/router/guard.d.ts.map +1 -0
- package/dist/router/guard.js +45 -0
- package/dist/router/guard.js.map +1 -0
- package/dist/router/head.d.ts.map +1 -1
- package/dist/router/head.js +5 -7
- package/dist/router/head.js.map +1 -1
- package/dist/router/index.d.ts +2 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +2 -1
- package/dist/router/index.js.map +1 -1
- package/dist/router/{server → ssg}/index.d.ts +4 -3
- package/dist/router/ssg/index.d.ts.map +1 -0
- package/dist/router/{server → ssg}/index.js +8 -5
- package/dist/router/ssg/index.js.map +1 -0
- package/dist/router/ssr/index.d.ts +20 -0
- package/dist/router/ssr/index.d.ts.map +1 -0
- package/dist/router/ssr/index.js +163 -0
- package/dist/router/ssr/index.js.map +1 -0
- package/dist/router/types.d.ts +42 -16
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.internal.d.ts +4 -0
- package/dist/router/types.internal.d.ts.map +1 -1
- package/dist/router/utils/index.d.ts +8 -3
- package/dist/router/utils/index.d.ts.map +1 -1
- package/dist/router/utils/index.js +38 -6
- package/dist/router/utils/index.js.map +1 -1
- package/dist/scheduler.d.ts +14 -3
- package/dist/scheduler.d.ts.map +1 -1
- package/dist/scheduler.js +3 -4
- package/dist/scheduler.js.map +1 -1
- package/dist/ssr/client.d.ts +1 -1
- package/dist/ssr/client.d.ts.map +1 -1
- package/dist/ssr/server.d.ts +9 -3
- package/dist/ssr/server.d.ts.map +1 -1
- package/dist/ssr/server.js +37 -30
- package/dist/ssr/server.js.map +1 -1
- package/dist/types.d.ts +3 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/format.d.ts +2 -1
- package/dist/utils/format.d.ts.map +1 -1
- package/dist/utils/format.js +4 -1
- package/dist/utils/format.js.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/promise.d.ts +2 -0
- package/dist/utils/promise.d.ts.map +1 -1
- package/dist/utils/promise.js +45 -1
- package/dist/utils/promise.js.map +1 -1
- package/dist/utils/runtime.d.ts +1 -1
- package/dist/utils/runtime.js +1 -1
- package/package.json +8 -4
- package/src/components/derive.ts +5 -3
- package/src/dom.ts +5 -1
- package/src/globals.ts +1 -1
- package/src/hooks/usePromise.ts +57 -77
- package/src/index.ts +1 -1
- package/src/router/client/index.ts +114 -16
- package/src/router/constants.ts +1 -0
- package/src/router/context.ts +7 -1
- package/src/router/fileRouterController.ts +304 -132
- package/src/router/globals.ts +4 -0
- package/src/router/guard.ts +72 -0
- package/src/router/head.ts +5 -7
- package/src/router/index.ts +12 -1
- package/src/router/{server → ssg}/index.ts +17 -10
- package/src/router/ssr/index.ts +252 -0
- package/src/router/types.internal.ts +5 -0
- package/src/router/types.ts +53 -16
- package/src/router/utils/index.ts +74 -8
- package/src/scheduler.ts +20 -3
- package/src/ssr/client.ts +1 -1
- package/src/ssr/server.ts +58 -34
- package/src/types.ts +3 -0
- package/src/utils/format.ts +5 -0
- package/src/utils/index.ts +1 -1
- package/src/utils/promise.ts +70 -1
- package/src/utils/runtime.ts +1 -1
- package/dist/router/server/index.d.ts.map +0 -1
- package/dist/router/server/index.js.map +0 -1
package/dist/router/globals.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globals.d.ts","sourceRoot":"","sources":["../../src/router/globals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,eAAO,MAAM,kBAAkB;aACZ,oBAAoB,GAAG,IAAI;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe;aACT,MAAM,GAAG,IAAI;CAC/B,CAAA;AAED,eAAO,MAAM,WAAW;aACL,WAAW,GAAG,IAAI;CACpC,CAAA"}
|
|
1
|
+
{"version":3,"file":"globals.d.ts","sourceRoot":"","sources":["../../src/router/globals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,eAAO,MAAM,kBAAkB;aACZ,oBAAoB,GAAG,IAAI;CAC7C,CAAA;AAED,eAAO,MAAM,eAAe;aACT,MAAM,GAAG,IAAI;CAC/B,CAAA;AAED,eAAO,MAAM,WAAW;aACL,WAAW,GAAG,IAAI;CACpC,CAAA;AAED,eAAO,MAAM,cAAc;aACV,IAAI,CAAC,cAAc;CACnC,CAAA"}
|
package/dist/router/globals.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../../src/router/globals.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,IAAmC;CAC7C,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,IAAqB;CAC/B,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,IAA0B;CACpC,CAAA"}
|
|
1
|
+
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../../src/router/globals.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,IAAmC;CAC7C,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,IAAqB;CAC/B,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,IAA0B;CACpC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,EAAyB;CACnC,CAAA"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { NavigationHook } from "./types";
|
|
2
|
+
import type { GuardModule } from "./types.internal";
|
|
3
|
+
export type GuardBeforeEach = NavigationHook<void | string | Promise<void | string>>;
|
|
4
|
+
export type GuardAfterEach = NavigationHook<void | Promise<void>>;
|
|
5
|
+
export interface NavGuard {
|
|
6
|
+
beforeEach: GuardBeforeEach;
|
|
7
|
+
afterEach: GuardAfterEach;
|
|
8
|
+
}
|
|
9
|
+
export declare const $NAVGUARD_INTERNAL: unique symbol;
|
|
10
|
+
export declare function resolveNavguard(module: GuardModule): NavGuard | null;
|
|
11
|
+
export interface NavGuardBuilder {
|
|
12
|
+
beforeEach(...fns: GuardBeforeEach[]): NavGuardBuilder;
|
|
13
|
+
afterEach(...fns: GuardAfterEach[]): NavGuardBuilder;
|
|
14
|
+
get [$NAVGUARD_INTERNAL](): NavGuard;
|
|
15
|
+
}
|
|
16
|
+
export declare function createNavGuard(): NavGuardBuilder;
|
|
17
|
+
//# sourceMappingURL=guard.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../src/router/guard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,MAAM,eAAe,GAAG,cAAc,CAC1C,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CACvC,CAAA;AACD,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;AAEjE,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,eAAe,CAAA;IAC3B,SAAS,EAAE,cAAc,CAAA;CAC1B;AAED,eAAO,MAAM,kBAAkB,eAA8B,CAAA;AAE7D,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,IAAI,CAQpE;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,GAAG,GAAG,EAAE,eAAe,EAAE,GAAG,eAAe,CAAA;IACtD,SAAS,CAAC,GAAG,GAAG,EAAE,cAAc,EAAE,GAAG,eAAe,CAAA;IACpD,IAAI,CAAC,kBAAkB,CAAC,IAAI,QAAQ,CAAA;CACrC;AAwBD,wBAAgB,cAAc,IAAI,eAAe,CAkBhD"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
export const $NAVGUARD_INTERNAL = Symbol.for("kiru:navguard");
|
|
2
|
+
export function resolveNavguard(module) {
|
|
3
|
+
if ("guard" in module &&
|
|
4
|
+
$NAVGUARD_INTERNAL in (module.guard ?? {})) {
|
|
5
|
+
return module.guard[$NAVGUARD_INTERNAL];
|
|
6
|
+
}
|
|
7
|
+
return null;
|
|
8
|
+
}
|
|
9
|
+
function createNavGuard_impl(beforeEach, afterEach) {
|
|
10
|
+
return {
|
|
11
|
+
beforeEach: async (ctx, to, from) => {
|
|
12
|
+
for (const fn of beforeEach) {
|
|
13
|
+
const res = await fn(ctx, to, from);
|
|
14
|
+
if (typeof res === "string") {
|
|
15
|
+
return res;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return;
|
|
19
|
+
},
|
|
20
|
+
afterEach: async (ctx, to, from) => {
|
|
21
|
+
for (const fn of afterEach) {
|
|
22
|
+
await fn(ctx, to, from);
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
export function createNavGuard() {
|
|
28
|
+
const beforeEach = [];
|
|
29
|
+
const afterEach = [];
|
|
30
|
+
const guard = createNavGuard_impl(beforeEach, afterEach);
|
|
31
|
+
return {
|
|
32
|
+
beforeEach(...fns) {
|
|
33
|
+
beforeEach.push(...fns);
|
|
34
|
+
return this;
|
|
35
|
+
},
|
|
36
|
+
afterEach(...fns) {
|
|
37
|
+
afterEach.push(...fns);
|
|
38
|
+
return this;
|
|
39
|
+
},
|
|
40
|
+
get [$NAVGUARD_INTERNAL]() {
|
|
41
|
+
return guard;
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guard.js","sourceRoot":"","sources":["../../src/router/guard.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAE7D,MAAM,UAAU,eAAe,CAAC,MAAmB;IACjD,IACE,OAAO,IAAI,MAAM;QACjB,kBAAkB,IAAK,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAqB,EAC/D,CAAC;QACD,OAAQ,MAAM,CAAC,KAAyB,CAAC,kBAAkB,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAQD,SAAS,mBAAmB,CAC1B,UAA6B,EAC7B,SAA2B;IAE3B,OAAO;QACL,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;YAClC,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;gBAC5B,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;gBACnC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;oBAC5B,OAAO,GAAG,CAAA;gBACZ,CAAC;YACH,CAAC;YACD,OAAM;QACR,CAAC;QACD,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;YACjC,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;gBAC3B,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,MAAM,UAAU,GAAsB,EAAE,CAAA;IACxC,MAAM,SAAS,GAAqB,EAAE,CAAA;IACtC,MAAM,KAAK,GAAG,mBAAmB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAExD,OAAO;QACL,UAAU,CAAC,GAAG,GAAsB;YAClC,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,SAAS,CAAC,GAAG,GAAqB;YAChC,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;YACtB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC;YACtB,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"head.d.ts","sourceRoot":"","sources":["../../src/router/head.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA;AAIlC,iBAAS,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"head.d.ts","sourceRoot":"","sources":["../../src/router/head.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA;AAIlC,iBAAS,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAsC1E;AAED,iBAAS,UAAU,IAAI,GAAG,CAAC,OAAO,CAEjC"}
|
package/dist/router/head.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Signal } from "../signals/base.js";
|
|
2
|
-
import { isValidTextChild, isVNode } from "../utils/index.js";
|
|
2
|
+
import { isValidTextChild, isVNode, toArray } from "../utils/index.js";
|
|
3
3
|
import { createElement } from "../element.js";
|
|
4
4
|
import { __DEV__ } from "../env.js";
|
|
5
5
|
import { KiruError } from "../error.js";
|
|
@@ -9,7 +9,7 @@ const validHeadChildren = ["title", "base", "link", "meta", "style", "script"];
|
|
|
9
9
|
function HeadContent({ children }) {
|
|
10
10
|
if (__DEV__) {
|
|
11
11
|
const n = node.current;
|
|
12
|
-
const asArray =
|
|
12
|
+
const asArray = toArray(children);
|
|
13
13
|
const invalidNodes = asArray.filter((c) => !isVNode(c) ||
|
|
14
14
|
typeof c.type !== "string" ||
|
|
15
15
|
!validHeadChildren.includes(c.type));
|
|
@@ -21,13 +21,11 @@ function HeadContent({ children }) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
if ("window" in globalThis) {
|
|
24
|
-
const
|
|
25
|
-
const titleNode =
|
|
24
|
+
const c = toArray(children);
|
|
25
|
+
const titleNode = c.find((c) => isVNode(c) && c.type === "title");
|
|
26
26
|
if (titleNode) {
|
|
27
27
|
const props = titleNode.props;
|
|
28
|
-
const titleChildren =
|
|
29
|
-
? props.children
|
|
30
|
-
: [props.children];
|
|
28
|
+
const titleChildren = toArray(props.children);
|
|
31
29
|
document.title = titleChildren
|
|
32
30
|
.map((c) => (Signal.isSignal(c) ? c.value : c))
|
|
33
31
|
.filter(isValidTextChild)
|
package/dist/router/head.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"head.js","sourceRoot":"","sources":["../../src/router/head.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"head.js","sourceRoot":"","sources":["../../src/router/head.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAA;AAElC,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;AAE9E,SAAS,WAAW,CAAC,EAAE,QAAQ,EAA8B;IAC3D,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,GAAG,IAAI,CAAC,OAAQ,CAAA;QACvB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,OAAO,CAAC,CAAC,CAAC;YACX,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;YAC1B,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC,CAAA;QACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,SAAS,CAAC;gBAClB,OAAO,EAAE,wHAAwH,YAAY,CAAC,GAAG,CAC/I,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAC1D,EAAE;gBACH,KAAK,EAAE,CAAC;aACT,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC3B,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAC1B,CAAA;QAEf,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAE7C,QAAQ,CAAC,KAAK,GAAG,aAAa;iBAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9C,MAAM,CAAC,gBAAgB,CAAC;iBACxB,IAAI,CAAC,EAAE,CAAC,CAAA;QACb,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,aAAa,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;AACzD,CAAC;AAED,SAAS,UAAU;IACjB,OAAO,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAC1C,CAAC"}
|
package/dist/router/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export { useFileRouter, type FileRouterContextType } from "./context.js";
|
|
1
|
+
export { useRequestContext, useFileRouter, type FileRouterContextType, } from "./context.js";
|
|
2
2
|
export * from "./errors.js";
|
|
3
3
|
export { FileRouter, type FileRouterProps } from "./fileRouter.js";
|
|
4
|
+
export { createNavGuard, type GuardBeforeEach, type GuardAfterEach, type NavGuard, type NavGuardBuilder, } from "./guard.js";
|
|
4
5
|
export * from "./link.js";
|
|
5
6
|
export * from "./pageConfig.js";
|
|
6
7
|
export type * from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,KAAK,qBAAqB,GAC3B,MAAM,cAAc,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EACL,cAAc,EACd,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,eAAe,GACrB,MAAM,YAAY,CAAA;AACnB,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,mBAAmB,YAAY,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEnD,eAAO,MAAM,IAAI;IACf;;;;;;;;;;;;;;;KAeC;;IAED;;;;;;;;;;;;;;;;KAgBC;;CAEF,CAAA;AAED,eAAO,MAAM,IAAI;IACf;;;;;;;;;;;;;;;;OAgBG;;CAEJ,CAAA;AAED,iBAAS,UAAU,iBAElB"}
|
package/dist/router/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { createElement } from "../element.js";
|
|
2
2
|
import { __DEV__ } from "../env.js";
|
|
3
|
-
export { useFileRouter } from "./context.js";
|
|
3
|
+
export { useRequestContext, useFileRouter, } from "./context.js";
|
|
4
4
|
export * from "./errors.js";
|
|
5
5
|
export { FileRouter } from "./fileRouter.js";
|
|
6
|
+
export { createNavGuard, } from "./guard.js";
|
|
6
7
|
export * from "./link.js";
|
|
7
8
|
export * from "./pageConfig.js";
|
|
8
9
|
import { HeadContent, HeadOutlet } from "./head.js";
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EACL,iBAAiB,EACjB,aAAa,GAEd,MAAM,cAAc,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAA;AAClE,OAAO,EACL,cAAc,GAKf,MAAM,YAAY,CAAA;AACnB,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAG/B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEnD,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB;;;;;;;;;;;;;;;KAeC;IACD,OAAO,EAAE,WAAW;IACpB;;;;;;;;;;;;;;;;KAgBC;IACD,MAAM,EAAE,UAAU;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,EAAE,UAAU;CACnB,CAAA;AAED,SAAS,UAAU;IACjB,OAAO,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAC1C,CAAC;AAED,IAAI,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,IAAI,CAAC,OAAmB,CAAC,WAAW,GAAG,mBAAmB,CAC3D;IAAC,IAAI,CAAC,MAAkB,CAAC,WAAW,GAAG,kBAAkB,CACzD;IAAC,IAAI,CAAC,MAAkB,CAAC,WAAW,GAAG,kBAAkB,CAAA;AAC5D,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { FormattedViteImportMap } from "../types.internal.js";
|
|
1
|
+
import type { FormattedViteImportMap, GuardModule, PageModule } from "../types.internal.js";
|
|
2
2
|
export interface RenderContext {
|
|
3
|
-
pages: FormattedViteImportMap
|
|
3
|
+
pages: FormattedViteImportMap<PageModule>;
|
|
4
4
|
layouts: FormattedViteImportMap;
|
|
5
|
+
guards: FormattedViteImportMap<GuardModule>;
|
|
5
6
|
Document: Kiru.FC;
|
|
6
7
|
registerModule: (moduleId: string) => void;
|
|
7
|
-
|
|
8
|
+
registerStaticProps: (props: Record<string, unknown>) => void;
|
|
8
9
|
}
|
|
9
10
|
export interface RenderResult {
|
|
10
11
|
status: number;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/ssg/index.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,sBAAsB,EACtB,WAAW,EACX,UAAU,EACX,MAAM,sBAAsB,CAAA;AAE7B,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAA;IACzC,OAAO,EAAE,sBAAsB,CAAA;IAC/B,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC,CAAA;IAC3C,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAA;IACjB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IAC1C,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;CAC9D;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACb;AAED,wBAAsB,MAAM,CAC1B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,aAAa,EAClB,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,YAAY,CAAC,CA0JvB;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,mCAmCtE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createElement, Fragment } from "../../element.js";
|
|
2
|
-
import {
|
|
2
|
+
import { matchModules, matchRoute, match404Route, parseQuery, wrapWithLayouts, } from "../utils/index.js";
|
|
3
3
|
import { RouterContext } from "../context.js";
|
|
4
4
|
import { __DEV__ } from "../../env.js";
|
|
5
5
|
import { FileRouterDataLoadError } from "../errors.js";
|
|
@@ -34,7 +34,7 @@ export async function render(url, ctx, result) {
|
|
|
34
34
|
}
|
|
35
35
|
const { pageEntry, routeSegments, params } = routeMatch;
|
|
36
36
|
const is404Route = routeMatch.routeSegments.includes("404");
|
|
37
|
-
const layoutEntries =
|
|
37
|
+
const layoutEntries = matchModules(ctx.layouts, routeSegments);
|
|
38
38
|
[pageEntry, ...layoutEntries].forEach((e) => {
|
|
39
39
|
ctx.registerModule(e.filePath);
|
|
40
40
|
});
|
|
@@ -47,7 +47,7 @@ export async function render(url, ctx, result) {
|
|
|
47
47
|
const config = page.config ?? {};
|
|
48
48
|
const abortController = new AbortController();
|
|
49
49
|
if (config.loader) {
|
|
50
|
-
if (config.loader.
|
|
50
|
+
if (!config.loader.static || __DEV__) {
|
|
51
51
|
props = { loading: true, data: null, error: null };
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
@@ -62,7 +62,10 @@ export async function render(url, ctx, result) {
|
|
|
62
62
|
abortController.abort("[kiru/router]: Page data loading timed out after 10 seconds");
|
|
63
63
|
}, 10000);
|
|
64
64
|
try {
|
|
65
|
-
const data = await config.loader.load(
|
|
65
|
+
const data = await config.loader.load({
|
|
66
|
+
...routerState,
|
|
67
|
+
context: {},
|
|
68
|
+
});
|
|
66
69
|
props = {
|
|
67
70
|
data,
|
|
68
71
|
error: null,
|
|
@@ -78,7 +81,7 @@ export async function render(url, ctx, result) {
|
|
|
78
81
|
}
|
|
79
82
|
finally {
|
|
80
83
|
clearTimeout(timeout);
|
|
81
|
-
ctx.
|
|
84
|
+
ctx.registerStaticProps({ data: props.data, error: props.error });
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/ssg/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { FormattedViteImportMap, GuardModule, PageModule } from "../types.internal.js";
|
|
2
|
+
export interface SSRRenderContext {
|
|
3
|
+
pages: FormattedViteImportMap<PageModule>;
|
|
4
|
+
layouts: FormattedViteImportMap;
|
|
5
|
+
guards: FormattedViteImportMap<GuardModule>;
|
|
6
|
+
Document: Kiru.FC;
|
|
7
|
+
userContext: Kiru.RequestContext;
|
|
8
|
+
registerModule: (moduleId: string) => void;
|
|
9
|
+
}
|
|
10
|
+
export interface SSRHttpResponse {
|
|
11
|
+
html: string;
|
|
12
|
+
statusCode: number;
|
|
13
|
+
headers: Array<[string, string]>;
|
|
14
|
+
stream: ReadableStream | null;
|
|
15
|
+
}
|
|
16
|
+
export interface SSRRenderResult {
|
|
17
|
+
httpResponse: SSRHttpResponse | null;
|
|
18
|
+
}
|
|
19
|
+
export declare function render(url: string, ctx: SSRRenderContext): Promise<SSRRenderResult>;
|
|
20
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/ssr/index.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,sBAAsB,EACtB,WAAW,EACX,UAAU,EACX,MAAM,sBAAsB,CAAA;AAI7B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAA;IACzC,OAAO,EAAE,sBAAsB,CAAA;IAC/B,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC,CAAA;IAC3C,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAA;IACjB,WAAW,EAAE,IAAI,CAAC,cAAc,CAAA;IAChC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAChC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,eAAe,GAAG,IAAI,CAAA;CACrC;AAED,wBAAsB,MAAM,CAC1B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,eAAe,CAAC,CA+L1B"}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import { createElement, Fragment } from "../../element.js";
|
|
3
|
+
import { __DEV__ } from "../../env.js";
|
|
4
|
+
import { renderToString } from "../../renderToString.js";
|
|
5
|
+
import { renderToReadableStream } from "../../ssr/server.js";
|
|
6
|
+
import { toArray } from "../../utils/format.js";
|
|
7
|
+
import { matchModules, matchRoute, match404Route, parseQuery, wrapWithLayouts, runBeforeEachGuards, runAfterEachGuards, runBeforeEnterHooks, } from "../utils/index.js";
|
|
8
|
+
import { RouterContext, RequestContext } from "../context.js";
|
|
9
|
+
import { createStatefulPromise } from "../../utils/promise.js";
|
|
10
|
+
import { PAGE_DATA_PROMISE_ID } from "../constants.js";
|
|
11
|
+
export async function render(url, ctx) {
|
|
12
|
+
const extName = path.extname(url);
|
|
13
|
+
if (extName && extName.length > 0) {
|
|
14
|
+
return { httpResponse: null };
|
|
15
|
+
}
|
|
16
|
+
else if (url.startsWith("/@")) {
|
|
17
|
+
return { httpResponse: null };
|
|
18
|
+
}
|
|
19
|
+
const u = new URL(url, "http://localhost");
|
|
20
|
+
const pathSegments = u.pathname.split("/").filter(Boolean);
|
|
21
|
+
let routeMatch = matchRoute(ctx.pages, pathSegments);
|
|
22
|
+
if (!routeMatch) {
|
|
23
|
+
// Try to find a 404 page in parent directories
|
|
24
|
+
const fourOhFourMatch = match404Route(ctx.pages, pathSegments);
|
|
25
|
+
if (fourOhFourMatch) {
|
|
26
|
+
routeMatch = fourOhFourMatch;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
// Fallback to root 404 or default fallback
|
|
30
|
+
if (url === "/404") {
|
|
31
|
+
if (__DEV__) {
|
|
32
|
+
console.warn("[kiru/router]: No 404 route defined. Using fallback 404 page.");
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
httpResponse: {
|
|
36
|
+
statusCode: 404,
|
|
37
|
+
headers: [["Content-Type", "text/html"]],
|
|
38
|
+
html: "<!doctype html><html><head><title>Not Found</title></head><body><h1>404</h1></body></html>",
|
|
39
|
+
stream: null,
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
// Recursively render the 404 page
|
|
44
|
+
const notFoundResponse = await render("/404", ctx);
|
|
45
|
+
return {
|
|
46
|
+
httpResponse: {
|
|
47
|
+
html: notFoundResponse.httpResponse?.html ?? "",
|
|
48
|
+
headers: notFoundResponse.httpResponse?.headers ?? [
|
|
49
|
+
["Content-Type", "text/html"],
|
|
50
|
+
],
|
|
51
|
+
...notFoundResponse,
|
|
52
|
+
statusCode: 404,
|
|
53
|
+
stream: null,
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
const { pageEntry, routeSegments, params } = routeMatch;
|
|
59
|
+
const is404Route = routeMatch.routeSegments.includes("404");
|
|
60
|
+
const guardEntries = matchModules(ctx.guards, routeSegments);
|
|
61
|
+
const guardModules = await Promise.all(guardEntries.map((entry) => entry.load()));
|
|
62
|
+
const redirectPath = await runBeforeEachGuards(guardModules, { ...ctx.userContext }, u.pathname);
|
|
63
|
+
if (redirectPath !== null) {
|
|
64
|
+
return createRedirectResult(redirectPath);
|
|
65
|
+
}
|
|
66
|
+
const layoutEntries = matchModules(ctx.layouts, routeSegments);
|
|
67
|
+
[pageEntry, ...layoutEntries].forEach((e) => {
|
|
68
|
+
ctx.registerModule(e.filePath);
|
|
69
|
+
});
|
|
70
|
+
const [page, ...layouts] = await Promise.all([
|
|
71
|
+
pageEntry.load(),
|
|
72
|
+
...layoutEntries.map((layoutEntry) => layoutEntry.load()),
|
|
73
|
+
]);
|
|
74
|
+
const onBeforeEnter = page.config?.hooks?.onBeforeEnter;
|
|
75
|
+
if (onBeforeEnter) {
|
|
76
|
+
const redirectPath = await runBeforeEnterHooks(toArray(onBeforeEnter), { ...ctx.userContext }, u.pathname);
|
|
77
|
+
if (redirectPath !== null) {
|
|
78
|
+
return createRedirectResult(redirectPath);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
let documentShell = renderToString(createElement(ctx.Document));
|
|
82
|
+
if (documentShell.includes("</body>") ||
|
|
83
|
+
!documentShell.includes("<kiru-body-outlet>")) {
|
|
84
|
+
throw new Error("[kiru/router]: Document is expected to contain a <Body.Outlet> element. See https://kirujs.dev/docs/api/file-router#general-usage");
|
|
85
|
+
}
|
|
86
|
+
const query = parseQuery(u.search);
|
|
87
|
+
let props = {};
|
|
88
|
+
const config = page.config ?? {};
|
|
89
|
+
const abortSignal = new AbortController().signal;
|
|
90
|
+
const routerState = {
|
|
91
|
+
params,
|
|
92
|
+
query,
|
|
93
|
+
pathname: u.pathname,
|
|
94
|
+
hash: "",
|
|
95
|
+
signal: abortSignal,
|
|
96
|
+
};
|
|
97
|
+
let pageDataPromise = null;
|
|
98
|
+
if (config.loader && !config.loader.static) {
|
|
99
|
+
props = {
|
|
100
|
+
data: null,
|
|
101
|
+
error: null,
|
|
102
|
+
loading: true,
|
|
103
|
+
};
|
|
104
|
+
const promise = config.loader.load({
|
|
105
|
+
...routerState,
|
|
106
|
+
context: { ...ctx.userContext },
|
|
107
|
+
});
|
|
108
|
+
pageDataPromise = createStatefulPromise(PAGE_DATA_PROMISE_ID, promise);
|
|
109
|
+
}
|
|
110
|
+
const children = wrapWithLayouts(layouts
|
|
111
|
+
.map((layout) => layout.default)
|
|
112
|
+
.filter((l) => typeof l === "function"), page.default, props);
|
|
113
|
+
const app = createElement(RouterContext.Provider, {
|
|
114
|
+
children: createElement(RequestContext.Provider, {
|
|
115
|
+
children: Fragment({ children }),
|
|
116
|
+
value: ctx.userContext,
|
|
117
|
+
}),
|
|
118
|
+
value: { state: routerState },
|
|
119
|
+
});
|
|
120
|
+
let { immediate: pageOutletContent, stream } = renderToReadableStream(app, {
|
|
121
|
+
data: pageDataPromise ? [pageDataPromise] : [],
|
|
122
|
+
});
|
|
123
|
+
const hasHeadContent = pageOutletContent.includes("<kiru-head-content>");
|
|
124
|
+
const hasHeadOutlet = documentShell.includes("<kiru-head-outlet>");
|
|
125
|
+
if (hasHeadOutlet && hasHeadContent) {
|
|
126
|
+
let [preHeadContent = "", headContentInner = "", postHeadContent = ""] = pageOutletContent.split(/<kiru-head-content>|<\/kiru-head-content>/);
|
|
127
|
+
documentShell = documentShell.replace("<kiru-head-outlet>", headContentInner);
|
|
128
|
+
pageOutletContent = `${preHeadContent}${postHeadContent}`;
|
|
129
|
+
}
|
|
130
|
+
else if (hasHeadContent) {
|
|
131
|
+
// remove head content element and everything within it
|
|
132
|
+
pageOutletContent = pageOutletContent.replace(/<kiru-head-content>(.*?)<\/kiru-head-content>/, "");
|
|
133
|
+
}
|
|
134
|
+
else if (hasHeadOutlet) {
|
|
135
|
+
// remove head outlet element and everything within it
|
|
136
|
+
documentShell = documentShell.replaceAll("<kiru-head-outlet>", "");
|
|
137
|
+
}
|
|
138
|
+
const [prePageOutlet, postPageOutlet] = documentShell.split("<kiru-body-outlet>");
|
|
139
|
+
const html = `<!DOCTYPE html>${prePageOutlet}<body>${pageOutletContent}</body>${postPageOutlet}`;
|
|
140
|
+
const statusCode = is404Route ? 404 : 200;
|
|
141
|
+
queueMicrotask(() => {
|
|
142
|
+
runAfterEachGuards(guardModules, { ...ctx.userContext }, u.pathname);
|
|
143
|
+
});
|
|
144
|
+
return {
|
|
145
|
+
httpResponse: {
|
|
146
|
+
html,
|
|
147
|
+
statusCode,
|
|
148
|
+
headers: [["Content-Type", "text/html;charset=utf-8"]],
|
|
149
|
+
stream,
|
|
150
|
+
},
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
function createRedirectResult(to) {
|
|
154
|
+
return {
|
|
155
|
+
httpResponse: {
|
|
156
|
+
statusCode: 302,
|
|
157
|
+
headers: [["Location", to]],
|
|
158
|
+
html: "",
|
|
159
|
+
stream: null,
|
|
160
|
+
},
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/ssr/index.ts"],"names":[],"mappings":"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"}
|
package/dist/router/types.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { AsyncTaskState } from "../types.utils";
|
|
2
2
|
import type { FileRouterDataLoadError } from "./errors";
|
|
3
|
-
import type { DefaultComponentModule, FormattedViteImportMap, PageModule } from "./types.internal";
|
|
3
|
+
import type { DefaultComponentModule, FormattedViteImportMap, GuardModule, PageModule } from "./types.internal";
|
|
4
4
|
export interface FileRouterPreloadConfig {
|
|
5
|
-
pages: FormattedViteImportMap
|
|
5
|
+
pages: FormattedViteImportMap<PageModule>;
|
|
6
6
|
layouts: FormattedViteImportMap;
|
|
7
|
+
guards?: FormattedViteImportMap<GuardModule>;
|
|
7
8
|
page: PageModule;
|
|
8
9
|
pageProps: Record<string, unknown>;
|
|
10
|
+
pagePropsPromise?: Promise<AsyncTaskState<unknown, FileRouterDataLoadError>>;
|
|
9
11
|
pageLayouts: DefaultComponentModule[];
|
|
10
12
|
params: RouteParams;
|
|
11
13
|
query: RouteQuery;
|
|
@@ -36,6 +38,14 @@ export interface FileRouterConfig {
|
|
|
36
38
|
* ```
|
|
37
39
|
*/
|
|
38
40
|
layouts: Record<string, unknown>;
|
|
41
|
+
/**
|
|
42
|
+
* The import map to use for loading nav guards
|
|
43
|
+
* @example
|
|
44
|
+
* ```tsx
|
|
45
|
+
* <FileRouter config={{ guards: import.meta.glob("/∗∗/guard.{ts,js}"), ... }} />
|
|
46
|
+
* ```
|
|
47
|
+
*/
|
|
48
|
+
guards?: Record<string, unknown>;
|
|
39
49
|
/**
|
|
40
50
|
* The base url to use as a prefix for route matching
|
|
41
51
|
* @default "/"
|
|
@@ -87,25 +97,37 @@ export interface RouterState {
|
|
|
87
97
|
*/
|
|
88
98
|
signal: AbortSignal;
|
|
89
99
|
}
|
|
90
|
-
type PageDataLoaderContext = RouterState & {};
|
|
91
100
|
export interface PageDataLoaderCacheConfig {
|
|
92
101
|
type: "memory" | "localStorage" | "sessionStorage";
|
|
93
102
|
ttl: number;
|
|
94
103
|
}
|
|
104
|
+
interface LoaderContext extends RouterState {
|
|
105
|
+
/**
|
|
106
|
+
* The request context - in SSR, this is the data from the server
|
|
107
|
+
* that's passed to the `renderPage` function
|
|
108
|
+
* @example
|
|
109
|
+
* ```ts
|
|
110
|
+
* // server.ts
|
|
111
|
+
* renderPage({ url, context: { test: 123 } })
|
|
112
|
+
*
|
|
113
|
+
* // page.tsx
|
|
114
|
+
* loader: {
|
|
115
|
+
* load: ({ context }) => context.test
|
|
116
|
+
* }
|
|
117
|
+
* ```
|
|
118
|
+
*/
|
|
119
|
+
context: Kiru.RequestContext;
|
|
120
|
+
}
|
|
95
121
|
export type PageDataLoaderConfig<T = unknown> = {
|
|
96
122
|
/**
|
|
97
123
|
* The function to load the page data
|
|
98
124
|
*/
|
|
99
|
-
load: (context:
|
|
125
|
+
load: (context: LoaderContext) => Promise<T>;
|
|
100
126
|
} & ({
|
|
101
127
|
/**
|
|
102
|
-
*
|
|
103
|
-
* @default "client"
|
|
104
|
-
* @description
|
|
105
|
-
* - **static**: The page data is loaded at build time and never updated
|
|
106
|
-
* - **client**: The page data is loaded upon navigation and updated on subsequent navigations
|
|
128
|
+
* Indicates that the page data should only be loaded at build time
|
|
107
129
|
*/
|
|
108
|
-
|
|
130
|
+
static?: false;
|
|
109
131
|
/**
|
|
110
132
|
* Enable transitions when swapping between "load", "error" and "data" states
|
|
111
133
|
*/
|
|
@@ -123,14 +145,17 @@ export type PageDataLoaderConfig<T = unknown> = {
|
|
|
123
145
|
cache?: PageDataLoaderCacheConfig;
|
|
124
146
|
} | {
|
|
125
147
|
/**
|
|
126
|
-
*
|
|
127
|
-
* @default "client"
|
|
128
|
-
* @description
|
|
129
|
-
* - **static**: The page data is loaded at build time and never updated
|
|
130
|
-
* - **client**: The page data is loaded upon navigation and updated on subsequent navigations
|
|
148
|
+
* Indicates that the page data should only be loaded at build time
|
|
131
149
|
*/
|
|
132
|
-
|
|
150
|
+
static: true;
|
|
133
151
|
});
|
|
152
|
+
export type NavigationHook<T> = (context: Kiru.RequestContext, to: string, from: string) => T;
|
|
153
|
+
export type OnBeforeEnterHook = NavigationHook<string | void | Promise<string | void>>;
|
|
154
|
+
export type OnBeforeLeaveHook = NavigationHook<false | void>;
|
|
155
|
+
interface PageContextHooks {
|
|
156
|
+
onBeforeEnter?: OnBeforeEnterHook | OnBeforeEnterHook[];
|
|
157
|
+
onBeforeLeave?: OnBeforeLeaveHook | OnBeforeLeaveHook[];
|
|
158
|
+
}
|
|
134
159
|
export interface PageConfig<T = unknown> {
|
|
135
160
|
/**
|
|
136
161
|
* The loader configuration for this page
|
|
@@ -141,6 +166,7 @@ export interface PageConfig<T = unknown> {
|
|
|
141
166
|
* returned, a page will be generated
|
|
142
167
|
*/
|
|
143
168
|
generateStaticParams?: () => RouteParams[] | Promise<RouteParams[]>;
|
|
169
|
+
hooks?: PageContextHooks;
|
|
144
170
|
}
|
|
145
171
|
export type PageProps<T extends PageConfig<any>> = T extends PageConfig<infer U> ? AsyncTaskState<U, FileRouterDataLoadError> : {};
|
|
146
172
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACtB,UAAU,EACX,MAAM,kBAAkB,CAAA;AAEzB,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { FileRouterContextType } from "./context";
|
|
2
2
|
import type { PageConfig } from "./types";
|
|
3
|
+
import type { NavGuardBuilder } from "./guard";
|
|
3
4
|
export interface CurrentPage {
|
|
4
5
|
component: Kiru.FC<any>;
|
|
5
6
|
config?: PageConfig;
|
|
@@ -16,6 +17,9 @@ export interface PageModule {
|
|
|
16
17
|
error: string | null;
|
|
17
18
|
}>;
|
|
18
19
|
}
|
|
20
|
+
export interface GuardModule {
|
|
21
|
+
guard: NavGuardBuilder;
|
|
22
|
+
}
|
|
19
23
|
export interface ViteImportMap {
|
|
20
24
|
[fp: string]: () => Promise<DefaultComponentModule>;
|
|
21
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.internal.d.ts","sourceRoot":"","sources":["../../src/router/types.internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"types.internal.d.ts","sourceRoot":"","sources":["../../src/router/types.internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;IACvB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAA;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,IAAI,CAAC,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAC5B,MAAM,EACN;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CACxC,CAAA;CACF;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAA;CACpD;AAED,MAAM,WAAW,2BAA2B,CAAC,CAAC,GAAG,sBAAsB;IACrE,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAA;IACtB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,sBAAsB;IAChE,CAAC,GAAG,EAAE,MAAM,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAA;CAC9C;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,2BAA2B,CAAC,UAAU,CAAC,CAAA;IAClD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,sBAAsB,CAAC,UAAU,CAAC,CAAA;IAClD,UAAU,EAAE,qBAAqB,CAAC,YAAY,CAAC,CAAA;IAC/C,QAAQ,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IACvC,SAAS,EAAE,CACT,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,KACnE,MAAM,IAAI,CAAA;CAChB"}
|