@mapl/router 0.4.0 → 0.4.1

package/README.md

@@ -6,5 +6,8 @@ A fast radix tree router.
 
 ```ts
 '/*/info' // Capture the value of a segment
-'/**' // Capture the entire path after
+'/**' // 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, startIndex: number) => 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,startIndex)=>router[0].map((pair)=>'if(p==="'+pair[0].slice(-startIndex)+'"){'+pair[1]+"}").join("")+(router[1]===null?"":"let l=p.length;"+compileNode(router[1],0,startIndex,""));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,5 +1,6 @@
 import { type Node } from './tree/node.js';
 export type Router<T = unknown> = [staticMap: [path: string, item: T][], root: Node<T> | null];
-export declare const createRouter: () => Router;
-export declare const insertItem: (router: Router, path: string, item: string) => void;
+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])};export var countParams=(path)=>{let cnt=0;for(let i=-1;(i=path.indexOf("*",i+1))!==-1;cnt++);return cnt-(path.endsWith("**")?1:0)};
+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,6 +1,6 @@
 {
   "name": "@mapl/router",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "./index.js",
   "devDependencies": {
     "@stylistic/eslint-plugin": "latest",
@@ -8,6 +8,7 @@
     "eslint": "latest",
     "eslint-plugin-jsdoc": "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/tree/compiler.d.ts

@@ -1,3 +1,3 @@
 import type { Node } from './node.js';
-declare const f: (node: Node, paramCount: number, 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,paramCount,startIndexValue,startIndexPrefix)=>{let builder="";if(node[0]!=="/"){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],paramCount,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],paramCount,startIndexValue,startIndexPrefix)+"break;"}builder+="}"}}if(node[3]!==null){let params=node[3];let hasStore=params[1]!==null;let hasChild=params[0]!==null;let requireAllocation=paramCount>1||hasChild||!hasStore;if(requireAllocation)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.substring("+currentIndex+",j)";builder+="if(j"+(hasStore?"!==":">")+currentIndex+"){let q"+paramCount+"="+paramsVal+";"+f(params[0],paramCount+1,0,"j+")+"}"}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="let q"+paramCount+"="+paramsVal+";"+node[4];builder+=noStore?"if(l!=="+currentIndex+"){"+body+"}":body}return node[0]==="/"?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/node.d.ts

@@ -1,7 +1,7 @@
 export type Node<T = unknown> = [
     part: string,
     store: T | null,
-    children: Node[] | null,
+    children: Node<T>[] | null,
     params: ParamNode<T> | null,
     wildcardStore: T | null
 ];
@@ -9,7 +9,7 @@ export type ParamNode<T = unknown> = [
     child: Node<T> | null,
     store: T | null
 ];
-export declare const createNode: (part: string) => Node;
+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;