@mapl/router 0.4.1 → 0.4.3

package/README.md

@@ -10,4 +10,4 @@ A fast radix tree router.
 ```
 
 ## Limitation
-Patterns cannot include quotes and escape characters.
+Patterns and methods cannot include quotes and escape characters.

package/method/compiler.d.ts

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

package/method/compiler.js

@@ -0,0 +1 @@
+export default (router,compile,methodInput,startIndex)=>{let str="switch("+methodInput+"){";for(let key in router)str+='case"'+key+'":'+compilePath(router[key],compile,startIndex)+"break;";str+="}";let all=router[ALL];if(all!=null)str+=compilePath(all,compile,startIndex);return str};import{ALL}from"./index.js";import compilePath from"../path/compiler.js";

package/method/index.d.ts

@@ -0,0 +1,6 @@
+import type { Router as PathRouter } from '../path/index.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;

package/method/index.js

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

package/method/matcher.d.ts

@@ -0,0 +1,5 @@
+import type { Matcher as PathMatcher } from '../path/matcher.js';
+import { type Router } from './index.js';
+export type Matcher<T> = [Map<string, PathMatcher<T>>, PathMatcher<T> | null];
+declare const _default: <T>(router: Router<T>, startIndex: 0 | -1) => Matcher<T>;
+export default _default;

package/method/matcher.js

@@ -0,0 +1 @@
+export default (router,startIndex)=>[new Map(Object.entries(router).map((pair)=>[pair[0],compileMatch(pair[1],startIndex)])),router[ALL]==null?null:compileMatch(router[ALL],startIndex)];import compileMatch from"../path/matcher.js";import{ALL}from"./index.js";

package/package.json

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

package/{compile.d.ts → path/compiler.d.ts}

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

package/{index.d.ts → path/index.d.ts}

@@ -1,4 +1,4 @@
-import { type Node } from './tree/node.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;

package/path/index.js

@@ -0,0 +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)};

package/path/matcher.d.ts

@@ -0,0 +1,4 @@
+import type { Router } from './index.js';
+export type Matcher<T = unknown> = [Map<string, T>, (path: string, params: string[]) => T | null];
+declare const _default: <T>(router: Router<T>, startIndex: 0 | -1) => Matcher<T>;
+export default _default;

package/path/matcher.js

@@ -0,0 +1 @@
+export default (router,startIndex)=>{let node=router[1];return[new Map(router[0]),node==null?noop:(path,params)=>match(node,path,params,startIndex)]};import match from"../tree/matcher.js";let noop=(_,_1)=>null;

package/transform.d.ts

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

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(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;
+let f=(node,path,params,start)=>{let part=node[0];let tmp=part.length;if(tmp!==1&&(start+tmp>path.length||!path.startsWith(part,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/index.js

@@ -1 +0,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/path.d.ts

@@ -1,12 +0,0 @@
-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;