@lsby/net-core 0.10.0 → 0.10.1

package/dist/bin/gen-api-type/bin.cjs

@@ -103,7 +103,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
                       ? {
                           path: jsonPath
                           method: jsonMethod
-                          input: jsonMethod extends 'post' ? jsonInput : jsonMethod extends 'get' ? getInput : {}
+                          input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
                           errorOutput: jsonErrorOutput
                           successOutput: jsonSuccessOutput
                           webSocketData: wsData

package/dist/bin/gen-api-type/index.cjs

@@ -108,7 +108,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
                       ? {
                           path: jsonPath
                           method: jsonMethod
-                          input: jsonMethod extends 'post' ? jsonInput : jsonMethod extends 'get' ? getInput : {}
+                          input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
                           errorOutput: jsonErrorOutput
                           successOutput: jsonSuccessOutput
                           webSocketData: wsData

package/dist/cjs/bin/gen-api-type/bin.cjs

@@ -103,7 +103,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
                       ? {
                           path: jsonPath
                           method: jsonMethod
-                          input: jsonMethod extends 'post' ? jsonInput : jsonMethod extends 'get' ? getInput : {}
+                          input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
                           errorOutput: jsonErrorOutput
                           successOutput: jsonSuccessOutput
                           webSocketData: wsData

package/dist/cjs/bin/gen-api-type/index.cjs

@@ -108,7 +108,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
                       ? {
                           path: jsonPath
                           method: jsonMethod
-                          input: jsonMethod extends 'post' ? jsonInput : jsonMethod extends 'get' ? getInput : {}
+                          input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
                           errorOutput: jsonErrorOutput
                           successOutput: jsonSuccessOutput
                           webSocketData: wsData

package/dist/cjs/help/help.cjs

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/help/help.ts
 var help_exports = {};
 __export(help_exports, {
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76: () => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u6784\u9020\u5143\u7EC4: () => \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61: () => \u6784\u9020\u5BF9\u8C61
 });
@@ -30,8 +31,28 @@ function \u6784\u9020\u5143\u7EC4(args) {
 function \u6784\u9020\u5BF9\u8C61(key, value) {
   return { [key]: value };
 }
+function \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target, source) {
+  if (typeof source !== "object" || source === null || Object.getPrototypeOf(source) !== Object.prototype) {
+    return source;
+  }
+  if (typeof target !== "object" || target === null || Object.getPrototypeOf(target) !== Object.prototype) {
+    return source;
+  }
+  let result = { ...target };
+  for (let key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (typeof source[key] === "object" && source[key] !== null && Object.getPrototypeOf(source[key]) === Object.prototype && typeof target[key] === "object" && target[key] !== null && Object.getPrototypeOf(target[key]) === Object.prototype) {
+        result[key] = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target[key], source[key]);
+      } else {
+        result[key] = source[key];
+      }
+    }
+  }
+  return result;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61
 });

package/dist/cjs/help/help.d.cts

@@ -1,4 +1,13 @@
 declare function 构造元组<T extends any[]>(args: [...T]): T;
 declare function 构造对象<K extends string, V>(key: K, value: V): Record<K, V>;
+type 普通对象 = Record<any, any>;
+type 严格递归合并对象<A, B> = A extends 普通对象 ? B extends 普通对象 ? {
+    [K in keyof A | keyof B]: K extends keyof A ? K extends keyof B ? A[K] extends 普通对象 ? B[K] extends 普通对象 ? 严格递归合并对象<A[K], B[K]> : never : never : A[K] : K extends keyof B ? B[K] : never;
+} : never : never;
+/**
+ * 深合并两个对象，如果两个值都是普通对象，则递归合并，否则用后者覆盖
+ * 只有直接上游是对象原型的对象才算是普通对象
+ */
+declare function 普通对象深合并(target: Record<any, any>, source: Record<any, any>): Record<string, any>;
 
-export { 构造元组, 构造对象 };
+export { type 严格递归合并对象, 普通对象深合并, 构造元组, 构造对象 };

package/dist/cjs/index.cjs

@@ -46,6 +46,7 @@ __export(index_exports, {
   \u63A5\u53E3\u903B\u8F91: () => \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base: () => \u63A5\u53E3\u903B\u8F91Base,
   \u63D2\u4EF6: () => \u63D2\u4EF6,
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76: () => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u670D\u52A1\u5668: () => \u670D\u52A1\u5668,
   \u6784\u9020\u5143\u7EC4: () => \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61: () => \u6784\u9020\u5BF9\u8C61,
@@ -64,6 +65,25 @@ function \u6784\u9020\u5143\u7EC4(args) {
 function \u6784\u9020\u5BF9\u8C61(key, value) {
   return { [key]: value };
 }
+function \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target, source) {
+  if (typeof source !== "object" || source === null || Object.getPrototypeOf(source) !== Object.prototype) {
+    return source;
+  }
+  if (typeof target !== "object" || target === null || Object.getPrototypeOf(target) !== Object.prototype) {
+    return source;
+  }
+  let result = { ...target };
+  for (let key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (typeof source[key] === "object" && source[key] !== null && Object.getPrototypeOf(source[key]) === Object.prototype && typeof target[key] === "object" && target[key] !== null && Object.getPrototypeOf(target[key]) === Object.prototype) {
+        result[key] = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target[key], source[key]);
+      } else {
+        result[key] = source[key];
+      }
+    }
+  }
+  return result;
+}
 
 // src/interface/interface-base.ts
 var \u63A5\u53E3 = class {
@@ -133,7 +153,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       let \u63D2\u4EF6\u8FD4\u56DE = await \u63D2\u4EF62.\u8FD0\u884C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
       \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
     }
-    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
+    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(s, a), {});
     return \u5408\u5E76\u7ED3\u679C;
   }
   async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
