@lsby/net-core 0.3.28 → 0.3.30

package/dist/esm/{chunk-YRW76W44.js → chunk-PVTF4VYK.js}

@@ -1,6 +1,6 @@
 import {
   接口
-} from "./chunk-E7N7HVWO.js";
+} from "./chunk-G4P3OAFL.js";
 import {
   接口类型
 } from "./chunk-SF5Z34AP.js";
@@ -23,18 +23,16 @@ var JSON\u72B6\u6001\u63A5\u53E3\u7C7B\u578B = class extends \u63A5\u53E3\u7C7B\
   }
 };
 var JSON\u72B6\u6001\u63A5\u53E3 = class extends \u63A5\u53E3 {
+  constructor(\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0, \u4E1A\u52A1\u884C\u4E3A) {
+    super();
+    this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0 = \u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
+    this.\u4E1A\u52A1\u884C\u4E3A = \u4E1A\u52A1\u884C\u4E3A;
+  }
   \u83B7\u5F97\u63A5\u53E3\u7C7B\u578B() {
-    var c = this.\u83B7\u5F97JSON\u63A5\u53E3\u7C7B\u578B();
-    return new \u63A5\u53E3\u7C7B\u578B(
-      c.\u83B7\u5F97\u8DEF\u5F84(),
-      c.\u83B7\u5F97\u65B9\u6CD5(),
-      c.\u83B7\u5F97\u63D2\u4EF6\u4EEC(),
-      c.\u83B7\u5F97\u6B63\u786E\u7ED3\u679C\u7C7B\u578B().shape.data,
-      c.\u83B7\u5F97\u9519\u8BEF\u7ED3\u679C\u7C7B\u578B().shape.data
-    );
+    return this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
   }
-  async \u8F6C\u6362\u4E1A\u52A1\u7ED3\u679C\u5230\u63A5\u53E3\u7ED3\u679C(\u4E1A\u52A1\u7ED3\u679C) {
-    var c = await \u4E1A\u52A1\u7ED3\u679C;
+  async \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
+    var c = await this.\u4E1A\u52A1\u884C\u4E3A.\u8FD0\u884C\u4E1A\u52A1\u884C\u4E3A(\u53C2\u6570);
     if (c.isLeft())
       return new \u9519\u8BEFJSON\u7ED3\u679C({ status: "fail", data: c.assertLeft().getLeft() });
     return new \u6B63\u786EJSON\u7ED3\u679C({ status: "success", data: c.assertRight().getRight() });

package/dist/esm/{chunk-6QNJCAAV.js → chunk-SMAC5ZMF.js}

@@ -8,23 +8,13 @@ import fs from "node:fs";
 import path from "node:path";
 import ts from "typescript";
 import { Log } from "@lsby/ts-log";
-function \u63D0\u53D6\u53D8\u91CF\u8282\u70B9(\u6E90\u6587\u4EF6) {
-  const \u53D8\u91CF\u8282\u70B9\u6570\u7EC4 = [];
-  const \u8BBF\u95EE\u8282\u70B9 = (\u8282\u70B9) => {
-    if (ts.isVariableStatement(\u8282\u70B9)) {
-      \u8282\u70B9.declarationList.declarations.forEach((\u53D8\u91CF\u58F0\u660E) => {
-        if (ts.isVariableDeclaration(\u53D8\u91CF\u58F0\u660E)) {
-          \u53D8\u91CF\u8282\u70B9\u6570\u7EC4.push(\u53D8\u91CF\u58F0\u660E);
-        }
-      });
+function \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6) {
+  for (const statement of \u6E90\u6587\u4EF6.statements) {
+    if (ts.isExportAssignment(statement) && statement.isExportEquals === void 0) {
+      return true;
     }
-    ts.forEachChild(\u8282\u70B9, \u8BBF\u95EE\u8282\u70B9);
-  };
-  ts.forEachChild(\u6E90\u6587\u4EF6, \u8BBF\u95EE\u8282\u70B9);
-  return \u53D8\u91CF\u8282\u70B9\u6570\u7EC4;
-}
-function \u66FF\u6362\u975E\u6CD5\u5B57\u7B26(\u5B57\u7B26\u4E32) {
-  return "_" + \u5B57\u7B26\u4E32.replace(/[ !\-!@#$%^&*()\[\]{}\\|;:'",.\/?]/g, "_");
+  }
+  return false;
 }
 async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84) {
   var log = new Log("@lsby:net-core").extend("gen-type");
@@ -34,7 +24,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
   await log.debug(`\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
   const tsconfig\u5185\u5BB9 = ts.parseConfigFileTextToJson(tsconfig\u8DEF\u5F84, fs.readFileSync(tsconfig\u8DEF\u5F84, "utf8"));
   if (tsconfig\u5185\u5BB9.error) {
-    await log.err("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
+    await log.err("\u65E0\u6CD5\u89E3\u6790 tsconfig.json: " + tsconfig\u5185\u5BB9.error.messageText);
     throw new Error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
   }
   const \u89E3\u6790\u540E\u7684tsconfig = ts.parseJsonConfigFileContent(tsconfig\u5185\u5BB9.config, ts.sys, path.resolve(tsconfig\u8DEF\u5F84, ".."));
@@ -43,63 +33,50 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
   const \u9879\u76EE = ts.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
   await log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
   var \u6240\u6709\u6E90\u6587\u4EF6 = \u9879\u76EE.getSourceFiles();
-  var \u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF62) => {
+  var \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF62) => {
     var \u6E90\u6587\u4EF6\u8DEF\u5F84 = path.normalize(\u6E90\u6587\u4EF62.fileName);
-    return \u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84);
+    if (!\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84))
+      return false;
+    var \u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA = \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF62);
+    if (!\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA)
+      return false;
+    return true;
   });
-  await log.debug(`\u7B5B\u9009\u51FA ${\u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
-  const \u76F8\u5173\u53D8\u91CF\u8282\u70B9\u4EEC = \u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.flatMap(
-    (a) => \u63D0\u53D6\u53D8\u91CF\u8282\u70B9(a).map((x) => ({
-      \u6587\u4EF6: a,
-      \u53D8\u91CF\u8282\u70B9: x,
-      \u8BA1\u7B97\u8282\u70B9\u540D\u79F0: \u66FF\u6362\u975E\u6CD5\u5B57\u7B26(randomUUID())
-    }))
-  );
-  await log.debug(`\u63D0\u53D6\u5230 ${\u76F8\u5173\u53D8\u91CF\u8282\u70B9\u4EEC.length} \u4E2A\u53D8\u91CF\u8282\u70B9`);
-  var \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u53D8\u91CF\u8282\u70B9\u4EEC.map((a) => {
-    var \u4EE3\u7801 = [];
-    if (a.\u53D8\u91CF\u8282\u70B9.name.kind != ts.SyntaxKind.Identifier) {
-      \u4EE3\u7801 = [];
-    } else {
-      var \u53D8\u91CF\u540D\u79F0 = a.\u53D8\u91CF\u8282\u70B9.name.text;
-      var netcore\u5F15\u5165 = a.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0 + "netcore";
-      var zod\u5F15\u5165 = a.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0 + "zod";
-      \u4EE3\u7801 = [
-        a.\u6587\u4EF6.getFullText(),
-        `import * as ${netcore\u5F15\u5165} from '@lsby/net-core'`,
-        `import { z as ${zod\u5F15\u5165} } from 'zod'`,
-        `
-        type ${a.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0} =
-          typeof ${\u53D8\u91CF\u540D\u79F0} extends ${netcore\u5F15\u5165}.\u63A5\u53E3\u7C7B\u578B<infer Path, infer Method, infer PreApis, infer SuccessSchema, infer ErrorSchema>
+  await log.debug(`\u7B5B\u9009\u51FA ${\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
+  var \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
+    var \u4EE3\u7801 = [
+      `import { \u63A5\u53E3\u7C7B\u578B, \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C } from '@lsby/net-core'`,
+      `import { z } from 'zod'`,
+      `import \u5BFC\u5165 from "./${a.fileName.split("/").at(-1)?.replaceAll(".ts", "")}"`,
+      ``,
+      `
+        type \u8BA1\u7B97\u7ED3\u679C =
+          typeof \u5BFC\u5165 extends \u63A5\u53E3\u7C7B\u578B<infer Path, infer Method, infer PreApis, infer SuccessSchema, infer ErrorSchema>
             ? Path extends string
               ? {
                   path: Path
                   method: Method
-                  input: ${netcore\u5F15\u5165}.\u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<PreApis>
-                  successOutput: ${zod\u5F15\u5165}.infer<SuccessSchema>
-                  errorOutput: ${zod\u5F15\u5165}.infer<ErrorSchema>
+                  input: \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<PreApis>
+                  successOutput: z.infer<SuccessSchema>
+                  errorOutput: z.infer<ErrorSchema>
                 }
               : never
             : never
         `
-      ];
-    }
-    return {
-      ...a,
-      \u6587\u4EF6: ts.createSourceFile(
-        a.\u6587\u4EF6.fileName.replaceAll(".ts", "-" + randomUUID() + ".ts"),
-        \u4EE3\u7801.join("\n"),
-        ts.ScriptTarget.Latest
-      )
-    };
+    ];
+    return ts.createSourceFile(
+      a.fileName.replaceAll(".ts", "-" + randomUUID() + ".ts"),
+      \u4EE3\u7801.join("\n"),
+      ts.ScriptTarget.Latest
+    );
   });
   const \u65B0\u9879\u76EE = ts.createProgram({
-    rootNames: [...\u9879\u76EE.getSourceFiles().map((a) => a.fileName), ...\u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.map((a) => a.\u6587\u4EF6.fileName)],
+    rootNames: [...\u9879\u76EE.getSourceFiles().map((a) => a.fileName), ...\u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.map((a) => a.fileName)],
     options: \u89E3\u6790\u540E\u7684tsconfig.options,
     host: {
       ...\u9879\u76EE\u4E3B\u673A,
       getSourceFile: (filename) => {
-        const \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 = \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.find((a) => a.\u6587\u4EF6.fileName == filename)?.\u6587\u4EF6;
+        const \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 = \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.find((a) => a.fileName == filename);
         if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 != null)
           return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
         return \u9879\u76EE.getSourceFile(filename);
@@ -110,19 +87,17 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
   var \u7C7B\u578B\u68C0\u67E5\u5668 = \u65B0\u9879\u76EE.getTypeChecker();
   var \u68C0\u67E5\u7ED3\u679C = [];
   for (var \u6E90\u6587\u4EF6 of \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC) {
-    var \u7ED3\u679C = "";
-    ts.forEachChild(\u6E90\u6587\u4EF6.\u6587\u4EF6, (node) => {
-      if (ts.isTypeAliasDeclaration(node) && node.name.text === \u6E90\u6587\u4EF6.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0) {
+    ts.forEachChild(\u6E90\u6587\u4EF6, (node) => {
+      if (ts.isTypeAliasDeclaration(node) && node.name.text === "\u8BA1\u7B97\u7ED3\u679C") {
         const type = \u7C7B\u578B\u68C0\u67E5\u5668.getTypeAtLocation(node);
-        var \u6587\u672C\u7ED3\u679C = \u7C7B\u578B\u68C0\u67E5\u5668.typeToString(type);
-        \u7ED3\u679C = \u6587\u672C\u7ED3\u679C;
+        \u68C0\u67E5\u7ED3\u679C.push(\u7C7B\u578B\u68C0\u67E5\u5668.typeToString(type));
       }
     });
-    \u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
   }
   var \u6700\u7EC8\u7ED3\u679C = Array.from(new Set(\u68C0\u67E5\u7ED3\u679C.filter((a) => a != "any" && a != "never" && a != "unknown")));
   await log.debug(`\u6700\u7EC8\u7B5B\u9009\u51FA ${\u6700\u7EC8\u7ED3\u679C.length} \u4E2A\u63A5\u53E3\u7C7B\u578B`);
   var \u6700\u7EC8\u4EE3\u7801 = [`export type InterfaceType = [${\u6700\u7EC8\u7ED3\u679C.join(",")}]`, ...\u9644\u52A0\u4EE3\u7801];
+  await log.debug("\u6700\u7EC8\u4EE3\u7801\u751F\u6210\u5B8C\u6210");
   var \u8F93\u51FA\u6587\u4EF6\u5939 = path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
   if (!fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939))
     fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });

package/dist/esm/{chunk-GWWQPWGC.js → chunk-UABF4235.js}

@@ -5,25 +5,22 @@ import path from "node:path";
 import L from "lodash";
 import ts from "typescript";
 import { Log } from "@lsby/ts-log";
-function \u63D0\u53D6\u9876\u7EA7\u5BFC\u51FA\u7C7B\u8282\u70B9(\u6E90\u6587\u4EF6) {
-  const \u7C7B\u8282\u70B9\u6570\u7EC4 = [];
-  const visit = (\u8282\u70B9) => {
-    if (ts.isClassDeclaration(\u8282\u70B9) && ts.getModifiers(\u8282\u70B9)?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword)) {
-      \u7C7B\u8282\u70B9\u6570\u7EC4.push(\u8282\u70B9);
+function \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6) {
+  for (const statement of \u6E90\u6587\u4EF6.statements) {
+    if (ts.isExportAssignment(statement) && statement.isExportEquals === void 0) {
+      return true;
     }
-    ts.forEachChild(\u8282\u70B9, visit);
-  };
-  ts.forEachChild(\u6E90\u6587\u4EF6, visit);
-  return \u7C7B\u8282\u70B9\u6570\u7EC4;
+  }
+  return false;
 }
 function \u66FF\u6362\u975E\u6CD5\u5B57\u7B26(\u5B57\u7B26\u4E32) {
   return "_" + \u5B57\u7B26\u4E32.replace(/[ !\-!@#$%^&*()\[\]{}\\|;:'",.\/?]/g, "_");
 }
 function \u8BA1\u7B97\u5B8C\u6574\u540D\u79F0(tsconfig\u8DEF\u5F84, a) {
-  return \u66FF\u6362\u975E\u6CD5\u5B57\u7B26(path.relative(path.dirname(tsconfig\u8DEF\u5F84), a.\u6587\u4EF6.fileName) + "_" + a.\u7C7B\u8282\u70B9.name?.text);
+  return \u66FF\u6362\u975E\u6CD5\u5B57\u7B26(path.relative(path.dirname(tsconfig\u8DEF\u5F84), a.fileName));
 }
 function \u8BA1\u7B97\u5F15\u5165\u8DEF\u5F84(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, a) {
-  return path.relative(path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84), a["\u6587\u4EF6"].fileName).replaceAll("\\", "/").replaceAll(".ts", "");
+  return path.relative(path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84), a.fileName).replaceAll("\\", "/").replaceAll(".ts", "");
 }
 async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6587\u4EF6\u8FC7\u6EE4\u8868\u8FBE\u5F0F) {
   var log = new Log("@lsby:net-core").extend("gen-test");
@@ -43,28 +40,28 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
   const \u9879\u76EE = ts.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
   await log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
   var \u6240\u6709\u6E90\u6587\u4EF6 = \u9879\u76EE.getSourceFiles();
-  var \u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF62) => {
+  var \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF62) => {
     var \u6E90\u6587\u4EF6\u8DEF\u5F84 = path.normalize(\u6E90\u6587\u4EF62.fileName);
+    if (!\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84))
+      return false;
+    var \u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA = \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF62);
+    if (!\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA)
+      return false;
     var \u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F = new RegExp(\u6587\u4EF6\u8FC7\u6EE4\u8868\u8FBE\u5F0F || ".*").test(\u6E90\u6587\u4EF6\u8DEF\u5F84);
-    return \u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) && \u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F;
+    if (!\u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F)
+      return false;
+    return true;
   });
-  await log.debug(`\u7B5B\u9009\u51FA ${\u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
-  const \u76F8\u5173\u7C7B\u8282\u70B9\u4EEC = \u6240\u6709\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.flatMap(
-    (a) => \u63D0\u53D6\u9876\u7EA7\u5BFC\u51FA\u7C7B\u8282\u70B9(a).map((x) => ({
-      \u6587\u4EF6: a,
-      \u7C7B\u8282\u70B9: x
-    }))
-  );
-  await log.debug(`\u63D0\u53D6\u5230 ${\u76F8\u5173\u7C7B\u8282\u70B9\u4EEC.length} \u4E2A\u7C7B\u8282\u70B9`);
-  var \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u7C7B\u8282\u70B9\u4EEC.map((a) => {
-    var \u7C7B\u540D\u5B57 = a.\u7C7B\u8282\u70B9.name?.text;
+  await log.debug(`\u7B5B\u9009\u51FA ${\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
+  var \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
     var \u4EE3\u7801 = [
       `import { \u63A5\u53E3\u6D4B\u8BD5 } from '@lsby/net-core'`,
-      `import {${\u7C7B\u540D\u5B57}} from "./${a.\u6587\u4EF6.fileName.split("/").at(-1)?.replaceAll(".ts", "")}"`,
-      `type \u8BA1\u7B97\u7ED3\u679C = ${\u7C7B\u540D\u5B57} extends \u63A5\u53E3\u6D4B\u8BD5 ? true : false`
+      `import \u5BFC\u5165 from "./${a.fileName.split("/").at(-1)?.replaceAll(".ts", "")}"`,
+      ``,
+      `type \u8BA1\u7B97\u7ED3\u679C = typeof \u5BFC\u5165 extends \u63A5\u53E3\u6D4B\u8BD5 ? true : false`
     ];
     return ts.createSourceFile(
-      a.\u6587\u4EF6.fileName.replaceAll(".ts", "-" + randomUUID() + ".ts"),
+      a.fileName.replaceAll(".ts", "-" + randomUUID() + ".ts"),
       \u4EE3\u7801.join("\n"),
       ts.ScriptTarget.Latest
     );
@@ -97,24 +94,21 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
     });
     \u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
   }
-  var \u6700\u7EC8\u7ED3\u679C = L.zip(\u76F8\u5173\u7C7B\u8282\u70B9\u4EEC, \u68C0\u67E5\u7ED3\u679C).filter((a) => a[1] == true).map((a) => a[0]).filter((a) => a != null);
+  var \u6700\u7EC8\u7ED3\u679C = L.zip(\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC, \u68C0\u67E5\u7ED3\u679C).filter((a) => a[1] == true).map((a) => a[0]).filter((a) => a != null);
   await log.debug(`\u6700\u7EC8\u7B5B\u9009\u51FA ${\u6700\u7EC8\u7ED3\u679C.length} \u4E2A\u6D4B\u8BD5\u7528\u4F8B`);
   var \u6700\u7EC8\u4EE3\u7801 = [
     "import { test } from 'vitest'",
     "import './unit-test-prefix'",
     "",
-    ...\u6700\u7EC8\u7ED3\u679C.map(
-      (a) => `import {${a.\u7C7B\u8282\u70B9.name?.text} as ${\u8BA1\u7B97\u5B8C\u6574\u540D\u79F0(tsconfig\u8DEF\u5F84, a)}} from './${\u8BA1\u7B97\u5F15\u5165\u8DEF\u5F84(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, a)}'`
-    ),
+    ...\u6700\u7EC8\u7ED3\u679C.map((a) => `import ${\u8BA1\u7B97\u5B8C\u6574\u540D\u79F0(tsconfig\u8DEF\u5F84, a)} from './${\u8BA1\u7B97\u5F15\u5165\u8DEF\u5F84(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, a)}'`),
     "",
-    ...\u6700\u7EC8\u7ED3\u679C.map((a) => \u8BA1\u7B97\u5B8C\u6574\u540D\u79F0(tsconfig\u8DEF\u5F84, a)).map((a) => `test('${a}', async () => await new ${a}().\u8FD0\u884C())`),
+    ...\u6700\u7EC8\u7ED3\u679C.map((a) => \u8BA1\u7B97\u5B8C\u6574\u540D\u79F0(tsconfig\u8DEF\u5F84, a)).map((a) => `test('${a}', async () => await ${a}.\u8FD0\u884C())`),
     ""
   ];
   await log.debug("\u6700\u7EC8\u4EE3\u7801\u751F\u6210\u5B8C\u6210");
   var \u8F93\u51FA\u6587\u4EF6\u5939 = path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
-  if (!fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939)) {
+  if (!fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939))
     fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
-  }
   fs.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
   await log.debug(`\u8F93\u51FA\u6587\u4EF6\u5199\u5165\u5B8C\u6210: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
 }

package/dist/esm/index.d.ts

@@ -1,9 +1,9 @@
 export { 业务行为, 业务行为参数类型, 业务行为返回类型, 业务行为错误类型, 计算业务行为参数, 计算业务行为返回, 计算业务行为错误 } from './action/action.js';
 export { JSON接口 } from './interface/extend/json-base.js';
-export { JSON状态接口, JSON状态接口类型, 计算JSON状态接口返回, 转换状态接口描述 } from './interface/extend/json-wrap.js';
-export { 接口, 有效的接口, 计算接口参数, 计算接口返回 } from './interface/interface-inst.js';
+export { JSON状态接口, JSON状态接口类型 } from './interface/extend/json-wrap.js';
+export { 任意接口, 接口, 计算接口参数, 计算接口返回 } from './interface/interface-inst.js';
 export { 接口测试 } from './interface/interface-test.js';
-export { 任意接口类型, 接口类型, 接口类型插件们, 接口类型方法, 接口类型正确结果, 接口类型路径, 接口类型错误结果, 有效的接口类型, 获得接口插件们 } from './interface/interface-type.js';
+export { 任意接口类型, 接口类型, 接口类型插件们, 接口类型方法, 接口类型正确结果, 接口类型路径, 接口类型错误结果, 获得接口插件们 } from './interface/interface-type.js';
 export { 中文路径支持插件 } from './plugin/extend/chinese-path.js';
 export { 自定义数据插件 } from './plugin/extend/custom-data.js';
 export { JSON解析插件, 从接口类型获得JSON参数, 任意JSON解析插件, 任意JSON解析插件项, 合并JSON插件结果 } from './plugin/extend/json.js';

package/dist/esm/index.js

@@ -1,10 +1,10 @@
 import {
   JSON接口
-} from "./chunk-FBFLXFIL.js";
+} from "./chunk-B55VVACL.js";
 import {
   JSON状态接口,
   JSON状态接口类型
-} from "./chunk-YRW76W44.js";
+} from "./chunk-PVTF4VYK.js";
 import {
   中文路径支持插件
 } from "./chunk-KW3M3VXP.js";
@@ -20,15 +20,15 @@ import {
 import {
   服务器
 } from "./chunk-BU63OHHK.js";
-import {
-  接口
-} from "./chunk-E7N7HVWO.js";
 import {
   业务行为
-} from "./chunk-T3WICQWT.js";
+} from "./chunk-B6PEMS6O.js";
+import {
+  接口
+} from "./chunk-G4P3OAFL.js";
 import {
   接口测试
-} from "./chunk-SFNQ5AWH.js";
+} from "./chunk-25X7QZ6T.js";
 import {
   接口类型
 } from "./chunk-SF5Z34AP.js";

package/dist/esm/interface/extend/json-base.d.ts

@@ -1,14 +1,18 @@
 import { z } from 'zod';
-import { 正确结果 as ____, 错误结果 as ____$1 } from '../../result/result.js';
-import { 接口 as __, 计算接口返回 as ______$1 } from '../interface-inst.js';
-import { 任意接口类型 as ______, 接口类型正确结果 as ________, 接口类型错误结果 as ________$1 } from '../interface-type.js';
-import 'express';
+import { 业务行为 as ____ } from '../../action/action.js';
+import { 接口 as __, 计算接口参数 as ______$1, 计算接口返回 as ______$2 } from '../interface-inst.js';
+import { 任意接口类型 as ______, 接口类型错误结果 as ________, 接口类型正确结果 as ________$1 } from '../interface-type.js';
 import '@lsby/ts-fp-data';
-import '../../action/action.js';
 import '../../plugin/plug.js';
+import 'express';
+import '../../result/result.js';
 
-declare abstract class JSON接口<接口类型描述 extends ______> extends __<接口类型描述> {
-    转换业务结果到接口结果(业务结果: ______$1<接口类型描述>): Promise<____<z.TypeOf<________<接口类型描述>>> | ____$1<z.TypeOf<________$1<接口类型描述>>>>;
+declare class JSON接口<接口类型描述 extends ______> extends __<接口类型描述> {
+    private 接口类型描述;
+    private 业务行为;
+    constructor(接口类型描述: 接口类型描述, 业务行为: ____<______$1<接口类型描述>, z.infer<________<接口类型描述>>, z.infer<________$1<接口类型描述>>>);
+    获得接口类型(): 接口类型描述;
+    接口实现(参数: ______$1<接口类型描述>): ______$2<接口类型描述>;
 }
 
 export { JSON接口 };

package/dist/esm/interface/extend/json-base.js

@@ -1,8 +1,7 @@
 import {
   JSON接口
-} from "../../chunk-FBFLXFIL.js";
-import "../../chunk-E7N7HVWO.js";
-import "../../chunk-T3WICQWT.js";
+} from "../../chunk-B55VVACL.js";
+import "../../chunk-G4P3OAFL.js";
 import "../../chunk-IPDMEQ3O.js";
 import "../../chunk-AHCV3LQ7.js";
 export {

package/dist/esm/interface/extend/json-wrap.d.ts

@@ -1,13 +1,13 @@
 import { z } from 'zod';
+import { 业务行为 as ____$1 } from '../../action/action.js';
 import { 插件项类型 as _____ } from '../../plugin/plug.js';
-import { 正确结果 as ____$1, 错误结果 as ____$2 } from '../../result/result.js';
-import { 计算接口返回 as ______, 接口 as __ } from '../interface-inst.js';
-import { 接口类型 as ____, 接口类型正确结果 as ________, 接口类型错误结果 as ________$1 } from '../interface-type.js';
-import 'express';
+import { 接口 as __, 计算接口参数 as ______, 计算接口返回 as ______$1 } from '../interface-inst.js';
+import { 接口类型 as ____, 接口类型错误结果 as ________, 接口类型正确结果 as ________$1 } from '../interface-type.js';
 import '@lsby/ts-fp-data';
-import '../../action/action.js';
+import 'express';
+import '../../result/result.js';
 
-declare class JSON状态接口类型<路径 extends string | null, 方法 extends 'get' | 'post', 插件们 extends Array<_____>, 正确结果类型 extends z.ZodTypeAny, 错误结果类型 extends z.ZodTypeAny> extends ____<路径, 方法, 插件们, z.ZodObject<{
+declare class JSON状态接口类型<路径 extends string, 方法 extends 'get' | 'post', 插件们 extends Array<_____>, 正确结果类型 extends z.ZodTypeAny, 错误结果类型 extends z.ZodTypeAny> extends ____<路径, 方法, 插件们, z.ZodObject<{
     status: z.ZodLiteral<'success'>;
     data: 正确结果类型;
 }>, z.ZodObject<{
@@ -17,12 +17,12 @@ declare class JSON状态接口类型<路径 extends string | null, 方法 extend
     constructor(path: 路径, method: 方法, 插件们: [...插件们], 正确结果类型: 正确结果类型, 错误结果类型: 错误结果类型);
 }
 type 任意的JSON状态接口类型 = JSON状态接口类型<any, any, any, any, any>;
-type 转换状态接口描述<A> = A extends JSON状态接口类型<infer 路径, infer 方法, infer 插件们, infer 正确结果类型, infer 错误结果类型> ? ____<路径, 方法, 插件们, 正确结果类型, 错误结果类型> : never;
-type 计算JSON状态接口返回<接口类型描述> = ______<转换状态接口描述<接口类型描述>>;
-declare abstract class JSON状态接口<接口类型描述 extends 任意的JSON状态接口类型> extends __<转换状态接口描述<接口类型描述>> {
-    abstract 获得JSON接口类型(): 接口类型描述;
-    获得接口类型(): 转换状态接口描述<接口类型描述>;
-    转换业务结果到接口结果(业务结果: ______<接口类型描述>): Promise<____$1<z.TypeOf<________<接口类型描述>>> | ____$2<z.TypeOf<________$1<接口类型描述>>>>;
+declare class JSON状态接口<接口类型描述 extends 任意的JSON状态接口类型> extends __<接口类型描述> {
+    private 接口类型描述;
+    private 业务行为;
+    constructor(接口类型描述: 接口类型描述, 业务行为: ____$1<______<接口类型描述>, z.infer<________<接口类型描述>>['data'], z.infer<________$1<接口类型描述>>['data']>);
+    获得接口类型(): 接口类型描述;
+    接口实现(参数: ______<接口类型描述>): ______$1<接口类型描述>;
 }
 
-export { JSON状态接口, JSON状态接口类型, type 计算JSON状态接口返回, type 转换状态接口描述 };
+export { JSON状态接口, JSON状态接口类型 };

package/dist/esm/interface/extend/json-wrap.js

@@ -1,9 +1,8 @@
 import {
   JSON状态接口,
   JSON状态接口类型
-} from "../../chunk-YRW76W44.js";
-import "../../chunk-E7N7HVWO.js";
-import "../../chunk-T3WICQWT.js";
+} from "../../chunk-PVTF4VYK.js";
+import "../../chunk-G4P3OAFL.js";
 import "../../chunk-SF5Z34AP.js";
 import "../../chunk-IPDMEQ3O.js";
 import "../../chunk-AHCV3LQ7.js";

package/dist/esm/interface/interface-inst.d.ts

@@ -1,19 +1,16 @@
 import { z } from 'zod';
-import { Either } from '@lsby/ts-fp-data';
-import { 业务行为 as ____ } from '../action/action.js';
 import { 合并插件结果 as ______ } from '../plugin/plug.js';
-import { 正确结果 as ____$1, 错误结果 as ____$2 } from '../result/result.js';
-import { 接口类型插件们 as _______, 接口类型错误结果 as ________, 接口类型正确结果 as ________$1, 任意接口类型 as ______$1, 有效的接口类型 as _______$1 } from './interface-type.js';
+import { 正确结果 as ____, 错误结果 as ____$1 } from '../result/result.js';
+import { 接口类型插件们 as _______, 接口类型正确结果 as ________, 接口类型错误结果 as ________$1, 任意接口类型 as ______$1 } from './interface-type.js';
 import 'express';
+import '@lsby/ts-fp-data';
 
 type 计算接口参数<接口类型描述> = ______<_______<接口类型描述>>;
-type 计算接口返回<接口类型描述> = Promise<Either<z.infer<________<接口类型描述>>, z.infer<________$1<接口类型描述>>>>;
-declare abstract class 接口<接口类型描述 extends ______$1> extends ____<计算接口参数<接口类型描述>, z.infer<________<接口类型描述>>, z.infer<________$1<接口类型描述>>> {
-    protected abstract 业务行为实现(参数: 计算接口参数<接口类型描述>): 计算接口返回<接口类型描述>;
+type 计算接口返回<接口类型描述> = Promise<____<z.infer<________<接口类型描述>>> | ____$1<z.infer<________$1<接口类型描述>>>>;
+declare abstract class 接口<接口类型描述 extends ______$1> {
     abstract 获得接口类型(): 接口类型描述;
-    接口实现(参数: 计算接口参数<接口类型描述>): Promise<____$1<z.infer<________$1<接口类型描述>>> | ____$2<z.infer<________<接口类型描述>>>>;
-    abstract 转换业务结果到接口结果(业务结果: 计算接口返回<接口类型描述>): Promise<____$1<z.infer<________$1<接口类型描述>>> | ____$2<z.infer<________<接口类型描述>>>>;
+    abstract 接口实现(参数: 计算接口参数<接口类型描述>): 计算接口返回<接口类型描述>;
 }
-type 有效的接口 = 接口<_______$1>;
+type 任意接口 = 接口<any>;
 
-export { 接口, type 有效的接口, type 计算接口参数, type 计算接口返回 };
+export { type 任意接口, 接口, type 计算接口参数, type 计算接口返回 };

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

@@ -1,7 +1,6 @@
 import {
   接口
-} from "../chunk-E7N7HVWO.js";
-import "../chunk-T3WICQWT.js";
+} from "../chunk-G4P3OAFL.js";
 export {
   \u63A5\u53E3
 };

package/dist/esm/interface/interface-test.d.ts

@@ -1,8 +1,8 @@
-declare abstract class 接口测试 {
-    constructor();
-    abstract 前置实现(): Promise<void>;
-    abstract 中置实现(): Promise<object>;
-    abstract 后置实现(中置结果: object): Promise<void>;
+declare class 接口测试 {
+    private 前置实现;
+    private 中置实现;
+    private 后置实现;
+    constructor(前置实现: () => Promise<void>, 中置实现: () => Promise<object>, 后置实现: (中置结果: object) => Promise<void>);
     运行(): Promise<void>;
 }
 

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

@@ -1,6 +1,6 @@
 import {
   接口测试
-} from "../chunk-SFNQ5AWH.js";
+} from "../chunk-25X7QZ6T.js";
 export {
   \u63A5\u53E3\u6D4B\u8BD5
 };

package/dist/esm/interface/interface-type.d.ts

@@ -8,7 +8,7 @@ type 接口类型方法<A> = A extends 接口类型<infer _A1, infer A2, infer _
 type 接口类型插件们<A> = A extends 接口类型<infer _A1, infer _A2, infer A3, infer _A4, infer _A5> ? A3 : never;
 type 接口类型正确结果<A> = A extends 接口类型<infer _A1, infer _A2, infer _A3, infer A4, infer _A5> ? A4 : never;
 type 接口类型错误结果<A> = A extends 接口类型<infer _A1, infer _A2, infer _A3, infer _A4, infer A5> ? A5 : never;
-declare class 接口类型<路径 extends string | null, 方法 extends 'get' | 'post', 插件们 extends Array<_____>, 正确结果类型 extends z.ZodTypeAny, 错误结果类型 extends z.ZodTypeAny> {
+declare class 接口类型<路径 extends string, 方法 extends 'get' | 'post', 插件们 extends Array<_____>, 正确结果类型 extends z.ZodTypeAny, 错误结果类型 extends z.ZodTypeAny> {
     private 路径;
     private 方法;
     private 插件们;
@@ -23,7 +23,6 @@ declare class 接口类型<路径 extends string | null, 方法 extends 'get' |
     获得错误结果类型(): 错误结果类型;
 }
 type 任意接口类型 = 接口类型<any, any, any, any, any>;
-type 有效的接口类型 = 接口类型<string, any, any, any, any>;
 type 获得接口插件们<接口类型描述> = 接口类型描述 extends 接口类型<any, any, infer 插件, any, any> ? 插件 : never;
 
-export { type 任意接口类型, 接口类型, type 接口类型插件们, type 接口类型方法, type 接口类型正确结果, type 接口类型路径, type 接口类型错误结果, type 有效的接口类型, type 获得接口插件们 };
+export { type 任意接口类型, 接口类型, type 接口类型插件们, type 接口类型方法, type 接口类型正确结果, type 接口类型路径, type 接口类型错误结果, type 获得接口插件们 };

package/dist/esm/server/server.d.ts

@@ -1,10 +1,9 @@
 import * as http from 'node:http';
-import { 有效的接口 as _____ } from '../interface/interface-inst.js';
+import { 任意接口 as ____ } from '../interface/interface-inst.js';
 import 'zod';
-import '@lsby/ts-fp-data';
-import '../action/action.js';
 import '../plugin/plug.js';
 import 'express';
+import '@lsby/ts-fp-data';
 import '../result/result.js';
 import '../interface/interface-type.js';
 
@@ -13,7 +12,7 @@ declare class 服务器 {
     private 端口;
     private 静态资源路径?;
     private log;
-    constructor(接口们: _____[], 端口: number, 静态资源路径?: string | undefined);
+    constructor(接口们: ____[], 端口: number, 静态资源路径?: string | undefined);
     run(): Promise<{
         ip: string[];
         server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsby/net-core",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "type": "module",
   "exports": {
     "require": "./dist/cjs/index.cjs",
@@ -29,7 +29,7 @@
     "test:coverage": "npm run check:all && vitest run --coverage && open-cli ./coverage/index.html"
   },
   "dependencies": {
-    "@lsby/ts-global": "^0.0.3",
+    "@lsby/ts-global": "^0.0.5",
     "@lsby/ts-log": "^0.0.3",
     "commander": "^12.1.0",
     "express": "^4.19.2",
@@ -51,7 +51,7 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "@lsby/ts-fp-data": "^0.2.3",
+    "@lsby/ts-fp-data": "^0.2.4",
     "@types/express": "^4.17.21"
   },
   "packageManager": "pnpm@9.7.1+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247"

package/dist/esm/chunk-E7N7HVWO.js

@@ -1,14 +0,0 @@
-import {
-  业务行为
-} from "./chunk-T3WICQWT.js";
-
-// src/interface/interface-inst.ts
-var \u63A5\u53E3 = class extends \u4E1A\u52A1\u884C\u4E3A {
-  \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
-    return this.\u8F6C\u6362\u4E1A\u52A1\u7ED3\u679C\u5230\u63A5\u53E3\u7ED3\u679C(this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570));
-  }
-};
-
-export {
-  接口
-};

package/dist/esm/chunk-FBFLXFIL.js

@@ -1,21 +0,0 @@
-import {
-  接口
-} from "./chunk-E7N7HVWO.js";
-import {
-  正确JSON结果,
-  错误JSON结果
-} from "./chunk-IPDMEQ3O.js";
-
-// src/interface/extend/json-base.ts
-var JSON\u63A5\u53E3 = class extends \u63A5\u53E3 {
-  async \u8F6C\u6362\u4E1A\u52A1\u7ED3\u679C\u5230\u63A5\u53E3\u7ED3\u679C(\u4E1A\u52A1\u7ED3\u679C) {
-    var c = await \u4E1A\u52A1\u7ED3\u679C;
-    if (c.isLeft())
-      return new \u9519\u8BEFJSON\u7ED3\u679C(c.assertLeft().getLeft());
-    return new \u6B63\u786EJSON\u7ED3\u679C(c.assertRight().getRight());
-  }
-};
-
-export {
-  JSON接口
-};