@kevisual/router 0.0.15 → 0.0.17

package/dist/router.js

@@ -116,7 +116,7 @@ try {
 }
 */
 
-var util;
+var util$1;
 (function (util) {
     util.assertEqual = (val) => val;
     function assertIs(_arg) { }
@@ -178,7 +178,7 @@ var util;
         }
         return value;
     };
-})(util || (util = {}));
+})(util$1 || (util$1 = {}));
 var objectUtil;
 (function (objectUtil) {
     objectUtil.mergeShapes = (first, second) => {
@@ -188,7 +188,7 @@ var objectUtil;
         };
     };
 })(objectUtil || (objectUtil = {}));
-const ZodParsedType = util.arrayToEnum([
+const ZodParsedType = util$1.arrayToEnum([
     "string",
     "nan",
     "number",
@@ -255,7 +255,7 @@ const getParsedType = (data) => {
     }
 };
 
-const ZodIssueCode = util.arrayToEnum([
+const ZodIssueCode = util$1.arrayToEnum([
     "invalid_type",
     "invalid_literal",
     "custom",
@@ -359,7 +359,7 @@ class ZodError extends Error {
         return this.message;
     }
     get message() {
-        return JSON.stringify(this.issues, util.jsonStringifyReplacer, 2);
+        return JSON.stringify(this.issues, util$1.jsonStringifyReplacer, 2);
     }
     get isEmpty() {
         return this.issues.length === 0;
@@ -399,19 +399,19 @@ const errorMap = (issue, _ctx) => {
             }
             break;
         case ZodIssueCode.invalid_literal:
-            message = `Invalid literal value, expected ${JSON.stringify(issue.expected, util.jsonStringifyReplacer)}`;
+            message = `Invalid literal value, expected ${JSON.stringify(issue.expected, util$1.jsonStringifyReplacer)}`;
             break;
         case ZodIssueCode.unrecognized_keys:
-            message = `Unrecognized key(s) in object: ${util.joinValues(issue.keys, ", ")}`;
+            message = `Unrecognized key(s) in object: ${util$1.joinValues(issue.keys, ", ")}`;
             break;
         case ZodIssueCode.invalid_union:
             message = `Invalid input`;
             break;
         case ZodIssueCode.invalid_union_discriminator:
-            message = `Invalid discriminator value. Expected ${util.joinValues(issue.options)}`;
+            message = `Invalid discriminator value. Expected ${util$1.joinValues(issue.options)}`;
             break;
         case ZodIssueCode.invalid_enum_value:
-            message = `Invalid enum value. Expected ${util.joinValues(issue.options)}, received '${issue.received}'`;
+            message = `Invalid enum value. Expected ${util$1.joinValues(issue.options)}, received '${issue.received}'`;
             break;
         case ZodIssueCode.invalid_arguments:
             message = `Invalid function arguments`;
@@ -437,7 +437,7 @@ const errorMap = (issue, _ctx) => {
                     message = `Invalid input: must end with "${issue.validation.endsWith}"`;
                 }
                 else {
-                    util.assertNever(issue.validation);
+                    util$1.assertNever(issue.validation);
                 }
             }
             else if (issue.validation !== "regex") {
@@ -507,7 +507,7 @@ const errorMap = (issue, _ctx) => {
             break;
         default:
             message = _ctx.defaultError;
-            util.assertNever(issue);
+            util$1.assertNever(issue);
     }
     return { message };
 };
@@ -1466,7 +1466,7 @@ class ZodString extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -1753,7 +1753,7 @@ class ZodNumber extends ZodType {
         const status = new ParseStatus();
         for (const check of this._def.checks) {
             if (check.kind === "int") {
-                if (!util.isInteger(input.data)) {
+                if (!util$1.isInteger(input.data)) {
                     ctx = this._getOrReturnCtx(input, ctx);
                     addIssueToContext(ctx, {
                         code: ZodIssueCode.invalid_type,
@@ -1820,7 +1820,7 @@ class ZodNumber extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -1943,7 +1943,7 @@ class ZodNumber extends ZodType {
     }
     get isInt() {
         return !!this._def.checks.find((ch) => ch.kind === "int" ||
-            (ch.kind === "multipleOf" && util.isInteger(ch.value)));
+            (ch.kind === "multipleOf" && util$1.isInteger(ch.value)));
     }
     get isFinite() {
         let max = null, min = null;
@@ -2039,7 +2039,7 @@ class ZodBigInt extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -2233,7 +2233,7 @@ class ZodDate extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return {
@@ -2606,7 +2606,7 @@ class ZodObject extends ZodType {
         if (this._cached !== null)
             return this._cached;
         const shape = this._def.shape();
-        const keys = util.objectKeys(shape);
+        const keys = util$1.objectKeys(shape);
         return (this._cached = { shape, keys });
     }
     _parse(input) {
@@ -2848,7 +2848,7 @@ class ZodObject extends ZodType {
     }
     pick(mask) {
         const shape = {};
-        util.objectKeys(mask).forEach((key) => {
+        util$1.objectKeys(mask).forEach((key) => {
             if (mask[key] && this.shape[key]) {
                 shape[key] = this.shape[key];
             }
@@ -2860,7 +2860,7 @@ class ZodObject extends ZodType {
     }
     omit(mask) {
         const shape = {};
-        util.objectKeys(this.shape).forEach((key) => {
+        util$1.objectKeys(this.shape).forEach((key) => {
             if (!mask[key]) {
                 shape[key] = this.shape[key];
             }
@@ -2878,7 +2878,7 @@ class ZodObject extends ZodType {
     }
     partial(mask) {
         const newShape = {};
-        util.objectKeys(this.shape).forEach((key) => {
+        util$1.objectKeys(this.shape).forEach((key) => {
             const fieldSchema = this.shape[key];
             if (mask && !mask[key]) {
                 newShape[key] = fieldSchema;
@@ -2894,7 +2894,7 @@ class ZodObject extends ZodType {
     }
     required(mask) {
         const newShape = {};
-        util.objectKeys(this.shape).forEach((key) => {
+        util$1.objectKeys(this.shape).forEach((key) => {
             if (mask && !mask[key]) {
                 newShape[key] = this.shape[key];
             }
@@ -2913,7 +2913,7 @@ class ZodObject extends ZodType {
         });
     }
     keyof() {
-        return createZodEnum(util.objectKeys(this.shape));
+        return createZodEnum(util$1.objectKeys(this.shape));
     }
 }
 ZodObject.create = (shape, params) => {
@@ -3061,7 +3061,7 @@ const getDiscriminator = (type) => {
     }
     else if (type instanceof ZodNativeEnum) {
         // eslint-disable-next-line ban/ban
-        return util.objectValues(type.enum);
+        return util$1.objectValues(type.enum);
     }
     else if (type instanceof ZodDefault) {
         return getDiscriminator(type._def.innerType);
@@ -3177,8 +3177,8 @@ function mergeValues(a, b) {
         return { valid: true, data: a };
     }
     else if (aType === ZodParsedType.object && bType === ZodParsedType.object) {
-        const bKeys = util.objectKeys(b);
-        const sharedKeys = util
+        const bKeys = util$1.objectKeys(b);
+        const sharedKeys = util$1
             .objectKeys(a)
             .filter((key) => bKeys.indexOf(key) !== -1);
         const newObj = { ...a, ...b };
@@ -3733,7 +3733,7 @@ class ZodEnum extends ZodType {
             const ctx = this._getOrReturnCtx(input);
             const expectedValues = this._def.values;
             addIssueToContext(ctx, {
-                expected: util.joinValues(expectedValues),
+                expected: util$1.joinValues(expectedValues),
                 received: ctx.parsedType,
                 code: ZodIssueCode.invalid_type,
             });
@@ -3799,23 +3799,23 @@ class ZodNativeEnum extends ZodType {
         _ZodNativeEnum_cache.set(this, void 0);
     }
     _parse(input) {
-        const nativeEnumValues = util.getValidEnumValues(this._def.values);
+        const nativeEnumValues = util$1.getValidEnumValues(this._def.values);
         const ctx = this._getOrReturnCtx(input);
         if (ctx.parsedType !== ZodParsedType.string &&
             ctx.parsedType !== ZodParsedType.number) {
-            const expectedValues = util.objectValues(nativeEnumValues);
+            const expectedValues = util$1.objectValues(nativeEnumValues);
             addIssueToContext(ctx, {
-                expected: util.joinValues(expectedValues),
+                expected: util$1.joinValues(expectedValues),
                 received: ctx.parsedType,
                 code: ZodIssueCode.invalid_type,
             });
             return INVALID;
         }
         if (!__classPrivateFieldGet(this, _ZodNativeEnum_cache)) {
-            __classPrivateFieldSet(this, _ZodNativeEnum_cache, new Set(util.getValidEnumValues(this._def.values)));
+            __classPrivateFieldSet(this, _ZodNativeEnum_cache, new Set(util$1.getValidEnumValues(this._def.values)));
         }
         if (!__classPrivateFieldGet(this, _ZodNativeEnum_cache).has(input.data)) {
-            const expectedValues = util.objectValues(nativeEnumValues);
+            const expectedValues = util$1.objectValues(nativeEnumValues);
             addIssueToContext(ctx, {
                 received: ctx.data,
                 code: ZodIssueCode.invalid_enum_value,
@@ -3998,7 +3998,7 @@ class ZodEffects extends ZodType {
                 });
             }
         }
-        util.assertNever(effect);
+        util$1.assertNever(effect);
     }
 }
 ZodEffects.create = (schema, effect, params) => {
@@ -4422,7 +4422,7 @@ var z = /*#__PURE__*/Object.freeze({
     isDirty: isDirty,
     isValid: isValid,
     isAsync: isAsync,
-    get util () { return util; },
+    get util () { return util$1; },
     get objectUtil () { return objectUtil; },
     ZodParsedType: ZodParsedType,
     getParsedType: getParsedType,
@@ -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) {
@@ -11930,6 +11938,97 @@ class WsServer extends WsServerBase {
     }
 }
 
+function define(value) {
+    return value;
+}
+class Chain {
+    object;
+    app;
+    constructor(object, opts) {
+        this.object = object;
+        this.app = opts?.app;
+    }
+    get key() {
+        return this.object.key;
+    }
+    get path() {
+        return this.object.path;
+    }
+    setDescription(desc) {
+        this.object.description = desc;
+        return this;
+    }
+    setMeta(metadata) {
+        this.object.metadata = metadata;
+        return this;
+    }
+    setPath(path) {
+        this.object.path = path;
+        return this;
+    }
+    setMiddleware(middleware) {
+        this.object.middleware = middleware;
+        return this;
+    }
+    setKey(key) {
+        this.object.key = key;
+        return this;
+    }
+    setId(key) {
+        this.object.id = key;
+        return this;
+    }
+    setRun(run) {
+        this.object.run = run;
+        return this;
+    }
+    define(run) {
+        this.object.run = run;
+        return this;
+    }
+    createRoute() {
+        this.app.route(this.object).addTo(this.app);
+        return this;
+    }
+}
+const util = {
+    getChain: (obj, opts) => {
+        return new Chain(obj, opts);
+    },
+};
+class QueryUtil {
+    routeObject;
+    app;
+    constructor(object, opts) {
+        this.routeObject = object;
+        this.app = opts?.app;
+    }
+    static createFormObj(object, opts) {
+        return new QueryUtil(object, opts);
+    }
+    static create(value, opts) {
+        const obj = value;
+        return new QueryUtil(obj, opts);
+    }
+    get(key) {
+        return this.routeObject[key];
+    }
+    chain(key, opts) {
+        const obj = this.routeObject[key];
+        let newOpts = { app: this.app, ...opts };
+        return new Chain(obj, newOpts);
+    }
+    queryChain(key) {
+        const value = this.routeObject[key];
+        return (queryData) => {
+            return {
+                ...value,
+                ...queryData,
+            };
+        };
+    }
+}
+
 /**
  *  封装了 Router 和 Server 的 App 模块，处理http的请求和响应，内置了 Cookie 和 Token 和 res 的处理
  */
@@ -12002,4 +12101,4 @@ class App {
     }
 }
 
-export { App, Connect, CustomError, QueryConnect, QueryRouter, QueryRouterServer, Route, ZodType as Schema, Server, createSchema, handleServer };
+export { App, Connect, CustomError, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, ZodType as Schema, Server, createSchema, define, handleServer, util };

package/package.json

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

package/src/browser.ts

@@ -9,3 +9,5 @@ export type { Run } from './route.ts';
 export { CustomError } from './result/error.ts';
 
 export * from './server/parse-body.ts';
+
+export * from './router-define.ts';

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';
 
@@ -14,3 +14,5 @@ export { CustomError } from './result/error.ts';
 export { Rule, Schema, createSchema } from './validator/index.ts';
 
 export { App } from './app.ts';
+
+export * from './router-define.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,4 @@
-import type { QueryRouterServer, Route, RouteOpts, Run } from './route.ts';
+import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from '@kevisual/router';
 
 // export type RouteObject<T extends readonly string[]> = {
 //   [K in T[number]]: RouteOpts;
@@ -45,7 +45,7 @@ class Chain {
     this.object.path = path;
     return this;
   }
-  setMiddleware(middleware: string[] | Route[]) {
+  setMiddleware(middleware: RouteMiddleware[]) {
     this.object.middleware = middleware;
     return this;
   }
@@ -98,8 +98,8 @@ export class QueryUtil<T extends RouteObject = RouteObject> {
     let newOpts = { app: this.app, ...opts };
     return new Chain(obj, newOpts);
   }
-  queryChain<K extends keyof T>(key: K) {
-    const value = this.routeObject[key] as RouteOpts;
+  queryChain<K extends keyof T>(key: K): (queryData?: Record<string, any>) => RouteOpts {
+    const value = this.routeObject[key];
     return (queryData?: Record<string, any>) => {
       return {
         ...value,

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'));