@kevisual/router 0.0.70 → 0.0.72

package/package.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
   "types": "./dist/router.d.ts",
   "scripts": {
-    "build": "npm run clean && rollup -c",
-    "watch": "rollup -c -w",
+    "build": "npm run clean && bun bun.config.ts",
+    "watch": "bun bun.config.ts --watch",
     "clean": "rm -rf dist"
   },
   "files": [
@@ -21,36 +21,27 @@
   "keywords": [],
   "author": "abearxiong",
   "license": "MIT",
-  "packageManager": "pnpm@10.28.2",
+  "packageManager": "pnpm@10.29.3",
   "devDependencies": {
-    "@kevisual/context": "^0.0.4",
-    "@kevisual/dts": "^0.0.3",
+    "@kevisual/code-builder": "^0.0.6",
+    "@kevisual/context": "^0.0.6",
+    "@kevisual/dts": "^0.0.4",
     "@kevisual/js-filter": "^0.0.5",
     "@kevisual/local-proxy": "^0.0.8",
-    "@kevisual/query": "^0.0.39",
+    "@kevisual/query": "^0.0.40",
     "@kevisual/use-config": "^1.0.30",
-    "@opencode-ai/plugin": "^1.1.49",
-    "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-commonjs": "29.0.0",
-    "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-typescript": "^12.3.0",
-    "@types/bun": "^1.3.8",
-    "@types/node": "^25.2.0",
+    "@opencode-ai/plugin": "^1.2.6",
+    "@types/bun": "^1.3.9",
+    "@types/node": "^25.2.3",
     "@types/send": "^1.2.1",
     "@types/ws": "^8.18.1",
     "@types/xml2js": "^0.4.14",
     "eventemitter3": "^5.0.4",
     "fast-glob": "^3.3.3",
-    "hono": "^4.11.7",
+    "hono": "^4.11.9",
     "nanoid": "^5.1.6",
     "path-to-regexp": "^8.3.0",
-    "rollup": "^4.57.1",
-    "rollup-plugin-dts": "^6.3.0",
     "send": "^1.2.1",
-    "ts-loader": "^9.5.4",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.8.1",
-    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
@@ -67,41 +58,15 @@
     "access": "public"
   },
   "exports": {
-    ".": {
-      "import": "./dist/router.js",
-      "require": "./dist/router.js",
-      "types": "./dist/router.d.ts"
-    },
-    "./browser": {
-      "import": "./dist/router-browser.js",
-      "require": "./dist/router-browser.js",
-      "types": "./dist/router-browser.d.ts"
-    },
-    "./simple": {
-      "import": "./dist/router-simple.js",
-      "require": "./dist/router-simple.js",
-      "types": "./dist/router-simple.d.ts"
-    },
+    ".": "./dist/router.js",
+    "./browser": "./dist/router-browser.js",
+    "./simple": "./dist/router-simple.js",
     "./opencode": "./dist/opencode.js",
     "./skill": "./dist/app.js",
-    "./define": {
-      "import": "./dist/router-define.js",
-      "require": "./dist/router-define.js",
-      "types": "./dist/router-define.d.ts"
-    },
+    "./define": "./dist/router-define.js",
     "./ws": "./dist/ws.js",
-    "./mod.ts": {
-      "import": "./mod.ts",
-      "require": "./mod.ts",
-      "types": "./mod.d.ts"
-    },
-    "./src/*": {
-      "import": "./src/*",
-      "require": "./src/*"
-    },
-    "./modules/*": {
-      "import": "./src/modules/*",
-      "require": "./src/modules/*"
-    }
+    "./mod.ts": "./mod.ts",
+    "./src/*": "./src/*",
+    "./modules/*": "./src/modules/*"
   }
 }

package/src/app.ts

@@ -6,7 +6,7 @@ import { handleServer } from './server/handle-server.ts';
 import { IncomingMessage, ServerResponse } from 'http';
 import { isBun } from './utils/is-engine.ts';
 import { BunServer } from './server/server-bun.ts';
