@rangojs/router 0.0.0-experimental.11 → 0.0.0-experimental.12

package/CLAUDE.md

@@ -40,4 +40,4 @@ like `useActionState`, refs, and local state. This is extremely hard to debug.
 
 4. Run `pnpm --filter @rangojs/router exec playwright test loader-behavior` after
    any changes to these files. The skipSSR action tests specifically catch tree
-   structure regressions.
+   structure regressions.

package/dist/bin/rango.js

@@ -9,7 +9,7 @@ import { join, dirname, resolve, relative, basename as pathBasename } from "node
 import picomatch from "picomatch";
 function extractRoutesFromSource(code) {
   const routes = [];
-  const regex = /\bpath(?:\.(?:json|text|html|xml|image|stream|any))?\s*\(/g;
+  const regex = /\bpath(?:\.[a-zA-Z_$][\w$]*)?\s*\(/g;
   let match;
   while ((match = regex.exec(code)) !== null) {
     const result = parsePathCall(code, match.index + match[0].length);
@@ -26,12 +26,16 @@ function generatePerModuleTypesSource(routes) {
     return true;
   });
   const deduped = /* @__PURE__ */ new Map();
-  for (const { name, pattern } of valid) {
-    deduped.set(name, pattern);
+  for (const { name, pattern, search } of valid) {
+    deduped.set(name, { pattern, search });
   }
   const sorted = [...deduped.entries()].sort(([a], [b]) => a.localeCompare(b));
-  const body = sorted.map(([name, pattern]) => {
+  const body = sorted.map(([name, { pattern, search }]) => {
     const key = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `"${name}"`;
+    if (search && Object.keys(search).length > 0) {
+      const searchBody = Object.entries(search).map(([k, v]) => `${k}: "${v}"`).join(", ");
+      return `  ${key}: { path: "${pattern}", search: { ${searchBody} } },`;
+    }
     return `  ${key}: "${pattern}",`;
   }).join("\n");
   return `// Auto-generated by @rangojs/router - do not edit
@@ -122,6 +126,53 @@ function extractNameValue(code, pos) {
   while (pos < code.length && isWhitespace(code[pos])) pos++;
   return readString(code, pos);
 }
+function matchesSearchColon(code, pos) {
+  if (code.slice(pos, pos + 6) !== "search") return false;
+  if (pos > 0 && /\w/.test(code[pos - 1])) return false;
+  const afterSearch = pos + 6;
+  if (afterSearch < code.length && /\w/.test(code[afterSearch])) return false;
+  let checkPos = afterSearch;
+  while (checkPos < code.length && isWhitespace(code[checkPos])) checkPos++;
+  return code[checkPos] === ":";
+}
+function extractSearchValue(code, pos) {
+  pos += 6;
+  while (pos < code.length && isWhitespace(code[pos])) pos++;
+  pos++;
+  while (pos < code.length && isWhitespace(code[pos])) pos++;
+  if (code[pos] !== "{") return null;
+  pos++;
+  const schema = {};
+  while (pos < code.length) {
+    while (pos < code.length && isWhitespace(code[pos])) pos++;
+    if (code[pos] === "}") return { value: schema, end: pos + 1 };
+    if (code[pos] === ",") {
+      pos++;
+      continue;
+    }
+    let key;
+    if (code[pos] === '"' || code[pos] === "'") {
+      const keyStr = readString(code, pos);
+      if (!keyStr) return null;
+      key = keyStr.value;
+      pos = keyStr.end;
+    } else {
+      const keyStart = pos;
+      while (pos < code.length && /[\w$]/.test(code[pos])) pos++;
+      if (pos === keyStart) return null;
+      key = code.slice(keyStart, pos);
+    }
+    while (pos < code.length && isWhitespace(code[pos])) pos++;
+    if (code[pos] !== ":") return null;
+    pos++;
+    while (pos < code.length && isWhitespace(code[pos])) pos++;
+    const valStr = readString(code, pos);
+    if (!valStr) return null;
+    schema[key] = valStr.value;
+    pos = valStr.end;
+  }
+  return null;
+}
 function parsePathCall(code, pos) {
   while (pos < code.length && isWhitespace(code[pos])) pos++;
   const patternStr = readString(code, pos);
@@ -130,6 +181,7 @@ function parsePathCall(code, pos) {
   pos = patternStr.end;
   let depth = 1;
   let name = null;
+  let search;
   while (pos < code.length && depth > 0) {
     const ch = code[pos];
     if (isWhitespace(ch)) {
@@ -156,6 +208,14 @@ function parsePathCall(code, pos) {
         continue;
       }
     }
+    if (depth === 2 && ch === "s" && matchesSearchColon(code, pos)) {
+      const searchResult = extractSearchValue(code, pos);
+      if (searchResult) {
+        search = searchResult.value;
+        pos = searchResult.end;
+        continue;
+      }
+    }
     if (ch === '"' || ch === "`" || ch === "'" && (pos === 0 || !/\w/.test(code[pos - 1]))) {
       pos = skipStringLiteral(code, pos);
       continue;
@@ -165,7 +225,7 @@ function parsePathCall(code, pos) {
     pos++;
   }
   if (name === null) return null;
-  return { name, pattern };
+  return { name, pattern, ...search ? { search } : {} };
 }
 function findTsFiles(dir, filter) {
   const results = [];