@mapl/router 0.3.5 → 0.4.1

package/README.md

@@ -1,3 +1,13 @@
-# `@mapl/router`
-
 A fast radix tree router.
+
+# Patterns
+
+`@mapl/router` supports two basic patterns:
+
+```ts
+'/*/info' // Capture the value of a segment
+'/**' // Capture everything after the slash
+```
+
+## Limitation
+Patterns cannot include quotes and escape characters.

package/compile.d.ts

@@ -1,3 +1,4 @@
 import type { Router } from './index.js';
-declare const _default: (router: Router) => string;
+import type { Compiler } from './tree/compiler.ts';
+declare const _default: (router: Router<string>, compile: Compiler, startIndex: 0 | 1) => string;
 export default _default;

package/compile.js

@@ -1 +1 @@
-export default (router)=>{let builder=router[0].length===0?"":router[0].map((pair)=>`if(p==="${pair[0].slice(1).replace(/"/g,"\\\"")}"){${pair[1]}}`).join("");return router[1]===null?builder:`${builder}let l=p.length;${compileNode(router[1],false,false,-1,"")}`};import compileNode from"./tree/compiler.js";
+export default (router,compile,startIndex)=>router[0].map((pair)=>'if(p==="'+pair[0].slice(startIndex)+'"){'+pair[1]+"}").join("")+(router[1]===null?"":"let l=p.length;"+compile(router[1],0,-startIndex,""));

package/index.d.ts

@@ -1,3 +1,6 @@
 import { type Node } from './tree/node.js';
-export type Router<T = string> = [staticMap: [path: string, item: T][], root: Node<T> | null];
-export declare const createRouter: () => Router, insertItem: (router: Router, path: string, item: string) => void;
+export type Router<T = unknown> = [staticMap: [path: string, item: T][], root: Node<T> | null];
+export declare const createRouter: <T>() => Router<T>;
+export declare const insertItem: <T>(router: Router, path: string, item: T) => void;
+export declare const insertItemWithParts: <T>(router: Router<T>, parts: string[], flag: 0 | 1 | 2, item: T) => void;
+export declare const countParams: (path: string) => number;

package/index.js

@@ -1 +1 @@
-import{createNode,insertItem as nodeInsertItem}from"./tree/node.js";export var createRouter=()=>[[],null];export var insertItem=(router,path,item)=>{if(path.includes("*"))nodeInsertItem(router[1]??=createNode("/"),path,item);else router[0].push([path,item])};
+import{createNode,insertItem as nodeInsertItem,insertItemWithParts as nodeInsertItemWithParts}from"./tree/node.js";export var createRouter=()=>[[],null];export var insertItem=(router,path,item)=>{if(path.includes("*"))nodeInsertItem(router[1]??=createNode("/"),path,item);else router[0].push([path,item])};export var insertItemWithParts=(router,parts,flag,item)=>{if(flag===0)router[0].push([parts[0],item]);else nodeInsertItemWithParts(router[1]??=createNode("/"),parts,flag,item)};export var countParams=(path)=>{let cnt=0;for(let i=-1;(i=path.indexOf("*",i+1))!==-1;cnt++);return cnt-(path.endsWith("**")?1:0)};

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@mapl/router",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "main": "./index.js",
   "devDependencies": {
     "@stylistic/eslint-plugin": "latest",
     "@types/bun": "latest",
     "eslint": "latest",
     "eslint-plugin-jsdoc": "latest",
-    "mitata": "latest",
+    "mitata": "^1.0.34",
+    "tsx": "^4.19.3",
     "typescript": "latest",
     "typescript-eslint": "latest"
   },
