LukeParke/vercel
1
0
Fork 0
mirror of https://github.com/LukeHagar/vercel.git synced 2025-12-11 04:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace regex lexer with minimal regex for named groups (#6171)

Browse Source
This commit is contained in:
JJ Kasper
2021-04-29 11:01:39 -05:00
committed by GitHub
parent 90e51287e9
commit 3fc4f64824
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/routing-utils/src/superstatic.ts
View File

@@ -5,10 +5,6 @@
import { parse as parseUrl, format as formatUrl } from 'url';
import { pathToRegexp, compile, Key } from 'path-to-regexp';
import { Route, Redirect, Rewrite, HasField, Header } from './types';
// @ts-ignore
import Lexer from 'regexr/lexer-dist/lexer';
// @ts-ignore
import lexerProfiles from 'regexr/lexer-dist/profiles';
const UN_NAMED_SEGMENT = '__UN_NAMED_SEGMENT__';
@@ -185,6 +181,8 @@ export function sourceToRegex(
return { src: r.source, segments };
}
const namedGroupsRegex = /\(\?<([a-zA-Z][a-zA-Z0-9]*)>/g;
function collectHasSegments(has?: HasField) {
const hasSegments = new Set<string>();
@@ -194,14 +192,11 @@ function collectHasSegments(has?: HasField) {
}
if (hasItem.value) {
const matcher = new RegExp(`^${hasItem.value}$`);
const lexer = new Lexer();
lexer.profile = lexerProfiles.js;
lexer.parse(`/${matcher.source}/`);
Object.keys(lexer.namedGroups).forEach(groupKey => {
hasSegments.add(groupKey);
});
for (const match of hasItem.value.matchAll(namedGroupsRegex)) {
if (match[1]) {
hasSegments.add(match[1]);
}
}
if (hasItem.type === 'host') {
hasSegments.add('host');