@@ -141,7 +161,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
     let \u6700\u7EC8\u7ED3\u679C = void 0;
     try {
       let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
+      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, a));
       return \u6700\u7EC8\u7ED3\u679C;
     } finally {
       if (\u6E05\u7406\u51FD\u6570 !== void 0) {
@@ -177,9 +197,9 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
         let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
         if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
-        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
+        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight());
         let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
+        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, a));
         return \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C;
       },
       \u5408\u5E76\u6E05\u7406,
@@ -730,6 +750,7 @@ var \u5E38\u7528\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = class extends
   \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base,
   \u63D2\u4EF6,
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u670D\u52A1\u5668,
   \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61,

package/dist/cjs/index.d.cts

@@ -1,4 +1,4 @@
-export { 构造元组, 构造对象 } from './help/help.cjs';
+export { 严格递归合并对象, 普通对象深合并, 构造元组, 构造对象 } from './help/help.cjs';
 export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, y as 任意插件, 兼 as 兼容空对象, A as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, z as 插件项类型, 服 as 服务器, 清 as 清理函数类型, 直 as 直接形式转换器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, d as 获得接口逻辑类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-CyfrfgWu.cjs';
 export { 任意接口结果返回器, 常用返回器, 接口结果返回器, 自定义返回器 } from './interface/interface-retuen.cjs';
 export { 接口测试 } from './interface/interface-test.cjs';

package/dist/cjs/interface/interface-logic.cjs

@@ -25,6 +25,29 @@ __export(interface_logic_exports, {
 });
 module.exports = __toCommonJS(interface_logic_exports);
 var import_ts_fp_data = require("@lsby/ts-fp-data");
+
+// src/help/help.ts
+function \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target, source) {
+  if (typeof source !== "object" || source === null || Object.getPrototypeOf(source) !== Object.prototype) {
+    return source;
+  }
+  if (typeof target !== "object" || target === null || Object.getPrototypeOf(target) !== Object.prototype) {
+    return source;
+  }
+  let result = { ...target };
+  for (let key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (typeof source[key] === "object" && source[key] !== null && Object.getPrototypeOf(source[key]) === Object.prototype && typeof target[key] === "object" && target[key] !== null && Object.getPrototypeOf(target[key]) === Object.prototype) {
+        result[key] = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target[key], source[key]);
+      } else {
+        result[key] = source[key];
+      }
+    }
+  }
+  return result;
+}
+
+// src/interface/interface-logic.ts
 var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
   constructor(\u4E0A\u6E38\u63A5\u53E3, \u6700\u540E\u63A5\u53E3) {
     this.\u4E0A\u6E38\u63A5\u53E3 = \u4E0A\u6E38\u63A5\u53E3;
@@ -57,7 +80,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       let \u63D2\u4EF6\u8FD4\u56DE = await \u63D2\u4EF6.\u8FD0\u884C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
       \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
     }
-    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
+    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(s, a), {});
     return \u5408\u5E76\u7ED3\u679C;
   }
   async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
