@lsby/net-core 0.3.21 → 0.3.23

package/dist/cjs/bin/gen-test/index.cjs

@@ -33,76 +33,112 @@ __export(gen_test_exports, {
   main: () => main
 });
 module.exports = __toCommonJS(gen_test_exports);
+var import_node_crypto = require("crypto");
 var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
+var import_lodash = __toESM(require("lodash"), 1);
 var import_typescript = __toESM(require("typescript"), 1);
 var import_ts_log = require("@lsby/ts-log");
-async function main(tsconfigPath, interfaceFolderPath, outFilePath, filter) {
-  var log = new import_ts_log.Log("@lsby:net-core").extend("gen-test");
-  await log.debug("\u51C6\u5907\u751F\u6210\u6D4B\u8BD5\u6587\u4EF6...");
-  const projectRootPath = import_node_path.default.dirname(tsconfigPath);
-  const tsconfigJson = import_typescript.default.parseConfigFileTextToJson(tsconfigPath, import_node_fs.default.readFileSync(tsconfigPath, "utf8"));
-  if (tsconfigJson.error) {
+function \u63D0\u53D6\u9876\u7EA7\u5BFC\u51FA\u7C7B\u8282\u70B9(\u6E90\u6587\u4EF6) {
+  const \u7C7B\u8282\u70B9\u6570\u7EC4 = [];
+  const visit = (\u8282\u70B9) => {
+    if (import_typescript.default.isClassDeclaration(\u8282\u70B9) && import_typescript.default.getModifiers(\u8282\u70B9)?.some((modifier) => modifier.kind === import_typescript.default.SyntaxKind.ExportKeyword)) {
+      \u7C7B\u8282\u70B9\u6570\u7EC4.push(\u8282\u70B9);
+    }
+    import_typescript.default.forEachChild(\u8282\u70B9, visit);
+  };
+  import_typescript.default.forEachChild(\u6E90\u6587\u4EF6, visit);
+  return \u7C7B\u8282\u70B9\u6570\u7EC4;
+}
+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(import_node_path.default.relative(import_node_path.default.dirname(tsconfig\u8DEF\u5F84), a.\u6587\u4EF6.fileName) + "_" + a.\u7C7B\u8282\u70B9.name?.text);
+}
+function \u8BA1\u7B97\u5F15\u5165\u8DEF\u5F84(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, a) {
+  return import_node_path.default.relative(import_node_path.default.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84), a["\u6587\u4EF6"].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 \u65E5\u5FD7 = new import_ts_log.Log("@lsby:net-core").extend("gen-test");
+  await \u65E5\u5FD7.debug("\u51C6\u5907\u751F\u6210\u63A5\u53E3\u6D4B\u8BD5...");
+  const tsconfig\u5185\u5BB9 = import_typescript.default.parseConfigFileTextToJson(tsconfig\u8DEF\u5F84, import_node_fs.default.readFileSync(tsconfig\u8DEF\u5F84, "utf8"));
+  if (tsconfig\u5185\u5BB9.error) {
     throw new Error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
   }
-  const parsedTsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfigJson.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfigPath, ".."));
-  await log.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
-  const projectHost = import_typescript.default.createCompilerHost(parsedTsconfig.options);
-  const project = import_typescript.default.createProgram(parsedTsconfig.fileNames, parsedTsconfig.options, projectHost);
-  await log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
-  const _check = project.getTypeChecker();
-  const allSourceFiles = project.getSourceFiles();
-  const typeSourceFiles = allSourceFiles.filter((sourceFile) => {
-    return new RegExp(`${interfaceFolderPath.replaceAll("\\", "\\\\")}.*type.ts`).test(
-      import_node_path.default.resolve(sourceFile.fileName)
-    );
+  const \u89E3\u6790\u540E\u7684tsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfig\u5185\u5BB9.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfig\u8DEF\u5F84, ".."));
+  await \u65E5\u5FD7.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
+  const \u9879\u76EE\u4E3B\u673A = import_typescript.default.createCompilerHost(\u89E3\u6790\u540E\u7684tsconfig.options);
+  const \u9879\u76EE = import_typescript.default.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
+  await \u65E5\u5FD7.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 \u6E90\u6587\u4EF6\u8DEF\u5F84 = import_node_path.default.normalize(\u6E90\u6587\u4EF62.fileName);
+    return \u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) && new RegExp(\u6587\u4EF6\u8FC7\u6EE4\u8868\u8FBE\u5F0F || ".*").test(\u6E90\u6587\u4EF6\u8DEF\u5F84);
   });
