@kevisual/query 0.0.41 → 0.0.43

package/dist/query-api.d.ts

@@ -220,6 +220,18 @@ type RouteInfo = {
     metadata?: {
         summary?: string;
         args?: Record<string, any>;
+        viewItem?: {
+            type?: string;
+            api?: {
+                query?: any;
+            };
+            worker?: {
+                worker?: any;
+            };
+            context?: {
+                router?: any;
+            };
+        };
     };
 };
 declare const createQueryByRoutes: (list: RouteInfo[]) => string;
@@ -254,9 +266,15 @@ type InferFromJSONSchema<T> = T extends {
 } : T extends {
     type: "array";
     items: infer I;
-} ? Array<InferFromJSONSchema<I>> : unknown;
+} ? Array<InferFromJSONSchema<I>> : T extends Record<string, any> ? T extends {
+    properties: infer P;
+} ? {
+    [K in keyof P]: InferFromJSONSchema<P[K]>;
+} : unknown : unknown;
 type InferType<T> = T extends z.ZodType<infer U> ? U : T extends {
     type: infer TType;
+} ? InferFromJSONSchema<T> : T extends {
+    properties: infer P;
 } ? InferFromJSONSchema<T> : T;
 type ExtractArgsFromMetadata<T> = T extends {
     metadata?: {

package/dist/query-api.js

@@ -263,8 +263,25 @@ class Query {
 }
 
 // src/create-query/index.ts
+var removeViewItemFromRoutes = (list) => {
+  for (const route of list) {
+    if (route.metadata?.viewItem) {
+      if (route.metadata.viewItem?.api?.query) {
+        delete route.metadata.viewItem.api.query;
+      }
+      if (route.metadata.viewItem?.worker?.worker) {
+        delete route.metadata.viewItem.worker.worker;
+      }
+      if (route.metadata.viewItem?.context?.router) {
+        delete route.metadata.viewItem.context.router;
+      }
+    }
+  }
+  return list;
+};
 var createQueryByRoutes = (list) => {
   const obj = {};
+  list = removeViewItemFromRoutes(list);
   for (const route of list) {
     if (!obj[route.path]) {
       obj[route.path] = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/query",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "type": "module",
   "scripts": {
     "build": "npm run clean && bun run bun.config.ts",

package/src/create-query/index.ts

@@ -7,10 +7,39 @@ type RouteInfo = {
   metadata?: {
     summary?: string;
     args?: Record<string, any>;
+    viewItem?: {
+      type?: string;
+      api?: {
+        query?: any;
+      },
+      worker?: {
+        worker?: any;
+      },
+      context?: {
+        router?: any;
+      }
+    }
   };
 }
+const removeViewItemFromRoutes = (list: RouteInfo[]) => {
+  for (const route of list) {
+    if (route.metadata?.viewItem) {
+      if (route.metadata.viewItem?.api?.query) {
+        delete route.metadata.viewItem.api.query;
+      }
+      if (route.metadata.viewItem?.worker?.worker) {
+        delete route.metadata.viewItem.worker.worker;
+      }
+      if (route.metadata.viewItem?.context?.router) {
+        delete route.metadata.viewItem.context.router;
+      }
+    }
+  }
+  return list;
+}
 export const createQueryByRoutes = (list: RouteInfo[]) => {
   const obj: any = {};
+  list = removeViewItemFromRoutes(list);
   for (const route of list) {
     if (!obj[route.path]) {
       obj[route.path] = {};

package/src/query-api.ts

@@ -13,22 +13,34 @@ type Pos = {
 
 // JSON Schema 类型推断 - 使用更精确的类型匹配
 type InferFromJSONSchema<T> =
+  // 处理带 enum 的字符串类型
   T extends { type: "string"; enum: readonly (infer E)[] } ? E :
   T extends { type: "string"; enum: (infer E)[] } ? E :
+  // 基础类型
   T extends { type: "string" } ? string :
   T extends { type: "number" } ? number :
   T extends { type: "integer" } ? number :
   T extends { type: "boolean" } ? boolean :
+  // 对象类型 - 检查是否有 properties
   T extends { type: "object"; properties: infer P }
-  ? { [K in keyof P]: InferFromJSONSchema<P[K]> }
-  : T extends { type: "array"; items: infer I }
+  ? {
+    [K in keyof P]: InferFromJSONSchema<P[K]>
+  }
+  : // 数组类型
+  T extends { type: "array"; items: infer I }
   ? Array<InferFromJSONSchema<I>>
+  : // 默认情况 - 如果是对象但没有 type 字段，尝试递归推断
+  T extends Record<string, any>
+  ? T extends { properties: infer P }
+  ? { [K in keyof P]: InferFromJSONSchema<P[K]> }
+  : unknown
   : unknown;
 
 // 统一类型推断：支持 Zod schema 和原始 JSON Schema
 type InferType<T> =
   T extends z.ZodType<infer U> ? U :          // Zod schema
   T extends { type: infer TType } ? InferFromJSONSchema<T> :  // 任何包含 type 字段的 JSON Schema（忽略 $schema）
+  T extends { properties: infer P } ? InferFromJSONSchema<T> : // 处理没有 type 但有 properties 的对象
   T;
 
 // 提取 args 对象，将每个 Zod schema 或 JSON Schema 转换为实际类型