@@ -65,7 +88,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
     let \u6700\u7EC8\u7ED3\u679C = void 0;
     try {
       let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
+      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, a));
       return \u6700\u7EC8\u7ED3\u679C;
     } finally {
       if (\u6E05\u7406\u51FD\u6570 !== void 0) {
@@ -101,9 +124,9 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
         let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
         if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
-        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
+        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight());
         let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
+        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, a));
         return \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C;
       },
       \u5408\u5E76\u6E05\u7406,

package/dist/cjs/plugin/extend/json.d.cts

@@ -1,5 +1,6 @@
 import express from 'express';
 import { AnyZodObject, z } from 'zod';
+import { 严格递归合并对象 as ________ } from '../../help/help.cjs';
 import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-CyfrfgWu.cjs';
 import '@lsby/ts-fp-data';
 import '../../help/interior.cjs';
@@ -16,9 +17,9 @@ declare class JSON解析插件<Result extends AnyZodObject> extends __<z.ZodObje
 }
 type 任意JSON解析插件 = JSON解析插件<any>;
 type 任意JSON解析插件项 = 任意JSON解析插件;
-type 合并JSON插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意JSON解析插件项 ? {
+type 合并JSON插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意JSON解析插件项 ? ________<{
     body: z.infer<_______<插件项>>['body'];
-} & 合并JSON插件结果<xs> : 合并JSON插件结果<xs> : {} : {} : {};
+}, 合并JSON插件结果<xs>> : 合并JSON插件结果<xs> : {} : {} : {};
 type 计算接口逻辑JSON参数<接口逻辑> = 合并JSON插件结果<__________<接口逻辑>>;
 
 export { JSON解析插件, type 任意JSON解析插件, type 任意JSON解析插件项, type 合并JSON插件结果, type 计算接口逻辑JSON参数 };

package/dist/cjs/plugin/extend/query.d.cts

@@ -1,4 +1,5 @@
 import { AnyZodObject, z } from 'zod';
+import { 严格递归合并对象 as ________ } from '../../help/help.cjs';
 import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-CyfrfgWu.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
@@ -16,9 +17,9 @@ declare class GET参数解析插件<Result extends AnyZodObject> extends __<z.Zo
 }
 type 任意GET参数解析插件 = GET参数解析插件<any>;
 type 任意GET参数解析插件项 = 任意GET参数解析插件;
-type 合并GET插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意GET参数解析插件项 ? {
+type 合并GET插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意GET参数解析插件项 ? ________<{
     query: z.infer<_______<插件项>>['query'];
-} & 合并GET插件结果<xs> : 合并GET插件结果<xs> : {} : {} : {};
+}, 合并GET插件结果<xs>> : 合并GET插件结果<xs> : {} : {} : {};
 type 计算接口逻辑GET参数<接口逻辑> = 合并GET插件结果<__________<接口逻辑>>;
 
 export { GET参数解析插件, type 任意GET参数解析插件, type 任意GET参数解析插件项, type 合并GET插件结果, type 计算接口逻辑GET参数 };

package/dist/esm/bin/gen-api-type/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   main
-} from "../../chunk-REQ5ZXOQ.js";
+} from "../../chunk-B5DKJ5AV.js";
 
 // src/bin/gen-api-type/bin.ts
 import { Command } from "commander";

package/dist/esm/bin/gen-api-type/index.js

@@ -1,6 +1,6 @@
 import {
   main
-} from "../../chunk-REQ5ZXOQ.js";
+} from "../../chunk-B5DKJ5AV.js";
 export {
   main
 };

package/dist/esm/chunk-7LQRWJ3X.js

@@ -0,0 +1,32 @@
+// src/help/help.ts
+function \u6784\u9020\u5143\u7EC4(args) {
+  return args;
+}
+function \u6784\u9020\u5BF9\u8C61(key, value) {
+  return { [key]: value };
+}
+function \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target, source) {
+  if (typeof source !== "object" || source === null || Object.getPrototypeOf(source) !== Object.prototype) {
+    return source;
+  }
+  if (typeof target !== "object" || target === null || Object.getPrototypeOf(target) !== Object.prototype) {
+    return source;
+  }
+  let result = { ...target };
+  for (let key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (typeof source[key] === "object" && source[key] !== null && Object.getPrototypeOf(source[key]) === Object.prototype && typeof target[key] === "object" && target[key] !== null && Object.getPrototypeOf(target[key]) === Object.prototype) {
+        result[key] = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(target[key], source[key]);
+      } else {
+        result[key] = source[key];
+      }
+    }
+  }
+  return result;
+}
+
+export {
+  构造元组,
+  构造对象,
+  普通对象深合并
+};

