Skip to content

Commit

Permalink
chore(flat-routes): add support for optional and escape route segments
Browse files Browse the repository at this point in the history 
Signed-off-by: Logan McAnsh <logan@mcan.sh>
  • Loading branch information
@mcansh
mcansh committed Dec 20, 2022
1 parent 9b87536 commit 31450e1
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 125 deletions.
2 changes: 1 addition & 1 deletion packages/remix-dev/__tests__/flat-routes-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ describe("createRoutePath", () => {

for (let [input, expected] of tests) {
it(`"${input}" -> "${expected}"`, () => {
let segments = getRouteSegments(input);
let index = isIndexRoute(input);
let segments = getRouteSegments(input);
let result = createRoutePath(segments, index);
let expectedPath = expected === undefined ? undefined : "/" + expected;
expect(result).toBe(expectedPath);
Expand Down
238 changes: 114 additions & 124 deletions packages/remix-dev/config/flat-routes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import minimatch from "minimatch";
import { createRouteId, defineRoutes } from "./routes";
import type { RouteManifest, DefineRouteFunction } from "./routes";
import {
escapeEnd,
escapeStart,
isCloseEscapeSequence,
isCloseOptionalSegment,
isNewEscapeSequence,
isNewOptionalSegment,
isRouteModuleFile,
isSegmentSeparator,
optionalEnd,
optionalStart,
paramPrefixChar,
Expand Down Expand Up @@ -144,90 +147,19 @@ export function getRouteInfo(routeDir: string, file: string) {
return routeInfo;
}

function handleEscapedSegment(segment: string) {
let matches = segment.match(/\[(.*?)\]/g);

if (!matches) return segment;

for (let match of matches) {
segment = segment.replace(match, match.slice(1, -1));
}

return segment;
}

function handleSplatOrParamSegment(segment: string) {
console.log("handleSplatOrParam", segment);

if (segment.startsWith(paramPrefixChar)) {
if (segment === "$?") return segment;
if (segment === paramPrefixChar) {
return "*";
}

return `:${segment.slice(1)}`;
}

return segment;
}

function handleOptionalSegment(segment: string) {
let optional = segment.slice(1, -1);

if (optional.startsWith(paramPrefixChar)) {
return `:${optional.slice(1)}?`;
}

return optional + "?";
}

// create full path starting with /
export function createRoutePath(
routeSegments: string[],
index: boolean
): string | undefined {
let result = "";

if (index) {
// remove index segment
routeSegments = routeSegments.slice(0, -1);
}

for (let segment of routeSegments) {
// skip pathless layout segments
if (segment.startsWith("_")) {
continue;
}

// remove trailing slash
if (segment.endsWith("_")) {
segment = segment.slice(0, -1);
}

// handle optional segments: `(segment)` => `segment?`
if (segment.startsWith(optionalStart) && segment.endsWith(optionalEnd)) {
let escaped = handleEscapedSegment(segment);
let optional = handleOptionalSegment(escaped);
let param = handleSplatOrParamSegment(optional);
result += `/${param}`;
}
let normalized = routeSegments.filter((s) => s !== "");

// handle escape segments: `[se[g]ment]` => `segment`
else if (segment.includes(escapeStart) && segment.includes(escapeEnd)) {
let escaped = handleEscapedSegment(segment);
let param = handleSplatOrParamSegment(escaped);
result += `/${param}`;
}

// handle param segments: `$` => `*`, `$id` => `:id`
else if (segment.startsWith(paramPrefixChar)) {
result += `/${handleSplatOrParamSegment(segment)}`;
} else {
result += `/${segment}`;
}
}

return result || undefined;
return normalized.length > 0 ? "/" + normalized.join("/") : undefined;
}

function findParentRouteId(
Expand All @@ -244,63 +176,121 @@ function findParentRouteId(
return undefined;
}

export function getRouteSegments(name: string) {
let routeSegments: string[] = [];
let index = 0;
let routeSegment = "";
let state = "START";
let subState = "NORMAL";
export function getRouteSegments(partialRouteId: string) {
let result = "";
let rawSegmentBuffer = "";

let inEscapeSequence = 0;
let inOptionalSegment = 0;
let optionalSegmentIndex = null;
let skipSegment = false;
for (let i = 0; i < partialRouteId.length; i++) {
let char = partialRouteId.charAt(i);
let prevChar = i > 0 ? partialRouteId.charAt(i - 1) : undefined;
let nextChar =
i < partialRouteId.length - 1 ? partialRouteId.charAt(i + 1) : undefined;

if (skipSegment) {
if (isSegmentSeparator(char)) {
skipSegment = false;
}
continue;
}

let pushRouteSegment = (routeSegment: string) => {
if (routeSegment) {
routeSegments.push(routeSegment);
if (isNewEscapeSequence(inEscapeSequence, char, prevChar)) {
inEscapeSequence++;
continue;
}
};

while (index < name.length) {
let char = name[index];
switch (state) {
case "START":
pushRouteSegment(routeSegment);
routeSegment = "";
state = "PATH";
continue; // restart without advancing index
case "PATH":
if (isPathSeparator(char) && subState === "NORMAL") {
state = "START";
break;
} else if (char === optionalStart) {
routeSegment += char;
subState = "OPTIONAL";
break;
} else if (char === optionalEnd) {
routeSegment += char;
subState = "NORMAL";
break;
} else if (char === escapeStart) {
routeSegment += char;
subState = "ESCAPE";
break;
} else if (char === escapeEnd) {
routeSegment += char;
subState = "NORMAL";
break;
}
routeSegment += char;
break;
if (isCloseEscapeSequence(inEscapeSequence, char, nextChar)) {
inEscapeSequence--;
continue;
}

if (
isNewOptionalSegment(char, prevChar, inOptionalSegment, inEscapeSequence)
) {
inOptionalSegment++;
optionalSegmentIndex = result.length;
result += optionalStart;
continue;
}

if (
isCloseOptionalSegment(
char,
nextChar,
inOptionalSegment,
inEscapeSequence
)
) {
if (optionalSegmentIndex !== null) {
result =
result.slice(0, optionalSegmentIndex) +
result.slice(optionalSegmentIndex + 1);
}
optionalSegmentIndex = null;
inOptionalSegment--;
result += "?";
continue;
}

if (inEscapeSequence) {
result += char;
continue;
}

if (isSegmentSeparator(char)) {
// url segment, no layout
if (prevChar === "_") {
result = result.slice(0, -1);
}

if (rawSegmentBuffer === "_index" && result.endsWith("_index")) {
result = result.replace(/\/?index$/, "");
} else {
result += "/";
}

rawSegmentBuffer = "";
inOptionalSegment = 0;
optionalSegmentIndex = null;
continue;
}
index++; // advance to next character

// isStartOfLayoutSegment
// layout nesting, no url segment
if (char === "_" && !rawSegmentBuffer) {
skipSegment = true;
continue;
}

rawSegmentBuffer += char;

if (char === paramPrefixChar) {
if (nextChar === optionalEnd) {
throw new Error(
`Invalid route path: ${partialRouteId}. Splat route $ is already optional`
);
}
result += typeof nextChar === "undefined" ? "*" : ":";
continue;
}

result += char;
}

// process remaining segment
pushRouteSegment(routeSegment);
if (rawSegmentBuffer === "_index" && result.endsWith("_index")) {
result = result.replace(/\/?index$/, "");
}

return routeSegments;
}
if (rawSegmentBuffer === "_index" && result.endsWith("_index?")) {
throw new Error(
`Invalid route path: ${partialRouteId}. Make index route optional by using (_index)`
);
}

const pathSeparatorRegex = /[/\\.]/;
function isPathSeparator(char: string) {
return pathSeparatorRegex.test(char);
return result ? result.split("/") : [];
}

export function visitFiles(
Expand Down

0 comments on commit 31450e1

Please sign in to comment.