@kevisual/query 0.0.44 → 0.0.46

package/dist/query-api.d.ts

@@ -263,17 +263,35 @@ type InferFromJSONSchema<T> = T extends {
 } ? number : T extends {
     type: "boolean";
 } ? boolean : T extends {
+    type: "array";
+    items: infer I;
+} ? Array<InferFromJSONSchema<I>> : T extends {
     type: "object";
     properties: infer P;
+    required: infer R extends readonly string[];
 } ? {
-    [K in keyof P]: InferFromJSONSchema<P[K]>;
+    [K in keyof P as K extends R[number] ? K : never]: InferFromJSONSchema<P[K]>;
+} & {
+    [K in keyof P as K extends R[number] ? never : K]?: InferFromJSONSchema<P[K]>;
+} : T extends {
+    type: "object";
+    properties: infer P;
+} ? {
+    [K in keyof P]?: InferFromJSONSchema<P[K]>;
+} : T extends {
+    type: "object";
+    additionalProperties: infer A;
+} ? (A extends false ? Record<string, never> : Record<string, any>) : T extends Record<string, any> ? T extends {
+    properties: infer P;
+    required: infer R extends readonly string[];
+} ? {
+    [K in keyof P as K extends R[number] ? K : never]: InferFromJSONSchema<P[K]>;
+} & {
+    [K in keyof P as K extends R[number] ? never : K]?: InferFromJSONSchema<P[K]>;
 } : T extends {
-    type: "array";
-    items: infer I;
-} ? Array<InferFromJSONSchema<I>> : T extends Record<string, any> ? T extends {
     properties: infer P;
 } ? {
-    [K in keyof P]: InferFromJSONSchema<P[K]>;
+    [K in keyof P]?: InferFromJSONSchema<P[K]>;
 } : unknown : unknown;
 type InferType<T> = T extends z.ZodType<infer U> ? U : T extends {
     type: infer TType;

package/package.json

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

package/src/query-api.ts

@@ -25,18 +25,35 @@ type InferFromJSONSchema<T> =
   T extends { type: "number" } ? number :
   T extends { type: "integer" } ? number :
   T extends { type: "boolean" } ? boolean :
-  // 对象类型 - 检查是否有 properties
+  // 数组类型
+  T extends { type: "array"; items: infer I }
+  ? Array<InferFromJSONSchema<I>>
+  : // 对象类型 - 带 required 字段（必需字段 + 可选字段）
+  // 注意：必须在 additionalProperties 检查之前，因为两者可能同时存在
+  T extends { type: "object"; properties: infer P; required: infer R extends readonly string[] }
+  ? {
+    [K in keyof P as K extends R[number] ? K : never]: InferFromJSONSchema<P[K]>
+  } & {
+    [K in keyof P as K extends R[number] ? never : K]?: InferFromJSONSchema<P[K]>
+  }
+  : // 对象类型 - 不带 required 字段（所有字段可选）
   T extends { type: "object"; properties: infer P }
   ? {
-    [K in keyof P]: InferFromJSONSchema<P[K]>
+    [K in keyof P]?: InferFromJSONSchema<P[K]>
   }
-  : // 数组类型
-  T extends { type: "array"; items: infer I }
-  ? Array<InferFromJSONSchema<I>>
+  : // 对象类型 - 只有 additionalProperties（纯动态对象）
+  T extends { type: "object"; additionalProperties: infer A }
+  ? (A extends false ? Record<string, never> : Record<string, any>)
   : // 默认情况 - 如果是对象但没有 type 字段，尝试递归推断
   T extends Record<string, any>
-  ? T extends { properties: infer P }
-  ? { [K in keyof P]: InferFromJSONSchema<P[K]> }
+  ? T extends { properties: infer P; required: infer R extends readonly string[] }
+  ? {
+    [K in keyof P as K extends R[number] ? K : never]: InferFromJSONSchema<P[K]>
+  } & {
+    [K in keyof P as K extends R[number] ? never : K]?: InferFromJSONSchema<P[K]>
+  }
+  : T extends { properties: infer P }
+  ? { [K in keyof P]?: InferFromJSONSchema<P[K]> }
   : unknown
   : unknown;