@kevisual/router 0.0.33 → 0.0.35

package/dist/router-browser.d.ts

@@ -171,7 +171,6 @@ declare class Route<U = {
      */
     key?: string;
     id?: string;
-    share?: boolean;
     run?: Run;
     nextRoute?: NextRoute;
     description?: string;
@@ -313,6 +312,7 @@ declare class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     queryRoute(message: {
@@ -327,6 +327,24 @@ declare class QueryRouter {
         data: any;
         message: any;
     }>;
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    run(message: {
+        id?: string;
+        path?: string;
+        key?: string;
+        payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
+    }): Promise<{
+        code: any;
+        data: any;
+        message: any;
+    }>;
     /**
      * 设置上下文
      * @description 这里的上下文是为了在handle函数中使用
@@ -418,7 +436,7 @@ declare class QueryRouterServer extends QueryRouter {
     prompt(description: string): Route<Required<RouteContext>>;
     prompt(description: Function): Route<Required<RouteContext>>;
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
@@ -426,9 +444,12 @@ declare class QueryRouterServer extends QueryRouter {
         path: string;
         key?: string;
         payload?: any;
+    }, ctx?: RouteContext & {
+        [key: string]: any;
     }): Promise<any>;
 }
-declare const Mini: typeof QueryRouterServer;
+declare class Mini extends QueryRouterServer {
+}
 
 /** 自定义错误 */
 declare class CustomError extends Error {

package/dist/router-browser.js

@@ -97,21 +97,30 @@ try {
 /** A special constant with type `never` */
 function $constructor(name, initializer, params) {
     function init(inst, def) {
-        var _a;
-        Object.defineProperty(inst, "_zod", {
-            value: inst._zod ?? {},
-            enumerable: false,
-        });
-        (_a = inst._zod).traits ?? (_a.traits = new Set());
+        if (!inst._zod) {
+            Object.defineProperty(inst, "_zod", {
+                value: {
+                    def,
+                    constr: _,
+                    traits: new Set(),
+                },
+                enumerable: false,
+            });
+        }
+        if (inst._zod.traits.has(name)) {
+            return;
+        }
         inst._zod.traits.add(name);
         initializer(inst, def);
         // support prototype modifications
-        for (const k in _.prototype) {
-            if (!(k in inst))
-                Object.defineProperty(inst, k, { value: _.prototype[k].bind(inst) });
+        const proto = _.prototype;
+        const keys = Object.keys(proto);
+        for (let i = 0; i < keys.length; i++) {
+            const k = keys[i];
+            if (!(k in inst)) {
+                inst[k] = proto[k].bind(inst);
+            }
         }
-        inst._zod.constr = _;
-        inst._zod.def = def;
     }
     // doesn't work if Parent has a constructor with arguments
     const Parent = params?.Parent ?? Object;
@@ -246,6 +255,14 @@ function mergeDefs(...defs) {
 function esc(str) {
     return JSON.stringify(str);
 }
+function slugify(input) {
+    return input
+        .toLowerCase()
+        .trim()
+        .replace(/[^\w\s-]/g, "")
+        .replace(/[\s_-]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+}
 const captureStackTrace = ("captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => { });
 function isObject$1(data) {
     return typeof data === "object" && data !== null && !Array.isArray(data);
@@ -271,6 +288,8 @@ function isPlainObject(o) {
     const ctor = o.constructor;
     if (ctor === undefined)
         return true;
+    if (typeof ctor !== "function")
+        return true;
     // modified prototype
     const prot = ctor.prototype;
     if (isObject$1(prot) === false)
@@ -734,9 +753,6 @@ const cidrv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|::|([0-9a-fA-F]{1,4})?:
 // https://stackoverflow.com/questions/7860392/determine-if-string-is-in-base64-using-javascript
 const base64 = /^$|^(?:[0-9a-zA-Z+/]{4})*(?:(?:[0-9a-zA-Z+/]{2}==)|(?:[0-9a-zA-Z+/]{3}=))?$/;
 const base64url = /^[A-Za-z0-9_-]*$/;
-// based on https://stackoverflow.com/questions/106179/regular-expression-to-match-dns-hostname-or-ip-address
-// export const hostname: RegExp = /^([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+$/;
-const hostname = /^(?=.{1,253}\.?$)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[-0-9a-zA-Z]{0,61}[0-9a-zA-Z])?)*\.?$/;
 // https://blog.stevenlevithan.com/archives/validate-phone-number#r4-3 (regex sans spaces)
 const e164 = /^\+(?:[0-9]){6,14}[0-9]$/;
 // const dateSource = `((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))`;
@@ -1227,7 +1243,7 @@ class Doc {
 const version = {
     major: 4,
     minor: 1,
-    patch: 12,
+    patch: 13,
 };
 
 const $ZodType = /*@__PURE__*/ $constructor("$ZodType", (inst, def) => {
@@ -1430,7 +1446,7 @@ const $ZodURL = /*@__PURE__*/ $constructor("$ZodURL", (inst, def) => {
                         code: "invalid_format",
                         format: "url",
                         note: "Invalid hostname",
-                        pattern: hostname.source,
+                        pattern: def.hostname.source,
                         input: payload.value,
                         inst,
                         continue: !def.abort,
@@ -1520,18 +1536,12 @@ const $ZodISODuration = /*@__PURE__*/ $constructor("$ZodISODuration", (inst, def
 const $ZodIPv4 = /*@__PURE__*/ $constructor("$ZodIPv4", (inst, def) => {
     def.pattern ?? (def.pattern = ipv4);
     $ZodStringFormat.init(inst, def);
-    inst._zod.onattach.push((inst) => {
-        const bag = inst._zod.bag;
-        bag.format = `ipv4`;
-    });
+    inst._zod.bag.format = `ipv4`;
 });
 const $ZodIPv6 = /*@__PURE__*/ $constructor("$ZodIPv6", (inst, def) => {
     def.pattern ?? (def.pattern = ipv6);
     $ZodStringFormat.init(inst, def);
-    inst._zod.onattach.push((inst) => {
-        const bag = inst._zod.bag;
-        bag.format = `ipv6`;
-    });
+    inst._zod.bag.format = `ipv6`;
     inst._zod.check = (payload) => {
         try {
             // @ts-ignore
@@ -1601,9 +1611,7 @@ function isValidBase64(data) {
 const $ZodBase64 = /*@__PURE__*/ $constructor("$ZodBase64", (inst, def) => {
     def.pattern ?? (def.pattern = base64);
     $ZodStringFormat.init(inst, def);
-    inst._zod.onattach.push((inst) => {
-        inst._zod.bag.contentEncoding = "base64";
-    });
+    inst._zod.bag.contentEncoding = "base64";
     inst._zod.check = (payload) => {
         if (isValidBase64(payload.value))
             return;
@@ -1627,9 +1635,7 @@ function isValidBase64URL(data) {
 const $ZodBase64URL = /*@__PURE__*/ $constructor("$ZodBase64URL", (inst, def) => {
     def.pattern ?? (def.pattern = base64url);
     $ZodStringFormat.init(inst, def);
-    inst._zod.onattach.push((inst) => {
-        inst._zod.bag.contentEncoding = "base64url";
-    });
+    inst._zod.bag.contentEncoding = "base64url";
     inst._zod.check = (payload) => {
         if (isValidBase64URL(payload.value))
             return;
@@ -1713,9 +1719,9 @@ const $ZodNumber = /*@__PURE__*/ $constructor("$ZodNumber", (inst, def) => {
         return payload;
     };
 });
-const $ZodNumberFormat = /*@__PURE__*/ $constructor("$ZodNumber", (inst, def) => {
+const $ZodNumberFormat = /*@__PURE__*/ $constructor("$ZodNumberFormat", (inst, def) => {
     $ZodCheckNumberFormat.init(inst, def);
-    $ZodNumber.init(inst, def); // no format checksp
+    $ZodNumber.init(inst, def); // no format checks
 });
 const $ZodBoolean = /*@__PURE__*/ $constructor("$ZodBoolean", (inst, def) => {
     $ZodType.init(inst, def);
@@ -1833,7 +1839,7 @@ function handleCatchall(proms, input, payload, ctx, def, inst) {
     const keySet = def.keySet;
     const _catchall = def.catchall._zod;
     const t = _catchall.def.type;
-    for (const key of Object.keys(input)) {
+    for (const key in input) {
         if (keySet.has(key))
             continue;
         if (t === "never") {
@@ -2387,8 +2393,8 @@ const $ZodReadonly = /*@__PURE__*/ $constructor("$ZodReadonly", (inst, def) => {
     $ZodType.init(inst, def);
     defineLazy(inst._zod, "propValues", () => def.innerType._zod.propValues);
     defineLazy(inst._zod, "values", () => def.innerType._zod.values);
-    defineLazy(inst._zod, "optin", () => def.innerType._zod.optin);
-    defineLazy(inst._zod, "optout", () => def.innerType._zod.optout);
+    defineLazy(inst._zod, "optin", () => def.innerType?._zod?.optin);
+    defineLazy(inst._zod, "optout", () => def.innerType?._zod?.optout);
     inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
             return def.innerType._zod.run(payload, ctx);
@@ -2436,6 +2442,7 @@ function handleRefineResult(result, payload, input, inst) {
     }
 }
 
+var _a;
 class $ZodRegistry {
     constructor() {
         this._map = new WeakMap();
@@ -2485,7 +2492,8 @@ class $ZodRegistry {
 function registry() {
     return new $ZodRegistry();
 }
-const globalRegistry = /*@__PURE__*/ registry();
+(_a = globalThis).__zod_globalRegistry ?? (_a.__zod_globalRegistry = registry());
+const globalRegistry = globalThis.__zod_globalRegistry;
 
 function _string(Class, params) {
     return new Class({
@@ -2897,6 +2905,10 @@ function _toLowerCase() {
 function _toUpperCase() {
     return _overwrite((input) => input.toUpperCase());
 }
+// slugify
+function _slugify() {
+    return _overwrite((input) => slugify(input));
+}
 function _array(Class, element, params) {
     return new Class({
         type: "array",
@@ -3140,6 +3152,7 @@ const _ZodString = /*@__PURE__*/ $constructor("_ZodString", (inst, def) => {
     inst.normalize = (...args) => inst.check(_normalize(...args));
     inst.toLowerCase = () => inst.check(_toLowerCase());
     inst.toUpperCase = () => inst.check(_toUpperCase());
+    inst.slugify = () => inst.check(_slugify());
 });
 const ZodString = /*@__PURE__*/ $constructor("ZodString", (inst, def) => {
     $ZodString.init(inst, def);
@@ -4799,7 +4812,6 @@ class Route {
      */
     key;
     id;
-    share = false;
     run;
     nextRoute; // route to run after this route
     description;
@@ -5276,9 +5288,7 @@ class QueryRouter {
         ctx.query = { ...ctx.query, ...query, ...payload };
         ctx.state = { ...ctx?.state };
         ctx.throw = this.throw;
-        // put queryRouter to ctx
-        // TODO: 是否需要queryRouter，函数内部处理router路由执行，这应该是避免去内部去包含的功能过
-        ctx.queryRouter = this;
+        ctx.app = this;
         ctx.call = this.call.bind(this);
         ctx.queryRoute = this.queryRoute.bind(this);
         ctx.index = 0;
@@ -5299,7 +5309,11 @@ class QueryRouter {
     async call(message, ctx) {
         let path = message.path;
         let key = message.key;
-        if (message.id) {
+        // 优先 path + key
+        if (path) {
+            return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
+        }
+        else if (message.id) {
             const route = this.routes.find((r) => r.id === message.id);
             if (route) {
                 path = route.path;
@@ -5310,9 +5324,6 @@ class QueryRouter {
             }
             return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
         }
-        else if (path) {
-            return await this.parse({ ...message, path, key }, { ...this.context, ...ctx });
-        }
         else {
             return { code: 404, body: null, message: 'Not found path' };
         }
@@ -5321,10 +5332,25 @@ class QueryRouter {
      * 请求 result 的数据
      * @param message
      * @param ctx
+     * @deprecated use run or call instead
      * @returns
      */
     async queryRoute(message, ctx) {
-        const res = await this.parse(message, { ...this.context, ...ctx });
+        const res = await this.call(message, { ...this.context, ...ctx });
+        return {
+            code: res.code,
+            data: res.body,
+            message: res.message,
+        };
+    }
+    /**
+     * Router Run获取数据
+     * @param message
+     * @param ctx
+     * @returns
+     */
+    async run(message, ctx) {
+        const res = await this.call(message, { ...this.context, ...ctx });
         return {
             code: res.code,
             data: res.body,
@@ -5351,18 +5377,7 @@ class QueryRouter {
         return async (msg, handleContext) => {
             try {
                 const context = { ...ctx, ...handleContext };
-                if (msg.id) {
-                    const route = router.routes.find((r) => r.id === msg.id);
-                    if (route) {
-                        msg.path = route.path;
-                        msg.key = route.key;
-                    }
-                    else {
-                        return { code: 404, message: 'Not found route' };
-                    }
-                }
-                // @ts-ignore
-                const res = await router.parse(msg, context);
+                const res = await router.call(msg, context);
                 if (wrapperFn) {
                     res.data = res.body;
                     return wrapperFn(res, context);
@@ -5474,37 +5489,21 @@ class QueryRouterServer extends QueryRouter {
         return new Route('', '', { description });
     }
     /**
-     * 等于queryRoute，但是调用了handle
+     * 调用了handle
      * @param param0
      * @returns
      */
-    async run({ path, key, payload }) {
+    async run({ path, key, payload }, ctx) {
         const handle = this.handle;
-        const resultError = (error, code = 500) => {
-            const r = {
-                code: code,
-                message: error,
-            };
-            return r;
-        };
-        try {
-            const end = handle({ path, key, ...payload });
-            return end;
-        }
-        catch (e) {
-            if (e.code && typeof e.code === 'number') {
-                return {
-                    code: e.code,
-                    message: e.message,
-                };
-            }
-            else {
-                return resultError('Router Server error');
-            }
+        if (handle) {
+            const result = await this.call({ path, key, payload }, ctx);
+            return handle(result);
         }
+        return super.run({ path, key, payload }, ctx);
     }
 }
-const Mini = QueryRouterServer;
+class Mini extends QueryRouterServer {
+}
 
 const parseBody = async (req) => {
     return new Promise((resolve, reject) => {

package/dist/router-sign.d.ts

@@ -8,8 +8,8 @@ type AltNames = {
     ip?: string;
 };
 declare const createCert: (attrs?: Attributes[], altNames?: AltNames[]) => {
-    key: string;
-    cert: string;
+    key: any;
+    cert: any;
 };
 
 export { createCert };