-  const testSourceFiles = allSourceFiles.filter((sourceFile) => {
-    return new RegExp(`${interfaceFolderPath.replaceAll("\\", "\\\\")}.*.test.ts`).test(
-      import_node_path.default.resolve(sourceFile.fileName)
+  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
+    }))
+  );
+  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;
+    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`
+    ];
+    return import_typescript.default.createSourceFile(
+      a.\u6587\u4EF6.fileName.replaceAll(".ts", "-" + (0, import_node_crypto.randomUUID)() + ".ts"),
+      \u4EE3\u7801.join("\n"),
+      import_typescript.default.ScriptTarget.Latest
     );
   });
-  const testSourceFilesFilter = testSourceFiles.filter((sourceFile) => {
-    return new RegExp(filter).test(import_node_path.default.resolve(sourceFile.fileName));
+  const \u65B0\u9879\u76EE = import_typescript.default.createProgram({
+    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.fileName == filename);
+        if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 != null)
+          return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
+        return \u9879\u76EE.getSourceFile(filename);
+      }
+    },
+    oldProgram: \u9879\u76EE
   });
-  await log.debug(
-    "\u627E\u5230 %o \u4E2A\u63A5\u53E3\uFF0C\u5176\u4E2D\u6709 %o \u4E2A\u6D4B\u8BD5\uFF0C\u7B5B\u9009\u540E\u8FD8\u5269 %o \u4E2A...",
-    typeSourceFiles.length,
-    testSourceFiles.length,
-    testSourceFilesFilter.length
-  );
-  const importCode = [];
-  const testCode = [];
-  for (var index = 0; index < testSourceFilesFilter.length; index++) {
-    var testSourceFile = testSourceFilesFilter[index];
-    if (testSourceFile == null)
-      throw new Error("\u975E\u9884\u671F\u7684\u6570\u7EC4\u8D8A\u754C");
-    const filenameRelativeToApiFolder = import_node_path.default.relative(interfaceFolderPath, testSourceFile.fileName).replaceAll("\\", "/");
-    const importName = filenameRelativeToApiFolder.replaceAll("/", "_").replaceAll(".test.ts", "").replaceAll("./", "").replaceAll("-", "_");
-    const filenameRelativeToProjectRoot = import_node_path.default.relative(projectRootPath, testSourceFile.fileName).replaceAll("\\", "/").replaceAll(".ts", "");
-    const outputFolderRelativeToProjectRoot = import_node_path.default.relative(import_node_path.default.dirname(outFilePath), projectRootPath).replaceAll("\\", "/");
-    const importPath = import_node_path.default.join(outputFolderRelativeToProjectRoot, filenameRelativeToProjectRoot).replaceAll("\\", "/");
-    await log.info(`\u5904\u7406\uFF08${index + 1} / ${testSourceFilesFilter.length}\uFF09\uFF1A${filenameRelativeToApiFolder}`);
-    importCode.push(`import ${importName} from '${importPath}'`);
-    testCode.push(generateTestCode(importName, importName));
+  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 = false;
+    import_typescript.default.forEachChild(\u6E90\u6587\u4EF6, (node) => {
+      if (import_typescript.default.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);
+        if (\u6587\u672C\u7ED3\u679C == "true")
+          \u7ED3\u679C = true;
+      }
+    });
+    \u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
   }
-  const finalTestFile = [
+  var \u6700\u7EC8\u7ED3\u679C = import_lodash.default.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\u4EE3\u7801 = [
     "import { test } from 'vitest'",
     "import './unit-test-prefix'",
     "",
-    ...importCode,
+    ...\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)}'`
+    ),
     "",
