@kevisual/router 0.0.16 → 0.0.17

package/dist/router-browser.d.ts

@@ -2,6 +2,7 @@ import { Schema } from 'zod';
 export { Schema } from 'zod';
 import * as querystring from 'querystring';
 import { IncomingMessage } from 'node:http';
+import { RouteOpts as RouteOpts$1, QueryRouterServer as QueryRouterServer$1, RouteMiddleware as RouteMiddleware$1, Run as Run$1 } from '@kevisual/router';
 
 type BaseRule = {
     value?: any;
@@ -436,5 +437,47 @@ declare const parseSearchValue: (value?: string, opts?: {
     decode?: boolean;
 }) => any;
 
-export { CustomError, QueryRouter, QueryRouterServer, Route, createSchema, parseBody, parseSearch, parseSearchValue };
-export type { RouteContext, RouteOpts, Rule, Run };
+type RouteObject = {
+    [key: string]: RouteOpts$1;
+};
+declare function define<T extends Record<string, RouteOpts$1>>(value: T): {
+    [K in keyof T]: T[K] & RouteOpts$1;
+};
+type RouteArray = RouteOpts$1[];
+type ChainOptions = {
+    app: QueryRouterServer$1;
+};
+declare class Chain {
+    object: RouteOpts$1;
+    app?: QueryRouterServer$1;
+    constructor(object: RouteOpts$1, opts?: ChainOptions);
+    get key(): string;
+    get path(): string;
+    setDescription(desc: string): this;
+    setMeta(metadata: {
+        [key: string]: any;
+    }): this;
+    setPath(path: string): this;
+    setMiddleware(middleware: RouteMiddleware$1[]): this;
+    setKey(key: string): this;
+    setId(key: string): this;
+    setRun(run: Run$1): this;
+    define(run: Run$1): this;
+    createRoute(): this;
+}
+declare const util: {
+    getChain: (obj: RouteOpts$1, opts?: ChainOptions) => Chain;
+};
+declare class QueryUtil<T extends RouteObject = RouteObject> {
+    routeObject: T;
+    app: QueryRouterServer$1;
+    constructor(object: T, opts?: ChainOptions);
+    static createFormObj<U extends RouteObject>(object: U, opts?: ChainOptions): QueryUtil<U>;
+    static create<U extends Record<string, RouteOpts$1>>(value: U, opts?: ChainOptions): QueryUtil<U>;
+    get<K extends keyof T>(key: K): RouteOpts$1;
+    chain<K extends keyof T>(key: K, opts?: ChainOptions): Chain;
+    queryChain<K extends keyof T>(key: K): (queryData?: Record<string, any>) => RouteOpts$1;
+}
+
+export { CustomError, QueryRouter, QueryRouterServer, QueryUtil, Route, createSchema, define, parseBody, parseSearch, parseSearchValue, util };
+export type { RouteArray, RouteContext, RouteObject, RouteOpts, Rule, Run };

package/dist/router-browser.js

@@ -94,7 +94,7 @@ try {
 }
 */
 
-var util;
+var util$1;
 (function (util) {
     util.assertEqual = (val) => val;
     function assertIs(_arg) { }
@@ -156,7 +156,7 @@ var util;
         }
         return value;
     };
-})(util || (util = {}));
+})(util$1 || (util$1 = {}));
 var objectUtil;
 (function (objectUtil) {
     objectUtil.mergeShapes = (first, second) => {
@@ -166,7 +166,7 @@ var objectUtil;
         };
     };
 })(objectUtil || (objectUtil = {}));