@@ -23,7 +24,7 @@
   "license": "MIT",
   "scripts": {
     "build:test": "bun scripts/build.ts && bun test",
-    "build:bench": "bun build:test && bun scripts/bench.ts",
+    "bench": "bun scripts/bench.ts",
     "build:publish": "bun build:test && bun scripts/publish.ts",
     "lint": "eslint ./src",
     "lint:fix": "eslint ./src --fix"

package/path.d.ts

@@ -0,0 +1,12 @@
+export type PathTransformResult = [
+    params: string[],
+    parts: string[],
+    flag: 0 | 1 | 2
+];
+export type PathTransformer = (path: string) => PathTransformResult;
+export type InferFSRoute<T extends string> = T extends `${string}[${infer Current}]${infer Rest}` ? Current extends `...${infer Name}` ? Record<Name, string> : Record<Current, string> & InferFSRoute<Rest> : {};
+export declare const transformFSRoute: PathTransformer;
+export type InferRoute<T extends string> = T extends `${string}:${infer Current}` ? Current extends `${infer Name}/${infer Rest}` ? Record<Name, string> & InferRoute<Rest> : Record<Current, string> : T extends '*' ? {
+    '*': string;
+} : {};
+export declare const transformRoute: PathTransformer;

package/path.js

@@ -0,0 +1 @@
+export var transformFSRoute=(path)=>{let idx=path.indexOf("[",1);if(idx===-1)return[[],[path],0];let params=[];let parts=[];let endIdx=-1;do{parts.push(path.substring(endIdx+1,idx));endIdx=path.indexOf("]",idx+1);if(path.charCodeAt(idx+1)===46){params.push(path.substring(idx+4,endIdx));return[params,parts,2]}params.push(path.substring(idx+1,endIdx));idx=path.indexOf("[",endIdx+1)}while(idx!==-1);if(endIdx+1!==path.length)parts.push(path.slice(endIdx+1));return[params,parts,1]};export var transformRoute=(path)=>{let idx=path.indexOf(":",1);if(idx===-1)return[[],[path],0];let params=[];let parts=[];let endIdx=0;do{parts.push(path.substring(endIdx,idx));endIdx=path.indexOf("/",idx+1);if(endIdx===-1){params.push(path.slice(idx+1));return[params,parts,1]}params.push(path.substring(idx+1,endIdx));idx=path.indexOf(":",endIdx+1)}while(idx!==-1);if(path.endsWith("*")){parts.push(path.slice(endIdx,-1));params.push("*");return[params,parts,2]}parts.push(path.slice(endIdx));return[params,parts,1]};

package/tree/compiler.d.ts

@@ -1,3 +1,3 @@
 import type { Node } from './node.js';
-declare const f: (node: Node, hasParam: boolean, hasMultipleParams: boolean, startIndexValue: number, startIndexPrefix: string) => string;
-export default f;
+export type Compiler = (node: Node<string>, paramCount: number, startIndexValue: number, startIndexPrefix: string) => string;
+export declare const o2: Compiler;

package/tree/compiler.js

@@ -1 +1 @@
-let f=(node,hasParam,hasMultipleParams,startIndexValue,startIndexPrefix)=>{let builder="";if(node[0].length!==1){let part=node[0];let len=part.length;builder+=`if(l>${startIndexPrefix}${startIndexValue+len-1})`;for(let i=1;i<len;i++)builder+=`if(p.charCodeAt(${startIndexPrefix}${startIndexValue+i})===${part.charCodeAt(i)})`;builder+="{";startIndexValue+=len}else startIndexValue++;if(node[1]!==null)builder+=`if(l===${startIndexPrefix}${startIndexValue}){${node[1]}}`;if(node[2]!==null){let children=node[2];let childrenEntries=Object.entries(children);if(childrenEntries.length===1){builder+=`if(p.charCodeAt(${startIndexPrefix}${startIndexValue})===${childrenEntries[0][0]}){${f(childrenEntries[0][1],hasParam,hasMultipleParams,startIndexValue,startIndexPrefix)}}`}else{builder+=`switch(p.charCodeAt(${startIndexPrefix}${startIndexValue})){`;for(let i=0;i<childrenEntries.length;i++){builder+=`case ${childrenEntries[i][0]}:${f(childrenEntries[i][1],hasParam,hasMultipleParams,startIndexValue,startIndexPrefix)}break;`}builder+="}"}}if(node[3]!==null){let params=node[3];let hasStore=params[1]!==null;let hasChild=params[0]!==null;let requireAllocation=hasParam?hasMultipleParams:hasChild||!hasStore;if(requireAllocation)builder+="{";if(hasParam)builder+=`${hasMultipleParams?"":"let "}i=${startIndexPrefix}${startIndexValue};`;let currentIndex=hasParam?"i":startIndexPrefix+startIndexValue;let slashIndex=`p.indexOf('/'${currentIndex==="0"?"":","+currentIndex})`;if(hasChild||!hasStore)builder+=`${hasParam?"":"let "}j=${slashIndex};`;if(hasStore){let paramsVal=currentIndex==="0"?"p":`p.slice(${currentIndex})`;builder+=`if(${hasChild?"j":slashIndex}===-1){${hasParam?`q.push(${paramsVal})`:`let q=[${paramsVal}]`};${params[1]}}`}if(hasChild){let paramsVal=`p.substring(${currentIndex},j)`;builder+=`if(j${hasStore?"!==":">"}${currentIndex}){${hasParam?`q.push(${paramsVal})`:`let q=[${paramsVal}]`};${f(params[0],true,hasParam,0,"j+")}${requireAllocation?"":"q.pop();"}}`}if(requireAllocation)builder+="}"}if(node[4]!==null){let noStore=node[1]===null;let currentIndex=startIndexPrefix+startIndexValue;let paramsVal=currentIndex==="0"?"p":`p.slice(${currentIndex})`;let body=`${hasParam?`q.push(${paramsVal})`:`let q=[${paramsVal}]`};${node[4]}`;builder+=noStore?`if(l!==${currentIndex}){${body}}`:body}return node[0].length===1?builder:builder+"}"};export default f;
+let toChar=(c)=>String.fromCharCode(+c[0]);export var o2=(node,paramCount,startIndexValue,startIndexPrefix)=>{let builder="";if(node[0]!=="/"){let part=node[0];let start=startIndexPrefix+(startIndexValue+1);builder+="if(p"+(part.length===2?"["+start+']==="'+part[1]+'"':'.startsWith("'+part.slice(1)+'",'+start+")")+"){";startIndexValue+=part.length}else startIndexValue++;if(node[1]!==null)builder+="if(l==="+startIndexPrefix+startIndexValue+"){"+node[1]+"}";if(node[2]!==null){let children=node[2];let childrenEntries=Object.entries(children);if(childrenEntries.length===1){builder+="if(p["+startIndexPrefix+startIndexValue+']==="'+toChar(childrenEntries[0])+'"){'+o2(childrenEntries[0][1],paramCount,startIndexValue,startIndexPrefix)+"}"}else{builder+="switch(p["+startIndexPrefix+startIndexValue+"]){";for(let i=0;i<childrenEntries.length;i++){builder+='case"'+toChar(childrenEntries[i])+'":'+o2(childrenEntries[i][1],paramCount,startIndexValue,startIndexPrefix)+"break;"}builder+="}"}}if(node[3]!==null){let params=node[3];let hasStore=params[1]!==null;let hasChild=params[0]!==null;builder+="{";if(paramCount>0)builder+=(paramCount>1?"":"let ")+"i="+startIndexPrefix+startIndexValue+";";let currentIndex=paramCount>0?"i":startIndexPrefix+startIndexValue;let slashIndex='p.indexOf("/"'+(currentIndex==="0"?"":","+currentIndex)+")";if(hasChild||!hasStore)builder+=(paramCount>0?"":"let ")+"j="+slashIndex+";";if(hasStore){let paramsVal=currentIndex==="0"?"p":"p.slice("+currentIndex+")";builder+="if("+(hasChild?"j":slashIndex)+"===-1){let q"+paramCount+"="+paramsVal+";"+params[1]+"}"}if(hasChild){let paramsVal="p.slice("+currentIndex+",j)";builder+="if(j>"+currentIndex+"){let q"+paramCount+"="+paramsVal+";"+o2(params[0],paramCount+1,0,"j+")+"}"}builder+="}"}if(node[4]!==null){let noStore=node[1]===null;let currentIndex=startIndexPrefix+startIndexValue;let paramsVal=currentIndex==="0"?"p":"p.slice("+currentIndex+")";let body="let q"+paramCount+"="+paramsVal+";"+node[4];builder+=noStore?"if(l>"+currentIndex+"){"+body+"}":body}return node[0]==="/"?builder:builder+"}"};

package/tree/matcher.d.ts

@@ -2,5 +2,5 @@ import type { Node } from './node.js';
 /**
  * Match a pathname and returns the result
  */
-declare const f: (node: Node<unknown>, path: string, params: string[], start: number) => unknown;
+declare const f: <T>(node: Node<T>, path: string, params: string[], start: number) => T | null;
 export default f;

package/tree/matcher.js

@@ -1 +1 @@
-let f=(node,path,params,start)=>{let part=node[0];let tmp=part.length;if(tmp!==1&&(start+tmp>path.length||path.indexOf(part,start)!==start))return null;start+=tmp;if(start===path.length&&node[1]!==null)return node[1];if(node[2]!==null){tmp=node[2][path.charCodeAt(start)];if(typeof tmp!=="undefined"){tmp=f(tmp,path,params,start);if(tmp!==null)return tmp}}if(node[3]!==null){tmp=path.indexOf("/",start);if(tmp===-1){if(node[3][1]!==null){params.push(path.substring(start));return node[3][1]}}else if(tmp!==start&&node[3][0]!==null){params.push(path.substring(start,tmp));tmp=f(node[3][0],path,params,tmp);if(tmp!==null)return tmp;params.pop()}}if(node[4]!==null){params.push(path.substring(start));return node[4]}return null};export default f;
+let f=(node,path,params,start)=>{let part=node[0];let tmp=part.length;if(tmp!==1&&(start+tmp>path.length||path.indexOf(part,start)!==start))return null;start+=tmp;if(start===path.length&&node[1]!==null)return node[1];if(node[2]!==null){tmp=node[2][path.charCodeAt(start)];if(tmp!=null){tmp=f(tmp,path,params,start);if(tmp!==null)return tmp}}if(node[3]!==null){tmp=path.indexOf("/",start);if(tmp===-1){if(node[3][1]!==null){params.push(path.substring(start));return node[3][1]}}else if(tmp!==start&&node[3][0]!==null){params.push(path.substring(start,tmp));tmp=f(node[3][0],path,params,tmp);if(tmp!==null)return tmp;params.pop()}}if(node[4]!==null){params.push(path.substring(start));return node[4]}return null};export default f;

package/tree/node.d.ts

@@ -1,12 +1,18 @@
-export type Node<T = string> = [
+export type Node<T = unknown> = [
     part: string,
     store: T | null,
-    children: Node[] | null,
+    children: Node<T>[] | null,
     params: ParamNode<T> | null,
     wildcardStore: T | null
 ];
-export type ParamNode<T = string> = [
+export type ParamNode<T = unknown> = [
     child: Node<T> | null,
     store: T | null
 ];
-export declare const createNode: (part: string) => Node, createParamNode: (nextNode: ParamNode[0]) => ParamNode, cloneNode: (node: Node, part: string) => Node, resetNode: (node: Node, part: string, children: Node[2]) => void, visitNode: (node: Node, path: string) => Node, insertItem: (node: Node, path: string, item: string) => void;
+export declare const createNode: <T>(part: string) => Node<T>;
+export declare const createParamNode: (nextNode: ParamNode[0]) => ParamNode;
+export declare const cloneNode: (node: Node, part: string) => Node;
+export declare const resetNode: (node: Node, part: string, children: Node[2]) => void;
+export declare const visitNode: (node: Node, parts: string[]) => Node;
+export declare const insertItemWithParts: <T>(node: Node<T>, parts: string[], flag: 0 | 1 | 2, item: T) => void;
+export declare const insertItem: <T>(node: Node<T>, path: string, item: T) => void;

package/tree/node.js

@@ -1 +1 @@
-export var createNode=(part)=>[part,null,null,null,null];export var createParamNode=(nextNode)=>[nextNode,null];export var cloneNode=(node,part)=>[part,node[1],node[2],node[3],node[4]];export var resetNode=(node,part,children)=>{node[0]=part;node[2]=children;node[1]=null;node[3]=null;node[4]=null};export var visitNode=(node,path)=>{for(let i=0,parts=path.split("*"),l=parts.length;i<l;++i){if(i!==0){if(node[3]===null){let nextNode=createNode(parts[i]);node[3]=createParamNode(nextNode);node=nextNode}else node=node[3][0]??=createNode(parts[i])}for(let j=0,pathPart=parts[i];;++j){let nodePart=node[0];if(j===pathPart.length){if(j<nodePart.length){let children=[];children[nodePart.charCodeAt(j)]=cloneNode(node,nodePart.slice(j));resetNode(node,pathPart,children)}break}if(j===nodePart.length){if(node[2]===null)node[2]=[];else{let nextNode=node[2][pathPart.charCodeAt(j)];if(typeof nextNode!=="undefined"){node=nextNode;pathPart=pathPart.slice(j);j=0;continue}}let nextNode=createNode(pathPart.slice(j));node[2][pathPart.charCodeAt(j)]=nextNode;node=nextNode;break}if(pathPart.charCodeAt(j)!==nodePart.charCodeAt(j)){let children=[];children[nodePart.charCodeAt(j)]=cloneNode(node,nodePart.slice(j));let nextNode=createNode(pathPart.slice(j));children[pathPart.charCodeAt(j)]=nextNode;resetNode(node,nodePart.substring(0,j),children);node=nextNode;break}}}return node};export var insertItem=(node,path,item)=>{if(path.charCodeAt(path.length-1)===42){if(path.charCodeAt(path.length-2)===42)visitNode(node,path.substring(0,path.length-2))[4]=item;else(visitNode(node,path.substring(0,path.length-1))[3]??=createParamNode(null))[1]=item}else visitNode(node,path)[1]=item};
+export var createNode=(part)=>[part,null,null,null,null];export var createParamNode=(nextNode)=>[nextNode,null];export var cloneNode=(node,part)=>[part,node[1],node[2],node[3],node[4]];export var resetNode=(node,part,children)=>{node[0]=part;node[2]=children;node[1]=null;node[3]=null;node[4]=null};export var visitNode=(node,parts)=>{for(let i=0;i<parts.length;++i){let pathPart=parts[i];if(i!==0){if(node[3]===null){let nextNode=createNode(pathPart);node[3]=createParamNode(nextNode);node=nextNode}else node=node[3][0]??=createNode(pathPart)}for(let j=0;;++j){let nodePart=node[0];if(j===pathPart.length){if(j<nodePart.length){let children=[];children[nodePart.charCodeAt(j)]=cloneNode(node,nodePart.slice(j));resetNode(node,pathPart,children)}break}if(j===nodePart.length){if(node[2]===null)node[2]=[];else{let nextNode=node[2][pathPart.charCodeAt(j)];if(nextNode!=null){node=nextNode;pathPart=pathPart.slice(j);j=0;continue}}let nextNode=createNode(pathPart.slice(j));node[2][pathPart.charCodeAt(j)]=nextNode;node=nextNode;break}if(pathPart[j]!==nodePart[j]){let children=[];children[nodePart.charCodeAt(j)]=cloneNode(node,nodePart.slice(j));let nextNode=createNode(pathPart.slice(j));children[pathPart.charCodeAt(j)]=nextNode;resetNode(node,nodePart.substring(0,j),children);node=nextNode;break}}}return node};export var insertItemWithParts=(node,parts,flag,item)=>{if(flag===0)visitNode(node,parts)[1]=item;else if(flag===2)visitNode(node,parts)[4]=item;else(visitNode(node,parts)[3]??=createParamNode(null))[1]=item};export var insertItem=(node,path,item)=>{if(path.charCodeAt(path.length-1)===42){if(path.charCodeAt(path.length-2)===42)visitNode(node,path.substring(0,path.length-2).split("*"))[4]=item;else(visitNode(node,path.substring(0,path.length-1).split("*"))[3]??=createParamNode(null))[1]=item}else visitNode(node,path.split("*"))[1]=item};

package/fast-compile.d.ts

@@ -1,8 +0,0 @@
-import type { Router } from './index.js';
-export declare const injectMatcher: (deps: any[]) => number;
-export declare const injectRouter: (deps: any[], router: Router) => number;
-/**
- * Compile the router but with no pattern matching code
- */
-declare const _default: (router: Router, decls: string[], routerId: number, matcherId: number, captures: string) => string;
-export default _default;

package/fast-compile.js

@@ -1 +0,0 @@
-export default (router,decls,routerId,matcherId,captures)=>{let builder=router[0].length===0?"":router[0].map((pair)=>`if(p==="${pair[0].slice(1).replace(/"/g,"\\\"")}"){${pair[1]}}`).join("");if(router[1]===null)return builder;let fns=[];f(router[1],fns);let args=`(t,q${captures})`;return`${builder}let q=[],t=f${matcherId}(f${routerId},p,q,-1,p.length);if(t!==null)return d${decls.push(`${args}=>{${fns.map((fn,i)=>`if(t===${i+1}){${fn}}`).join("")}}`)}${args};`};import matcher from"./tree/matcher.js";let f=(node,fns)=>{if(node[1]!==null)node[1]=fns.push(node[1]);if(node[2]!==null){let children=node[2];for(let key in children)f(children[key],fns)}if(node[3]!==null){let params=node[3];if(params[1]!==null)params[1]=fns.push(params[1]);if(params[0]!==null)f(params[0],fns)}if(node[4]!==null)node[4]=fns.push(node[4])};export var injectMatcher=(deps)=>deps.push(matcher);export var injectRouter=(deps,router)=>deps.push(router[1]);