-import { nanoid } from 'nanoid';
+import { randomId } from './utils/random.ts';
 
 type RouterHandle = (msg: { path: string;[key: string]: any }) => { code: string; data?: any; message?: string;[key: string]: any };
 type AppOptions<T = {}> = {
@@ -48,7 +48,7 @@ export class App<U = {}> extends QueryRouter {
     if (opts?.appId) {
       this.appId = opts.appId;
     } else {
-      this.appId = nanoid(16);
+      this.appId = randomId(16, 'rand-');
     }
     router.appId = this.appId;
   }

package/src/browser.ts

@@ -4,7 +4,7 @@ export type { Rule, Schema, } from './validator/index.ts';
 
 export { createSchema } from './validator/index.ts';
 
-export type { RouteContext, RouteOpts, RouteMiddleware } from './route.ts';
+export type { RouteContext, RouteOpts, RouteInfo, RouteMiddleware } from './route.ts';
 
 export type { Run, Skill } from './route.ts';
 

package/src/index.ts

@@ -4,7 +4,7 @@ export type { Rule, Schema, } from './validator/index.ts';
 
 export { createSchema } from './validator/index.ts';
 
-export type { RouteContext, RouteOpts, RouteMiddleware } from './route.ts';
+export type { RouteContext, RouteOpts, RouteInfo, RouteMiddleware } from './route.ts';
 
 export type { Run, Skill } from './route.ts';
 

package/src/route.ts

@@ -1,10 +1,8 @@
-import { nanoid } from 'nanoid';
 import { CustomError } from './result/error.ts';
 import { pick } from './utils/pick.ts';
 import { listenProcess, MockProcess } from './utils/listen-process.ts';
 import { z } from 'zod';
-import { filter } from '@kevisual/js-filter'
-
+import { randomId } from './utils/random.ts';
 export type RouterContextT = { code?: number;[key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
   /**
@@ -14,6 +12,7 @@ export type RouteContext<T = { code?: number }, S = any> = {
   appId?: string;
   // run first
   query?: { [key: string]: any };
+  args?: { [key: string]: any };
   // response body
   /** return body */
   body?: number | string | Object;
@@ -114,6 +113,7 @@ export const createSkill = <T = SimpleObject>(skill: Skill<T>): Skill<T> => {
 }
 
 export type RouteInfo = Pick<Route, (typeof pickValue)[number]>;
+
 export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleObject> {
   /**
    * 一级路径
@@ -137,14 +137,14 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
   isDebug?: boolean;
   constructor(path: string = '', key: string = '', opts?: RouteOpts) {
     if (!path) {
-      path = nanoid(8)
+      path = randomId(8, 'rand-');
     }
     path = path.trim();
     key = key.trim();
     this.path = path;
     this.key = key;
     if (opts) {
-      this.id = opts.id || nanoid();
+      this.id = opts.id || randomId(12, 'rand-');
       if (!opts.id && opts.idUsePath) {
         const delimiter = opts.delimiter ?? '$#$';
         this.id = path + delimiter + key;
@@ -159,7 +159,7 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
       this.path = opts.path || path;
     } else {
       this.middleware = [];
-      this.id = nanoid();
+      this.id = randomId(12, 'rand-');
     }
     this.isDebug = opts?.isDebug ?? false;
   }
@@ -215,10 +215,10 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
     return this;
   }
 
-  update(opts: DefineRouteOpts, checkList?: string[]): this {
+  update(opts: DefineRouteOpts, onlyUpdateList?: string[]): this {
     const keys = Object.keys(opts);
     const defaultCheckList = ['path', 'key', 'run', 'nextRoute', 'description', 'metadata', 'middleware', 'type', 'isDebug'];
-    checkList = checkList || defaultCheckList;
+    const checkList = onlyUpdateList || defaultCheckList;
     for (let item of keys) {
       if (!checkList.includes(item)) {
         continue;
@@ -316,8 +316,8 @@ export class QueryRouter {
    * remove route by id
    * @param uniqueId
    */
-  removeById(unique: string) {
-    this.routes = this.routes.filter((r) => r.id !== unique);
+  removeById(uniqueId: string) {
+    this.routes = this.routes.filter((r) => r.id !== uniqueId);
   }
   /**
    * 执行route
@@ -405,15 +405,15 @@ export class QueryRouter {
               console.error('=====debug====:middlerware error');
               console.error('=====debug====:', e);
               console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
-              console.error('=====debug====:', e.message);
             }
             if (e instanceof CustomError || e?.code) {
               ctx.code = e.code;
               ctx.message = e.message;
               ctx.body = null;
             } else {
-              console.error(`fn:${route.path}-${route.key}:${route.id}`);
-              console.error(`middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(e)
               ctx.code = 500;
               ctx.message = 'Internal Server Error';
               ctx.body = null;
@@ -432,14 +432,16 @@ export class QueryRouter {
           await route.run(ctx as Required<RouteContext>);
         } catch (e) {
           if (route?.isDebug) {
-            console.error('=====debug====:', 'router run error:', e.message);
+            console.error('=====debug====:route error');
+            console.error('=====debug====:', e);
+            console.error('=====debug====:[path:key]:', `${route.path}-${route.key}`);
           }
           if (e instanceof CustomError) {
             ctx.code = e.code;
             ctx.message = e.message;
           } else {
-            console.error(`[error]fn:${route.path}-${route.key}:${route.id}`);
-            console.error('error', e.message);
+            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+            console.error(`[router error] error`, e);
             ctx.code = 500;
             ctx.message = 'Internal Server Error';
           }
@@ -469,6 +471,7 @@ export class QueryRouter {
             return ctx;
           }
           ctx.query = { ...ctx.query, ...ctx.nextQuery };
+          ctx.args = ctx.query;
           ctx.nextQuery = {};
           return await this.runRoute(path, key, ctx);
         }
@@ -496,6 +499,7 @@ export class QueryRouter {
     const { path, key = '', payload = {}, ...query } = message;
     ctx = ctx || {};
     ctx.query = { ...ctx.query, ...query, ...payload };
+    ctx.args = ctx.query;
     ctx.state = { ...ctx?.state };
     ctx.throw = this.throw;
     ctx.app = this;
@@ -720,7 +724,7 @@ export class QueryRouterServer extends QueryRouter {
     if (opts?.appId) {
       this.appId = opts.appId;
     } else {
-      this.appId = nanoid(16);
+      this.appId = randomId(16);
     }
   }
   setHandle(wrapperFn?: HandleFn, ctx?: RouteContext) {

package/src/router-define.ts

@@ -1,4 +1,4 @@
-import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from '@kevisual/router';
+import type { QueryRouterServer, RouteOpts, Run, RouteMiddleware } from './route.ts';
 import type { DataOpts, Query, Result } from '@kevisual/query/query';
 // export type RouteObject<T extends readonly string[]> = {
 //   [K in T[number]]: RouteOpts;

package/src/utils/random.ts

@@ -0,0 +1,8 @@
+import { customAlphabet } from 'nanoid';
+
+const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz', 16);
+
+export const randomId = (length: number = 8, affix: string = '') => {
+  return affix + nanoid(length);
+}
+export { nanoid };