-const ZodParsedType = util.arrayToEnum([
+const ZodParsedType = util$1.arrayToEnum([
     "string",
     "nan",
     "number",
@@ -233,7 +233,7 @@ const getParsedType = (data) => {
     }
 };
 
-const ZodIssueCode = util.arrayToEnum([
+const ZodIssueCode = util$1.arrayToEnum([
     "invalid_type",
     "invalid_literal",
     "custom",
@@ -337,7 +337,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;
@@ -377,19 +377,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`;
@@ -415,7 +415,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") {
@@ -485,7 +485,7 @@ const errorMap = (issue, _ctx) => {
             break;
         default:
             message = _ctx.defaultError;
-            util.assertNever(issue);
+            util$1.assertNever(issue);
     }
     return { message };
 };
@@ -1444,7 +1444,7 @@ class ZodString extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -1731,7 +1731,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,
@@ -1798,7 +1798,7 @@ class ZodNumber extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -1921,7 +1921,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;
@@ -2017,7 +2017,7 @@ class ZodBigInt extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return { status: status.value, value: input.data };
@@ -2211,7 +2211,7 @@ class ZodDate extends ZodType {
                 }
             }
             else {
-                util.assertNever(check);
+                util$1.assertNever(check);
             }
         }
         return {
@@ -2584,7 +2584,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) {
@@ -2826,7 +2826,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];
             }
@@ -2838,7 +2838,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];
             }
@@ -2856,7 +2856,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;
@@ -2872,7 +2872,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];
             }
@@ -2891,7 +2891,7 @@ class ZodObject extends ZodType {
         });
     }
     keyof() {
-        return createZodEnum(util.objectKeys(this.shape));
+        return createZodEnum(util$1.objectKeys(this.shape));
     }
 }
 ZodObject.create = (shape, params) => {
@@ -3039,7 +3039,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);
@@ -3155,8 +3155,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 };
@@ -3711,7 +3711,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,
             });
@@ -3777,23 +3777,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,
@@ -3976,7 +3976,7 @@ class ZodEffects extends ZodType {
                 });
             }
         }
-        util.assertNever(effect);
+        util$1.assertNever(effect);
     }
 }
 ZodEffects.create = (schema, effect, params) => {
@@ -4400,7 +4400,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,
@@ -6299,4 +6299,95 @@ const parseSearchValue = (value, opts) => {
     }
 };
 
-export { CustomError, QueryRouter, QueryRouterServer, Route, ZodType as Schema, createSchema, parseBody, parseSearch, parseSearchValue };
+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,
+            };
+        };
+    }
+}
+
+export { CustomError, QueryRouter, QueryRouterServer, QueryUtil, Route, ZodType as Schema, createSchema, define, parseBody, parseSearch, parseSearchValue, util };

package/dist/router-define.d.ts

@@ -1,398 +1,5 @@
-import * as node_modules_zod_lib_types_js from 'node_modules/zod/lib/types.js';
-import { Schema } from 'zod';
-
-type BaseRule = {
-    value?: any;
-    required?: boolean;
-    message?: string;
-};
-type RuleString = {
-    type: 'string';
-    minLength?: number;
-    maxLength?: number;
-    regex?: string;
-} & BaseRule;
-type RuleNumber = {
-    type: 'number';
-    min?: number;
-    max?: number;
-} & BaseRule;
-type RuleBoolean = {
-    type: 'boolean';
-} & BaseRule;
-type RuleArray = {
-    type: 'array';
-    items: Rule;
-    minItems?: number;
-    maxItems?: number;
-} & BaseRule;
-type RuleObject = {
-    type: 'object';
-    properties: {
-        [key: string]: Rule;
-    };
-} & BaseRule;
-type RuleAny = {
-    type: 'any';
-} & BaseRule;
-type Rule = RuleString | RuleNumber | RuleBoolean | RuleArray | RuleObject | RuleAny;
-
-type RouterContextT = {
-    code?: number;
-    [key: string]: any;
-};
-type RouteContext<T = {
-    code?: number;
-}, S = any> = {
-    query?: {
-        [key: string]: any;
-    };
-    /** return body */
-    body?: number | string | Object;
-    /** return code */
-    code?: number;
-    /** return msg */
-    message?: string;
-    state?: S;
-    /**
-     * 当前路径
-     */
-    currentPath?: string;
-    /**
-     * 当前key
-     */
-    currentKey?: string;
-    /**
-     * 当前route
-     */
-    currentRoute?: Route;
-    /**
-     * 进度
-     */
-    progress?: [string, string][];
-    nextQuery?: {
-        [key: string]: any;
-    };
-    end?: boolean;
-    /**
-     * 请求 route的返回结果，包函ctx
-     */
-    queryRouter?: QueryRouter;
-    error?: any;
-    /** 请求 route的返回结果，包函ctx */
-    call?: (message: {
-        path: string;
-        key?: string;
-        payload?: any;
-        [key: string]: any;
-    } | {
-        id: string;
-        apyload?: any;
-        [key: string]: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }) => Promise<any>;
-    /** 请求 route的返回结果，不包函ctx */
-    queryRoute?: (message: {
-        path: string;
-        key?: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }) => Promise<any>;
-    index?: number;
-    throw?: (code?: number | string, message?: string, tips?: string) => void;
-    /** 是否需要序列化 */
-    needSerialize?: boolean;
-} & 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;
-    id?: string;
-    run?: Run;
-    nextRoute?: NextRoute;
-    description?: string;
-    metadata?: {
-        [key: string]: any;
-    };
-    middleware?: RouteMiddleware[];
-    type?: 'route' | 'middleware';
-    /**
-     * validator: {
-     *  packageName: {
-     *    type: 'string',
-     *    required: true,
-     *  },
-     * }
-     */
-    validator?: {
-        [key: string]: Rule;
-    };
-    schema?: {
-        [key: string]: Schema<any>;
-    };
-    isVerify?: boolean;
-    verify?: (ctx?: RouteContext, dev?: boolean) => boolean;
-    verifyKey?: (key: string, ctx?: RouteContext, dev?: boolean) => boolean;
-    /**
-     * $#$ will be used to split path and key
-     */
-    idUsePath?: boolean;
-    /**
-     * id 合并的分隔符，默认为 $#$
-     */
-    delimiter?: string;
-    isDebug?: boolean;
-};
-type DefineRouteOpts = Omit<RouteOpts, 'idUsePath' | 'verify' | 'verifyKey' | 'nextRoute'>;
-declare const pickValue: readonly ["path", "key", "id", "description", "type", "validator", "middleware"];
-type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
-declare class Route<U = {
-    [key: string]: any;
-}> {
-    /**
-     * 一级路径
-     */
-    path?: string;
-    /**
-     * 二级路径
-     */
-    key?: string;
-    id?: string;
-    share?: boolean;
-    run?: Run;
-    nextRoute?: NextRoute;
-    description?: string;
-    metadata?: {
-        [key: string]: any;
-    };
-    middleware?: RouteMiddleware[];
-    type?: string;
-    private _validator?;
-    schema?: {
-        [key: string]: Schema<any>;
-    };
-    data?: any;
-    /**
-     * 是否需要验证
-     */
-    isVerify?: boolean;
-    /**
-     * 是否开启debug，开启后会打印错误信息
-     */
-    isDebug?: boolean;
-    constructor(path: string, key?: string, opts?: RouteOpts);
-    private createSchema;
-    /**
-     * set validator and create schema
-     * @param validator
-     */
-    set validator(validator: {
-        [key: string]: Rule;
-    });
-    get validator(): {
-        [key: string]: Rule;
-    };
-    /**
-     * has code, body, message in ctx, return ctx if has error
-     * @param ctx
-     * @param dev
-     * @returns
-     */
-    verify(ctx: RouteContext, dev?: boolean): void;
-    /**
-     * Need to manully call return ctx fn and configure body, code, message
-     * @param key
-     * @param ctx
-     * @param dev
-     * @returns
-     */
-    verifyKey(key: string, ctx: RouteContext, dev?: boolean): {
-        message: string;
-        path: string;
-        key: string;
-        error: any;
-    } | {
-        message: string;
-        path: string;
-        key: string;
-        error?: undefined;
-    };
-    setValidator(validator: {
-        [key: string]: Rule;
-    }): this;
-    define<T extends {
-        [key: string]: any;
-    } = RouterContextT>(opts: DefineRouteOpts): this;
-    define<T extends {
-        [key: string]: any;
-    } = RouterContextT>(fn: Run<T & U>): this;
-    define<T extends {
-        [key: string]: any;
-    } = RouterContextT>(key: string, fn: Run<T & U>): this;
-    define<T extends {
-        [key: string]: any;
-    } = RouterContextT>(path: string, key: string, fn: Run<T & U>): this;
-    addTo(router: QueryRouter | {
-        add: (route: Route) => void;
-        [key: string]: any;
-    }): void;
-    setData(data: any): this;
-    throw(code?: number | string, message?: string, tips?: string): void;
-}
-declare class QueryRouter {
-    routes: Route[];
-    maxNextRoute: number;
-    context?: RouteContext;
-    constructor();
-    add(route: Route): void;
-    /**
-     * remove route by path and key
-     * @param route
-     */
-    remove(route: Route | {
-        path: string;
-        key?: string;
-    }): void;
-    /**
-     * remove route by id
-     * @param uniqueId
-     */
-    removeById(unique: string): void;
-    /**
-     * 执行route
-     * @param path
-     * @param key
-     * @param ctx
-     * @returns
-     */
-    runRoute(path: string, key: string, ctx?: RouteContext): any;
-    /**
-     * 第一次执行
-     * @param message
-     * @param ctx
-     * @returns
-     */
-    parse(message: {
-        path: string;
-        key?: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * 返回的数据包含所有的context的请求返回的内容，可做其他处理
-     * @param message
-     * @param ctx
-     * @returns
-     */
-    call(message: {
-        id?: string;
-        path?: string;
-        key?: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }): Promise<any>;
-    /**
-     * 请求 result 的数据
-     * @param message
-     * @param ctx
-     * @returns
-     */
-    queryRoute(message: {
-        path: string;
-        key?: string;
-        payload?: any;
-    }, ctx?: RouteContext & {
-        [key: string]: any;
-    }): Promise<{
-        code: any;
-        data: any;
-        message: any;
-    }>;
-    setContext(ctx: RouteContext): Promise<void>;
-    getList(): RouteInfo[];
-    /**
-     * 获取handle函数, 这里会去执行parse函数
-     */
-    getHandle<T = any>(router: QueryRouter, wrapperFn?: HandleFn<T>, ctx?: RouteContext): (msg: {
-        path: string;
-        key?: string;
-        [key: string]: any;
-    }, handleContext?: RouteContext) => Promise<{
-        [key: string]: any;
-        code: string;
-        data?: any;
-        message?: string;
-    } | {
-        code: any;
-        data: any;
-        message: any;
-    } | {
-        code: number;
-        message: any;
-        data?: undefined;
-    }>;
-    exportRoutes(): Route<{
-        [key: string]: any;
-    }>[];
-    importRoutes(routes: Route[]): void;
-    importRouter(router: QueryRouter): void;
-    throw(code?: number | string, message?: string, tips?: string): void;
-    hasRoute(path: string, key?: string): Route<{
-        [key: string]: any;
-    }>;
-}
-type QueryRouterServerOpts = {
-    handleFn?: HandleFn;
-    context?: RouteContext;
-};
-interface HandleFn<T = any> {
-    (msg: {
-        path: string;
-        [key: string]: any;
-    }, ctx?: any): {
-        code: string;
-        data?: any;
-        message?: string;
-        [key: string]: any;
-    };
-    (res: RouteContext<T>): any;
-}
-/**
- * QueryRouterServer
- * @description 移除server相关的功能，只保留router相关的功能，和http.createServer不相关，独立
- */
-declare class QueryRouterServer extends QueryRouter {
-    handle: any;
-    constructor(opts?: QueryRouterServerOpts);
-    setHandle(wrapperFn?: HandleFn, ctx?: RouteContext): void;
-    use(path: string, fn: (ctx: any) => any, opts?: RouteOpts): void;
-    addRoute(route: Route): void;
-    Route: typeof Route;
-    route(opts: RouteOpts): Route<Required<RouteContext>>;
-    route(path: string, key?: string): Route<Required<RouteContext>>;
-    route(path: string, opts?: RouteOpts): Route<Required<RouteContext>>;
-    route(path: string, key?: string, opts?: RouteOpts): Route<Required<RouteContext>>;
-    /**
-     * 等于queryRoute，但是调用了handle
-     * @param param0
-     * @returns
-     */
-    run({ path, key, payload }: {
-        path: string;
-        key?: string;
-        payload?: any;
-    }): Promise<any>;
-}
+import { RouteOpts, QueryRouterServer, RouteMiddleware, Run } from '@kevisual/router';
+export { RouteOpts } from '@kevisual/router';
 
 type RouteObject = {
     [key: string]: RouteOpts;
@@ -433,32 +40,8 @@ declare class QueryUtil<T extends RouteObject = RouteObject> {
     static create<U extends Record<string, RouteOpts>>(value: U, opts?: ChainOptions): QueryUtil<U>;
     get<K extends keyof T>(key: K): RouteOpts;
     chain<K extends keyof T>(key: K, opts?: ChainOptions): Chain;
-    queryChain<K extends keyof T>(key: K): (queryData?: Record<string, any>) => {
-        path?: string;
-        key?: string;
-        id?: string;
-        run?: Run;
-        nextRoute?: NextRoute;
-        description?: string;
-        metadata?: {
-            [key: string]: any;
-        };
-        middleware?: RouteMiddleware[];
-        type?: "route" | "middleware";
-        validator?: {
-            [key: string]: Rule;
-        };
-        schema?: {
-            [key: string]: node_modules_zod_lib_types_js.ZodType<any>;
-        };
-        isVerify?: boolean;
-        verify?: (ctx?: RouteContext, dev?: boolean) => boolean;
-        verifyKey?: (key: string, ctx?: RouteContext, dev?: boolean) => boolean;
-        idUsePath?: boolean;
-        delimiter?: string;
-        isDebug?: boolean;
-    };
+    queryChain<K extends keyof T>(key: K): (queryData?: Record<string, any>) => RouteOpts;
 }
 
 export { QueryUtil, define, util };
-export type { RouteArray, RouteObject, RouteOpts };
+export type { RouteArray, RouteObject };

package/dist/router.d.ts

@@ -5,6 +5,7 @@ import https from 'node:https';
 import http2 from 'node:http2';
 import * as cookie from 'cookie';
 import { WebSocketServer, WebSocket } from 'ws';
+import { RouteOpts as RouteOpts$1, QueryRouterServer as QueryRouterServer$1, RouteMiddleware as RouteMiddleware$1, Run as Run$1 } from '@kevisual/router';
 
 type BaseRule = {
     value?: any;
@@ -577,6 +578,48 @@ declare class WsServer extends WsServerBase {
     listen(): void;
 }
 
+type RouteObject = {
+    [key: string]: RouteOpts$1;
+};
+declare function define<T extends Record<string, RouteOpts$1>>(value: T): {
+    [K in keyof T]: T[K] & RouteOpts$1;
+};
+type RouteArray = RouteOpts$1[];
+type ChainOptions = {
+    app: QueryRouterServer$1;
+};
+declare class Chain {
+    object: RouteOpts$1;
+    app?: QueryRouterServer$1;
+    constructor(object: RouteOpts$1, opts?: ChainOptions);
+    get key(): string;
+    get path(): string;
+    setDescription(desc: string): this;
+    setMeta(metadata: {
+        [key: string]: any;
+    }): this;
+    setPath(path: string): this;
+    setMiddleware(middleware: RouteMiddleware$1[]): this;
+    setKey(key: string): this;
+    setId(key: string): this;
+    setRun(run: Run$1): this;
+    define(run: Run$1): this;
+    createRoute(): this;
+}
+declare const util: {
+    getChain: (obj: RouteOpts$1, opts?: ChainOptions) => Chain;
+};
+declare class QueryUtil<T extends RouteObject = RouteObject> {
+    routeObject: T;
+    app: QueryRouterServer$1;
+    constructor(object: T, opts?: ChainOptions);
+    static createFormObj<U extends RouteObject>(object: U, opts?: ChainOptions): QueryUtil<U>;
+    static create<U extends Record<string, RouteOpts$1>>(value: U, opts?: ChainOptions): QueryUtil<U>;
+    get<K extends keyof T>(key: K): RouteOpts$1;
+    chain<K extends keyof T>(key: K, opts?: ChainOptions): Chain;
+    queryChain<K extends keyof T>(key: K): (queryData?: Record<string, any>) => RouteOpts$1;
+}
+
 type RouterHandle = (msg: {
     path: string;
     [key: string]: any;
@@ -647,5 +690,5 @@ declare class App<T = {}, U = AppReqRes> {
     throw(code?: number | string, message?: string, tips?: string): void;
 }
 
-export { App, Connect, CustomError, QueryConnect, QueryRouter, QueryRouterServer, Route, Server, createSchema, handleServer };
-export type { RouteContext, RouteMiddleware, RouteOpts, Rule, Run };
+export { App, Connect, CustomError, QueryConnect, QueryRouter, QueryRouterServer, QueryUtil, Route, Server, createSchema, define, handleServer, util };
+export type { RouteArray, RouteContext, RouteMiddleware, RouteObject, RouteOpts, Rule, Run };

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,
@@ -11938,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 的处理
  */
@@ -12010,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.16",
+  "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

@@ -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/router-define.ts

@@ -1,5 +1,4 @@
-// import type { QueryRouterServer, Route, RouteOpts, Run } from '@kevisual/router';
-import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from './index.ts';
+import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from '@kevisual/router';
 
 // export type RouteObject<T extends readonly string[]> = {
 //   [K in T[number]]: RouteOpts;
@@ -99,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,