npm - @kevisual/router - Versions diffs - 0.0.8-alpha.1 → 0.0.8-alpha.3 - Mend

@kevisual/router 0.0.8-alpha.1 → 0.0.8-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/router-browser.d.ts CHANGED Viewed

@@ -70,6 +70,11 @@ type RouteContext<T = {
         path: string;
         key?: string;
         payload?: any;
+        [key: string]: any;
+    } | {
+        id: string;
+        apyload?: any;
+        [key: string]: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }) => Promise<any>;
@@ -264,7 +269,8 @@ declare class QueryRouter {
      * @returns
      */
     call(message: {
-        path: string;
+        id?: string;
+        path?: string;
         key?: string;
         payload?: any;
     }, ctx?: RouteContext & {

package/dist/router-browser.js CHANGED Viewed

@@ -4513,9 +4513,12 @@ const schemaFormRule = (rule) => {
 };
 const createSchema = (rule) => {
     try {
-        rule.required = rule.required || false;
+        rule.required = rule.required ?? false;
         if (!rule.required) {
-            return schemaFormRule(rule).nullable();
+            // nullable is null
+            // nullish is null or undefined
+            // optional is undefined
+            return schemaFormRule(rule).optional();
         }
         return schemaFormRule(rule);
     }
@@ -5673,15 +5676,20 @@ class Route {
         this.isDebug = opts?.isDebug ?? false;
     }
     createSchema() {
-        const validator = this.validator;
-        const keys = Object.keys(validator || {});
-        const schemaList = keys.map((key) => {
-            return { [key]: createSchema(validator[key]) };
-        });
-        const schema = schemaList.reduce((prev, current) => {
-            return { ...prev, ...current };
-        }, {});
-        this.schema = schema;
+        try {
+            const validator = this.validator;
+            const keys = Object.keys(validator || {});
+            const schemaList = keys.map((key) => {
+                return { [key]: createSchema(validator[key]) };
+            });
+            const schema = schemaList.reduce((prev, current) => {
+                return { ...prev, ...current };
+            }, {});
+            this.schema = schema;
+        }
+        catch (e) {
+            console.error('createSchema error:', e);
+        }
     }
     /**
      * set validator and create schema
@@ -6065,7 +6073,24 @@ class QueryRouter {
      * @returns
      */
     async call(message, ctx) {
-        return await this.parse(message, { ...this.context, ...ctx });
+        let path = message.path;
+        message.key;
+        if (message.id) {
+            const route = this.routes.find((r) => r.id === message.id);
+            if (route) {
+                path = route.path;
+                route.key;
+            }
+            else {
+                return { code: 404, body: null, message: 'Not found route' };
+            }
+        }
+        else if (path) {
+            return await this.parse({ ...message, path }, { ...this.context, ...ctx });
+        }
+        else {
+            return { code: 404, body: null, message: 'Not found path' };
+        }
     }
     /**
      * 请求 result 的数据

package/dist/router.d.ts CHANGED Viewed

@@ -75,6 +75,11 @@ type RouteContext<T = {
         path: string;
         key?: string;
         payload?: any;
+        [key: string]: any;
+    } | {
+        id: string;
+        apyload?: any;
+        [key: string]: any;
     }, ctx?: RouteContext & {
         [key: string]: any;
     }) => Promise<any>;
@@ -269,7 +274,8 @@ declare class QueryRouter {
      * @returns
      */
     call(message: {
-        path: string;
+        id?: string;
+        path?: string;
         key?: string;
         payload?: any;
     }, ctx?: RouteContext & {

package/dist/router.js CHANGED Viewed

@@ -4532,9 +4532,12 @@ const schemaFormRule = (rule) => {
 };
 const createSchema = (rule) => {
     try {
-        rule.required = rule.required || false;
+        rule.required = rule.required ?? false;
         if (!rule.required) {
-            return schemaFormRule(rule).nullable();
+            // nullable is null
+            // nullish is null or undefined
+            // optional is undefined
+            return schemaFormRule(rule).optional();
         }
         return schemaFormRule(rule);
     }
@@ -5692,15 +5695,20 @@ class Route {
         this.isDebug = opts?.isDebug ?? false;
     }
     createSchema() {
-        const validator = this.validator;
-        const keys = Object.keys(validator || {});
-        const schemaList = keys.map((key) => {
-            return { [key]: createSchema(validator[key]) };
-        });
-        const schema = schemaList.reduce((prev, current) => {
-            return { ...prev, ...current };
-        }, {});
-        this.schema = schema;
+        try {
+            const validator = this.validator;
+            const keys = Object.keys(validator || {});
+            const schemaList = keys.map((key) => {
+                return { [key]: createSchema(validator[key]) };
+            });
+            const schema = schemaList.reduce((prev, current) => {
+                return { ...prev, ...current };
+            }, {});
+            this.schema = schema;
+        }
+        catch (e) {
+            console.error('createSchema error:', e);
+        }
     }
     /**
      * set validator and create schema
@@ -6084,7 +6092,24 @@ class QueryRouter {
      * @returns
      */
     async call(message, ctx) {
-        return await this.parse(message, { ...this.context, ...ctx });
+        let path = message.path;
+        message.key;
+        if (message.id) {
+            const route = this.routes.find((r) => r.id === message.id);
+            if (route) {
+                path = route.path;
+                route.key;
+            }
+            else {
+                return { code: 404, body: null, message: 'Not found route' };
+            }
+        }
+        else if (path) {
+            return await this.parse({ ...message, path }, { ...this.context, ...ctx });
+        }
+        else {
+            return { code: 404, body: null, message: 'Not found path' };
+        }
     }
     /**
      * 请求 result 的数据

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.8-alpha.1",
+  "version": "0.0.8-alpha.3",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",