what-router 0.10.0 → 0.11.0

package/dist/match.js

@@ -0,0 +1,72 @@
+// packages/router/src/match.js
+function compilePath(path) {
+  const normalized = path.replace(/\([\w-]+\)\//g, "").replace(/\[\.\.\.(\w+)\]/g, (_, name) => `*:${name}`).replace(/\[(\w+)\]/g, ":$1");
+  const paramNames = [];
+  let catchAll = null;
+  const regexStr = normalized.split("/").map((segment) => {
+    if (segment.startsWith("*:")) {
+      catchAll = segment.slice(2);
+      paramNames.push(catchAll);
+      return "(.+)";
+    }
+    if (segment === "*") {
+      catchAll = "rest";
+      paramNames.push("rest");
+      return "(.+)";
+    }
+    if (segment.startsWith(":")) {
+      paramNames.push(segment.slice(1));
+      return "([^/]+)";
+    }
+    return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  }).join("/");
+  const regex = new RegExp(`^${regexStr}$`);
+  return { regex, paramNames, catchAll };
+}
+function matchRoute(path, routes) {
+  const routable = routes.filter((r) => r.path);
+  const sorted = routable.sort((a, b) => {
+    const aSpecific = (a.path.match(/:/g) || []).length + (a.path.includes("*") ? 100 : 0);
+    const bSpecific = (b.path.match(/:/g) || []).length + (b.path.includes("*") ? 100 : 0);
+    return aSpecific - bSpecific;
+  });
+  for (const route of sorted) {
+    const { regex, paramNames } = compilePath(route.path);
+    const match = path.match(regex);
+    if (match) {
+      const params = {};
+      paramNames.forEach((name, i) => {
+        params[name] = decodeURIComponent(match[i + 1]);
+      });
+      return { route, params };
+    }
+  }
+  return null;
+}
+function parseQuery(search) {
+  const params = {};
+  if (!search) return params;
+  const qs = search.startsWith("?") ? search.slice(1) : search;
+  for (const pair of qs.split("&")) {
+    const [key, val] = pair.split("=");
+    if (!key) continue;
+    const decodedKey = decodeURIComponent(key);
+    const decodedVal = val ? decodeURIComponent(val) : "";
+    if (decodedKey in params) {
+      if (Array.isArray(params[decodedKey])) {
+        params[decodedKey].push(decodedVal);
+      } else {
+        params[decodedKey] = [params[decodedKey], decodedVal];
+      }
+    } else {
+      params[decodedKey] = decodedVal;
+    }
+  }
+  return params;
+}
+export {
+  compilePath,
+  matchRoute,
+  parseQuery
+};
+//# sourceMappingURL=match.js.map

package/dist/match.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/match.js"],
+  "sourcesContent": ["// Isomorphic route matching \u2014 pure functions with no window/location/document\n// dependencies, so they are safe to import on the server (deploy adapter) as\n// well as in the client Router/FileRouter. Moved verbatim from index.js.\n\nexport function compilePath(path) {\n  // /users/:id -> regex + param names\n  // /posts/* -> catch-all\n  // /[slug] -> dynamic (file-based syntax)\n  // (group) -> route group (ignored in URL)\n\n  // Remove route groups from path (they don't affect URL matching)\n  const normalized = path\n    .replace(/\\([\\w-]+\\)\\//g, '') // Remove (group)/ prefixes\n    .replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => `*:${name}`) // Preserve catch-all name\n    .replace(/\\[(\\w+)\\]/g, ':$1'); // File-based [param] to :param\n\n  const paramNames = [];\n  let catchAll = null;\n\n  const regexStr = normalized\n    .split('/')\n    .map(segment => {\n      if (segment.startsWith('*:')) {\n        catchAll = segment.slice(2);\n        paramNames.push(catchAll);\n        return '(.+)';\n      }\n      if (segment === '*') {\n        catchAll = 'rest';\n        paramNames.push('rest');\n        return '(.+)';\n      }\n      if (segment.startsWith(':')) {\n        paramNames.push(segment.slice(1));\n        return '([^/]+)';\n      }\n      return segment.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n    })\n    .join('/');\n\n  const regex = new RegExp(`^${regexStr}$`);\n  return { regex, paramNames, catchAll };\n}\n\nexport function matchRoute(path, routes) {\n  // Filter out routes without a path (layout-only routes, etc.)\n  const routable = routes.filter(r => r.path);\n\n  // Sort routes by specificity (more specific first)\n  const sorted = routable.sort((a, b) => {\n    const aSpecific = (a.path.match(/:/g) || []).length + (a.path.includes('*') ? 100 : 0);\n    const bSpecific = (b.path.match(/:/g) || []).length + (b.path.includes('*') ? 100 : 0);\n    return aSpecific - bSpecific;\n  });\n\n  for (const route of sorted) {\n    const { regex, paramNames } = compilePath(route.path);\n    const match = path.match(regex);\n    if (match) {\n      const params = {};\n      paramNames.forEach((name, i) => {\n        params[name] = decodeURIComponent(match[i + 1]);\n      });\n      return { route, params };\n    }\n  }\n  return null;\n}\n\nexport function parseQuery(search) {\n  const params = {};\n  if (!search) return params;\n  const qs = search.startsWith('?') ? search.slice(1) : search;\n  for (const pair of qs.split('&')) {\n    const [key, val] = pair.split('=');\n    if (!key) continue;\n    const decodedKey = decodeURIComponent(key);\n    const decodedVal = val ? decodeURIComponent(val) : '';\n    if (decodedKey in params) {\n      // Collect repeated keys into arrays\n      if (Array.isArray(params[decodedKey])) {\n        params[decodedKey].push(decodedVal);\n      } else {\n        params[decodedKey] = [params[decodedKey], decodedVal];\n      }\n    } else {\n      params[decodedKey] = decodedVal;\n    }\n  }\n  return params;\n}\n"],
+  "mappings": ";AAIO,SAAS,YAAY,MAAM;AAOhC,QAAM,aAAa,KAChB,QAAQ,iBAAiB,EAAE,EAC3B,QAAQ,oBAAoB,CAAC,GAAG,SAAS,KAAK,IAAI,EAAE,EACpD,QAAQ,cAAc,KAAK;AAE9B,QAAM,aAAa,CAAC;AACpB,MAAI,WAAW;AAEf,QAAM,WAAW,WACd,MAAM,GAAG,EACT,IAAI,aAAW;AACd,QAAI,QAAQ,WAAW,IAAI,GAAG;AAC5B,iBAAW,QAAQ,MAAM,CAAC;AAC1B,iBAAW,KAAK,QAAQ;AACxB,aAAO;AAAA,IACT;AACA,QAAI,YAAY,KAAK;AACnB,iBAAW;AACX,iBAAW,KAAK,MAAM;AACtB,aAAO;AAAA,IACT;AACA,QAAI,QAAQ,WAAW,GAAG,GAAG;AAC3B,iBAAW,KAAK,QAAQ,MAAM,CAAC,CAAC;AAChC,aAAO;AAAA,IACT;AACA,WAAO,QAAQ,QAAQ,uBAAuB,MAAM;AAAA,EACtD,CAAC,EACA,KAAK,GAAG;AAEX,QAAM,QAAQ,IAAI,OAAO,IAAI,QAAQ,GAAG;AACxC,SAAO,EAAE,OAAO,YAAY,SAAS;AACvC;AAEO,SAAS,WAAW,MAAM,QAAQ;AAEvC,QAAM,WAAW,OAAO,OAAO,OAAK,EAAE,IAAI;AAG1C,QAAM,SAAS,SAAS,KAAK,CAAC,GAAG,MAAM;AACrC,UAAM,aAAa,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,EAAE,KAAK,SAAS,GAAG,IAAI,MAAM;AACpF,UAAM,aAAa,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,EAAE,KAAK,SAAS,GAAG,IAAI,MAAM;AACpF,WAAO,YAAY;AAAA,EACrB,CAAC;AAED,aAAW,SAAS,QAAQ;AAC1B,UAAM,EAAE,OAAO,WAAW,IAAI,YAAY,MAAM,IAAI;AACpD,UAAM,QAAQ,KAAK,MAAM,KAAK;AAC9B,QAAI,OAAO;AACT,YAAM,SAAS,CAAC;AAChB,iBAAW,QAAQ,CAAC,MAAM,MAAM;AAC9B,eAAO,IAAI,IAAI,mBAAmB,MAAM,IAAI,CAAC,CAAC;AAAA,MAChD,CAAC;AACD,aAAO,EAAE,OAAO,OAAO;AAAA,IACzB;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,WAAW,QAAQ;AACjC,QAAM,SAAS,CAAC;AAChB,MAAI,CAAC,OAAQ,QAAO;AACpB,QAAM,KAAK,OAAO,WAAW,GAAG,IAAI,OAAO,MAAM,CAAC,IAAI;AACtD,aAAW,QAAQ,GAAG,MAAM,GAAG,GAAG;AAChC,UAAM,CAAC,KAAK,GAAG,IAAI,KAAK,MAAM,GAAG;AACjC,QAAI,CAAC,IAAK;AACV,UAAM,aAAa,mBAAmB,GAAG;AACzC,UAAM,aAAa,MAAM,mBAAmB,GAAG,IAAI;AACnD,QAAI,cAAc,QAAQ;AAExB,UAAI,MAAM,QAAQ,OAAO,UAAU,CAAC,GAAG;AACrC,eAAO,UAAU,EAAE,KAAK,UAAU;AAAA,MACpC,OAAO;AACL,eAAO,UAAU,IAAI,CAAC,OAAO,UAAU,GAAG,UAAU;AAAA,MACtD;AAAA,IACF,OAAO;AACL,aAAO,UAAU,IAAI;AAAA,IACvB;AAAA,EACF;AACA,SAAO;AACT;",
+  "names": []
+}

