one 1.2.55 → 1.2.57
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/createHandleRequest.cjs +10 -2
- package/dist/cjs/createHandleRequest.js +16 -7
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +10 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.cjs +155 -0
- package/dist/cjs/createHandleRequest.test.js +91 -0
- package/dist/cjs/createHandleRequest.test.js.map +6 -0
- package/dist/cjs/createHandleRequest.test.native.js +162 -0
- package/dist/cjs/createHandleRequest.test.native.js.map +1 -0
- package/dist/cjs/link/linking.cjs +13 -56
- package/dist/cjs/link/linking.js +13 -55
- package/dist/cjs/link/linking.js.map +1 -1
- package/dist/cjs/link/linking.native.js +3 -9
- package/dist/cjs/link/linking.native.js.map +1 -1
- package/dist/cjs/link/openExternalURL.cjs +28 -0
- package/dist/cjs/link/openExternalURL.js +23 -0
- package/dist/cjs/link/openExternalURL.js.map +6 -0
- package/dist/cjs/link/openExternalURL.native.js +43 -0
- package/dist/cjs/link/openExternalURL.native.js.map +1 -0
- package/dist/cjs/router/router.cjs +6 -17
- package/dist/cjs/router/router.js +4 -12
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +6 -17
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +1 -1
- package/dist/cjs/server/oneServe.js +1 -1
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +3 -1
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +36 -19
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +31 -19
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +2 -2
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +36 -23
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +16 -7
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +10 -2
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +10 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/createHandleRequest.test.js +92 -0
- package/dist/esm/createHandleRequest.test.js.map +6 -0
- package/dist/esm/createHandleRequest.test.mjs +156 -0
- package/dist/esm/createHandleRequest.test.mjs.map +1 -0
- package/dist/esm/createHandleRequest.test.native.js +160 -0
- package/dist/esm/createHandleRequest.test.native.js.map +1 -0
- package/dist/esm/link/linking.js +10 -47
- package/dist/esm/link/linking.js.map +1 -1
- package/dist/esm/link/linking.mjs +8 -40
- package/dist/esm/link/linking.mjs.map +1 -1
- package/dist/esm/link/linking.native.js +0 -6
- package/dist/esm/link/linking.native.js.map +1 -1
- package/dist/esm/link/openExternalURL.js +7 -0
- package/dist/esm/link/openExternalURL.js.map +6 -0
- package/dist/esm/link/openExternalURL.mjs +5 -0
- package/dist/esm/link/openExternalURL.mjs.map +1 -0
- package/dist/esm/link/openExternalURL.native.js +6 -0
- package/dist/esm/link/openExternalURL.native.js.map +1 -0
- package/dist/esm/router/router.js +2 -2
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +2 -2
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +2 -2
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +1 -1
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +1 -1
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +3 -1
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +21 -17
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +21 -15
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +21 -19
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/package.json +10 -9
- package/src/createHandleRequest.test.ts +147 -0
- package/src/createHandleRequest.ts +21 -0
- package/src/link/linking.native.ts +97 -0
- package/src/link/linking.ts +13 -88
- package/src/link/openExternalURL.native.ts +5 -0
- package/src/link/openExternalURL.ts +3 -0
- package/src/router/router.ts +2 -2
- package/src/server/oneServe.ts +5 -0
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +29 -25
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/createHandleRequest.test.d.ts +2 -0
- package/types/createHandleRequest.test.d.ts.map +1 -0
- package/types/link/linking.d.ts +1 -1
- package/types/link/linking.d.ts.map +1 -1
- package/types/link/linking.native.d.ts +7 -0
- package/types/link/linking.native.d.ts.map +1 -0
- package/types/link/openExternalURL.d.ts +2 -0
- package/types/link/openExternalURL.d.ts.map +1 -0
- package/types/link/openExternalURL.native.d.ts +2 -0
- package/types/link/openExternalURL.native.d.ts.map +1 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
|
@@ -162,6 +162,7 @@ function createHandleRequest(handlers, {
|
|
|
162
162
|
search
|
|
163
163
|
} = url;
|
|
164
164
|
if (pathname === "/__vxrnhmr" || pathname.startsWith("/@")) return null;
|
|
165
|
+
const looksLikeStaticFile = !pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED) && /\.[a-zA-Z0-9]{2,4}$/.test(pathname);
|
|
165
166
|
if (handlers.handleAPI) {
|
|
166
167
|
const apiRoute = compiledManifest.apiRoutes.find(route => route.compiledRegex.test(pathname));
|
|
167
168
|
if (apiRoute) return debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 matched API route: ${apiRoute.page}`), await resolveAPIRoute(handlers, request, url, apiRoute);
|
|
@@ -182,8 +183,15 @@ function createHandleRequest(handlers, {
|
|
|
182
183
|
routes: manifest.pageRoutes
|
|
183
184
|
}), Response.error();
|
|
184
185
|
}
|
|
185
|
-
if (handlers.handlePage) {
|
|
186
|
-
|
|
186
|
+
if (handlers.handlePage) for (const route of compiledManifest.pageRoutes) {
|
|
187
|
+
if (!route.compiledRegex.test(pathname)) continue;
|
|
188
|
+
const isDynamicRoute = Object.keys(route.routeKeys).length > 0,
|
|
189
|
+
isNotFoundRoute = route.page.endsWith("/+not-found");
|
|
190
|
+
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
191
|
+
debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route.page} for static-looking path`);
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
return debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 matched page route: ${route.page} (${route.type})`), resolvePageRoute(handlers, request, url, route);
|
|
187
195
|
}
|
|
188
196
|
return null;
|
|
189
197
|
}
|
|
@@ -153,6 +153,7 @@ function createHandleRequest(handlers, { routerRoot }) {
|
|
|
153
153
|
const url = getURLfromRequestURL(request), { pathname, search } = url;
|
|
154
154
|
if (pathname === "/__vxrnhmr" || pathname.startsWith("/@"))
|
|
155
155
|
return null;
|
|
156
|
+
const looksLikeStaticFile = !pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED) && /\.[a-zA-Z0-9]{2,4}$/.test(pathname);
|
|
156
157
|
if (handlers.handleAPI) {
|
|
157
158
|
const apiRoute = compiledManifest.apiRoutes.find((route) => route.compiledRegex.test(pathname));
|
|
158
159
|
if (apiRoute)
|
|
@@ -177,13 +178,21 @@ function createHandleRequest(handlers, { routerRoot }) {
|
|
|
177
178
|
routes: manifest.pageRoutes
|
|
178
179
|
}), Response.error();
|
|
179
180
|
}
|
|
180
|
-
if (handlers.handlePage)
|
|
181
|
-
for (const route of compiledManifest.pageRoutes)
|
|
182
|
-
if (route.compiledRegex.test(pathname))
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
181
|
+
if (handlers.handlePage)
|
|
182
|
+
for (const route of compiledManifest.pageRoutes) {
|
|
183
|
+
if (!route.compiledRegex.test(pathname))
|
|
184
|
+
continue;
|
|
185
|
+
const isDynamicRoute = Object.keys(route.routeKeys).length > 0, isNotFoundRoute = route.page.endsWith("/+not-found");
|
|
186
|
+
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
187
|
+
debugRouter && console.info(
|
|
188
|
+
`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route.page} for static-looking path`
|
|
189
|
+
);
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
return debugRouter && console.info(
|
|
193
|
+
`[one] \u26A1 ${pathname} \u2192 matched page route: ${route.page} (${route.type})`
|
|
194
|
+
), resolvePageRoute(handlers, request, url, route);
|
|
195
|
+
}
|
|
187
196
|
return null;
|
|
188
197
|
}
|
|
189
198
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -178,6 +178,7 @@ function createHandleRequest(handlers, param) {
|
|
|
178
178
|
search
|
|
179
179
|
} = url;
|
|
180
180
|
if (pathname === "/__vxrnhmr" || pathname.startsWith("/@")) return null;
|
|
181
|
+
var looksLikeStaticFile = !pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED) && /\.[a-zA-Z0-9]{2,4}$/.test(pathname);
|
|
181
182
|
if (handlers.handleAPI) {
|
|
182
183
|
var apiRoute = compiledManifest.apiRoutes.find(function (route2) {
|
|
183
184
|
return route2.compiledRegex.test(pathname);
|
|
@@ -226,7 +227,15 @@ function createHandleRequest(handlers, param) {
|
|
|
226
227
|
try {
|
|
227
228
|
for (var _iterator1 = compiledManifest.pageRoutes[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
|
|
228
229
|
var route1 = _step1.value;
|
|
229
|
-
if (route1.compiledRegex.test(pathname))
|
|
230
|
+
if (route1.compiledRegex.test(pathname)) {
|
|
231
|
+
var isDynamicRoute = Object.keys(route1.routeKeys).length > 0,
|
|
232
|
+
isNotFoundRoute = route1.page.endsWith("/+not-found");
|
|
233
|
+
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
234
|
+
debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route1.page} for static-looking path`);
|
|
235
|
+
continue;
|
|
236
|
+
}
|
|
237
|
+
return debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 matched page route: ${route1.page} (${route1.type})`), resolvePageRoute(handlers, request, url, route1);
|
|
238
|
+
}
|
|
230
239
|
}
|
|
231
240
|
} catch (err) {
|
|
232
241
|
_didIteratorError1 = !0, _iteratorError1 = err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","import_cleanUrl","import_isResponse","import_getManifest","import_resolveResponse","debugRouter","process","env","ONE_DEBUG_ROUTER","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","console","info","page","context","dispatch","index","_this","middlewareModule","contextKey","exported","default","next","response","status","url","pathname","params","getRouteParams","method","file","resolveAPIEndpoint","handleAPI","loaderProps","path","search","err","isResponse","NODE_ENV","error","resolveResponse","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolved","handlePage","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","manifest","pageRoutes","map","apiRoutes","param","routerRoot","getManifest","compiledManifest","handler","startsWith","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","import_cleanUrl","import_isResponse","import_getManifest","import_resolveResponse","debugRouter","process","env","ONE_DEBUG_ROUTER","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","console","info","page","context","dispatch","index","_this","middlewareModule","contextKey","exported","default","next","response","status","url","pathname","params","getRouteParams","method","file","resolveAPIEndpoint","handleAPI","loaderProps","path","search","err","isResponse","NODE_ENV","error","resolveResponse","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolved","handlePage","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","manifest","pageRoutes","map","apiRoutes","param","routerRoot","getManifest","compiledManifest","handler","startsWith","looksLikeStaticFile","endsWith","LOADER_JS_POSTFIX_UNCACHED","test","apiRoute","find","route2","isClientRequestingNewRoute","originalUrl","getPathFromLoaderPath","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","finalUrl","origin","cleanedRequest","Request","return","routes","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","route1","isDynamicRoute","Object","keys","routeKeys","isNotFoundRoute"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
var import_vitest = require("vitest"),
|
|
2
|
+
import_createHandleRequest = require("./createHandleRequest.cjs");
|
|
3
|
+
import_vitest.vi.mock("./vite/getManifest", () => ({
|
|
4
|
+
getManifest: () => ({
|
|
5
|
+
pageRoutes: [{
|
|
6
|
+
file: "app/[slug].tsx",
|
|
7
|
+
page: "/[slug]",
|
|
8
|
+
namedRegex: "^/(?<nxtPslug>[^/]+?)(?:/)?$",
|
|
9
|
+
routeKeys: {
|
|
10
|
+
nxtPslug: "slug"
|
|
11
|
+
},
|
|
12
|
+
type: "ssr",
|
|
13
|
+
middlewares: []
|
|
14
|
+
}, {
|
|
15
|
+
file: "app/index.tsx",
|
|
16
|
+
page: "/",
|
|
17
|
+
namedRegex: "^/(?:/)?$",
|
|
18
|
+
routeKeys: {},
|
|
19
|
+
type: "ssr",
|
|
20
|
+
middlewares: []
|
|
21
|
+
}],
|
|
22
|
+
apiRoutes: []
|
|
23
|
+
})
|
|
24
|
+
}));
|
|
25
|
+
function createRequest(path) {
|
|
26
|
+
return new Request(`http://localhost:3000${path}`, {
|
|
27
|
+
headers: {
|
|
28
|
+
host: "localhost:3000"
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
(0, import_vitest.describe)("createHandleRequest", () => {
|
|
33
|
+
const mockHandlers = {
|
|
34
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>")
|
|
35
|
+
};
|
|
36
|
+
(0, import_vitest.beforeEach)(() => {
|
|
37
|
+
import_vitest.vi.clearAllMocks();
|
|
38
|
+
}), (0, import_vitest.describe)("static file extension filtering", () => {
|
|
39
|
+
(0, import_vitest.it)("should skip paths with file extensions (favicon.ico)", async () => {
|
|
40
|
+
const {
|
|
41
|
+
handler
|
|
42
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
43
|
+
routerRoot: "/app"
|
|
44
|
+
}),
|
|
45
|
+
result = await handler(createRequest("/favicon.ico"));
|
|
46
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
47
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (logo.png)", async () => {
|
|
48
|
+
const {
|
|
49
|
+
handler
|
|
50
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
51
|
+
routerRoot: "/app"
|
|
52
|
+
}),
|
|
53
|
+
result = await handler(createRequest("/logo.png"));
|
|
54
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
55
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (styles.css)", async () => {
|
|
56
|
+
const {
|
|
57
|
+
handler
|
|
58
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
59
|
+
routerRoot: "/app"
|
|
60
|
+
}),
|
|
61
|
+
result = await handler(createRequest("/styles.css"));
|
|
62
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
63
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (robots.txt)", async () => {
|
|
64
|
+
const {
|
|
65
|
+
handler
|
|
66
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
67
|
+
routerRoot: "/app"
|
|
68
|
+
}),
|
|
69
|
+
result = await handler(createRequest("/robots.txt"));
|
|
70
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
71
|
+
}), (0, import_vitest.it)("should skip nested paths with file extensions", async () => {
|
|
72
|
+
const {
|
|
73
|
+
handler
|
|
74
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
75
|
+
routerRoot: "/app"
|
|
76
|
+
}),
|
|
77
|
+
result = await handler(createRequest("/assets/images/logo.png"));
|
|
78
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
79
|
+
}), (0, import_vitest.it)("should skip extensions 2-4 chars like .xyz", async () => {
|
|
80
|
+
const {
|
|
81
|
+
handler
|
|
82
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
83
|
+
routerRoot: "/app"
|
|
84
|
+
}),
|
|
85
|
+
result = await handler(createRequest("/somefile.xyz"));
|
|
86
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
87
|
+
}), (0, import_vitest.it)("should NOT skip extensions longer than 4 chars (routes with dots in names)", async () => {
|
|
88
|
+
const {
|
|
89
|
+
handler
|
|
90
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
91
|
+
routerRoot: "/app"
|
|
92
|
+
});
|
|
93
|
+
await handler(createRequest("/route.normal")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
94
|
+
}), (0, import_vitest.it)("should NOT skip 5+ char extensions like .woff2", async () => {
|
|
95
|
+
const {
|
|
96
|
+
handler
|
|
97
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
98
|
+
routerRoot: "/app"
|
|
99
|
+
});
|
|
100
|
+
await handler(createRequest("/font.woff2")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
101
|
+
}), (0, import_vitest.it)("should NOT skip loader paths ending with _vxrn_loader.js", async () => {
|
|
102
|
+
const mockHandlersWithLoader = {
|
|
103
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>"),
|
|
104
|
+
handleLoader: import_vitest.vi.fn().mockResolvedValue("loader data")
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
handler
|
|
108
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlersWithLoader, {
|
|
109
|
+
routerRoot: "/app"
|
|
110
|
+
});
|
|
111
|
+
await handler(createRequest("/assets/my-page_123_vxrn_loader.js")), (0, import_vitest.expect)(mockHandlersWithLoader.handleLoader).toHaveBeenCalled();
|
|
112
|
+
});
|
|
113
|
+
}), (0, import_vitest.describe)("dynamic route matching", () => {
|
|
114
|
+
(0, import_vitest.it)("should match dynamic routes for regular paths without extensions", async () => {
|
|
115
|
+
const {
|
|
116
|
+
handler
|
|
117
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
118
|
+
routerRoot: "/app"
|
|
119
|
+
});
|
|
120
|
+
await handler(createRequest("/my-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
121
|
+
}), (0, import_vitest.it)("should match index route", async () => {
|
|
122
|
+
const {
|
|
123
|
+
handler
|
|
124
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
125
|
+
routerRoot: "/app"
|
|
126
|
+
});
|
|
127
|
+
await handler(createRequest("/")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
128
|
+
}), (0, import_vitest.it)("should match paths with hyphens", async () => {
|
|
129
|
+
const {
|
|
130
|
+
handler
|
|
131
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
132
|
+
routerRoot: "/app"
|
|
133
|
+
});
|
|
134
|
+
await handler(createRequest("/my-awesome-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
135
|
+
});
|
|
136
|
+
}), (0, import_vitest.describe)("special paths", () => {
|
|
137
|
+
(0, import_vitest.it)("should skip __vxrnhmr path", async () => {
|
|
138
|
+
const {
|
|
139
|
+
handler
|
|
140
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
141
|
+
routerRoot: "/app"
|
|
142
|
+
}),
|
|
143
|
+
result = await handler(createRequest("/__vxrnhmr"));
|
|
144
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
145
|
+
}), (0, import_vitest.it)("should skip paths starting with /@", async () => {
|
|
146
|
+
const {
|
|
147
|
+
handler
|
|
148
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
149
|
+
routerRoot: "/app"
|
|
150
|
+
}),
|
|
151
|
+
result = await handler(createRequest("/@fs/some/path"));
|
|
152
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
153
|
+
});
|
|
154
|
+
});
|
|
155
|
+
});
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
var import_vitest = require("vitest"), import_createHandleRequest = require("./createHandleRequest");
|
|
2
|
+
import_vitest.vi.mock("./vite/getManifest", () => ({
|
|
3
|
+
getManifest: () => ({
|
|
4
|
+
pageRoutes: [
|
|
5
|
+
{
|
|
6
|
+
file: "app/[slug].tsx",
|
|
7
|
+
page: "/[slug]",
|
|
8
|
+
namedRegex: "^/(?<nxtPslug>[^/]+?)(?:/)?$",
|
|
9
|
+
routeKeys: { nxtPslug: "slug" },
|
|
10
|
+
type: "ssr",
|
|
11
|
+
middlewares: []
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
file: "app/index.tsx",
|
|
15
|
+
page: "/",
|
|
16
|
+
namedRegex: "^/(?:/)?$",
|
|
17
|
+
routeKeys: {},
|
|
18
|
+
type: "ssr",
|
|
19
|
+
middlewares: []
|
|
20
|
+
}
|
|
21
|
+
],
|
|
22
|
+
apiRoutes: []
|
|
23
|
+
})
|
|
24
|
+
}));
|
|
25
|
+
function createRequest(path) {
|
|
26
|
+
return new Request(`http://localhost:3000${path}`, {
|
|
27
|
+
headers: {
|
|
28
|
+
host: "localhost:3000"
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
(0, import_vitest.describe)("createHandleRequest", () => {
|
|
33
|
+
const mockHandlers = {
|
|
34
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>")
|
|
35
|
+
};
|
|
36
|
+
(0, import_vitest.beforeEach)(() => {
|
|
37
|
+
import_vitest.vi.clearAllMocks();
|
|
38
|
+
}), (0, import_vitest.describe)("static file extension filtering", () => {
|
|
39
|
+
(0, import_vitest.it)("should skip paths with file extensions (favicon.ico)", async () => {
|
|
40
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/favicon.ico"));
|
|
41
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
42
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (logo.png)", async () => {
|
|
43
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/logo.png"));
|
|
44
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
45
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (styles.css)", async () => {
|
|
46
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/styles.css"));
|
|
47
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
48
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (robots.txt)", async () => {
|
|
49
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/robots.txt"));
|
|
50
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
51
|
+
}), (0, import_vitest.it)("should skip nested paths with file extensions", async () => {
|
|
52
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/assets/images/logo.png"));
|
|
53
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
54
|
+
}), (0, import_vitest.it)("should skip extensions 2-4 chars like .xyz", async () => {
|
|
55
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/somefile.xyz"));
|
|
56
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
57
|
+
}), (0, import_vitest.it)("should NOT skip extensions longer than 4 chars (routes with dots in names)", async () => {
|
|
58
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" });
|
|
59
|
+
await handler(createRequest("/route.normal")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
60
|
+
}), (0, import_vitest.it)("should NOT skip 5+ char extensions like .woff2", async () => {
|
|
61
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" });
|
|
62
|
+
await handler(createRequest("/font.woff2")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
63
|
+
}), (0, import_vitest.it)("should NOT skip loader paths ending with _vxrn_loader.js", async () => {
|
|
64
|
+
const mockHandlersWithLoader = {
|
|
65
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>"),
|
|
66
|
+
handleLoader: import_vitest.vi.fn().mockResolvedValue("loader data")
|
|
67
|
+
}, { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlersWithLoader, { routerRoot: "/app" });
|
|
68
|
+
await handler(createRequest("/assets/my-page_123_vxrn_loader.js")), (0, import_vitest.expect)(mockHandlersWithLoader.handleLoader).toHaveBeenCalled();
|
|
69
|
+
});
|
|
70
|
+
}), (0, import_vitest.describe)("dynamic route matching", () => {
|
|
71
|
+
(0, import_vitest.it)("should match dynamic routes for regular paths without extensions", async () => {
|
|
72
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" });
|
|
73
|
+
await handler(createRequest("/my-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
74
|
+
}), (0, import_vitest.it)("should match index route", async () => {
|
|
75
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" });
|
|
76
|
+
await handler(createRequest("/")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
77
|
+
}), (0, import_vitest.it)("should match paths with hyphens", async () => {
|
|
78
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" });
|
|
79
|
+
await handler(createRequest("/my-awesome-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
80
|
+
});
|
|
81
|
+
}), (0, import_vitest.describe)("special paths", () => {
|
|
82
|
+
(0, import_vitest.it)("should skip __vxrnhmr path", async () => {
|
|
83
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/__vxrnhmr"));
|
|
84
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
85
|
+
}), (0, import_vitest.it)("should skip paths starting with /@", async () => {
|
|
86
|
+
const { handler } = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, { routerRoot: "/app" }), result = await handler(createRequest("/@fs/some/path"));
|
|
87
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=createHandleRequest.test.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/createHandleRequest.test.ts"],
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var import_vitest = require("vitest"),
|
|
4
|
+
import_createHandleRequest = require("./createHandleRequest.native.js");
|
|
5
|
+
import_vitest.vi.mock("./vite/getManifest", function () {
|
|
6
|
+
return {
|
|
7
|
+
getManifest: function () {
|
|
8
|
+
return {
|
|
9
|
+
pageRoutes: [{
|
|
10
|
+
file: "app/[slug].tsx",
|
|
11
|
+
page: "/[slug]",
|
|
12
|
+
namedRegex: "^/(?<nxtPslug>[^/]+?)(?:/)?$",
|
|
13
|
+
routeKeys: {
|
|
14
|
+
nxtPslug: "slug"
|
|
15
|
+
},
|
|
16
|
+
type: "ssr",
|
|
17
|
+
middlewares: []
|
|
18
|
+
}, {
|
|
19
|
+
file: "app/index.tsx",
|
|
20
|
+
page: "/",
|
|
21
|
+
namedRegex: "^/(?:/)?$",
|
|
22
|
+
routeKeys: {},
|
|
23
|
+
type: "ssr",
|
|
24
|
+
middlewares: []
|
|
25
|
+
}],
|
|
26
|
+
apiRoutes: []
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
});
|
|
31
|
+
function createRequest(path) {
|
|
32
|
+
return new Request(`http://localhost:3000${path}`, {
|
|
33
|
+
headers: {
|
|
34
|
+
host: "localhost:3000"
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
(0, import_vitest.describe)("createHandleRequest", function () {
|
|
39
|
+
var mockHandlers = {
|
|
40
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>")
|
|
41
|
+
};
|
|
42
|
+
(0, import_vitest.beforeEach)(function () {
|
|
43
|
+
import_vitest.vi.clearAllMocks();
|
|
44
|
+
}), (0, import_vitest.describe)("static file extension filtering", function () {
|
|
45
|
+
(0, import_vitest.it)("should skip paths with file extensions (favicon.ico)", async function () {
|
|
46
|
+
var {
|
|
47
|
+
handler
|
|
48
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
49
|
+
routerRoot: "/app"
|
|
50
|
+
}),
|
|
51
|
+
result = await handler(createRequest("/favicon.ico"));
|
|
52
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
53
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (logo.png)", async function () {
|
|
54
|
+
var {
|
|
55
|
+
handler
|
|
56
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
57
|
+
routerRoot: "/app"
|
|
58
|
+
}),
|
|
59
|
+
result = await handler(createRequest("/logo.png"));
|
|
60
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
61
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (styles.css)", async function () {
|
|
62
|
+
var {
|
|
63
|
+
handler
|
|
64
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
65
|
+
routerRoot: "/app"
|
|
66
|
+
}),
|
|
67
|
+
result = await handler(createRequest("/styles.css"));
|
|
68
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
69
|
+
}), (0, import_vitest.it)("should skip paths with file extensions (robots.txt)", async function () {
|
|
70
|
+
var {
|
|
71
|
+
handler
|
|
72
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
73
|
+
routerRoot: "/app"
|
|
74
|
+
}),
|
|
75
|
+
result = await handler(createRequest("/robots.txt"));
|
|
76
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
77
|
+
}), (0, import_vitest.it)("should skip nested paths with file extensions", async function () {
|
|
78
|
+
var {
|
|
79
|
+
handler
|
|
80
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
81
|
+
routerRoot: "/app"
|
|
82
|
+
}),
|
|
83
|
+
result = await handler(createRequest("/assets/images/logo.png"));
|
|
84
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
85
|
+
}), (0, import_vitest.it)("should skip extensions 2-4 chars like .xyz", async function () {
|
|
86
|
+
var {
|
|
87
|
+
handler
|
|
88
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
89
|
+
routerRoot: "/app"
|
|
90
|
+
}),
|
|
91
|
+
result = await handler(createRequest("/somefile.xyz"));
|
|
92
|
+
(0, import_vitest.expect)(result).toBeNull(), (0, import_vitest.expect)(mockHandlers.handlePage).not.toHaveBeenCalled();
|
|
93
|
+
}), (0, import_vitest.it)("should NOT skip extensions longer than 4 chars (routes with dots in names)", async function () {
|
|
94
|
+
var {
|
|
95
|
+
handler
|
|
96
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
97
|
+
routerRoot: "/app"
|
|
98
|
+
});
|
|
99
|
+
await handler(createRequest("/route.normal")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
100
|
+
}), (0, import_vitest.it)("should NOT skip 5+ char extensions like .woff2", async function () {
|
|
101
|
+
var {
|
|
102
|
+
handler
|
|
103
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
104
|
+
routerRoot: "/app"
|
|
105
|
+
});
|
|
106
|
+
await handler(createRequest("/font.woff2")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
107
|
+
}), (0, import_vitest.it)("should NOT skip loader paths ending with _vxrn_loader.js", async function () {
|
|
108
|
+
var mockHandlersWithLoader = {
|
|
109
|
+
handlePage: import_vitest.vi.fn().mockResolvedValue("<html></html>"),
|
|
110
|
+
handleLoader: import_vitest.vi.fn().mockResolvedValue("loader data")
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
handler
|
|
114
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlersWithLoader, {
|
|
115
|
+
routerRoot: "/app"
|
|
116
|
+
});
|
|
117
|
+
await handler(createRequest("/assets/my-page_123_vxrn_loader.js")), (0, import_vitest.expect)(mockHandlersWithLoader.handleLoader).toHaveBeenCalled();
|
|
118
|
+
});
|
|
119
|
+
}), (0, import_vitest.describe)("dynamic route matching", function () {
|
|
120
|
+
(0, import_vitest.it)("should match dynamic routes for regular paths without extensions", async function () {
|
|
121
|
+
var {
|
|
122
|
+
handler
|
|
123
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
124
|
+
routerRoot: "/app"
|
|
125
|
+
});
|
|
126
|
+
await handler(createRequest("/my-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
127
|
+
}), (0, import_vitest.it)("should match index route", async function () {
|
|
128
|
+
var {
|
|
129
|
+
handler
|
|
130
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
131
|
+
routerRoot: "/app"
|
|
132
|
+
});
|
|
133
|
+
await handler(createRequest("/")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
134
|
+
}), (0, import_vitest.it)("should match paths with hyphens", async function () {
|
|
135
|
+
var {
|
|
136
|
+
handler
|
|
137
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
138
|
+
routerRoot: "/app"
|
|
139
|
+
});
|
|
140
|
+
await handler(createRequest("/my-awesome-page")), (0, import_vitest.expect)(mockHandlers.handlePage).toHaveBeenCalled();
|
|
141
|
+
});
|
|
142
|
+
}), (0, import_vitest.describe)("special paths", function () {
|
|
143
|
+
(0, import_vitest.it)("should skip __vxrnhmr path", async function () {
|
|
144
|
+
var {
|
|
145
|
+
handler
|
|
146
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
147
|
+
routerRoot: "/app"
|
|
148
|
+
}),
|
|
149
|
+
result = await handler(createRequest("/__vxrnhmr"));
|
|
150
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
151
|
+
}), (0, import_vitest.it)("should skip paths starting with /@", async function () {
|
|
152
|
+
var {
|
|
153
|
+
handler
|
|
154
|
+
} = (0, import_createHandleRequest.createHandleRequest)(mockHandlers, {
|
|
155
|
+
routerRoot: "/app"
|
|
156
|
+
}),
|
|
157
|
+
result = await handler(createRequest("/@fs/some/path"));
|
|
158
|
+
(0, import_vitest.expect)(result).toBeNull();
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
//# sourceMappingURL=createHandleRequest.test.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["import_vitest","require","import_createHandleRequest","vi","mock","getManifest","pageRoutes","file","page","namedRegex","routeKeys","nxtPslug","type","middlewares","apiRoutes","createRequest","path","Request","headers","host","describe","mockHandlers","handlePage","fn","mockResolvedValue","beforeEach","clearAllMocks","it","handler","createHandleRequest","routerRoot","result","expect","toBeNull","not","toHaveBeenCalled","mockHandlersWithLoader","handleLoader"],"sources":["../../src/createHandleRequest.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|