package/dist/esm/{chunk-REQ5ZXOQ.js → chunk-B5DKJ5AV.js}

@@ -74,7 +74,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
                       ? {
                           path: jsonPath
                           method: jsonMethod
-                          input: jsonMethod extends 'post' ? jsonInput : jsonMethod extends 'get' ? getInput : {}
+                          input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
                           errorOutput: jsonErrorOutput
                           successOutput: jsonSuccessOutput
                           webSocketData: wsData

package/dist/esm/{chunk-ITCALAYE.js → chunk-E23EZWBE.js}

@@ -1,3 +1,7 @@
+import {
+  普通对象深合并
+} from "./chunk-7LQRWJ3X.js";
+
 // src/interface/interface-logic.ts
 import { Right } from "@lsby/ts-fp-data";
 var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
@@ -32,7 +36,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       let \u63D2\u4EF6\u8FD4\u56DE = await \u63D2\u4EF6.\u8FD0\u884C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
       \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
     }
-    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
+    let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(s, a), {});
     return \u5408\u5E76\u7ED3\u679C;
   }
   async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
@@ -40,7 +44,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
     let \u6700\u7EC8\u7ED3\u679C = void 0;
     try {
       let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
+      \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, a));
       return \u6700\u7EC8\u7ED3\u679C;
     } finally {
       if (\u6E05\u7406\u51FD\u6570 !== void 0) {
@@ -76,9 +80,9 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
         let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
         if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
-        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
+        let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight());
         let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
-        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
+        let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76(\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, a));
         return \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C;
       },
       \u5408\u5E76\u6E05\u7406,

package/dist/esm/help/help.d.ts

@@ -1,4 +1,13 @@
 declare function 构造元组<T extends any[]>(args: [...T]): T;
 declare function 构造对象<K extends string, V>(key: K, value: V): Record<K, V>;
+type 普通对象 = Record<any, any>;
+type 严格递归合并对象<A, B> = A extends 普通对象 ? B extends 普通对象 ? {
+    [K in keyof A | keyof B]: K extends keyof A ? K extends keyof B ? A[K] extends 普通对象 ? B[K] extends 普通对象 ? 严格递归合并对象<A[K], B[K]> : never : never : A[K] : K extends keyof B ? B[K] : never;
+} : never : never;
+/**
+ * 深合并两个对象，如果两个值都是普通对象，则递归合并，否则用后者覆盖
+ * 只有直接上游是对象原型的对象才算是普通对象
+ */
+declare function 普通对象深合并(target: Record<any, any>, source: Record<any, any>): Record<string, any>;
 
-export { 构造元组, 构造对象 };
+export { type 严格递归合并对象, 普通对象深合并, 构造元组, 构造对象 };

package/dist/esm/help/help.js

@@ -1,8 +1,10 @@
 import {
+  普通对象深合并,
   构造元组,
   构造对象
-} from "../chunk-YMH6HJJF.js";
+} from "../chunk-7LQRWJ3X.js";
 export {
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61
 };

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-export { 构造元组, 构造对象 } from './help/help.js';
+export { 严格递归合并对象, 普通对象深合并, 构造元组, 构造对象 } from './help/help.js';
 export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, y as 任意插件, 兼 as 兼容空对象, A as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, z as 插件项类型, 服 as 服务器, 清 as 清理函数类型, 直 as 直接形式转换器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, d as 获得接口逻辑类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-C1ZNSMJz.js';
 export { 任意接口结果返回器, 常用返回器, 接口结果返回器, 自定义返回器 } from './interface/interface-retuen.js';
 export { 接口测试 } from './interface/interface-test.js';

package/dist/esm/index.js

