@mapl/router 0.6.0 → 0.6.2

package/method/compiler.js

@@ -1 +1 @@
-import compilePath from"../path/compiler.js";export default (router,methodInput,parsePath,startIndex)=>{let allRouter=router[``];let str=``;for(let key in router)if(key!==``)str+=(str===``?`if(`:`else if(`)+methodInput+`==="`+key+`"){`+(allRouter==null?parsePath:``)+compilePath(router[key],startIndex)+`}`;return allRouter==null?str:parsePath+str+compilePath(allRouter,startIndex)};
+import compilePath from"../path/compiler.js";export default (router,methodInput,parsePath,startIndex)=>{let allRouter=router[``];let str=``;for(let key in router)key!==``&&(str+=(str===``?`if(`:`else if(`)+methodInput+`==="`+key+`"){`+(allRouter==null?parsePath:``)+compilePath(router[key],startIndex)+`}`);return allRouter==null?str:parsePath+str+compilePath(allRouter,startIndex)};

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/router",
-"version": "0.6.0",
+"version": "0.6.2",
 "description": "The fastest possible JS router",
 "repository": {
 "type": "git",
@@ -13,11 +13,11 @@
 "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac",
 "exports": {
 "./constants": "./constants.js",
-"./tree/compiler": "./tree/compiler.js",
-"./tree/node": "./tree/node.js",
+"./method/compiler": "./method/compiler.js",
 "./path/compiler": "./path/compiler.js",
+"./method": "./method/index.js",
 "./path": "./path/index.js",
-"./method/compiler": "./method/compiler.js",
-"./method": "./method/index.js"
+"./tree/node": "./tree/node.js",
+"./tree/compiler": "./tree/compiler.js"
 }
 }

package/path/compiler.js

@@ -1 +1 @@
-import{compile}from"../tree/compiler.js";export default (router,startIndex)=>{let str=``;for(let i=0,pairs=router[0];i<pairs.length;i++)str+=(str===``?`if(`:`else if(`)+`p==="`+pairs[i][0].slice(startIndex)+`"){`+pairs[i][1]+`}`;return str+(router[1]===null?``:`{let l=p.length;`+compile(router[1],0,-startIndex,``)+`}`)};
+import{compile}from"../tree/compiler.js";export default (router,startIndex)=>{let str=``;for(let i=0,pairs=router[0];i<pairs.length;i++)str+=(str===``?`if(`:`else if(`)+`p==="`+pairs[i][0].slice(startIndex)+`"){`+pairs[i][1]+`}`;return str+(router[1]==null?``:`{let l=p.length;`+compile(router[1],0,-startIndex,``)+`}`)};

package/path/index.d.ts

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

package/path/index.js

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

package/tree/compiler.js

