@kevisual/cli 0.1.31 → 0.1.33

package/dist/assistant.js

@@ -37219,7 +37219,7 @@ class Query {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+router@0.1.6/node_modules/@kevisual/router/dist/router-browser.js
+// ../node_modules/.pnpm/@kevisual+router@0.2.2/node_modules/@kevisual/router/dist/router-browser.js
 var __create3 = Object.create;
 var __getProtoOf3 = Object.getPrototypeOf;
 var __defProp3 = Object.defineProperty;
@@ -70036,7 +70036,7 @@ function filter(data, query) {
   return executor.execute(ast, data);
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.64_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
+// ../node_modules/.pnpm/@kevisual+api@0.0.65_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/query/query-proxy/router-api-proxy.ts
 var initApi = async (opts) => {
   const router = opts?.router;
   const item = opts?.item;
@@ -70224,7 +70224,7 @@ var getStringHash = (str) => {
   return crypto2.createHash("md5").update(str).digest("hex");
 };
 
-// ../node_modules/.pnpm/@kevisual+router@0.1.6/node_modules/@kevisual/router/dist/router.js
+// ../node_modules/.pnpm/@kevisual+router@0.2.2/node_modules/@kevisual/router/dist/router.js
 import { createRequire as createRequire3 } from "node:module";
 import { webcrypto as crypto3 } from "node:crypto";
 import http from "node:http";
@@ -87473,11 +87473,11 @@ var fromJSONSchema22 = (args2 = {}, opts) => {
   }
   return resultArgs;
 };
-var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
+var pickValue = ["path", "key", "rid", "description", "type", "middleware", "metadata"];
 class Route {
   path;
   key;
-  id;
+  rid;
   run;
   nextRoute;
   description;
@@ -87495,7 +87495,7 @@ class Route {
     this.key = key;
     const pathKey = `${path7}$$${key}`;
     if (opts) {
-      this.id = opts.id || hashIdMd5Sync(pathKey);
+      this.rid = opts.rid || hashIdMd5Sync(pathKey);
       this.run = opts.run;
       this.nextRoute = opts.nextRoute;
       this.description = opts.description;
@@ -87507,8 +87507,8 @@ class Route {
     } else {
       this.middleware = [];
     }
-    if (!this.id) {
-      this.id = hashIdMd5Sync(pathKey);
+    if (!this.rid) {
+      this.rid = hashIdMd5Sync(pathKey);
     }
     this.isDebug = opts?.isDebug ?? false;
   }
@@ -87614,14 +87614,14 @@ class QueryRouter {
     this.routes = this.routes.filter((r) => r.path === route.path && r.key == route.key);
   }
   removeById(uniqueId) {
-    this.routes = this.routes.filter((r) => r.id !== uniqueId);
+    this.routes = this.routes.filter((r) => r.rid !== uniqueId);
   }
   async runRoute(path7, key, ctx) {
     const route = this.routes.find((r) => r.path === path7 && r.key === key);
     const maxNextRoute = this.maxNextRoute;
     ctx = ctx || {};
     ctx.currentPath = path7;
-    ctx.currentId = route?.id;
+    ctx.currentId = route?.rid;
     ctx.currentKey = key;
     ctx.currentRoute = route;
     ctx.index = (ctx.index || 0) + 1;
@@ -87648,11 +87648,11 @@ class QueryRouter {
           let route2;
           const isString22 = typeof item === "string";
           if (isString22) {
-            route2 = this.routes.find((r) => r.id === item);
+            route2 = this.routes.find((r) => r.rid === item);
           } else {
             route2 = this.routes.find((r) => {
-              if (item.id) {
-                return r.id === item.id;
+              if (item.rid) {
+                return r.rid === item.rid;
               } else {
                 return r.path === item.path && r.key == item.key;
               }
@@ -87701,8 +87701,8 @@ class QueryRouter {
               ctx.message = e.message;
               ctx.body = null;
             } else {
-              console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
-              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.id}`);
+              console.error(`[router error] fn:${route.path}-${route.key}:${route.rid}`);
+              console.error(`[router error] middleware:${middleware.path}-${middleware.key}:${middleware.rid}`);
               console.error(e);
               ctx.code = 500;
               ctx.message = "Internal Server Error";
@@ -87730,7 +87730,7 @@ class QueryRouter {
             ctx.code = e.code;
             ctx.message = e.message;
           } else {
-            console.error(`[router error] fn:${route.path}-${route.key}:${route.id}`);
+            console.error(`[router error] fn:${route.path}-${route.key}:${route.rid}`);
             console.error(`[router error] error`, e);
             ctx.code = 500;
             ctx.message = "Internal Server Error";
@@ -87746,8 +87746,8 @@ class QueryRouter {
           if (route.nextRoute.path || route.nextRoute.key) {
             path22 = route.nextRoute.path;
             key2 = route.nextRoute.key;
-          } else if (route.nextRoute.id) {
-            const nextRoute = this.routes.find((r) => r.id === route.nextRoute.id);
+          } else if (route.nextRoute.rid) {
+            const nextRoute = this.routes.find((r) => r.rid === route.nextRoute.rid);
             if (nextRoute) {
               path22 = nextRoute.path;
               key2 = nextRoute.key;
@@ -87811,8 +87811,8 @@ class QueryRouter {
     let key = message.key;
     if (path7) {
       return await this.parse({ ...message, path: path7, key }, { ...this.context, ...ctx });
-    } else if (message.id) {
-      const route = this.routes.find((r) => r.id === message.id);
+    } else if (message.rid) {
+      const route = this.routes.find((r) => r.rid === message.rid);
       if (route) {
         path7 = route.path;
         key = route.key;
@@ -87885,10 +87885,10 @@ class QueryRouter {
     return this.routes.find((r) => r.path === path7 && r.key === key);
   }
   findRoute(opts) {
-    const { path: path7, key, id } = opts || {};
+    const { path: path7, key, rid } = opts || {};
     return this.routes.find((r) => {
-      if (id) {
-        return r.id === id;
+      if (rid) {
+        return r.rid === rid;
       }
       if (path7) {
         if (key !== undefined) {
@@ -87909,14 +87909,14 @@ class QueryRouter {
           const tokenUser = ctx.state;
           let isUser = !!tokenUser;
           const list4 = this.getList(opts?.filter).filter((item) => {
-            if (item.id === "auth" || item.id === "auth-can" || item.id === "check-auth-admin" || item.id === "auth-admin") {
+            if (item.rid === "auth" || item.rid === "auth-can" || item.rid === "check-auth-admin" || item.rid === "auth-admin") {
               return false;
             }
             return true;
           });
           ctx.body = {
             list: list4.map((item) => {
-              const route = pick2(item, ["id", "path", "key", "description", "middleware", "metadata"]);
+              const route = pick2(item, ["rid", "path", "key", "description", "middleware", "metadata"]);
               return toJSONSchemaRoute(route);
             }),
             isUser
@@ -87986,14 +87986,14 @@ class QueryRouterServer2 extends QueryRouter {
     return super.run(msg, ctx);
   }
   async runAction(api2, payload, ctx) {
-    const { path: path7, key, id } = api2;
-    return this.run({ path: path7, key, id, payload }, ctx);
+    const { path: path7, key, rid } = api2;
+    return this.run({ path: path7, key, rid, payload }, ctx);
   }
   async createAuth(fun) {
     this.route({
       path: "auth",
       key: "auth",
-      id: "auth",
+      rid: "auth",
       description: "token验证"
     }).define(async (ctx) => {
       if (fun) {
@@ -88003,7 +88003,7 @@ class QueryRouterServer2 extends QueryRouter {
     this.route({
       path: "auth-admin",
       key: "auth-admin",
-      id: "auth-admin",
+      rid: "auth-admin",
       description: "admin token验证",
       middleware: ["auth"]
     }).define(async (ctx) => {
@@ -88014,7 +88014,7 @@ class QueryRouterServer2 extends QueryRouter {
     this.route({
       path: "auth-can",
       key: "auth-can",
-      id: "auth-can",
+      rid: "auth-can",
       description: "权限验证"
     }).define(async (ctx) => {
       if (fun) {
@@ -88946,7 +88946,7 @@ class App extends QueryRouterServer2 {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+router@0.1.6/node_modules/@kevisual/router/dist/router-simple.js
+// ../node_modules/.pnpm/@kevisual+router@0.2.2/node_modules/@kevisual/router/dist/router-simple.js
 import url5 from "node:url";
 var __create5 = Object.create;
 var __getProtoOf5 = Object.getPrototypeOf;
@@ -90751,7 +90751,7 @@ ${line}`;
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+api@0.0.64_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
+// ../node_modules/.pnpm/@kevisual+api@0.0.65_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/@kevisual/api/dist/query-login-node.js
 import { homedir as homedir2 } from "node:os";
 import { join, dirname } from "node:path";
 import fs12 from "node:fs";
@@ -90761,15 +90761,29 @@ var __getProtoOf6 = Object.getPrototypeOf;
 var __defProp6 = Object.defineProperty;
 var __getOwnPropNames6 = Object.getOwnPropertyNames;
 var __hasOwnProp6 = Object.prototype.hasOwnProperty;
+function __accessProp5(key) {
+  return this[key];
+}
+var __toESMCache_node5;
+var __toESMCache_esm5;
 var __toESM6 = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node5 ??= new WeakMap : __toESMCache_esm5 ??= new WeakMap;
+    var cached3 = cache.get(mod);
+    if (cached3)
+      return cached3;
+  }
   target = mod != null ? __create6(__getProtoOf6(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp6(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames6(mod))
     if (!__hasOwnProp6.call(to, key))
       __defProp6(to, key, {
-        get: () => mod[key],
+        get: __accessProp5.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS6 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
@@ -91151,10 +91165,6 @@ class Query3 {
           });
         }
       }
-      const headers2 = req.headers || {};
-      if (options?.token && !headers2["Authorization"]) {
-        headers2["Authorization"] = `Bearer ${options.token}`;
-      }
     } catch (e) {
       console.error("request beforeFn error", e, req);
       return wrapperError3({
@@ -91215,20 +91225,20 @@ class Query3 {
     this.afterResponse = fn;
   }
   async fetchText(urlOrOptions, options) {
-    let _options = { method: "GET", ...options };
+    let _options = { ...options };
     if (typeof urlOrOptions === "string" && !_options.url) {
       _options.url = urlOrOptions;
     }
     if (typeof urlOrOptions === "object") {
       _options = { ...urlOrOptions, ..._options };
     }
-    const headers = { ...this.headers, ..._options.headers };
-    if (options?.token && !headers["Authorization"] && _options.method !== "GET") {
-      headers["Authorization"] = `Bearer ${options.token}`;
-    }
     const res = await adapter3({
+      method: "GET",
       ..._options,
-      headers
+      headers: {
+        ...this.headers,
+        ..._options?.headers || {}
+      }
     });
     if (res && !res.code) {
       return {
@@ -92097,6 +92107,9 @@ class QueryLogin extends BaseQuery {
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;
+      } else {
+        this.storage.removeItem("token");
+        await this.cacheStore.clearCurrentUser();
       }
       return null;
     }