-    ...testCode,
+    ...\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())`),
     ""
-  ].join("\n");
-  var outDir = import_node_path.default.dirname(outFilePath);
-  if (!(0, import_node_fs.existsSync)(outDir)) {
-    (0, import_node_fs.mkdirSync)(outDir, { recursive: true });
-  }
-  (0, import_node_fs.writeFileSync)(outFilePath, finalTestFile);
-}
-function generateTestCode(testCaseName, importName) {
-  return `test('${testCaseName}', async () => await ${importName}.\u8FD0\u884C())`;
+  ];
+  var \u8F93\u51FA\u6587\u4EF6\u5939 = import_node_path.default.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
+  if (!import_node_fs.default.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939))
+    import_node_fs.default.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
+  import_node_fs.default.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/bin/gen-test/index.d.cts

@@ -1,3 +1,3 @@
-declare function main(tsconfigPath: string, interfaceFolderPath: string, outFilePath: string, filter: string): Promise<void>;
+declare function main(tsconfig路径: string, 目标路径: string, 输出文件路径: string, 文件过滤表达式: string): Promise<void>;
 
 export { main };

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

@@ -33,111 +33,112 @@ var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
 var import_typescript = __toESM(require("typescript"), 1);
 var import_ts_log = require("@lsby/ts-log");
-
-// src/bin/gen-type/calc-code.ts
-var calcCode = `
-import type { z } from 'zod'
-import type { \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C, \u63A5\u53E3\u7C7B\u578B\u62BD\u8C61\u7C7B } from '@lsby/net-core'
-import exportedApiSchema from './type'
-
-type Api =
-  typeof exportedApiSchema extends \u63A5\u53E3\u7C7B\u578B\u62BD\u8C61\u7C7B<
-    infer Path,
-    infer Method,
-    infer PreApis,
-    infer SuccessSchema,
-    infer ErrorSchema
-  >
-    ? {
-        path: Path
-        method: Method
-        input: \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<PreApis>
-        successOutput: z.infer<SuccessSchema>
-        errorOutput: z.infer<ErrorSchema>
-      }
-    : never
-
-export default Api
-`;
-
-// src/bin/gen-type/index.ts
-async function main(tsconfigPath, apiFolderPath, outputPath) {
-  var log = new import_ts_log.Log("@lsby:net-core").extend("gen-type");
-  await log.debug("\u51C6\u5907\u751F\u6210\u7C7B\u578B\u6587\u4EF6...");
-  const tsconfigJson = import_typescript.default.parseConfigFileTextToJson(tsconfigPath, import_node_fs.default.readFileSync(tsconfigPath, "utf8"));
-  if (tsconfigJson.error) {
+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 (import_typescript.default.isVariableStatement(\u8282\u70B9)) {
+      \u8282\u70B9.declarationList.declarations.forEach((\u53D8\u91CF\u58F0\u660E) => {
+        if (import_typescript.default.isVariableDeclaration(\u53D8\u91CF\u58F0\u660E)) {
+          \u53D8\u91CF\u8282\u70B9\u6570\u7EC4.push(\u53D8\u91CF\u58F0\u660E);
+        }
+      });
+    }
+    import_typescript.default.forEachChild(\u8282\u70B9, \u8BBF\u95EE\u8282\u70B9);
+  };
+  import_typescript.default.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, "_");
+}
+async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84) {
+  var \u65E5\u5FD7 = new import_ts_log.Log("@lsby:net-core").extend("gen-type");
+  await \u65E5\u5FD7.debug("\u51C6\u5907\u751F\u6210\u63A5\u53E3\u7C7B\u578B...");
+  const tsconfig\u5185\u5BB9 = import_typescript.default.parseConfigFileTextToJson(tsconfig\u8DEF\u5F84, import_node_fs.default.readFileSync(tsconfig\u8DEF\u5F84, "utf8"));
+  if (tsconfig\u5185\u5BB9.error) {
     throw new Error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
   }
-  const parsedTsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfigJson.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfigPath, ".."));
-  await log.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
-  const projectHost = import_typescript.default.createCompilerHost(parsedTsconfig.options);
-  const project = import_typescript.default.createProgram(parsedTsconfig.fileNames, parsedTsconfig.options, projectHost);
-  await log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
-  const allSourceFiles = project.getSourceFiles();
-  const apiSourceFiles = allSourceFiles.filter((sourceFile) => {
-    return new RegExp(`${apiFolderPath.replaceAll("\\", "\\\\")}.*type.ts`).test(import_node_path.default.resolve(sourceFile.fileName));
+  const \u89E3\u6790\u540E\u7684tsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfig\u5185\u5BB9.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfig\u8DEF\u5F84, ".."));
+  await \u65E5\u5FD7.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
+  const \u9879\u76EE\u4E3B\u673A = import_typescript.default.createCompilerHost(\u89E3\u6790\u540E\u7684tsconfig.options);
+  const \u9879\u76EE = import_typescript.default.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
+  await \u65E5\u5FD7.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 \u6E90\u6587\u4EF6\u8DEF\u5F84 = import_node_path.default.normalize(\u6E90\u6587\u4EF62.fileName);
+    return \u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84);
   });
-  await log.debug("\u627E\u5230 %o \u4E2A\u63A5\u53E3...", apiSourceFiles.length);
-  const apiTypeCalcFileNames = apiSourceFiles.map(
-    (sourceFile) => sourceFile.fileName.replace("type.ts", `type-calculate-${(0, import_node_crypto.randomUUID)()}.ts`)
+  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((0, import_node_crypto.randomUUID)())
+    }))
   );
-  const apiTypeCalcFiles = apiTypeCalcFileNames.map((filename) => {
+  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 != import_typescript.default.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>
+          ? {
+              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>
+            }
+          : never
+        `
+      ];
+    }
     return {
-      name: filename,
-      sourceFile: import_typescript.default.createSourceFile(filename, calcCode, import_typescript.default.ScriptTarget.Latest)
+      ...a,
+      \u6587\u4EF6: import_typescript.default.createSourceFile(
+        a.\u6587\u4EF6.fileName.replaceAll(".ts", "-" + (0, import_node_crypto.randomUUID)() + ".ts"),
+        \u4EE3\u7801.join("\n"),
+        import_typescript.default.ScriptTarget.Latest
+      )
     };
   });
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u8BA1\u7B97\u6587\u4EF6...");
-  const newProject = import_typescript.default.createProgram({
-    rootNames: [...parsedTsconfig.fileNames, ...apiTypeCalcFileNames],
-    options: parsedTsconfig.options,
+  const \u65B0\u9879\u76EE = import_typescript.default.createProgram({
+    rootNames: [...\u9879\u76EE.getSourceFiles().map((a) => a.fileName), ...\u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.map((a) => a.\u6587\u4EF6.fileName)],
+    options: \u89E3\u6790\u540E\u7684tsconfig.options,
     host: {
-      ...projectHost,
+      ...\u9879\u76EE\u4E3B\u673A,
       getSourceFile: (filename) => {
-        const apiTypeCalcSourceFile = apiTypeCalcFiles.find(
-          (apiTypeCalcSourceFile2) => apiTypeCalcSourceFile2.name === filename
-        );
-        if (apiTypeCalcSourceFile !== void 0) {
-          return apiTypeCalcSourceFile.sourceFile;
-        }
-        return project.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;
+        if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 != null)
+          return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
+        return \u9879\u76EE.getSourceFile(filename);
       }
     },
-    oldProgram: project
+    oldProgram: \u9879\u76EE
   });
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u9879\u76EE...");
-  const check = newProject.getTypeChecker();
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u9879\u76EE\u7C7B\u578B\u68C0\u67E5\u5668...");
-  const result = [];
-  for (var index = 0; index < apiSourceFiles.length; index++) {
-    var apiSourceFile = apiSourceFiles[index];
-    if (apiSourceFile == null)
-      throw new Error("\u975E\u9884\u671F\u7684\u6570\u7EC4\u8D8A\u754C");
-    await log.info(`\u5904\u7406\uFF08${index + 1} / ${apiSourceFiles.length}\uFF09\uFF1A${apiSourceFile.fileName}`);
-    const apiCalcSourceFile = apiTypeCalcFiles[index]?.sourceFile;
-    if (apiCalcSourceFile === void 0) {
-      throw new Error("\u975E\u9884\u671F\u7684\u6570\u7EC4\u8D8A\u754C");
-    }
-    for (const node of apiCalcSourceFile.statements) {
-      if (import_typescript.default.isExportAssignment(node) && node.isExportEquals === void 0) {
-        const apiType = check.getTypeAtLocation(node.expression);
-        const typeString = check.typeToString(
-          apiType,
-          void 0,
-          import_typescript.default.TypeFormatFlags.NoTruncation | import_typescript.default.TypeFormatFlags.AllowUniqueESSymbolType | import_typescript.default.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope
-        );
-        result.push(typeString);
+  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 = "";
+    import_typescript.default.forEachChild(\u6E90\u6587\u4EF6.\u6587\u4EF6, (node) => {
+      if (import_typescript.default.isTypeAliasDeclaration(node) && node.name.text === \u6E90\u6587\u4EF6.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0) {
+        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;
       }
-    }
-  }
-  await log.debug("\u6210\u529F\u5904\u7406\u6240\u6709\u63A5\u53E3...");
-  const outputPathAbs = import_node_path.default.resolve(outputPath);
-  var outDir = import_node_path.default.dirname(outputPathAbs);
-  if (!(0, import_node_fs.existsSync)(outDir)) {
-    (0, import_node_fs.mkdirSync)(outDir, { recursive: true });
+    });
+    \u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
   }
-  var code = [
-    `export type InterfaceType = [${result.join(",")}]`,
+  var \u6700\u7EC8\u7ED3\u679C = Array.from(new Set(\u68C0\u67E5\u7ED3\u679C.filter((a) => a != "any")));
+  var \u6700\u7EC8\u4EE3\u7801 = [
+    `export type InterfaceType = [${\u6700\u7EC8\u7ED3\u679C.join(",")}]`,
     "",
     `type \u5143\u7EC4\u8F6C\u8054\u5408<T> = T extends any[] ? T[number] : never`,
     "",
@@ -231,8 +232,10 @@ async function main(tsconfigPath, apiFolderPath, outputPath) {
     `) => Promise<\u4ECE\u8DEF\u5F84\u83B7\u5F97\u6B63\u786E\u8FD4\u56DE<\u8DEF\u5F84> | \u4ECE\u8DEF\u5F84\u83B7\u5F97\u9519\u8BEF\u8FD4\u56DE<\u8DEF\u5F84>>`,
     ""
   ];
-  import_node_fs.default.writeFileSync(outputPathAbs, code.join("\n"));
-  await log.debug("\u751F\u6210\u6210\u529F\uFF1A%o", outputPathAbs);
+  var \u8F93\u51FA\u6587\u4EF6\u5939 = import_node_path.default.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
+  if (!import_node_fs.default.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939))
+    import_node_fs.default.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
+  import_node_fs.default.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
 }
 
 // src/bin/gen-type/bin.ts

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

@@ -38,111 +38,112 @@ var import_node_fs = __toESM(require("fs"), 1);
 var import_node_path = __toESM(require("path"), 1);
 var import_typescript = __toESM(require("typescript"), 1);
 var import_ts_log = require("@lsby/ts-log");
-
-// src/bin/gen-type/calc-code.ts
-var calcCode = `
-import type { z } from 'zod'
-import type { \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C, \u63A5\u53E3\u7C7B\u578B\u62BD\u8C61\u7C7B } from '@lsby/net-core'
-import exportedApiSchema from './type'
-
-type Api =
-  typeof exportedApiSchema extends \u63A5\u53E3\u7C7B\u578B\u62BD\u8C61\u7C7B<
-    infer Path,
-    infer Method,
-    infer PreApis,
-    infer SuccessSchema,
-    infer ErrorSchema
-  >
-    ? {
-        path: Path
-        method: Method
-        input: \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<PreApis>
-        successOutput: z.infer<SuccessSchema>
-        errorOutput: z.infer<ErrorSchema>
-      }
-    : never
-
-export default Api
-`;
-
-// src/bin/gen-type/index.ts
-async function main(tsconfigPath, apiFolderPath, outputPath) {
-  var log = new import_ts_log.Log("@lsby:net-core").extend("gen-type");
-  await log.debug("\u51C6\u5907\u751F\u6210\u7C7B\u578B\u6587\u4EF6...");
-  const tsconfigJson = import_typescript.default.parseConfigFileTextToJson(tsconfigPath, import_node_fs.default.readFileSync(tsconfigPath, "utf8"));
-  if (tsconfigJson.error) {
+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 (import_typescript.default.isVariableStatement(\u8282\u70B9)) {
+      \u8282\u70B9.declarationList.declarations.forEach((\u53D8\u91CF\u58F0\u660E) => {
+        if (import_typescript.default.isVariableDeclaration(\u53D8\u91CF\u58F0\u660E)) {
+          \u53D8\u91CF\u8282\u70B9\u6570\u7EC4.push(\u53D8\u91CF\u58F0\u660E);
+        }
+      });
+    }
+    import_typescript.default.forEachChild(\u8282\u70B9, \u8BBF\u95EE\u8282\u70B9);
+  };
+  import_typescript.default.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, "_");
+}
+async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84) {
+  var \u65E5\u5FD7 = new import_ts_log.Log("@lsby:net-core").extend("gen-type");
+  await \u65E5\u5FD7.debug("\u51C6\u5907\u751F\u6210\u63A5\u53E3\u7C7B\u578B...");
+  const tsconfig\u5185\u5BB9 = import_typescript.default.parseConfigFileTextToJson(tsconfig\u8DEF\u5F84, import_node_fs.default.readFileSync(tsconfig\u8DEF\u5F84, "utf8"));
+  if (tsconfig\u5185\u5BB9.error) {
     throw new Error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
   }
-  const parsedTsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfigJson.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfigPath, ".."));
-  await log.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
-  const projectHost = import_typescript.default.createCompilerHost(parsedTsconfig.options);
-  const project = import_typescript.default.createProgram(parsedTsconfig.fileNames, parsedTsconfig.options, projectHost);
-  await log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
-  const allSourceFiles = project.getSourceFiles();
-  const apiSourceFiles = allSourceFiles.filter((sourceFile) => {
-    return new RegExp(`${apiFolderPath.replaceAll("\\", "\\\\")}.*type.ts`).test(import_node_path.default.resolve(sourceFile.fileName));
+  const \u89E3\u6790\u540E\u7684tsconfig = import_typescript.default.parseJsonConfigFileContent(tsconfig\u5185\u5BB9.config, import_typescript.default.sys, import_node_path.default.resolve(tsconfig\u8DEF\u5F84, ".."));
+  await \u65E5\u5FD7.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
+  const \u9879\u76EE\u4E3B\u673A = import_typescript.default.createCompilerHost(\u89E3\u6790\u540E\u7684tsconfig.options);
+  const \u9879\u76EE = import_typescript.default.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
+  await \u65E5\u5FD7.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 \u6E90\u6587\u4EF6\u8DEF\u5F84 = import_node_path.default.normalize(\u6E90\u6587\u4EF62.fileName);
+    return \u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84);
   });
