@mapl/router 0.4.8 → 0.4.10

package/method/index.d.ts

@@ -1,7 +1,8 @@
 import type { Router as PathRouter } from '../path/index.js';
+import type { PathTransformResult } from '../transform.js';
 export declare const ALL: unique symbol;
 export type ALL = typeof ALL;
 export type Method = string | ALL;
 export type Router<T = unknown> = Partial<Record<Method, PathRouter<T>>>;
 export declare const insertItem: <T>(router: Router<T>, method: Method, path: string, item: T) => void;
-export declare const insertItemWithParts: <T>(router: Router<T>, method: Method, parts: string[], flag: 0 | 1 | 2, item: T) => void;
+export declare const insertItemWithParts: <T>(router: Router<T>, method: Method, result: PathTransformResult, item: T) => void;

package/method/index.js

@@ -1 +1 @@
-import{createRouter as createPathRouter,insertItem as insertItemToPath,insertItemWithParts as insertItemToPathRouterWithPaths}from"../path/index.js";export var ALL=Symbol();export var insertItem=(router,method,path,item)=>{insertItemToPath(router[method]??=createPathRouter(),path,item)};export var insertItemWithParts=(router,method,parts,flag,item)=>{insertItemToPathRouterWithPaths(router[method]??=createPathRouter(),parts,flag,item)};
+import{createRouter as createPathRouter,insertItem as insertItemToPath,insertItemWithParts as insertItemToPathRouterWithPaths}from"../path/index.js";export var ALL=Symbol();export var insertItem=(router,method,path,item)=>{insertItemToPath(router[method]??=createPathRouter(),path,item)};export var insertItemWithParts=(router,method,result,item)=>{insertItemToPathRouterWithPaths(router[method]??=createPathRouter(),result,item)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapl/router",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "main": "./index.js",
   "devDependencies": {
     "@stylistic/eslint-plugin": "latest",

package/path/index.d.ts

@@ -1,6 +1,7 @@
+import type { PathTransformResult } from '../transform.js';
 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: <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 insertItemWithParts: <T>(router: Router<T>, result: PathTransformResult, item: T) => void;
 export declare const countParams: (path: string) => number;

package/path/index.js

@@ -1 +1 @@
-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)};
+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,result,item)=>{if(result[2]===0)router[0].push([result[1][0],item]);else nodeInsertItemWithParts(router[1]??=createNode("/"),result,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/tree/compiler.js

@@ -1 +1 @@
-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+"}"};
+let toChar=(c)=>String.fromCharCode(+c[0]);export var o2=(node,paramCount,startIndexValue,startIndexPrefix)=>{let builder="";if(node[0].length!==1){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].length!==1?builder+"}":builder};

package/tree/node.d.ts

@@ -1,3 +1,4 @@
+import type { PathTransformResult } from '../transform.js';
 export type Node<T = unknown> = [
     part: string,
     store: T | null,
@@ -14,5 +15,5 @@ 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 insertItemWithParts: <T>(node: Node<T>, result: PathTransformResult, 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,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};
+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,result,item)=>{let nextNode=visitNode(node,result[1]);switch(result[2]){case 0:nextNode[1]=item;break;case 1:if(result[1].length===result[0].length)(nextNode[3]??=createParamNode(null))[1]=item;else nextNode[1]=item;break;case 2:nextNode[4]=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};