@mapl/router 0.2.0 → 0.2.2

package/README.md

@@ -1,3 +1,3 @@
 # `@mapl/router`
 
-A fast compiled radix tree router.
+A fast radix tree router.

package/compile.d.ts

@@ -0,0 +1,3 @@
+import type { Router } from './index.js';
+declare const _default: (router: Router) => string;
+export default _default;

package/compile.js

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

package/constants.d.ts

@@ -4,3 +4,4 @@ export declare const PATH_LEN = "l";
 export declare const PARAMS = "q";
 export declare const PREV_PARAM_IDX = "i";
 export declare const CURRENT_PARAM_IDX = "j";
+export declare const TMP = "t";

package/constants.js

@@ -1 +1 @@
-export var REQ="r";export var PATH="p";export var PATH_LEN="l";export var PARAMS="q";export var PREV_PARAM_IDX="i";export var CURRENT_PARAM_IDX="j";
+export var REQ="r";export var PATH="p";export var PATH_LEN="l";export var PARAMS="q";export var PREV_PARAM_IDX="i";export var CURRENT_PARAM_IDX="j";export var TMP="t";

package/fast-compile.d.ts

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

package/fast-compile.js

@@ -0,0 +1 @@
+export default (router,decls,deps,captures)=>{let builder=router[0].length===0?"":`switch(p){${router[0].map((pair)=>`case "${pair[0].slice(1).replace(/"/g,"\\\"")}":{${pair[1]}break;}`).join("")}}`;if(router[1]===null)return builder;let fns=[];f(router[1],fns);return`${builder}let q=[],t=f${deps.push(matcher)}(f${deps.push(router[1])},p,q,-1,p.length);if(t!==null){t=d${decls.push(`(t,q${captures})=>{switch(t){${fns.map((fn,i)=>`case ${i+1}:{${fn}break;}`).join("")}}}`)}(t,q${captures});if(t!=null)return t;}`};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])};

package/index.d.ts

@@ -1,3 +1,3 @@
 import { type Node } from './tree/node.js';
-export type Router = [staticMap: [path: string, item: string][], root: Node | null];
-export declare const createRouter: () => Router, insertItem: (router: Router, path: string, item: string) => void, compileRouter: (router: Router) => string;
+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;

package/index.js

@@ -1 +1 @@
-import compileNode from"./tree/compiler.js";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 compileRouter=(router)=>{let builder=router[0].length===0?"":`switch(p){${router[0].map((pair)=>`case "${pair[0].slice(1).replace(/"/g,"\\\"")}":{${pair[1]}break;}`).join("")}}`;return router[1]===null?builder:`${builder}let l=p.length;${compileNode(router[1],false,false,-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])};

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@mapl/router",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "./index.js",
   "devDependencies": {
     "@stylistic/eslint-plugin": "latest",
+    "@types/bun": "latest",
     "eslint": "latest",
-    "typescript-eslint": "latest",
     "eslint-plugin-jsdoc": "latest",
-    "@types/bun": "latest",
     "mitata": "latest",
-    "typescript": "latest"
+    "typescript": "latest",
+    "typescript-eslint": "latest"
   },
   "description": "Fast compiled router for all runtimes",
   "keywords": [

package/tree/compiler.js

@@ -1 +1 @@
-let f=(node,hasParam,hasMultipleParams,startIndexValue,startIndexPrefix)=>{let builder="";let part=node[0];let partLen=part.length;if(partLen!==1){builder+=`if(l>${startIndexPrefix}${startIndexValue+partLen-1})`;for(let i=1;i<partLen;i++)builder+=`if(p.charCodeAt(${startIndexPrefix}${startIndexValue+i})===${part.charCodeAt(i)})`;builder+="{"}startIndexValue+=partLen;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,l=childrenEntries.length;i<l;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 partLen===1?builder:builder+"}"};export default f;
+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,l=childrenEntries.length;i<l;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;

package/tree/matcher.d.ts

@@ -0,0 +1,6 @@
+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, len: number) => unknown;
+export default f;

package/tree/matcher.js

@@ -0,0 +1 @@
+let f=(node,path,params,start,len)=>{let part=node[0];let tmp=part.length;if(tmp!==1&&(start+tmp>len||path.indexOf(part,start)!==start))return null;start+=tmp;if(start===len&&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,len);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,len);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,12 @@
-export type Node = [
+export type Node<T = string> = [
     part: string,
-    store: string | null,
+    store: T | null,
     children: Node[] | null,
-    params: ParamNode | null,
-    wildcardStore: string | null
+    params: ParamNode<T> | null,
+    wildcardStore: T | null
 ];
-export type ParamNode = [
-    child: Node | null,
-    store: string | null
+export type ParamNode<T = string> = [
+    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;