-  await log.debug("\u627E\u5230 %o \u4E2A\u63A5\u53E3...", apiSourceFiles.length);
-  const apiTypeCalcFileNames = apiSourceFiles.map(
-    (sourceFile) => sourceFile.fileName.replace("type.ts", `type-calculate-${(0, import_node_crypto.randomUUID)()}.ts`)
+  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((0, import_node_crypto.randomUUID)())
+    }))
   );
-  const apiTypeCalcFiles = apiTypeCalcFileNames.map((filename) => {
+  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 != import_typescript.default.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>
+          ? {
+              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>
+            }
+          : never
+        `
+      ];
+    }
     return {
-      name: filename,
-      sourceFile: import_typescript.default.createSourceFile(filename, calcCode, import_typescript.default.ScriptTarget.Latest)
+      ...a,
+      \u6587\u4EF6: import_typescript.default.createSourceFile(
+        a.\u6587\u4EF6.fileName.replaceAll(".ts", "-" + (0, import_node_crypto.randomUUID)() + ".ts"),
+        \u4EE3\u7801.join("\n"),
+        import_typescript.default.ScriptTarget.Latest
+      )
     };
   });
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u8BA1\u7B97\u6587\u4EF6...");
-  const newProject = import_typescript.default.createProgram({
-    rootNames: [...parsedTsconfig.fileNames, ...apiTypeCalcFileNames],
-    options: parsedTsconfig.options,
+  const \u65B0\u9879\u76EE = import_typescript.default.createProgram({
+    rootNames: [...\u9879\u76EE.getSourceFiles().map((a) => a.fileName), ...\u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.map((a) => a.\u6587\u4EF6.fileName)],
+    options: \u89E3\u6790\u540E\u7684tsconfig.options,
     host: {
-      ...projectHost,
+      ...\u9879\u76EE\u4E3B\u673A,
       getSourceFile: (filename) => {
-        const apiTypeCalcSourceFile = apiTypeCalcFiles.find(
-          (apiTypeCalcSourceFile2) => apiTypeCalcSourceFile2.name === filename
-        );
-        if (apiTypeCalcSourceFile !== void 0) {
-          return apiTypeCalcSourceFile.sourceFile;
-        }
-        return project.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;
+        if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 != null)
+          return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
+        return \u9879\u76EE.getSourceFile(filename);
       }
     },
-    oldProgram: project
+    oldProgram: \u9879\u76EE
   });
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u9879\u76EE...");
-  const check = newProject.getTypeChecker();
-  await log.debug("\u6210\u529F\u751F\u6210\u865A\u62DF\u9879\u76EE\u7C7B\u578B\u68C0\u67E5\u5668...");
-  const result = [];
-  for (var index = 0; index < apiSourceFiles.length; index++) {
-    var apiSourceFile = apiSourceFiles[index];
-    if (apiSourceFile == null)
-      throw new Error("\u975E\u9884\u671F\u7684\u6570\u7EC4\u8D8A\u754C");
-    await log.info(`\u5904\u7406\uFF08${index + 1} / ${apiSourceFiles.length}\uFF09\uFF1A${apiSourceFile.fileName}`);
-    const apiCalcSourceFile = apiTypeCalcFiles[index]?.sourceFile;
-    if (apiCalcSourceFile === void 0) {
-      throw new Error("\u975E\u9884\u671F\u7684\u6570\u7EC4\u8D8A\u754C");
-    }
-    for (const node of apiCalcSourceFile.statements) {
-      if (import_typescript.default.isExportAssignment(node) && node.isExportEquals === void 0) {
-        const apiType = check.getTypeAtLocation(node.expression);
-        const typeString = check.typeToString(
-          apiType,
-          void 0,
-          import_typescript.default.TypeFormatFlags.NoTruncation | import_typescript.default.TypeFormatFlags.AllowUniqueESSymbolType | import_typescript.default.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope
-        );
-        result.push(typeString);
+  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 = "";
+    import_typescript.default.forEachChild(\u6E90\u6587\u4EF6.\u6587\u4EF6, (node) => {
+      if (import_typescript.default.isTypeAliasDeclaration(node) && node.name.text === \u6E90\u6587\u4EF6.\u8BA1\u7B97\u8282\u70B9\u540D\u79F0) {
+        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;
       }
-    }
-  }
-  await log.debug("\u6210\u529F\u5904\u7406\u6240\u6709\u63A5\u53E3...");
-  const outputPathAbs = import_node_path.default.resolve(outputPath);
-  var outDir = import_node_path.default.dirname(outputPathAbs);
-  if (!(0, import_node_fs.existsSync)(outDir)) {
-    (0, import_node_fs.mkdirSync)(outDir, { recursive: true });
+    });
+    \u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
   }
-  var code = [
-    `export type InterfaceType = [${result.join(",")}]`,
+  var \u6700\u7EC8\u7ED3\u679C = Array.from(new Set(\u68C0\u67E5\u7ED3\u679C.filter((a) => a != "any")));
+  var \u6700\u7EC8\u4EE3\u7801 = [
+    `export type InterfaceType = [${\u6700\u7EC8\u7ED3\u679C.join(",")}]`,
     "",
     `type \u5143\u7EC4\u8F6C\u8054\u5408<T> = T extends any[] ? T[number] : never`,
     "",
@@ -236,8 +237,10 @@ async function main(tsconfigPath, apiFolderPath, outputPath) {
     `) => Promise<\u4ECE\u8DEF\u5F84\u83B7\u5F97\u6B63\u786E\u8FD4\u56DE<\u8DEF\u5F84> | \u4ECE\u8DEF\u5F84\u83B7\u5F97\u9519\u8BEF\u8FD4\u56DE<\u8DEF\u5F84>>`,
     ""
   ];
-  import_node_fs.default.writeFileSync(outputPathAbs, code.join("\n"));
-  await log.debug("\u751F\u6210\u6210\u529F\uFF1A%o", outputPathAbs);
+  var \u8F93\u51FA\u6587\u4EF6\u5939 = import_node_path.default.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
+  if (!import_node_fs.default.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939))
+    import_node_fs.default.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
+  import_node_fs.default.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/bin/gen-type/index.d.cts

@@ -1,3 +1,3 @@
-declare function main(tsconfigPath: string, apiFolderPath: string, outputPath: string): Promise<void>;
+declare function main(tsconfig路径: string, 目标路径: string, 输出文件路径: string): Promise<void>;
 
 export { main };