kiru 0.54.0-preview.0 → 0.54.0
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/memo.d.ts +1 -3
- package/dist/components/memo.d.ts.map +1 -1
- package/dist/components/memo.js +2 -2
- package/dist/components/memo.js.map +1 -1
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +1 -23
- package/dist/context.js.map +1 -1
- package/dist/dom.d.ts.map +1 -1
- package/dist/dom.js +109 -72
- package/dist/dom.js.map +1 -1
- package/dist/error.d.ts.map +1 -1
- package/dist/error.js +2 -4
- package/dist/error.js.map +1 -1
- package/dist/form/index.d.ts.map +1 -1
- package/dist/form/index.js +6 -10
- package/dist/form/index.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/hmr.d.ts +1 -0
- package/dist/hmr.d.ts.map +1 -1
- package/dist/hmr.js +11 -3
- package/dist/hmr.js.map +1 -1
- package/dist/hooks/useEffectEvent.d.ts.map +1 -1
- package/dist/hooks/useEffectEvent.js.map +1 -1
- package/dist/hooks/usePromise.d.ts.map +1 -1
- package/dist/hooks/usePromise.js.map +1 -1
- package/dist/hooks/utils.d.ts.map +1 -1
- package/dist/hooks/utils.js +10 -10
- package/dist/hooks/utils.js.map +1 -1
- package/dist/hydration.d.ts +6 -13
- package/dist/hydration.d.ts.map +1 -1
- package/dist/hydration.js +20 -50
- package/dist/hydration.js.map +1 -1
- package/dist/reconciler.d.ts.map +1 -1
- package/dist/reconciler.js +3 -6
- package/dist/reconciler.js.map +1 -1
- package/dist/recursiveRender.d.ts.map +1 -1
- package/dist/recursiveRender.js +9 -8
- package/dist/recursiveRender.js.map +1 -1
- package/dist/renderToString.d.ts.map +1 -1
- package/dist/renderToString.js.map +1 -1
- package/dist/router/client/index.d.ts +2 -4
- package/dist/router/client/index.d.ts.map +1 -1
- package/dist/router/client/index.js +11 -49
- package/dist/router/client/index.js.map +1 -1
- package/dist/router/context.d.ts +5 -2
- package/dist/router/context.d.ts.map +1 -1
- package/dist/router/context.js +1 -5
- package/dist/router/context.js.map +1 -1
- package/dist/router/fileRouter.d.ts.map +1 -1
- package/dist/router/fileRouter.js +2 -4
- package/dist/router/fileRouter.js.map +1 -1
- package/dist/router/fileRouterController.d.ts +2 -2
- package/dist/router/fileRouterController.d.ts.map +1 -1
- package/dist/router/fileRouterController.js +39 -101
- package/dist/router/fileRouterController.js.map +1 -1
- package/dist/router/globals.d.ts +0 -3
- package/dist/router/globals.d.ts.map +1 -1
- package/dist/router/globals.js +0 -3
- package/dist/router/globals.js.map +1 -1
- package/dist/router/head.d.ts.map +1 -1
- package/dist/router/head.js +7 -5
- package/dist/router/head.js.map +1 -1
- package/dist/router/index.d.ts +1 -2
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +1 -2
- package/dist/router/index.js.map +1 -1
- package/dist/router/link.js +3 -3
- package/dist/router/link.js.map +1 -1
- package/dist/router/{ssg → server}/index.d.ts +3 -4
- package/dist/router/server/index.d.ts.map +1 -0
- package/dist/router/{ssg → server}/index.js +5 -8
- package/dist/router/server/index.js.map +1 -0
- package/dist/router/types.d.ts +4 -37
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.internal.d.ts +0 -4
- package/dist/router/types.internal.d.ts.map +1 -1
- package/dist/router/utils/index.d.ts +3 -8
- package/dist/router/utils/index.d.ts.map +1 -1
- package/dist/router/utils/index.js +8 -40
- package/dist/router/utils/index.js.map +1 -1
- package/dist/scheduler.d.ts.map +1 -1
- package/dist/scheduler.js +60 -53
- package/dist/scheduler.js.map +1 -1
- package/dist/signals/base.d.ts +0 -2
- package/dist/signals/base.d.ts.map +1 -1
- package/dist/signals/base.js +0 -6
- package/dist/signals/base.js.map +1 -1
- package/dist/signals/computed.d.ts +3 -0
- package/dist/signals/computed.d.ts.map +1 -1
- package/dist/signals/computed.js +29 -20
- package/dist/signals/computed.js.map +1 -1
- package/dist/signals/for.d.ts +3 -3
- package/dist/signals/for.d.ts.map +1 -1
- package/dist/signals/for.js +2 -1
- package/dist/signals/for.js.map +1 -1
- package/dist/signals/utils.d.ts.map +1 -1
- package/dist/signals/utils.js +2 -1
- package/dist/signals/utils.js.map +1 -1
- package/dist/signals/watch.d.ts.map +1 -1
- package/dist/signals/watch.js +18 -22
- package/dist/signals/watch.js.map +1 -1
- package/dist/ssr/client.d.ts +1 -1
- package/dist/ssr/client.d.ts.map +1 -1
- package/dist/ssr/client.js +0 -2
- package/dist/ssr/client.js.map +1 -1
- package/dist/ssr/server.d.ts +2 -1
- package/dist/ssr/server.d.ts.map +1 -1
- package/dist/ssr/server.js +19 -16
- package/dist/ssr/server.js.map +1 -1
- package/dist/types.d.ts +0 -7
- package/dist/types.d.ts.map +1 -1
- package/dist/types.dom.d.ts +3 -3
- package/dist/types.dom.d.ts.map +1 -1
- package/dist/utils/format.d.ts +1 -2
- package/dist/utils/format.d.ts.map +1 -1
- package/dist/utils/format.js +1 -4
- package/dist/utils/format.js.map +1 -1
- package/dist/utils/runtime.d.ts +3 -2
- package/dist/utils/runtime.d.ts.map +1 -1
- package/dist/utils/runtime.js +5 -2
- package/dist/utils/runtime.js.map +1 -1
- package/dist/utils/vdom.d.ts.map +1 -1
- package/dist/utils/vdom.js +2 -2
- package/dist/utils/vdom.js.map +1 -1
- package/package.json +4 -8
- package/src/components/memo.ts +3 -11
- package/src/context.ts +1 -24
- package/src/dom.ts +145 -96
- package/src/error.ts +2 -4
- package/src/form/index.ts +6 -9
- package/src/globals.ts +1 -1
- package/src/hmr.ts +14 -5
- package/src/hooks/useEffectEvent.ts +0 -1
- package/src/hooks/usePromise.ts +0 -1
- package/src/hooks/utils.ts +12 -12
- package/src/hydration.ts +21 -57
- package/src/reconciler.ts +2 -6
- package/src/recursiveRender.ts +10 -9
- package/src/renderToString.ts +0 -1
- package/src/router/client/index.ts +14 -100
- package/src/router/context.ts +6 -7
- package/src/router/fileRouter.ts +2 -6
- package/src/router/fileRouterController.ts +39 -159
- package/src/router/globals.ts +0 -4
- package/src/router/head.ts +7 -5
- package/src/router/index.ts +1 -12
- package/src/router/link.ts +3 -3
- package/src/router/{ssg → server}/index.ts +10 -17
- package/src/router/types.internal.ts +0 -5
- package/src/router/types.ts +4 -48
- package/src/router/utils/index.ts +16 -79
- package/src/scheduler.ts +83 -70
- package/src/signals/base.ts +0 -8
- package/src/signals/computed.ts +30 -18
- package/src/signals/for.ts +15 -10
- package/src/signals/utils.ts +2 -1
- package/src/signals/watch.ts +27 -22
- package/src/ssr/client.ts +1 -4
- package/src/ssr/server.ts +21 -20
- package/src/types.dom.ts +4 -5
- package/src/types.ts +0 -10
- package/src/utils/format.ts +0 -5
- package/src/utils/runtime.ts +6 -2
- package/src/utils/vdom.ts +2 -7
- package/dist/router/guard.d.ts +0 -17
- package/dist/router/guard.d.ts.map +0 -1
- package/dist/router/guard.js +0 -45
- package/dist/router/guard.js.map +0 -1
- package/dist/router/ssg/index.d.ts.map +0 -1
- package/dist/router/ssg/index.js.map +0 -1
- package/dist/router/ssr/index.d.ts +0 -20
- package/dist/router/ssr/index.d.ts.map +0 -1
- package/dist/router/ssr/index.js +0 -160
- package/dist/router/ssr/index.js.map +0 -1
- package/src/router/guard.ts +0 -72
- package/src/router/ssr/index.ts +0 -247
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"}
|
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"}
|
|
@@ -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,CAwC1E;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
|
|
2
|
+
import { isValidTextChild, isVNode } 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 = Array.isArray(children) ? children : [children];
|
|
13
13
|
const invalidNodes = asArray.filter((c) => !isVNode(c) ||
|
|
14
14
|
typeof c.type !== "string" ||
|
|
15
15
|
!validHeadChildren.includes(c.type));
|
|
@@ -21,11 +21,13 @@ function HeadContent({ children }) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
if ("window" in globalThis) {
|
|
24
|
-
const
|
|
25
|
-
const titleNode =
|
|
24
|
+
const asArray = Array.isArray(children) ? children : [children];
|
|
25
|
+
const titleNode = asArray.find((c) => isVNode(c) && c.type === "title");
|
|
26
26
|
if (titleNode) {
|
|
27
27
|
const props = titleNode.props;
|
|
28
|
-
const titleChildren =
|
|
28
|
+
const titleChildren = Array.isArray(props.children)
|
|
29
|
+
? props.children
|
|
30
|
+
: [props.children];
|
|
29
31
|
document.title = titleChildren
|
|
30
32
|
.map((c) => (Signal.isSignal(c) ? c.value : c))
|
|
31
33
|
.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,
|
|
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;AAC7D,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,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QAC/D,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,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAC5B,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,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACjD,CAAC,CAAC,KAAK,CAAC,QAAQ;gBAChB,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAEpB,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,7 +1,6 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export { 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";
|
|
5
4
|
export * from "./link.js";
|
|
6
5
|
export * from "./pageConfig.js";
|
|
7
6
|
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,EAAE,aAAa,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACxE,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAClE,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,9 +1,8 @@
|
|
|
1
1
|
import { createElement } from "../element.js";
|
|
2
2
|
import { __DEV__ } from "../env.js";
|
|
3
|
-
export {
|
|
3
|
+
export { useFileRouter } from "./context.js";
|
|
4
4
|
export * from "./errors.js";
|
|
5
5
|
export { FileRouter } from "./fileRouter.js";
|
|
6
|
-
export { createNavGuard, } from "./guard.js";
|
|
7
6
|
export * from "./link.js";
|
|
8
7
|
export * from "./pageConfig.js";
|
|
9
8
|
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,EAAE,aAAa,EAA8B,MAAM,cAAc,CAAA;AACxE,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAA;AAClE,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"}
|
package/dist/router/link.js
CHANGED
|
@@ -2,7 +2,7 @@ import { createElement } from "../element.js";
|
|
|
2
2
|
import { useCallback } from "../hooks/index.js";
|
|
3
3
|
import { useFileRouter } from "./context.js";
|
|
4
4
|
export const Link = ({ to, onclick, onmouseover, onfocus, replace, transition, prefetchJs, ...props }) => {
|
|
5
|
-
const { navigate, prefetchRouteModules } = useFileRouter();
|
|
5
|
+
const { navigate, prefetchRouteModules, baseUrl } = useFileRouter();
|
|
6
6
|
const handleMouseOver = useCallback((e) => {
|
|
7
7
|
if (prefetchJs !== false) {
|
|
8
8
|
prefetchRouteModules(to);
|
|
@@ -20,10 +20,10 @@ export const Link = ({ to, onclick, onmouseover, onfocus, replace, transition, p
|
|
|
20
20
|
if (e.defaultPrevented)
|
|
21
21
|
return;
|
|
22
22
|
e.preventDefault();
|
|
23
|
-
navigate(to, { replace, transition });
|
|
23
|
+
navigate(baseUrl + to, { replace, transition });
|
|
24
24
|
}, [onclick, navigate, to, replace, transition]);
|
|
25
25
|
return createElement("a", {
|
|
26
|
-
href: to,
|
|
26
|
+
href: baseUrl + to,
|
|
27
27
|
onclick: handleClick,
|
|
28
28
|
onmouseover: handleMouseOver,
|
|
29
29
|
onfocus: handleFocus,
|
package/dist/router/link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/router/link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AA0B5C,MAAM,CAAC,MAAM,IAAI,GAAuB,CAAC,EACvC,EAAE,EACF,OAAO,EACP,WAAW,EACX,OAAO,EACP,OAAO,EACP,UAAU,EACV,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,aAAa,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/router/link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AA0B5C,MAAM,CAAC,MAAM,IAAI,GAAuB,CAAC,EACvC,EAAE,EACF,OAAO,EACP,WAAW,EACX,OAAO,EACP,OAAO,EACP,UAAU,EACV,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAAA;IAEnE,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,CAAqC,EAAE,EAAE;QACxC,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YACzB,oBAAoB,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QACD,WAAW,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAA;IACD,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,CAAqC,EAAE,EAAE;QACxC,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YACzB,oBAAoB,CAAC,EAAE,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;IACd,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAA;IAED,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,CAAqC,EAAE,EAAE;QACxC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;QACZ,IAAI,CAAC,CAAC,gBAAgB;YAAE,OAAM;QAC9B,CAAC,CAAC,cAAc,EAAE,CAAA;QAClB,QAAQ,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;IACjD,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,CAC7C,CAAA;IAED,OAAO,aAAa,CAAC,GAAG,EAAE;QACxB,IAAI,EAAE,OAAO,GAAG,EAAE;QAClB,OAAO,EAAE,WAAW;QACpB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,WAAW;QACpB,GAAG,KAAK;KACT,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { FormattedViteImportMap } from "../types.internal.js";
|
|
2
2
|
export interface RenderContext {
|
|
3
|
-
pages: FormattedViteImportMap
|
|
3
|
+
pages: FormattedViteImportMap;
|
|
4
4
|
layouts: FormattedViteImportMap;
|
|
5
|
-
guards: FormattedViteImportMap<GuardModule>;
|
|
6
5
|
Document: Kiru.FC;
|
|
7
6
|
registerModule: (moduleId: string) => void;
|
|
8
|
-
|
|
7
|
+
registerPreloadedPageProps: (props: Record<string, unknown>) => void;
|
|
9
8
|
}
|
|
10
9
|
export interface RenderResult {
|
|
11
10
|
status: number;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/server/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAA;AAKzE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,sBAAsB,CAAA;IAC7B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAA;IACjB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IAC1C,0BAA0B,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;CACrE;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,CAuJvB;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,mCAmCtE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createElement, Fragment } from "../../element.js";
|
|
2
|
-
import {
|
|
2
|
+
import { matchLayouts, 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 = matchLayouts(ctx.layouts, routeSegments);
|
|
38
38
|
[pageEntry, ...layoutEntries].forEach((e) => {
|
|
39
39
|
ctx.registerModule(e.filePath);
|
|
40
40
|
});
|
|
@@ -62,10 +62,7 @@ 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(
|
|
66
|
-
...routerState,
|
|
67
|
-
context: {},
|
|
68
|
-
});
|
|
65
|
+
const data = await config.loader.load(routerState);
|
|
69
66
|
props = {
|
|
70
67
|
data,
|
|
71
68
|
error: null,
|
|
@@ -81,7 +78,7 @@ export async function render(url, ctx, result) {
|
|
|
81
78
|
}
|
|
82
79
|
finally {
|
|
83
80
|
clearTimeout(timeout);
|
|
84
|
-
ctx.
|
|
81
|
+
ctx.registerPreloadedPageProps({ data: props.data, error: props.error });
|
|
85
82
|
}
|
|
86
83
|
}
|
|
87
84
|
}
|
|
@@ -123,7 +120,7 @@ export async function render(url, ctx, result) {
|
|
|
123
120
|
const [prePageOutlet, postPageOutlet] = documentShell.split("<kiru-body-outlet>");
|
|
124
121
|
// console.log("immediate", immediate)
|
|
125
122
|
return {
|
|
126
|
-
status: is404Route ? 404 : result?.status ?? 200,
|
|
123
|
+
status: is404Route ? 404 : (result?.status ?? 200),
|
|
127
124
|
body: `<!doctype html>${prePageOutlet}<body>${pageOutletContent}</body>${postPageOutlet}`,
|
|
128
125
|
};
|
|
129
126
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/server/index.ts"],"names":[],"mappings":"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"}
|
package/dist/router/types.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import type { AsyncTaskState } from "../types.utils";
|
|
2
2
|
import type { FileRouterDataLoadError } from "./errors";
|
|
3
|
-
import type { DefaultComponentModule, FormattedViteImportMap,
|
|
3
|
+
import type { DefaultComponentModule, FormattedViteImportMap, PageModule } from "./types.internal";
|
|
4
4
|
export interface FileRouterPreloadConfig {
|
|
5
|
-
pages: FormattedViteImportMap
|
|
5
|
+
pages: FormattedViteImportMap;
|
|
6
6
|
layouts: FormattedViteImportMap;
|
|
7
|
-
guards?: FormattedViteImportMap<GuardModule>;
|
|
8
7
|
page: PageModule;
|
|
9
8
|
pageProps: Record<string, unknown>;
|
|
10
9
|
pageLayouts: DefaultComponentModule[];
|
|
@@ -37,14 +36,6 @@ export interface FileRouterConfig {
|
|
|
37
36
|
* ```
|
|
38
37
|
*/
|
|
39
38
|
layouts: Record<string, unknown>;
|
|
40
|
-
/**
|
|
41
|
-
* The import map to use for loading nav guards
|
|
42
|
-
* @example
|
|
43
|
-
* ```tsx
|
|
44
|
-
* <FileRouter config={{ guards: import.meta.glob("/∗∗/guard.{ts,js}"), ... }} />
|
|
45
|
-
* ```
|
|
46
|
-
*/
|
|
47
|
-
guards?: Record<string, unknown>;
|
|
48
39
|
/**
|
|
49
40
|
* The base url to use as a prefix for route matching
|
|
50
41
|
* @default "/"
|
|
@@ -96,32 +87,16 @@ export interface RouterState {
|
|
|
96
87
|
*/
|
|
97
88
|
signal: AbortSignal;
|
|
98
89
|
}
|
|
90
|
+
type PageDataLoaderContext = RouterState & {};
|
|
99
91
|
export interface PageDataLoaderCacheConfig {
|
|
100
92
|
type: "memory" | "localStorage" | "sessionStorage";
|
|
101
93
|
ttl: number;
|
|
102
94
|
}
|
|
103
|
-
interface LoaderContext extends RouterState {
|
|
104
|
-
/**
|
|
105
|
-
* The request context - in SSR, this is the data from the server
|
|
106
|
-
* that's passed to the `renderPage` function
|
|
107
|
-
* @example
|
|
108
|
-
* ```ts
|
|
109
|
-
* // server.ts
|
|
110
|
-
* renderPage({ url, context: { test: 123 } })
|
|
111
|
-
*
|
|
112
|
-
* // page.tsx
|
|
113
|
-
* loader: {
|
|
114
|
-
* load: ({ context }) => context.test
|
|
115
|
-
* }
|
|
116
|
-
* ```
|
|
117
|
-
*/
|
|
118
|
-
context: Kiru.RequestContext;
|
|
119
|
-
}
|
|
120
95
|
export type PageDataLoaderConfig<T = unknown> = {
|
|
121
96
|
/**
|
|
122
97
|
* The function to load the page data
|
|
123
98
|
*/
|
|
124
|
-
load: (context:
|
|
99
|
+
load: (context: PageDataLoaderContext) => Promise<T>;
|
|
125
100
|
} & ({
|
|
126
101
|
/**
|
|
127
102
|
* The mode to use for the page data loader
|
|
@@ -156,13 +131,6 @@ export type PageDataLoaderConfig<T = unknown> = {
|
|
|
156
131
|
*/
|
|
157
132
|
mode: "static";
|
|
158
133
|
});
|
|
159
|
-
export type NavigationHook<T> = (context: Kiru.RequestContext, to: string, from: string) => T;
|
|
160
|
-
export type OnBeforeEnterHook = NavigationHook<string | void | Promise<string | void>>;
|
|
161
|
-
export type OnBeforeLeaveHook = NavigationHook<false | void>;
|
|
162
|
-
interface PageContextHooks {
|
|
163
|
-
onBeforeEnter?: OnBeforeEnterHook | OnBeforeEnterHook[];
|
|
164
|
-
onBeforeLeave?: OnBeforeLeaveHook | OnBeforeLeaveHook[];
|
|
165
|
-
}
|
|
166
134
|
export interface PageConfig<T = unknown> {
|
|
167
135
|
/**
|
|
168
136
|
* The loader configuration for this page
|
|
@@ -173,7 +141,6 @@ export interface PageConfig<T = unknown> {
|
|
|
173
141
|
* returned, a page will be generated
|
|
174
142
|
*/
|
|
175
143
|
generateStaticParams?: () => RouteParams[] | Promise<RouteParams[]>;
|
|
176
|
-
hooks?: PageContextHooks;
|
|
177
144
|
}
|
|
178
145
|
export type PageProps<T extends PageConfig<any>> = T extends PageConfig<infer U> ? AsyncTaskState<U, FileRouterDataLoadError> : {};
|
|
179
146
|
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,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { FileRouterContextType } from "./context";
|
|
2
2
|
import type { PageConfig } from "./types";
|
|
3
|
-
import type { NavGuardBuilder } from "./guard";
|
|
4
3
|
export interface CurrentPage {
|
|
5
4
|
component: Kiru.FC<any>;
|
|
6
5
|
config?: PageConfig;
|
|
@@ -17,9 +16,6 @@ export interface PageModule {
|
|
|
17
16
|
error: string | null;
|
|
18
17
|
}>;
|
|
19
18
|
}
|
|
20
|
-
export interface GuardModule {
|
|
21
|
-
guard: NavGuardBuilder;
|
|
22
|
-
}
|
|
23
19
|
export interface ViteImportMap {
|
|
24
20
|
[fp: string]: () => Promise<DefaultComponentModule>;
|
|
25
21
|
}
|
|
@@ -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;AAEzC,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,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"}
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
export { formatViteImportMap, matchRoute, match404Route, matchModules, normalizePrefixPath, parseQuery, wrapWithLayouts, runBeforeLeaveHooks, runBeforeEnterHooks, runBeforeEachGuards, runAfterEachGuards, };
|
|
1
|
+
import type { FormattedViteImportMap, RouteMatch, ViteImportMap } from "../types.internal";
|
|
2
|
+
export { formatViteImportMap, matchRoute, match404Route, matchLayouts, normalizePrefixPath, parseQuery, wrapWithLayouts, };
|
|
4
3
|
declare function formatViteImportMap(map: ViteImportMap, dir: string, baseUrl: string): FormattedViteImportMap;
|
|
5
4
|
declare function matchRoute(pages: FormattedViteImportMap, pathSegments: string[]): RouteMatch | null;
|
|
6
5
|
declare function match404Route(pages: FormattedViteImportMap, pathSegments: string[]): RouteMatch | null;
|
|
7
|
-
declare function
|
|
6
|
+
declare function matchLayouts(layouts: FormattedViteImportMap, routeSegments: string[]): import("../types.internal").FormattedViteImportMapEntry<import("../types.internal").DefaultComponentModule>[];
|
|
8
7
|
declare function normalizePrefixPath(path: string): string;
|
|
9
8
|
declare function parseQuery(search: string): Record<string, string | string[] | undefined>;
|
|
10
9
|
declare function wrapWithLayouts(layouts: Kiru.FC[], page: Kiru.FC, props: Record<string, unknown>): Kiru.Element;
|
|
11
|
-
declare function runBeforeLeaveHooks(hooks: OnBeforeLeaveHook[], context: Kiru.RequestContext, to: string, from?: string): false | void;
|
|
12
|
-
declare function runBeforeEnterHooks(hooks: OnBeforeEnterHook[], context: Kiru.RequestContext, to: string, from?: string): Promise<string | null>;
|
|
13
|
-
declare function runBeforeEachGuards(guardModules: GuardModule[], context: Kiru.RequestContext, to: string, from?: string): Promise<string | null>;
|
|
14
|
-
declare function runAfterEachGuards(guardModules: GuardModule[], context: Kiru.RequestContext, to: string, from?: string): Promise<void>;
|
|
15
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,UAAU,EACV,aAAa,EACd,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,UAAU,EACV,eAAe,GAChB,CAAA;AAED,iBAAS,mBAAmB,CAC1B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,sBAAsB,CAsExB;AAED,iBAAS,UAAU,CACjB,KAAK,EAAE,sBAAsB,EAC7B,YAAY,EAAE,MAAM,EAAE,GACrB,UAAU,GAAG,IAAI,CA+DnB;AAED,iBAAS,aAAa,CACpB,KAAK,EAAE,sBAAsB,EAC7B,YAAY,EAAE,MAAM,EAAE,GACrB,UAAU,GAAG,IAAI,CAYnB;AAED,iBAAS,YAAY,CACnB,OAAO,EAAE,sBAAsB,EAC/B,aAAa,EAAE,MAAM,EAAE,iHAexB;AAED,iBAAS,mBAAmB,CAAC,IAAI,EAAE,MAAM,UAYxC;AAED,iBAAS,UAAU,CACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAkB/C;AAED,iBAAS,eAAe,CACtB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,EAClB,IAAI,EAAE,IAAI,CAAC,EAAE,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,gBAM/B"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createElement } from "../../element.js";
|
|
2
2
|
import { __DEV__ } from "../../env.js";
|
|
3
|
-
|
|
4
|
-
export { formatViteImportMap, matchRoute, match404Route, matchModules, normalizePrefixPath, parseQuery, wrapWithLayouts, runBeforeLeaveHooks, runBeforeEnterHooks, runBeforeEachGuards, runAfterEachGuards, };
|
|
3
|
+
export { formatViteImportMap, matchRoute, match404Route, matchLayouts, normalizePrefixPath, parseQuery, wrapWithLayouts, };
|
|
5
4
|
function formatViteImportMap(map, dir, baseUrl) {
|
|
6
5
|
return Object.keys(map).reduce((acc, key) => {
|
|
7
6
|
const dirIndex = key.indexOf(dir);
|
|
@@ -12,7 +11,7 @@ function formatViteImportMap(map, dir, baseUrl) {
|
|
|
12
11
|
return acc;
|
|
13
12
|
}
|
|
14
13
|
let specificity = 0;
|
|
15
|
-
let k = key.slice(dirIndex + dir.length);
|
|
14
|
+
let k = baseUrl + key.slice(dirIndex + dir.length);
|
|
16
15
|
while (k.startsWith("/")) {
|
|
17
16
|
k = k.slice(1);
|
|
18
17
|
}
|
|
@@ -57,7 +56,7 @@ function formatViteImportMap(map, dir, baseUrl) {
|
|
|
57
56
|
};
|
|
58
57
|
return {
|
|
59
58
|
...acc,
|
|
60
|
-
[
|
|
59
|
+
[segments.join("/")]: value,
|
|
61
60
|
};
|
|
62
61
|
}, {});
|
|
63
62
|
}
|
|
@@ -126,14 +125,14 @@ function match404Route(pages, pathSegments) {
|
|
|
126
125
|
}
|
|
127
126
|
return null;
|
|
128
127
|
}
|
|
129
|
-
function
|
|
128
|
+
function matchLayouts(layouts, routeSegments) {
|
|
130
129
|
return ["/", ...routeSegments].reduce((acc, _, i) => {
|
|
131
|
-
const
|
|
132
|
-
const
|
|
133
|
-
if (!
|
|
130
|
+
const layoutPath = routeSegments.slice(0, i).join("/");
|
|
131
|
+
const layout = layouts[layoutPath];
|
|
132
|
+
if (!layout) {
|
|
134
133
|
return acc;
|
|
135
134
|
}
|
|
136
|
-
return [...acc,
|
|
135
|
+
return [...acc, layout];
|
|
137
136
|
}, []);
|
|
138
137
|
}
|
|
139
138
|
function normalizePrefixPath(path) {
|
|
@@ -172,35 +171,4 @@ function parseQuery(search) {
|
|
|
172
171
|
function wrapWithLayouts(layouts, page, props) {
|
|
173
172
|
return layouts.reduceRight((children, Layout) => createElement(Layout, { children }), createElement(page, props));
|
|
174
173
|
}
|
|
175
|
-
function runBeforeLeaveHooks(hooks, context, to, from = to) {
|
|
176
|
-
for (const hook of hooks) {
|
|
177
|
-
const res = hook(context, to, from);
|
|
178
|
-
if (res === false) {
|
|
179
|
-
return false;
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
async function runBeforeEnterHooks(hooks, context, to, from = to) {
|
|
184
|
-
for (const hook of hooks) {
|
|
185
|
-
const result = await hook(context, to, from);
|
|
186
|
-
if (typeof result === "string") {
|
|
187
|
-
return result;
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
return null;
|
|
191
|
-
}
|
|
192
|
-
async function runBeforeEachGuards(guardModules, context, to, from = to) {
|
|
193
|
-
const beforeHooks = guardModules
|
|
194
|
-
.map((guardModule) => resolveNavguard(guardModule)?.beforeEach)
|
|
195
|
-
.filter((x) => typeof x === "function");
|
|
196
|
-
return runBeforeEnterHooks(beforeHooks, context, to, from);
|
|
197
|
-
}
|
|
198
|
-
async function runAfterEachGuards(guardModules, context, to, from = to) {
|
|
199
|
-
const afterHooks = guardModules
|
|
200
|
-
.map((guardModule) => resolveNavguard(guardModule)?.afterEach)
|
|
201
|
-
.filter((x) => typeof x === "function");
|
|
202
|
-
for (const hook of afterHooks) {
|
|
203
|
-
await hook(context, to, from);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
174
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/scheduler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AA0CA,KAAK,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;AAevB;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAM7C;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,IAAI,CAIhC;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,CAMpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAKhD"}
|