@kevisual/router 0.0.15 → 0.0.16

package/dist/router-browser.d.ts

@@ -110,6 +110,11 @@ type RouteContext<T = {
 } & T;
 type Run<T = any> = (ctx: RouteContext<T>) => Promise<typeof ctx | null | void>;
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type RouteMiddleware = {
+    path: string;
+    key?: string;
+    id?: string;
+} | string;
 type RouteOpts = {
     path?: string;
     key?: string;
@@ -120,7 +125,7 @@ type RouteOpts = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: Route[] | string[];
+    middleware?: RouteMiddleware[];
     type?: 'route' | 'middleware';
     /**
      * validator: {
@@ -171,7 +176,7 @@ declare class Route<U = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: (Route | string)[];
+    middleware?: RouteMiddleware[];
     type?: string;
     private _validator?;
     schema?: {

package/dist/router-browser.js

@@ -5911,7 +5911,15 @@ class QueryRouter {
                         route = this.routes.find((r) => r.id === item);
                     }
                     else {
-                        route = this.routes.find((r) => r.path === item.path && r.key === item.key);
+                        route = this.routes.find((r) => {
+                            if (item.id) {
+                                return r.id === item.id;
+                            }
+                            else {
+                                // key 可以是空，所以可以不严格验证
+                                return r.path === item.path && r.key == item.key;
+                            }
+                        });
                     }
                     if (!route) {
                         if (isString) {

package/dist/router-define.d.ts

@@ -1,4 +1,4 @@
-import * as zod from 'zod';
+import * as node_modules_zod_lib_types_js from 'node_modules/zod/lib/types.js';
 import { Schema } from 'zod';
 
 type BaseRule = {
@@ -107,6 +107,11 @@ type RouteContext<T = {
 } & T;
 type Run<T = any> = (ctx: RouteContext<T>) => Promise<typeof ctx | null | void>;
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type RouteMiddleware = {
+    path: string;
+    key?: string;
+    id?: string;
+} | string;
 type RouteOpts = {
     path?: string;
     key?: string;
@@ -117,7 +122,7 @@ type RouteOpts = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: Route[] | string[];
+    middleware?: RouteMiddleware[];
     type?: 'route' | 'middleware';
     /**
      * validator: {
@@ -168,7 +173,7 @@ declare class Route<U = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: (Route | string)[];
+    middleware?: RouteMiddleware[];
     type?: string;
     private _validator?;
     schema?: {
@@ -410,7 +415,7 @@ declare class Chain {
         [key: string]: any;
     }): this;
     setPath(path: string): this;
-    setMiddleware(middleware: string[] | Route[]): this;
+    setMiddleware(middleware: RouteMiddleware[]): this;
     setKey(key: string): this;
     setId(key: string): this;
     setRun(run: Run): this;
@@ -438,13 +443,13 @@ declare class QueryUtil<T extends RouteObject = RouteObject> {
         metadata?: {
             [key: string]: any;
         };
-        middleware?: Route[] | string[];
+        middleware?: RouteMiddleware[];
         type?: "route" | "middleware";
         validator?: {
             [key: string]: Rule;
         };
         schema?: {
-            [key: string]: zod.ZodType<any>;
+            [key: string]: node_modules_zod_lib_types_js.ZodType<any>;
         };
         isVerify?: boolean;
         verify?: (ctx?: RouteContext, dev?: boolean) => boolean;

package/dist/router.d.ts

@@ -113,6 +113,11 @@ type RouteContext<T = {
 } & T;
 type Run<T = any> = (ctx: RouteContext<T>) => Promise<typeof ctx | null | void>;
 type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+type RouteMiddleware = {
+    path: string;
+    key?: string;
+    id?: string;
+} | string;
 type RouteOpts = {
     path?: string;
     key?: string;
@@ -123,7 +128,7 @@ type RouteOpts = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: Route[] | string[];
+    middleware?: RouteMiddleware[];
     type?: 'route' | 'middleware';
     /**
      * validator: {
@@ -174,7 +179,7 @@ declare class Route<U = {
     metadata?: {
         [key: string]: any;
     };
-    middleware?: (Route | string)[];
+    middleware?: RouteMiddleware[];
     type?: string;
     private _validator?;
     schema?: {
@@ -643,4 +648,4 @@ declare class App<T = {}, U = AppReqRes> {
 }
 
 export { App, Connect, CustomError, QueryConnect, QueryRouter, QueryRouterServer, Route, Server, createSchema, handleServer };
-export type { RouteContext, RouteOpts, Rule, Run };
+export type { RouteContext, RouteMiddleware, RouteOpts, Rule, Run };

package/dist/router.js

@@ -5933,7 +5933,15 @@ class QueryRouter {
                         route = this.routes.find((r) => r.id === item);
                     }
                     else {
-                        route = this.routes.find((r) => r.path === item.path && r.key === item.key);
+                        route = this.routes.find((r) => {
+                            if (item.id) {
+                                return r.id === item.id;
+                            }
+                            else {
+                                // key 可以是空，所以可以不严格验证
+                                return r.path === item.path && r.key == item.key;
+                            }
+                        });
                     }
                     if (!route) {
                         if (isString) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/index.ts

@@ -1,7 +1,7 @@
 export { Route, QueryRouter, QueryRouterServer } from './route.ts';
 export { Connect, QueryConnect } from './connect.ts';
 
-export type { RouteContext, RouteOpts } from './route.ts';
+export type { RouteContext, RouteOpts, RouteMiddleware } from './route.ts';
 
 export type { Run } from './route.ts';
 

package/src/route.ts

@@ -61,6 +61,13 @@ export type RouteContext<T = { code?: number }, S = any> = {
 export type Run<T = any> = (ctx: RouteContext<T>) => Promise<typeof ctx | null | void>;
 
 export type NextRoute = Pick<Route, 'id' | 'path' | 'key'>;
+export type RouteMiddleware =
+  | {
+      path: string;
+      key?: string;
+      id?: string;
+    }
+  | string;
 export type RouteOpts = {
   path?: string;
   key?: string;
@@ -69,7 +76,7 @@ export type RouteOpts = {
   nextRoute?: NextRoute; // route to run after this route
   description?: string;
   metadata?: { [key: string]: any };
-  middleware?: Route[] | string[]; // middleware
+  middleware?: RouteMiddleware[]; // middleware
   type?: 'route' | 'middleware';
   /**
    * validator: {
@@ -112,7 +119,7 @@ export class Route<U = { [key: string]: any }> {
   nextRoute?: NextRoute; // route to run after this route
   description?: string;
   metadata?: { [key: string]: any };
-  middleware?: (Route | string)[]; // middleware
+  middleware?: RouteMiddleware[]; // middleware
   type? = 'route';
   private _validator?: { [key: string]: Rule };
   schema?: { [key: string]: Schema<any> };
@@ -379,7 +386,14 @@ export class QueryRouter {
           if (isString) {
             route = this.routes.find((r) => r.id === item);
           } else {
-            route = this.routes.find((r) => r.path === item.path && r.key === item.key);
+            route = this.routes.find((r) => {
+              if (item.id) {
+                return r.id === item.id;
+              } else {
+                // key 可以是空，所以可以不严格验证
+                return r.path === item.path && r.key == item.key;
+              }
+            });
           }
           if (!route) {
             if (isString) {

package/src/router-define.ts

@@ -1,4 +1,5 @@
-import type { QueryRouterServer, Route, RouteOpts, Run } from './route.ts';
+// import type { QueryRouterServer, Route, RouteOpts, Run } from '@kevisual/router';
+import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from './index.ts';
 
 // export type RouteObject<T extends readonly string[]> = {
 //   [K in T[number]]: RouteOpts;
@@ -45,7 +46,7 @@ class Chain {
     this.object.path = path;
     return this;
   }
-  setMiddleware(middleware: string[] | Route[]) {
+  setMiddleware(middleware: RouteMiddleware[]) {
     this.object.middleware = middleware;
     return this;
   }

package/src/test/define.ts

@@ -0,0 +1,10 @@
+import { App } from '@/app.ts';
+import { QueryUtil } from '@/router-define.ts';
+const v = QueryUtil.create({
+  a: {
+    path: 'a',
+    key: 'b',
+  },
+});
+const app = new App();
+app.route(v.get('a'));