@@ -1 +1 @@
-let toChar=c=>String.fromCharCode(+c[0]);export let compile=(node,paramCount,idx,idxPrefix)=>{let builder=`{`;let noStore=node[1]===null;let partLen=node[0].length;let currentIdx=idxPrefix+(idx+partLen);if(partLen>1){let start=idxPrefix+(idx+1);builder=partLen===2?`if(l`+(noStore?`>`:`>=`)+currentIdx+`)if(p[`+start+`]==="`+node[0][1]+`"){`:(noStore?`if(l>`+currentIdx+`)if(`:`if(`)+`p.startsWith("`+node[0].slice(1)+`",`+start+`)){`}else if(noStore)builder=`if(l>`+currentIdx+`){`;idx+=partLen;if(!noStore)builder+=`if(l===`+currentIdx+`){`+node[1]+`}`;if(node[2]!==null){let childrenEntries=Object.entries(node[2]);if(childrenEntries.length===1)builder+=`if(p[`+currentIdx+`]==="`+toChar(childrenEntries[0])+`"){`+compile(childrenEntries[0][1],paramCount,idx,idxPrefix)+`}`;else{builder+=`switch(p[`+currentIdx+`]){`;for(let i=0;i<childrenEntries.length;i++)builder+=`case"`+toChar(childrenEntries[i])+`":`+compile(childrenEntries[i][1],paramCount,idx,idxPrefix)+`break;`;builder+=`}`}}if(node[3]!==null){let params=node[3];let hasStore=params[1]!==null;let hasChild=params[0]!==null;if(paramCount>0){builder+=`let i=`+currentIdx+`;`;currentIdx=`i`}let slashIndex=`p.indexOf("/"`+(currentIdx===`0`?``:`,`+currentIdx)+`)`;if(hasChild||!hasStore){builder+=(paramCount>0?``:`let `)+`j=`+slashIndex+`;`;slashIndex=`j`}if(hasStore)builder+=`if(`+slashIndex+`===-1){let q`+paramCount+`=`+(currentIdx===`0`?`p`:`p.slice(`+currentIdx+`)`)+`;`+params[1]+`}`;if(hasChild)builder+=(hasStore?`else if(`:`if(`)+`j>`+currentIdx+`){let q`+paramCount+`=p.slice(`+currentIdx+`,j);`+compile(params[0],paramCount+1,0,`j+`)+`}`}if(node[4]!==null)builder+=`let q`+paramCount+`=`+(currentIdx===`0`?`p`:`p.slice(`+currentIdx+`)`)+`;`+node[4];return builder+`}`};
+export let compile=(node,paramCount,idx,idxPrefix)=>{let builder=`{`;let noStore=node[1]==null;let partLen=node[0].length;let currentIdx=idxPrefix+(idx+partLen);if(partLen>1){let start=idxPrefix+(idx+1);builder=partLen===2?`if(l`+(noStore?`>`:`>=`)+currentIdx+`)if(p[`+start+`]==="`+node[0][1]+`"){`:(noStore?`if(l>`+currentIdx+`)if(`:`if(`)+`p.startsWith("`+node[0].slice(1)+`",`+start+`)){`}else if(noStore)builder=`if(l>`+currentIdx+`){`;idx+=partLen;noStore||(builder+=`if(l===`+currentIdx+`){`+node[1]+`}`);if(node[2]!=null){let childrenEntries=Object.entries(node[2]);for(let i=0;i<childrenEntries.length;i++)builder+=(i!==0?`else if(`:`if(`)+`p[`+currentIdx+`]==="`+String.fromCharCode(+childrenEntries[i][0])+`"){`+compile(childrenEntries[i][1],paramCount,idx,idxPrefix)+`}`}if(node[3]!=null){let params=node[3];let hasStore=params[1]!=null;let hasChild=params[0]!=null;if(paramCount>0){builder+=`let i=`+currentIdx+`;`;currentIdx=`i`}let slashIndex=`p.indexOf("/"`+(currentIdx===`0`?``:`,`+currentIdx)+`)`;if(hasChild||!hasStore){builder+=(paramCount>0?``:`let `)+`j=`+slashIndex+`;`;slashIndex=`j`}hasStore&&(builder+=`if(`+slashIndex+`===-1){let q`+paramCount+`=`+(currentIdx===`0`?`p`:`p.slice(`+currentIdx+`)`)+`;`+params[1]+`}`);hasChild&&(builder+=(hasStore?`else if(`:`if(`)+`j>`+currentIdx+`){let q`+paramCount+`=p.slice(`+currentIdx+`,j);`+compile(params[0],paramCount+1,0,`j+`)+`}`)}node[4]==null||(builder+=`let q`+paramCount+`=`+(currentIdx===`0`?`p`:`p.slice(`+currentIdx+`)`)+`;`+node[4]);return builder+`}`};

package/tree/node.d.ts

@@ -1,5 +1,5 @@
-export type Node<T = unknown> = [part: string, store: T | null, children: Node<T>[] | null, params: ParamNode<T> | null, wildcardStore: T | null];
-export type ParamNode<T = unknown> = [child: Node<T> | null, store: T | null];
+export type Node<T = unknown> = [part: string, store: T | undefined, children: Node<T>[] | undefined, params: ParamNode<T> | undefined, wildcardStore: T | undefined];
+export type ParamNode<T = unknown> = [child: Node<T> | undefined, store: T | undefined];
 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;

package/tree/node.js

@@ -1 +1 @@
-export let createNode=part=>[part,null,null,null,null];export let createParamNode=nextNode=>[nextNode,null];export let cloneNode=(node,part)=>[part,node[1],node[2],node[3],node[4]];export let resetNode=(node,part,children)=>{node[0]=part;node[2]=children;node[1]=null;node[3]=null;node[4]=null};export let 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 let insertItem=(node,path,item)=>{if(path[path.length-1]===`*`)if(path[path.length-2]===`*`)visitNode(node,path.slice(0,-2).split(`*`))[4]=item;else (visitNode(node,path.slice(0,-1).split(`*`))[3]??=createParamNode(null))[1]=item;else visitNode(node,path.split(`*`))[1]=item};
+export let createNode=part=>[part,,,,,];export let createParamNode=nextNode=>[nextNode,,];export let cloneNode=(node,part)=>[part,node[1],node[2],node[3],node[4]];export let resetNode=(node,part,children)=>{node[0]=part;node[2]=children;node[1]=node[3]=node[4]=void 0};export let 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 let insertItem=(node,path,item)=>{if(path.endsWith(`*`))if(path[path.length-2]===`*`)visitNode(node,path.slice(0,-2).split(`*`))[4]=item;else (visitNode(node,path.slice(0,-1).split(`*`))[3]??=[,,])[1]=item;else visitNode(node,path.split(`*`))[1]=item};