package/dist/match.min.js

@@ -0,0 +1,2 @@
+function u(n){let e=n.replace(/\([\w-]+\)\//g,"").replace(/\[\.\.\.(\w+)\]/g,(t,o)=>`*:${o}`).replace(/\[(\w+)\]/g,":$1"),a=[],c=null,r=e.split("/").map(t=>t.startsWith("*:")?(c=t.slice(2),a.push(c),"(.+)"):t==="*"?(c="rest",a.push("rest"),"(.+)"):t.startsWith(":")?(a.push(t.slice(1)),"([^/]+)"):t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")).join("/");return{regex:new RegExp(`^${r}$`),paramNames:a,catchAll:c}}function h(n,e){let c=e.filter(r=>r.path).sort((r,s)=>{let t=(r.path.match(/:/g)||[]).length+(r.path.includes("*")?100:0),o=(s.path.match(/:/g)||[]).length+(s.path.includes("*")?100:0);return t-o});for(let r of c){let{regex:s,paramNames:t}=u(r.path),o=n.match(s);if(o){let i={};return t.forEach((p,l)=>{i[p]=decodeURIComponent(o[l+1])}),{route:r,params:i}}}return null}function f(n){let e={};if(!n)return e;let a=n.startsWith("?")?n.slice(1):n;for(let c of a.split("&")){let[r,s]=c.split("=");if(!r)continue;let t=decodeURIComponent(r),o=s?decodeURIComponent(s):"";t in e?Array.isArray(e[t])?e[t].push(o):e[t]=[e[t],o]:e[t]=o}return e}export{u as compilePath,h as matchRoute,f as parseQuery};
+//# sourceMappingURL=match.min.js.map

package/dist/match.min.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/match.js"],
+  "sourcesContent": ["// Isomorphic route matching \u2014 pure functions with no window/location/document\n// dependencies, so they are safe to import on the server (deploy adapter) as\n// well as in the client Router/FileRouter. Moved verbatim from index.js.\n\nexport function compilePath(path) {\n  // /users/:id -> regex + param names\n  // /posts/* -> catch-all\n  // /[slug] -> dynamic (file-based syntax)\n  // (group) -> route group (ignored in URL)\n\n  // Remove route groups from path (they don't affect URL matching)\n  const normalized = path\n    .replace(/\\([\\w-]+\\)\\//g, '') // Remove (group)/ prefixes\n    .replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => `*:${name}`) // Preserve catch-all name\n    .replace(/\\[(\\w+)\\]/g, ':$1'); // File-based [param] to :param\n\n  const paramNames = [];\n  let catchAll = null;\n\n  const regexStr = normalized\n    .split('/')\n    .map(segment => {\n      if (segment.startsWith('*:')) {\n        catchAll = segment.slice(2);\n        paramNames.push(catchAll);\n        return '(.+)';\n      }\n      if (segment === '*') {\n        catchAll = 'rest';\n        paramNames.push('rest');\n        return '(.+)';\n      }\n      if (segment.startsWith(':')) {\n        paramNames.push(segment.slice(1));\n        return '([^/]+)';\n      }\n      return segment.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n    })\n    .join('/');\n\n  const regex = new RegExp(`^${regexStr}$`);\n  return { regex, paramNames, catchAll };\n}\n\nexport function matchRoute(path, routes) {\n  // Filter out routes without a path (layout-only routes, etc.)\n  const routable = routes.filter(r => r.path);\n\n  // Sort routes by specificity (more specific first)\n  const sorted = routable.sort((a, b) => {\n    const aSpecific = (a.path.match(/:/g) || []).length + (a.path.includes('*') ? 100 : 0);\n    const bSpecific = (b.path.match(/:/g) || []).length + (b.path.includes('*') ? 100 : 0);\n    return aSpecific - bSpecific;\n  });\n\n  for (const route of sorted) {\n    const { regex, paramNames } = compilePath(route.path);\n    const match = path.match(regex);\n    if (match) {\n      const params = {};\n      paramNames.forEach((name, i) => {\n        params[name] = decodeURIComponent(match[i + 1]);\n      });\n      return { route, params };\n    }\n  }\n  return null;\n}\n\nexport function parseQuery(search) {\n  const params = {};\n  if (!search) return params;\n  const qs = search.startsWith('?') ? search.slice(1) : search;\n  for (const pair of qs.split('&')) {\n    const [key, val] = pair.split('=');\n    if (!key) continue;\n    const decodedKey = decodeURIComponent(key);\n    const decodedVal = val ? decodeURIComponent(val) : '';\n    if (decodedKey in params) {\n      // Collect repeated keys into arrays\n      if (Array.isArray(params[decodedKey])) {\n        params[decodedKey].push(decodedVal);\n      } else {\n        params[decodedKey] = [params[decodedKey], decodedVal];\n      }\n    } else {\n      params[decodedKey] = decodedVal;\n    }\n  }\n  return params;\n}\n"],
+  "mappings": "AAIO,SAASA,EAAYC,EAAM,CAOhC,IAAMC,EAAaD,EAChB,QAAQ,gBAAiB,EAAE,EAC3B,QAAQ,mBAAoB,CAACE,EAAGC,IAAS,KAAKA,CAAI,EAAE,EACpD,QAAQ,aAAc,KAAK,EAExBC,EAAa,CAAC,EAChBC,EAAW,KAETC,EAAWL,EACd,MAAM,GAAG,EACT,IAAIM,GACCA,EAAQ,WAAW,IAAI,GACzBF,EAAWE,EAAQ,MAAM,CAAC,EAC1BH,EAAW,KAAKC,CAAQ,EACjB,QAELE,IAAY,KACdF,EAAW,OACXD,EAAW,KAAK,MAAM,EACf,QAELG,EAAQ,WAAW,GAAG,GACxBH,EAAW,KAAKG,EAAQ,MAAM,CAAC,CAAC,EACzB,WAEFA,EAAQ,QAAQ,sBAAuB,MAAM,CACrD,EACA,KAAK,GAAG,EAGX,MAAO,CAAE,MADK,IAAI,OAAO,IAAID,CAAQ,GAAG,EACxB,WAAAF,EAAY,SAAAC,CAAS,CACvC,CAEO,SAASG,EAAWR,EAAMS,EAAQ,CAKvC,IAAMC,EAHWD,EAAO,OAAO,GAAK,EAAE,IAAI,EAGlB,KAAK,CAACE,EAAGC,IAAM,CACrC,IAAMC,GAAaF,EAAE,KAAK,MAAM,IAAI,GAAK,CAAC,GAAG,QAAUA,EAAE,KAAK,SAAS,GAAG,EAAI,IAAM,GAC9EG,GAAaF,EAAE,KAAK,MAAM,IAAI,GAAK,CAAC,GAAG,QAAUA,EAAE,KAAK,SAAS,GAAG,EAAI,IAAM,GACpF,OAAOC,EAAYC,CACrB,CAAC,EAED,QAAWC,KAASL,EAAQ,CAC1B,GAAM,CAAE,MAAAM,EAAO,WAAAZ,CAAW,EAAIL,EAAYgB,EAAM,IAAI,EAC9CE,EAAQjB,EAAK,MAAMgB,CAAK,EAC9B,GAAIC,EAAO,CACT,IAAMC,EAAS,CAAC,EAChB,OAAAd,EAAW,QAAQ,CAACD,EAAMgB,IAAM,CAC9BD,EAAOf,CAAI,EAAI,mBAAmBc,EAAME,EAAI,CAAC,CAAC,CAChD,CAAC,EACM,CAAE,MAAAJ,EAAO,OAAAG,CAAO,CACzB,CACF,CACA,OAAO,IACT,CAEO,SAASE,EAAWC,EAAQ,CACjC,IAAMH,EAAS,CAAC,EAChB,GAAI,CAACG,EAAQ,OAAOH,EACpB,IAAMI,EAAKD,EAAO,WAAW,GAAG,EAAIA,EAAO,MAAM,CAAC,EAAIA,EACtD,QAAWE,KAAQD,EAAG,MAAM,GAAG,EAAG,CAChC,GAAM,CAACE,EAAKC,CAAG,EAAIF,EAAK,MAAM,GAAG,EACjC,GAAI,CAACC,EAAK,SACV,IAAME,EAAa,mBAAmBF,CAAG,EACnCG,EAAaF,EAAM,mBAAmBA,CAAG,EAAI,GAC/CC,KAAcR,EAEZ,MAAM,QAAQA,EAAOQ,CAAU,CAAC,EAClCR,EAAOQ,CAAU,EAAE,KAAKC,CAAU,EAElCT,EAAOQ,CAAU,EAAI,CAACR,EAAOQ,CAAU,EAAGC,CAAU,EAGtDT,EAAOQ,CAAU,EAAIC,CAEzB,CACA,OAAOT,CACT",
+  "names": ["compilePath", "path", "normalized", "_", "name", "paramNames", "catchAll", "regexStr", "segment", "matchRoute", "routes", "sorted", "a", "b", "aSpecific", "bSpecific", "route", "regex", "match", "params", "i", "parseQuery", "search", "qs", "pair", "key", "val", "decodedKey", "decodedVal"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "what-router",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "What Framework - File-based & programmatic router with View Transitions",
   "type": "module",
   "main": "src/index.js",
@@ -32,7 +32,7 @@
   "author": "ZVN DEV (https://zvndev.com)",
   "license": "MIT",
   "peerDependencies": {
-    "what-core": "^0.10.0"
+    "what-core": "^0.11.0"
   },
   "repository": {
     "type": "git",