@@ -22,12 +22,12 @@ import {
 import {
   接口测试
 } from "./chunk-N7TPWCQ5.js";
-import {
-  服务器
-} from "./chunk-3ZQFVYIR.js";
 import {
   插件
 } from "./chunk-43GZE5YL.js";
+import {
+  服务器
+} from "./chunk-3ZQFVYIR.js";
 import {
   EXPORT_TYPE
 } from "./chunk-ZF7EC2OM.js";
@@ -44,10 +44,6 @@ import {
   自定义返回器
 } from "./chunk-XBAKTT6S.js";
 import "./chunk-NJKBRPN7.js";
-import {
-  构造元组,
-  构造对象
-} from "./chunk-YMH6HJJF.js";
 import "./chunk-ZIVQ3WZA.js";
 import {
   接口
@@ -55,7 +51,12 @@ import {
 import {
   接口逻辑,
   接口逻辑Base
-} from "./chunk-ITCALAYE.js";
+} from "./chunk-E23EZWBE.js";
+import {
+  普通对象深合并,
+  构造元组,
+  构造对象
+} from "./chunk-7LQRWJ3X.js";
 import {
   常用形式转换器,
   接口结果转换器,
@@ -78,6 +79,7 @@ export {
   \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base,
   \u63D2\u4EF6,
+  \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u670D\u52A1\u5668,
   \u6784\u9020\u5143\u7EC4,
   \u6784\u9020\u5BF9\u8C61,

package/dist/esm/interface/interface-logic.js

@@ -1,7 +1,8 @@
 import {
   接口逻辑,
   接口逻辑Base
-} from "../chunk-ITCALAYE.js";
+} from "../chunk-E23EZWBE.js";
+import "../chunk-7LQRWJ3X.js";
 export {
   \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base

package/dist/esm/plugin/extend/json.d.ts

@@ -1,5 +1,6 @@
 import express from 'express';
 import { AnyZodObject, z } from 'zod';
+import { 严格递归合并对象 as ________ } from '../../help/help.js';
 import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-C1ZNSMJz.js';
 import '@lsby/ts-fp-data';
 import '../../help/interior.js';
@@ -16,9 +17,9 @@ declare class JSON解析插件<Result extends AnyZodObject> extends __<z.ZodObje
 }
 type 任意JSON解析插件 = JSON解析插件<any>;
 type 任意JSON解析插件项 = 任意JSON解析插件;
-type 合并JSON插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意JSON解析插件项 ? {
+type 合并JSON插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意JSON解析插件项 ? ________<{
     body: z.infer<_______<插件项>>['body'];
-} & 合并JSON插件结果<xs> : 合并JSON插件结果<xs> : {} : {} : {};
+}, 合并JSON插件结果<xs>> : 合并JSON插件结果<xs> : {} : {} : {};
 type 计算接口逻辑JSON参数<接口逻辑> = 合并JSON插件结果<__________<接口逻辑>>;
 
 export { JSON解析插件, type 任意JSON解析插件, type 任意JSON解析插件项, type 合并JSON插件结果, type 计算接口逻辑JSON参数 };

package/dist/esm/plugin/extend/query.d.ts

@@ -1,4 +1,5 @@
 import { AnyZodObject, z } from 'zod';
+import { 严格递归合并对象 as ________ } from '../../help/help.js';
 import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-C1ZNSMJz.js';
 import '@lsby/ts-fp-data';
 import 'express';
@@ -16,9 +17,9 @@ declare class GET参数解析插件<Result extends AnyZodObject> extends __<z.Zo
 }
 type 任意GET参数解析插件 = GET参数解析插件<any>;
 type 任意GET参数解析插件项 = 任意GET参数解析插件;
-type 合并GET插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意GET参数解析插件项 ? {
+type 合并GET插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意GET参数解析插件项 ? ________<{
     query: z.infer<_______<插件项>>['query'];
-} & 合并GET插件结果<xs> : 合并GET插件结果<xs> : {} : {} : {};
+}, 合并GET插件结果<xs>> : 合并GET插件结果<xs> : {} : {} : {};
 type 计算接口逻辑GET参数<接口逻辑> = 合并GET插件结果<__________<接口逻辑>>;
 
 export { GET参数解析插件, type 任意GET参数解析插件, type 任意GET参数解析插件项, type 合并GET插件结果, type 计算接口逻辑GET参数 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsby/net-core",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "type": "module",
   "exports": {
     "require": "./dist/cjs/index.cjs",

package/dist/esm/chunk-YMH6HJJF.js

@@ -1,12 +0,0 @@
-// src/help/help.ts
-function \u6784\u9020\u5143\u7EC4(args) {
-  return args;
-}
-function \u6784\u9020\u5BF9\u8C61(key, value) {
-  return { [key]: value };
-}
-
-export {
-  构造元组,
-  构造对象
-};