one 1.1.381 → 1.1.383
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/cjs/Route.js.map +1 -1
- package/dist/cjs/Route.native.js.map +1 -1
- package/dist/cjs/cli/build.cjs +100 -69
- package/dist/cjs/cli/build.js +83 -41
- package/dist/cjs/cli/build.js.map +2 -2
- package/dist/cjs/cli/build.native.js +161 -68
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/cli/{run.cjs → dev.cjs} +7 -8
- package/dist/cjs/cli/{run.js → dev.js} +7 -8
- package/dist/cjs/cli/dev.js.map +6 -0
- package/dist/cjs/cli/{run.native.js → dev.native.js} +8 -9
- package/dist/cjs/cli/dev.native.js.map +6 -0
- package/dist/cjs/cli/main.cjs +2 -2
- package/dist/cjs/cli/main.js +2 -2
- package/dist/cjs/cli/main.native.js +2 -2
- package/dist/cjs/cli/main.native.js.map +1 -1
- package/dist/cjs/cli.cjs +3 -7
- package/dist/cjs/cli.js +2 -6
- package/dist/cjs/cli.js.map +2 -2
- package/dist/cjs/cli.native.js +2 -6
- package/dist/cjs/cli.native.js.map +2 -2
- package/dist/cjs/constants.cjs +3 -1
- package/dist/cjs/constants.js +2 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/constants.native.js +3 -1
- package/dist/cjs/constants.native.js.map +2 -2
- package/dist/cjs/createHandleRequest.cjs +124 -87
- package/dist/cjs/createHandleRequest.js +129 -81
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +153 -96
- package/dist/cjs/createHandleRequest.native.js.map +2 -2
- package/dist/cjs/createMiddleware.cjs +28 -0
- package/dist/cjs/createMiddleware.js +23 -0
- package/dist/cjs/createMiddleware.js.map +6 -0
- package/dist/cjs/createMiddleware.native.js +28 -0
- package/dist/cjs/createMiddleware.native.js.map +6 -0
- package/dist/cjs/getRoutes.cjs +11 -18
- package/dist/cjs/getRoutes.js +13 -19
- package/dist/cjs/getRoutes.js.map +1 -1
- package/dist/cjs/getRoutes.native.js +20 -26
- package/dist/cjs/getRoutes.native.js.map +2 -2
- package/dist/cjs/index.cjs +2 -0
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +3 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/serve-worker.cjs +5 -3
- package/dist/cjs/serve-worker.js +3 -3
- package/dist/cjs/serve-worker.js.map +1 -1
- package/dist/cjs/serve-worker.native.js +3 -3
- package/dist/cjs/serve-worker.native.js.map +2 -2
- package/dist/cjs/serve.cjs +12 -14
- package/dist/cjs/serve.js +12 -13
- package/dist/cjs/serve.js.map +1 -1
- package/dist/cjs/serve.native.js +12 -13
- package/dist/cjs/serve.native.js.map +2 -2
- package/dist/cjs/server/createRoutesManifest.js.map +1 -1
- package/dist/cjs/server/createRoutesManifest.native.js.map +1 -1
- package/dist/cjs/server/getServerManifest.cjs +7 -2
- package/dist/cjs/server/getServerManifest.js +7 -2
- package/dist/cjs/server/getServerManifest.js.map +1 -1
- package/dist/cjs/server/getServerManifest.native.js +23 -3
- package/dist/cjs/server/getServerManifest.native.js.map +2 -2
- package/dist/cjs/server/oneServe.cjs +86 -84
- package/dist/cjs/server/oneServe.js +95 -110
- package/dist/cjs/server/oneServe.js.map +2 -2
- package/dist/cjs/server/oneServe.native.js +102 -89
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/utils/getHonoPath.cjs +28 -0
- package/dist/cjs/utils/getHonoPath.js +23 -0
- package/dist/cjs/utils/getHonoPath.js.map +6 -0
- package/dist/cjs/utils/getHonoPath.native.js +28 -0
- package/dist/cjs/utils/getHonoPath.native.js.map +6 -0
- package/dist/cjs/utils/toAbsolute.cjs +27 -0
- package/dist/cjs/utils/toAbsolute.js +22 -0
- package/dist/cjs/utils/toAbsolute.js.map +6 -0
- package/dist/cjs/utils/toAbsolute.native.js +28 -0
- package/dist/cjs/utils/toAbsolute.native.js.map +6 -0
- package/dist/cjs/vite/one.cjs +4 -3
- package/dist/cjs/vite/one.js +4 -2
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +4 -2
- package/dist/cjs/vite/one.native.js.map +2 -2
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +7 -8
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +8 -9
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +8 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
- package/dist/cjs/vite/resolveResponse.cjs +100 -0
- package/dist/cjs/vite/resolveResponse.js +79 -0
- package/dist/cjs/vite/resolveResponse.js.map +6 -0
- package/dist/cjs/vite/resolveResponse.native.js +94 -0
- package/dist/cjs/vite/resolveResponse.native.js.map +6 -0
- package/dist/cjs/vite/{headers.cjs → server.cjs} +5 -5
- package/dist/cjs/vite/{headers.js → server.js} +6 -6
- package/dist/cjs/vite/{headers.js.map → server.js.map} +2 -2
- package/dist/cjs/vite/{headers.native.js → server.native.js} +7 -7
- package/dist/cjs/vite/{headers.native.js.map → server.native.js.map} +3 -3
- package/dist/cjs/vite/types.native.js.map +1 -1
- package/dist/cjs/vite.cjs +2 -2
- package/dist/cjs/vite.js +2 -2
- package/dist/cjs/vite.js.map +1 -1
- package/dist/cjs/vite.native.js +3 -3
- package/dist/cjs/vite.native.js.map +1 -1
- package/dist/esm/Route.js.map +1 -1
- package/dist/esm/Route.mjs.map +1 -1
- package/dist/esm/Route.native.js.map +1 -1
- package/dist/esm/cli/build.js +81 -38
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +98 -67
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +160 -66
- package/dist/esm/cli/build.native.js.map +2 -2
- package/dist/esm/cli/{run.js → dev.js} +4 -5
- package/dist/esm/cli/dev.js.map +6 -0
- package/dist/esm/cli/{run.mjs → dev.mjs} +5 -6
- package/dist/esm/cli/dev.mjs.map +1 -0
- package/dist/esm/cli/{run.native.js → dev.native.js} +4 -5
- package/dist/esm/cli/dev.native.js.map +6 -0
- package/dist/esm/cli/main.js +2 -2
- package/dist/esm/cli/main.mjs +2 -2
- package/dist/esm/cli/main.mjs.map +1 -1
- package/dist/esm/cli/main.native.js +2 -2
- package/dist/esm/cli/main.native.js.map +1 -1
- package/dist/esm/cli.js +2 -6
- package/dist/esm/cli.js.map +2 -2
- package/dist/esm/cli.mjs +3 -7
- package/dist/esm/cli.mjs.map +1 -1
- package/dist/esm/cli.native.js +2 -6
- package/dist/esm/cli.native.js.map +2 -2
- package/dist/esm/constants.js +2 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/constants.mjs +3 -2
- package/dist/esm/constants.mjs.map +1 -1
- package/dist/esm/constants.native.js +2 -1
- package/dist/esm/constants.native.js.map +2 -2
- package/dist/esm/createHandleRequest.js +130 -81
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +118 -86
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +148 -95
- package/dist/esm/createHandleRequest.native.js.map +2 -2
- package/dist/esm/createMiddleware.js +7 -0
- package/dist/esm/createMiddleware.js.map +6 -0
- package/dist/esm/createMiddleware.mjs +5 -0
- package/dist/esm/createMiddleware.mjs.map +1 -0
- package/dist/esm/createMiddleware.native.js +7 -0
- package/dist/esm/createMiddleware.native.js.map +6 -0
- package/dist/esm/getRoutes.js +13 -19
- package/dist/esm/getRoutes.js.map +1 -1
- package/dist/esm/getRoutes.mjs +12 -18
- package/dist/esm/getRoutes.mjs.map +1 -1
- package/dist/esm/getRoutes.native.js +20 -25
- package/dist/esm/getRoutes.native.js.map +2 -2
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -0
- package/dist/esm/index.native.js.map +2 -2
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/serve-worker.js +3 -2
- package/dist/esm/serve-worker.js.map +1 -1
- package/dist/esm/serve-worker.mjs +4 -2
- package/dist/esm/serve-worker.mjs.map +1 -1
- package/dist/esm/serve-worker.native.js +3 -2
- package/dist/esm/serve-worker.native.js.map +2 -2
- package/dist/esm/serve.js +12 -13
- package/dist/esm/serve.js.map +1 -1
- package/dist/esm/serve.mjs +12 -14
- package/dist/esm/serve.mjs.map +1 -1
- package/dist/esm/serve.native.js +12 -13
- package/dist/esm/serve.native.js.map +2 -2
- package/dist/esm/server/createRoutesManifest.js.map +1 -1
- package/dist/esm/server/createRoutesManifest.mjs.map +1 -1
- package/dist/esm/server/createRoutesManifest.native.js.map +1 -1
- package/dist/esm/server/getServerManifest.js +7 -2
- package/dist/esm/server/getServerManifest.js.map +1 -1
- package/dist/esm/server/getServerManifest.mjs +7 -2
- package/dist/esm/server/getServerManifest.mjs.map +1 -1
- package/dist/esm/server/getServerManifest.native.js +23 -3
- package/dist/esm/server/getServerManifest.native.js.map +2 -2
- package/dist/esm/server/oneServe.js +100 -110
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +86 -84
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +107 -89
- package/dist/esm/server/oneServe.native.js.map +2 -2
- package/dist/esm/utils/getHonoPath.js +7 -0
- package/dist/esm/utils/getHonoPath.js.map +6 -0
- package/dist/esm/utils/getHonoPath.mjs +5 -0
- package/dist/esm/utils/getHonoPath.mjs.map +1 -0
- package/dist/esm/utils/getHonoPath.native.js +7 -0
- package/dist/esm/utils/getHonoPath.native.js.map +6 -0
- package/dist/esm/utils/toAbsolute.js +6 -0
- package/dist/esm/utils/toAbsolute.js.map +6 -0
- package/dist/esm/utils/toAbsolute.mjs +4 -0
- package/dist/esm/utils/toAbsolute.mjs.map +1 -0
- package/dist/esm/utils/toAbsolute.native.js +8 -0
- package/dist/esm/utils/toAbsolute.native.js.map +6 -0
- package/dist/esm/vite/one.js +5 -3
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +4 -3
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +5 -3
- package/dist/esm/vite/one.native.js.map +2 -2
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +7 -9
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +7 -8
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +7 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
- package/dist/esm/vite/resolveResponse.js +64 -0
- package/dist/esm/vite/resolveResponse.js.map +6 -0
- package/dist/esm/vite/resolveResponse.mjs +76 -0
- package/dist/esm/vite/resolveResponse.mjs.map +1 -0
- package/dist/esm/vite/resolveResponse.native.js +73 -0
- package/dist/esm/vite/resolveResponse.native.js.map +6 -0
- package/dist/esm/vite/{headers.js → server.js} +3 -3
- package/dist/esm/vite/{headers.js.map → server.js.map} +2 -2
- package/dist/esm/vite/{headers.mjs → server.mjs} +3 -3
- package/dist/esm/vite/server.mjs.map +1 -0
- package/dist/esm/vite/{headers.native.js → server.native.js} +3 -3
- package/dist/esm/vite/{headers.native.js.map → server.native.js.map} +3 -3
- package/dist/esm/vite.js +2 -2
- package/dist/esm/vite.js.map +1 -1
- package/dist/esm/vite.mjs +2 -2
- package/dist/esm/vite.mjs.map +1 -1
- package/dist/esm/vite.native.js +2 -2
- package/dist/esm/vite.native.js.map +2 -2
- package/package.json +14 -13
- package/src/Route.tsx +2 -0
- package/src/cli/build.ts +110 -53
- package/src/cli/{run.ts → dev.ts} +1 -2
- package/src/cli/main.ts +2 -2
- package/src/cli.ts +2 -6
- package/src/constants.ts +2 -1
- package/src/createHandleRequest.ts +210 -126
- package/src/createMiddleware.ts +14 -0
- package/src/getRoutes.ts +27 -41
- package/src/index.ts +3 -0
- package/src/router/router.ts +1 -0
- package/src/serve-worker.ts +7 -2
- package/src/serve.ts +13 -14
- package/src/server/createRoutesManifest.ts +7 -0
- package/src/server/getServerManifest.ts +16 -0
- package/src/server/oneServe.ts +141 -150
- package/src/types.ts +0 -4
- package/src/utils/getHonoPath.ts +17 -0
- package/src/utils/toAbsolute.ts +3 -0
- package/src/vite/one.ts +13 -5
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +8 -15
- package/src/vite/resolveResponse.ts +93 -0
- package/src/vite/{headers.native.ts → server.native.ts} +1 -1
- package/src/vite/{headers.ts → server.ts} +1 -1
- package/src/vite/types.ts +12 -6
- package/src/vite.ts +1 -1
- package/types/Route.d.ts +2 -0
- package/types/Route.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/{run.d.ts → dev.d.ts} +2 -2
- package/types/cli/{run.d.ts.map → dev.d.ts.map} +1 -1
- package/types/constants.d.ts +1 -0
- package/types/constants.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts +19 -6
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/createMiddleware.d.ts +12 -0
- package/types/createMiddleware.d.ts.map +1 -0
- package/types/getRoutes.d.ts +0 -3
- package/types/getRoutes.d.ts.map +1 -1
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
- package/types/layouts/Drawer.d.ts +2 -2
- package/types/layouts/Stack.d.ts +2 -2
- package/types/layouts/Tabs.d.ts +2 -2
- package/types/router/router.d.ts.map +1 -1
- package/types/serve-worker.d.ts +2 -1
- package/types/serve-worker.d.ts.map +1 -1
- package/types/serve.d.ts.map +1 -1
- package/types/server/createRoutesManifest.d.ts +6 -0
- package/types/server/createRoutesManifest.d.ts.map +1 -1
- package/types/server/getServerManifest.d.ts +2 -0
- package/types/server/getServerManifest.d.ts.map +1 -1
- package/types/server/oneServe.d.ts +1 -2
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/types.d.ts +0 -2
- package/types/types.d.ts.map +1 -1
- package/types/utils/getHonoPath.d.ts +2 -0
- package/types/utils/getHonoPath.d.ts.map +1 -0
- package/types/utils/toAbsolute.d.ts +2 -0
- package/types/utils/toAbsolute.d.ts.map +1 -0
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
- package/types/vite/resolveResponse.d.ts +3 -0
- package/types/vite/resolveResponse.d.ts.map +1 -0
- package/types/vite/{headers.d.ts → server.d.ts} +2 -2
- package/types/vite/server.d.ts.map +1 -0
- package/types/vite/{headers.native.d.ts → server.native.d.ts} +2 -2
- package/types/vite/server.native.d.ts.map +1 -0
- package/types/vite/types.d.ts +11 -5
- package/types/vite/types.d.ts.map +1 -1
- package/types/vite.d.ts +1 -1
- package/types/vite.d.ts.map +1 -1
- package/dist/cjs/cli/run.js.map +0 -6
- package/dist/cjs/cli/run.native.js.map +0 -6
- package/dist/cjs/vite/resolveAPIRequest.cjs +0 -90
- package/dist/cjs/vite/resolveAPIRequest.js +0 -71
- package/dist/cjs/vite/resolveAPIRequest.js.map +0 -6
- package/dist/cjs/vite/resolveAPIRequest.native.js +0 -84
- package/dist/cjs/vite/resolveAPIRequest.native.js.map +0 -6
- package/dist/esm/cli/run.js.map +0 -6
- package/dist/esm/cli/run.mjs.map +0 -1
- package/dist/esm/cli/run.native.js.map +0 -6
- package/dist/esm/vite/headers.mjs.map +0 -1
- package/dist/esm/vite/resolveAPIRequest.js +0 -56
- package/dist/esm/vite/resolveAPIRequest.js.map +0 -6
- package/dist/esm/vite/resolveAPIRequest.mjs +0 -67
- package/dist/esm/vite/resolveAPIRequest.mjs.map +0 -1
- package/dist/esm/vite/resolveAPIRequest.native.js +0 -64
- package/dist/esm/vite/resolveAPIRequest.native.js.map +0 -6
- package/src/vite/resolveAPIRequest.ts +0 -86
- package/types/vite/headers.d.ts.map +0 -1
- package/types/vite/headers.native.d.ts.map +0 -1
- package/types/vite/resolveAPIRequest.d.ts +0 -2
- package/types/vite/resolveAPIRequest.d.ts.map +0 -1
@@ -14,115 +14,163 @@ var __export = (target, all) => {
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
15
15
|
var createHandleRequest_exports = {};
|
16
16
|
__export(createHandleRequest_exports, {
|
17
|
-
|
17
|
+
compileManifest: () => compileManifest,
|
18
|
+
createHandleRequest: () => createHandleRequest,
|
19
|
+
getURLfromRequestURL: () => getURLfromRequestURL,
|
20
|
+
resolveAPIRoute: () => resolveAPIRoute,
|
21
|
+
resolveLoaderRoute: () => resolveLoaderRoute,
|
22
|
+
resolvePageRoute: () => resolvePageRoute
|
18
23
|
});
|
19
24
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
20
|
-
var import_cleanUrl = require("./cleanUrl"), import_constants = require("./constants"),
|
21
|
-
function
|
25
|
+
var import_cleanUrl = require("./cleanUrl"), import_constants = require("./constants"), import_getHonoPath = require("./utils/getHonoPath"), import_isResponse = require("./utils/isResponse"), import_getManifest = require("./vite/getManifest"), import_resolveResponse = require("./vite/resolveResponse");
|
26
|
+
async function runMiddlewares(handlers, request, route, getResponse) {
|
27
|
+
const middlewares = route.middlewares;
|
28
|
+
if (!middlewares?.length)
|
29
|
+
return await getResponse();
|
30
|
+
if (!handlers.loadMiddleware)
|
31
|
+
throw new Error("No middleware handler configured");
|
32
|
+
const context = {};
|
33
|
+
async function dispatch(index) {
|
34
|
+
const middlewareModule = middlewares[index];
|
35
|
+
if (!middlewareModule)
|
36
|
+
return await getResponse();
|
37
|
+
const exported = (await handlers.loadMiddleware(middlewareModule))?.default;
|
38
|
+
if (!exported)
|
39
|
+
throw new Error(`No valid export found in middleware: ${middlewareModule.contextKey}`);
|
40
|
+
const response = await exported({ request, next: async () => dispatch(index + 1), context });
|
41
|
+
return response || dispatch(index + 1);
|
42
|
+
}
|
43
|
+
return dispatch(0);
|
44
|
+
}
|
45
|
+
async function resolveAPIRoute(handlers, request, url, route) {
|
46
|
+
const { pathname } = url, params = getRouteParams(pathname, route);
|
47
|
+
try {
|
48
|
+
return (0, import_resolveResponse.resolveAPIEndpoint)(
|
49
|
+
() => handlers.handleAPI({
|
50
|
+
request,
|
51
|
+
route,
|
52
|
+
url,
|
53
|
+
loaderProps: {
|
54
|
+
path: pathname,
|
55
|
+
params
|
56
|
+
}
|
57
|
+
}),
|
58
|
+
request,
|
59
|
+
params || {}
|
60
|
+
);
|
61
|
+
} catch (err) {
|
62
|
+
if ((0, import_isResponse.isResponse)(err))
|
63
|
+
return err;
|
64
|
+
throw process.env.NODE_ENV === "development" && console.error(`
|
65
|
+
[one] Error importing API route at ${pathname}:
|
66
|
+
|
67
|
+
${err}
|
68
|
+
|
69
|
+
If this is an import error, you can likely fix this by adding this dependency to
|
70
|
+
the "optimizeDeps.include" array in your vite.config.ts.
|
71
|
+
`), err;
|
72
|
+
}
|
73
|
+
}
|
74
|
+
async function resolveLoaderRoute(handlers, request, url, route) {
|
75
|
+
return await runMiddlewares(handlers, request, route, async () => await (0, import_resolveResponse.resolveResponse)(async () => {
|
76
|
+
const headers = new Headers();
|
77
|
+
headers.set("Content-Type", "text/javascript");
|
78
|
+
try {
|
79
|
+
const loaderResponse = await handlers.handleLoader({
|
80
|
+
request,
|
81
|
+
route,
|
82
|
+
url,
|
83
|
+
loaderProps: {
|
84
|
+
path: url.pathname,
|
85
|
+
request: route.type === "ssr" ? request : void 0,
|
86
|
+
params: getLoaderParams(url, route)
|
87
|
+
}
|
88
|
+
});
|
89
|
+
return new Response(loaderResponse, {
|
90
|
+
headers
|
91
|
+
});
|
92
|
+
} catch (err) {
|
93
|
+
if ((0, import_isResponse.isResponse)(err))
|
94
|
+
return err;
|
95
|
+
throw console.error(`Error running loader: ${err}`), err;
|
96
|
+
}
|
97
|
+
}));
|
98
|
+
}
|
99
|
+
async function resolvePageRoute(handlers, request, url, route) {
|
100
|
+
const { pathname, search } = url;
|
101
|
+
return (0, import_resolveResponse.resolveResponse)(async () => await runMiddlewares(handlers, request, route, async () => await handlers.handlePage({
|
102
|
+
request,
|
103
|
+
route,
|
104
|
+
url,
|
105
|
+
loaderProps: {
|
106
|
+
path: pathname + search,
|
107
|
+
params: getLoaderParams(url, route)
|
108
|
+
}
|
109
|
+
})));
|
110
|
+
}
|
111
|
+
function getURLfromRequestURL(request) {
|
112
|
+
const urlString = request.url || "";
|
113
|
+
return new URL(
|
114
|
+
urlString || "",
|
115
|
+
request.headers.get("host") ? `http://${request.headers.get("host")}` : ""
|
116
|
+
);
|
117
|
+
}
|
118
|
+
function compileRouteRegex(route) {
|
119
|
+
return {
|
120
|
+
...route,
|
121
|
+
compiledRegex: new RegExp(route.namedRegex),
|
122
|
+
honoPath: (0, import_getHonoPath.getHonoPath)(route.page)
|
123
|
+
};
|
124
|
+
}
|
125
|
+
function compileManifest(manifest) {
|
126
|
+
return {
|
127
|
+
pageRoutes: manifest.pageRoutes.map(compileRouteRegex),
|
128
|
+
apiRoutes: manifest.apiRoutes.map(compileRouteRegex)
|
129
|
+
};
|
130
|
+
}
|
131
|
+
function createHandleRequest(handlers) {
|
22
132
|
const manifest = (0, import_getManifest.getManifest)();
|
23
133
|
if (!manifest)
|
24
134
|
throw new Error("No routes manifest");
|
25
|
-
const
|
26
|
-
...route,
|
27
|
-
workingRegex: new RegExp(route.namedRegex)
|
28
|
-
}));
|
135
|
+
const compiledManifest = compileManifest(manifest);
|
29
136
|
return {
|
30
137
|
manifest,
|
31
138
|
handler: async function(request) {
|
32
|
-
const
|
33
|
-
urlString || "",
|
34
|
-
request.headers.get("host") ? `http://${request.headers.get("host")}` : ""
|
35
|
-
), { pathname, search } = url;
|
36
|
-
if (process.env.NODE_ENV !== "production" && activeRequests[pathname])
|
37
|
-
return await activeRequests[pathname];
|
139
|
+
const url = getURLfromRequestURL(request), { pathname, search } = url;
|
38
140
|
if (pathname === "/__vxrnhmr" || pathname.startsWith("/@"))
|
39
141
|
return null;
|
40
142
|
if (handlers.handleAPI) {
|
41
|
-
const apiRoute =
|
42
|
-
if (apiRoute)
|
43
|
-
|
44
|
-
try {
|
45
|
-
return await handlers.handleAPI({
|
46
|
-
request,
|
47
|
-
route: apiRoute,
|
48
|
-
url,
|
49
|
-
loaderProps: {
|
50
|
-
path: pathname,
|
51
|
-
params
|
52
|
-
}
|
53
|
-
});
|
54
|
-
} catch (err) {
|
55
|
-
if ((0, import_isResponse.isResponse)(err))
|
56
|
-
return err;
|
57
|
-
throw err;
|
58
|
-
}
|
59
|
-
}
|
143
|
+
const apiRoute = compiledManifest.apiRoutes.find((route) => route.compiledRegex.test(pathname));
|
144
|
+
if (apiRoute)
|
145
|
+
return await resolveAPIRoute(handlers, request, url, apiRoute);
|
60
146
|
}
|
61
147
|
if (request.method !== "GET")
|
62
148
|
return null;
|
63
149
|
if (handlers.handleLoader && pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
64
|
-
const originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(pathname)
|
65
|
-
for (const route of pageRoutes) {
|
66
|
-
if (route.file === ""
|
150
|
+
const originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(pathname);
|
151
|
+
for (const route of compiledManifest.pageRoutes) {
|
152
|
+
if (route.file === "")
|
67
153
|
continue;
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
try {
|
72
|
-
const loaderResponse = await handlers.handleLoader({
|
73
|
-
request,
|
74
|
-
route,
|
75
|
-
url,
|
76
|
-
loaderProps: {
|
77
|
-
path: finalUrl.pathname,
|
78
|
-
request: route.type === "ssr" ? request : void 0,
|
79
|
-
params: getLoaderParams(finalUrl, route)
|
80
|
-
}
|
81
|
-
});
|
82
|
-
return new Response(loaderResponse, {
|
83
|
-
headers
|
84
|
-
});
|
85
|
-
} catch (err) {
|
86
|
-
if ((0, import_isResponse.isResponse)(err))
|
87
|
-
return err;
|
88
|
-
throw console.error(`Error running loader: ${err}`), err;
|
89
|
-
}
|
154
|
+
const finalUrl = new URL(originalUrl, url.origin);
|
155
|
+
if (route.compiledRegex.test(finalUrl.pathname))
|
156
|
+
return resolveLoaderRoute(handlers, request, finalUrl, route);
|
90
157
|
}
|
91
158
|
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
92
159
|
originalUrl,
|
93
160
|
routes: manifest.pageRoutes
|
94
161
|
}), Response.error();
|
95
162
|
}
|
96
|
-
if (handlers.
|
97
|
-
const
|
98
|
-
|
99
|
-
|
100
|
-
for (const route of pageRoutes) {
|
101
|
-
if (!route.workingRegex.test(pathname))
|
102
|
-
continue;
|
103
|
-
const ssrResponse = await handlers.handleSSR({
|
104
|
-
request,
|
105
|
-
route,
|
106
|
-
url,
|
107
|
-
loaderProps: {
|
108
|
-
path: pathname + search,
|
109
|
-
params: getLoaderParams(url, route)
|
110
|
-
}
|
111
|
-
});
|
112
|
-
return resolve(ssrResponse), ssrResponse;
|
113
|
-
}
|
114
|
-
} catch (err) {
|
115
|
-
throw reject(err), err;
|
116
|
-
} finally {
|
117
|
-
delete activeRequests[pathname];
|
118
|
-
}
|
163
|
+
if (handlers.handlePage) {
|
164
|
+
for (const route of compiledManifest.pageRoutes)
|
165
|
+
if (route.compiledRegex.test(pathname))
|
166
|
+
return resolvePageRoute(handlers, request, url, route);
|
119
167
|
}
|
120
168
|
return null;
|
121
169
|
}
|
122
170
|
};
|
123
171
|
}
|
124
172
|
function getLoaderParams(url, config) {
|
125
|
-
const params = {}, match = new RegExp(config.
|
173
|
+
const params = {}, match = new RegExp(config.compiledRegex).exec(url.pathname);
|
126
174
|
if (match?.groups)
|
127
175
|
for (const [key, value] of Object.entries(match.groups)) {
|
128
176
|
const namedKey = config.routeKeys[key];
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAsC,uBACtC,mBAA2C,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -15,89 +15,159 @@ var __export = (target, all) => {
|
|
15
15
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
16
16
|
var createHandleRequest_exports = {};
|
17
17
|
__export(createHandleRequest_exports, {
|
18
|
-
|
18
|
+
compileManifest: () => compileManifest,
|
19
|
+
createHandleRequest: () => createHandleRequest,
|
20
|
+
getURLfromRequestURL: () => getURLfromRequestURL,
|
21
|
+
resolveAPIRoute: () => resolveAPIRoute,
|
22
|
+
resolveLoaderRoute: () => resolveLoaderRoute,
|
23
|
+
resolvePageRoute: () => resolvePageRoute
|
19
24
|
});
|
20
25
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
21
|
-
var import_cleanUrl = require("./cleanUrl"), import_constants = require("./constants"),
|
22
|
-
function
|
26
|
+
var import_cleanUrl = require("./cleanUrl"), import_constants = require("./constants"), import_getHonoPath = require("./utils/getHonoPath"), import_isResponse = require("./utils/isResponse"), import_getManifest = require("./vite/getManifest"), import_resolveResponse = require("./vite/resolveResponse");
|
27
|
+
async function runMiddlewares(handlers, request, route, getResponse) {
|
28
|
+
var middlewares = route.middlewares;
|
29
|
+
if (!(middlewares != null && middlewares.length))
|
30
|
+
return await getResponse();
|
31
|
+
if (!handlers.loadMiddleware)
|
32
|
+
throw new Error("No middleware handler configured");
|
33
|
+
var context = {};
|
34
|
+
async function dispatch(index) {
|
35
|
+
var _this, middlewareModule = middlewares[index];
|
36
|
+
if (!middlewareModule)
|
37
|
+
return await getResponse();
|
38
|
+
var exported = (_this = await handlers.loadMiddleware(middlewareModule)) === null || _this === void 0 ? void 0 : _this.default;
|
39
|
+
if (!exported)
|
40
|
+
throw new Error(`No valid export found in middleware: ${middlewareModule.contextKey}`);
|
41
|
+
var next = async function() {
|
42
|
+
return dispatch(index + 1);
|
43
|
+
}, response = await exported({
|
44
|
+
request,
|
45
|
+
next,
|
46
|
+
context
|
47
|
+
});
|
48
|
+
return response || dispatch(index + 1);
|
49
|
+
}
|
50
|
+
return dispatch(0);
|
51
|
+
}
|
52
|
+
async function resolveAPIRoute(handlers, request, url, route) {
|
53
|
+
var { pathname } = url, params = getRouteParams(pathname, route);
|
54
|
+
try {
|
55
|
+
return (0, import_resolveResponse.resolveAPIEndpoint)(function() {
|
56
|
+
return handlers.handleAPI({
|
57
|
+
request,
|
58
|
+
route,
|
59
|
+
url,
|
60
|
+
loaderProps: {
|
61
|
+
path: pathname,
|
62
|
+
params
|
63
|
+
}
|
64
|
+
});
|
65
|
+
}, request, params || {});
|
66
|
+
} catch (err) {
|
67
|
+
if ((0, import_isResponse.isResponse)(err))
|
68
|
+
return err;
|
69
|
+
throw process.env.NODE_ENV === "development" && console.error(`
|
70
|
+
[one] Error importing API route at ${pathname}:
|
71
|
+
|
72
|
+
${err}
|
73
|
+
|
74
|
+
If this is an import error, you can likely fix this by adding this dependency to
|
75
|
+
the "optimizeDeps.include" array in your vite.config.ts.
|
76
|
+
`), err;
|
77
|
+
}
|
78
|
+
}
|
79
|
+
async function resolveLoaderRoute(handlers, request, url, route) {
|
80
|
+
return await runMiddlewares(handlers, request, route, async function() {
|
81
|
+
return await (0, import_resolveResponse.resolveResponse)(async function() {
|
82
|
+
var headers = new Headers();
|
83
|
+
headers.set("Content-Type", "text/javascript");
|
84
|
+
try {
|
85
|
+
var loaderResponse = await handlers.handleLoader({
|
86
|
+
request,
|
87
|
+
route,
|
88
|
+
url,
|
89
|
+
loaderProps: {
|
90
|
+
path: url.pathname,
|
91
|
+
request: route.type === "ssr" ? request : void 0,
|
92
|
+
params: getLoaderParams(url, route)
|
93
|
+
}
|
94
|
+
});
|
95
|
+
return new Response(loaderResponse, {
|
96
|
+
headers
|
97
|
+
});
|
98
|
+
} catch (err) {
|
99
|
+
if ((0, import_isResponse.isResponse)(err))
|
100
|
+
return err;
|
101
|
+
throw console.error(`Error running loader: ${err}`), err;
|
102
|
+
}
|
103
|
+
});
|
104
|
+
});
|
105
|
+
}
|
106
|
+
async function resolvePageRoute(handlers, request, url, route) {
|
107
|
+
var { pathname, search } = url;
|
108
|
+
return (0, import_resolveResponse.resolveResponse)(async function() {
|
109
|
+
var resolved = await runMiddlewares(handlers, request, route, async function() {
|
110
|
+
return await handlers.handlePage({
|
111
|
+
request,
|
112
|
+
route,
|
113
|
+
url,
|
114
|
+
loaderProps: {
|
115
|
+
path: pathname + search,
|
116
|
+
params: getLoaderParams(url, route)
|
117
|
+
}
|
118
|
+
});
|
119
|
+
});
|
120
|
+
return resolved;
|
121
|
+
});
|
122
|
+
}
|
123
|
+
function getURLfromRequestURL(request) {
|
124
|
+
var urlString = request.url || "";
|
125
|
+
return new URL(urlString || "", request.headers.get("host") ? `http://${request.headers.get("host")}` : "");
|
126
|
+
}
|
127
|
+
function compileRouteRegex(route) {
|
128
|
+
return {
|
129
|
+
...route,
|
130
|
+
compiledRegex: new RegExp(route.namedRegex),
|
131
|
+
honoPath: (0, import_getHonoPath.getHonoPath)(route.page)
|
132
|
+
};
|
133
|
+
}
|
134
|
+
function compileManifest(manifest) {
|
135
|
+
return {
|
136
|
+
pageRoutes: manifest.pageRoutes.map(compileRouteRegex),
|
137
|
+
apiRoutes: manifest.apiRoutes.map(compileRouteRegex)
|
138
|
+
};
|
139
|
+
}
|
140
|
+
function createHandleRequest(handlers) {
|
23
141
|
var manifest = (0, import_getManifest.getManifest)();
|
24
142
|
if (!manifest)
|
25
143
|
throw new Error("No routes manifest");
|
26
|
-
var
|
27
|
-
return acc[cur.page] = {
|
28
|
-
...cur,
|
29
|
-
compiledRegex: new RegExp(cur.namedRegex)
|
30
|
-
}, acc;
|
31
|
-
}, {}), apiRoutesList = Object.values(apiRoutesMap), activeRequests = {}, pageRoutes = manifest.pageRoutes.map(function(route) {
|
32
|
-
return {
|
33
|
-
...route,
|
34
|
-
workingRegex: new RegExp(route.namedRegex)
|
35
|
-
};
|
36
|
-
});
|
144
|
+
var compiledManifest = compileManifest(manifest);
|
37
145
|
return {
|
38
146
|
manifest,
|
39
147
|
handler: async function(request) {
|
40
|
-
var
|
41
|
-
if (process.env.NODE_ENV !== "production" && activeRequests[pathname])
|
42
|
-
return await activeRequests[pathname];
|
148
|
+
var url = getURLfromRequestURL(request), { pathname, search } = url;
|
43
149
|
if (pathname === "/__vxrnhmr" || pathname.startsWith("/@"))
|
44
150
|
return null;
|
45
151
|
if (handlers.handleAPI) {
|
46
|
-
var apiRoute =
|
47
|
-
|
48
|
-
return regex.test(pathname);
|
152
|
+
var apiRoute = compiledManifest.apiRoutes.find(function(route2) {
|
153
|
+
return route2.compiledRegex.test(pathname);
|
49
154
|
});
|
50
|
-
if (apiRoute)
|
51
|
-
|
52
|
-
try {
|
53
|
-
return await handlers.handleAPI({
|
54
|
-
request,
|
55
|
-
route: apiRoute,
|
56
|
-
url,
|
57
|
-
loaderProps: {
|
58
|
-
path: pathname,
|
59
|
-
params
|
60
|
-
}
|
61
|
-
});
|
62
|
-
} catch (err) {
|
63
|
-
if ((0, import_isResponse.isResponse)(err))
|
64
|
-
return err;
|
65
|
-
throw err;
|
66
|
-
}
|
67
|
-
}
|
155
|
+
if (apiRoute)
|
156
|
+
return await resolveAPIRoute(handlers, request, url, apiRoute);
|
68
157
|
}
|
69
158
|
if (request.method !== "GET")
|
70
159
|
return null;
|
71
160
|
if (handlers.handleLoader) {
|
72
161
|
var isClientRequestingNewRoute = pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED);
|
73
162
|
if (isClientRequestingNewRoute) {
|
74
|
-
var originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(pathname),
|
163
|
+
var originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(pathname), _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
75
164
|
try {
|
76
|
-
for (var _iterator = pageRoutes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
165
|
+
for (var _iterator = compiledManifest.pageRoutes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
77
166
|
var route = _step.value;
|
78
|
-
if (route.file !== ""
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
try {
|
83
|
-
var loaderResponse = await handlers.handleLoader({
|
84
|
-
request,
|
85
|
-
route,
|
86
|
-
url,
|
87
|
-
loaderProps: {
|
88
|
-
path: finalUrl.pathname,
|
89
|
-
request: route.type === "ssr" ? request : void 0,
|
90
|
-
params: getLoaderParams(finalUrl, route)
|
91
|
-
}
|
92
|
-
});
|
93
|
-
return new Response(loaderResponse, {
|
94
|
-
headers
|
95
|
-
});
|
96
|
-
} catch (err) {
|
97
|
-
if ((0, import_isResponse.isResponse)(err))
|
98
|
-
return err;
|
99
|
-
throw console.error(`Error running loader: ${err}`), err;
|
100
|
-
}
|
167
|
+
if (route.file !== "") {
|
168
|
+
var finalUrl = new URL(originalUrl, url.origin);
|
169
|
+
if (route.compiledRegex.test(finalUrl.pathname))
|
170
|
+
return resolveLoaderRoute(handlers, request, finalUrl, route);
|
101
171
|
}
|
102
172
|
}
|
103
173
|
} catch (err) {
|
@@ -116,41 +186,23 @@ function createHandleRequest(options, handlers) {
|
|
116
186
|
}), Response.error();
|
117
187
|
}
|
118
188
|
}
|
119
|
-
if (handlers.
|
120
|
-
var
|
121
|
-
activeRequests[pathname] = promise;
|
189
|
+
if (handlers.handlePage) {
|
190
|
+
var _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
|
122
191
|
try {
|
123
|
-
var
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
if (route1.workingRegex.test(pathname)) {
|
128
|
-
var ssrResponse = await handlers.handleSSR({
|
129
|
-
request,
|
130
|
-
route: route1,
|
131
|
-
url,
|
132
|
-
loaderProps: {
|
133
|
-
path: pathname + search,
|
134
|
-
params: getLoaderParams(url, route1)
|
135
|
-
}
|
136
|
-
});
|
137
|
-
return resolve(ssrResponse), ssrResponse;
|
138
|
-
}
|
139
|
-
}
|
140
|
-
} catch (err) {
|
141
|
-
_didIteratorError1 = !0, _iteratorError1 = err;
|
142
|
-
} finally {
|
143
|
-
try {
|
144
|
-
!_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
|
145
|
-
} finally {
|
146
|
-
if (_didIteratorError1)
|
147
|
-
throw _iteratorError1;
|
148
|
-
}
|
192
|
+
for (var _iterator1 = compiledManifest.pageRoutes[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
|
193
|
+
var route1 = _step1.value;
|
194
|
+
if (route1.compiledRegex.test(pathname))
|
195
|
+
return resolvePageRoute(handlers, request, url, route1);
|
149
196
|
}
|
150
197
|
} catch (err) {
|
151
|
-
|
198
|
+
_didIteratorError1 = !0, _iteratorError1 = err;
|
152
199
|
} finally {
|
153
|
-
|
200
|
+
try {
|
201
|
+
!_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
|
202
|
+
} finally {
|
203
|
+
if (_didIteratorError1)
|
204
|
+
throw _iteratorError1;
|
205
|
+
}
|
154
206
|
}
|
155
207
|
}
|
156
208
|
return null;
|
@@ -158,7 +210,7 @@ function createHandleRequest(options, handlers) {
|
|
158
210
|
};
|
159
211
|
}
|
160
212
|
function getLoaderParams(url, config) {
|
161
|
-
var params = {}, match = new RegExp(config.
|
213
|
+
var params = {}, match = new RegExp(config.compiledRegex).exec(url.pathname);
|
162
214
|
if (match != null && match.groups) {
|
163
215
|
var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
164
216
|
try {
|
@@ -191,6 +243,11 @@ function getRouteParams(pathname, route) {
|
|
191
243
|
}
|
192
244
|
// Annotate the CommonJS export names for ESM import in node:
|
193
245
|
0 && (module.exports = {
|
194
|
-
|
246
|
+
compileManifest,
|
247
|
+
createHandleRequest,
|
248
|
+
getURLfromRequestURL,
|
249
|
+
resolveAPIRoute,
|
250
|
+
resolveLoaderRoute,
|
251
|
+
resolvePageRoute
|
195
252
|
});
|
196
253
|
//# sourceMappingURL=createHandleRequest.js.map
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA
|
5
|
-
"names": ["
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["runMiddlewares", "handlers", "request", "route", "getResponse", "middlewares", "length", "loadMiddleware", "Error", "context", "dispatch", "index", "middlewareModule", "exported", "default", "contextKey", "next", "response", "resolveAPIRoute", "url", "pathname", "params", "getRouteParams", "resolveAPIEndpoint", "handleAPI", "loaderProps", "path", "err", "isResponse", "process", "env", "NODE_ENV", "console", "error", "resolveLoaderRoute", "resolveResponse", "headers", "Headers", "set", "loaderResponse", "handleLoader", "type", "undefined", "getLoaderParams", "Response", "resolvePageRoute", "search", "resolved", "handlePage", "getURLfromRequestURL", "urlString", "URL", "get", "compileRouteRegex", "compiledRegex", "RegExp", "namedRegex", "honoPath", "getHonoPath", "page", "compileManifest", "manifest", "pageRoutes", "map", "apiRoutes", "createHandleRequest", "getManifest", "compiledManifest", "handler", "startsWith", "apiRoute", "find", "test", "method", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "file", "finalUrl", "origin", "routes", "config", "match", "exec", "groups", "Object", "entries", "key", "value", "namedKey", "routeKeys", "regex", "fromEntries"]
|
6
6
|
}
|