@dune2/cli 0.5.2 → 0.5.4

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
 } from "./chunk-UGSBKD2I.js";
 
 // package.json
-var version = "0.5.1";
+var version = "0.5.3";
 
 // src/cli.ts
 cli.command("download", "\u751F\u6210\u7FFB\u8BD1\u6587\u4EF6").example("dune download").action(async () => {
@@ -28,7 +28,7 @@ cli.command("upload", "\u4E0A\u4F20\u7FFB\u8BD1\u6587\u4EF6").example("dune uplo
   await upload();
 });
 cli.command("generateApi", "\u751F\u6210 api \u6587\u4EF6").example("dune generateApi").action(async () => {
-  const { generateApi } = await import("./generateApi-A4RH4WFR.js");
+  const { generateApi } = await import("./generateApi-B7OSZKPS.js");
   await generateApi();
 });
 cli.command("login", "\u767B\u5F55").action(async () => {

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../package.json","../src/cli.ts"],"sourcesContent":["{\n  \"name\": \"@dune2/cli\",\n  \"version\": \"0.5.1\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/liaoyinglong/next-tools.git\",\n    \"directory\": \"packages/cli\"\n  },\n  \"type\": \"module\",\n  \"exports\": {\n    \".\": {\n      \"import\": \"./dist/index.js\"\n    },\n    \"./cli\": {\n      \"import\": \"./dist/cli.js\"\n    },\n    \"./normalizeConfig\": {\n      \"import\": \"./dist/normalizeConfig.js\"\n    },\n    \"./prettier\": {\n      \"import\": \"./dist/prettier.js\",\n      \"require\": \"./dist/prettier.cjs\"\n    },\n    \"./package.json\": \"./package.json\"\n  },\n  \"types\": \"dist/index.d.ts\",\n  \"bin\": {\n    \"dune\": \"./dist/cli.js\"\n  },\n  \"files\": [\n    \"dist\"\n  ],\n  \"scripts\": {\n    \"build\": \"shx rm -rf ./dist && tsup --splitting\",\n    \"dev\": \"pnpm run build --watch\",\n    \"lint\": \"tsc --diagnostics --noEmit\",\n    \"test\": \"vitest run\",\n    \"test:u\": \"vitest -u\"\n  },\n  \"dependencies\": {\n    \"@apidevtools/swagger-parser\": \"^10.1.0\",\n    \"@dune2/wasm\": \"workspace:*\",\n    \"cac\": \"^6.7.14\",\n    \"cli-table3\": \"^0.6.3\",\n    \"connect\": \"^3.7.0\",\n    \"debug\": \"^4.3.4\",\n    \"enquirer\": \"^2.3.6\",\n    \"fs-extra\": \"^11.2.0\",\n    \"globby\": \"^14.0.1\",\n    \"googleapis\": \"108.0.0\",\n    \"joycon\": \"^3.1.1\",\n    \"json-schema-to-typescript\": \"15.0.0\",\n    \"lodash\": \"^4.17.21\",\n    \"open\": \"^10.1.0\",\n    \"p-map\": \"^7.0.2\",\n    \"path-to-regexp\": \"7.1.0\",\n    \"picocolors\": \"^1.0.0\"\n  },\n  \"devDependencies\": {\n    \"@types/debug\": \"^4.1.7\",\n    \"@types/lodash\": \"^4.14.186\",\n    \"gaxios\": \"*\",\n    \"google-auth-library\": \"*\",\n    \"openapi-types\": \"^12.0.2\",\n    \"prettier\": \"^3\",\n    \"tsup\": \"8\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  }\n}\n","#!/usr/bin/env node\nimport { version } from \"../package.json\";\nimport { cli } from \"./shared\";\n//#region 翻译相关\n\ncli\n  .command(\"download\", \"生成翻译文件\")\n  .example(\"dune download\")\n  .action(async () => {\n    const { download } = await import(\"./commands/download\");\n    await download();\n  });\ncli\n  .command(\"extract\", \"提取代码中的文案\")\n  .option(\"--deleteUnused\", \"删除未使用的文案\")\n  .example(\"dune extract\")\n  .action(async (args) => {\n    const { extract } = await import(\"./commands/extract\");\n    await extract(args);\n  });\n\ncli\n  .command(\"namespaceSwc\", \"添加 namespace 前缀，由 swc 驱动\")\n  .example(\"dune namespaceSwc\")\n  .action(async () => {\n    const { namespace } = await import(\"./commands/namespace\");\n    return namespace({ mode: \"swc\" });\n  });\n\ncli\n  .command(\"namespaceReg\", \"添加 namespace 前缀，由正则驱动\")\n  .example(\"dune namespaceReg\")\n  .action(async () => {\n    const { namespace } = await import(\"./commands/namespace\");\n    return namespace({ mode: \"reg\" });\n  });\n\ncli\n  .command(\"upload\", \"上传翻译文件\")\n  .example(\"dune upload\")\n  .action(async (args) => {\n    const { upload } = await import(\"./commands/upload\");\n    await upload();\n  });\n\n//#endregion\n\n//#region api 相关\ncli\n  .command(\"generateApi\", \"生成 api 文件\")\n  .example(\"dune generateApi\")\n  .action(async () => {\n    const { generateApi } = await import(\"./commands/generateApi\");\n    await generateApi();\n  });\n//#endregion\n\n//#region user 相关\ncli.command(\"login\", \"登录\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  await googleAuth.initCredentials();\n});\ncli.command(\"logout\", \"退出\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  await googleAuth.removeCredentials();\n});\ncli.command(\"userInfo\", \"用户信息\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  if (googleAuth.tokens) {\n    console.log(`\\\nemail: ${googleAuth.tokens.email}\naud  : ${googleAuth.tokens.aud}\nexp  : ${new Date(googleAuth.tokens.expiry_date).toLocaleString()}\n`);\n  } else {\n    console.log(\"未登录\");\n    console.log(`运行 dune login 登录`);\n  }\n});\n//#endregion\n\ncli\n  .command(\"init\", \"初始化配置文件\")\n  .example(\"dune init\")\n  .action(async () => {\n    const { initConfig } = await import(\"./commands/initConfig\");\n    await initConfig();\n  });\n\ncli\n  .command(\"interactive\", \"交互式操作\")\n  .example(\"dune interactive\")\n  .alias(\"i\")\n  .action(async (args) => {\n    const { interactive } = await import(\"./commands/interactive\");\n    await interactive(args);\n  });\n\n// make default command run interactive\ncli.command(\"\").action(async (args) => {\n  const { interactive } = await import(\"./commands/interactive\");\n  await interactive(args);\n});\n\ncli.version(version);\ncli.help();\n\n(async () => {\n  try {\n    // Parse CLI args without running the command\n    cli.parse(process.argv, { run: false });\n    // Run the command yourself\n    // You only need `await` when your command action returns a Promise\n    await cli.runMatchedCommand();\n  } catch (error) {\n    // Handle error here..\n    // e.g.\n    // console.error(error.stack)\n    // process.exit(1)\n  }\n})();\n"],"mappings":";;;;;;AAEE,cAAW;;;ACGb,IACG,QAAQ,YAAY,sCAAQ,EAC5B,QAAQ,eAAe,EACvB,OAAO,YAAY;AAClB,QAAM,EAAE,SAAS,IAAI,MAAM,OAAO,wBAAqB;AACvD,QAAM,SAAS;AACjB,CAAC;AACH,IACG,QAAQ,WAAW,kDAAU,EAC7B,OAAO,kBAAkB,kDAAU,EACnC,QAAQ,cAAc,EACtB,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,QAAQ,IAAI,MAAM,OAAO,uBAAoB;AACrD,QAAM,QAAQ,IAAI;AACpB,CAAC;AAEH,IACG,QAAQ,gBAAgB,kEAA0B,EAClD,QAAQ,mBAAmB,EAC3B,OAAO,YAAY;AAClB,QAAM,EAAE,UAAU,IAAI,MAAM,OAAO,yBAAsB;AACzD,SAAO,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,CAAC;AAEH,IACG,QAAQ,gBAAgB,yEAAuB,EAC/C,QAAQ,mBAAmB,EAC3B,OAAO,YAAY;AAClB,QAAM,EAAE,UAAU,IAAI,MAAM,OAAO,yBAAsB;AACzD,SAAO,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,CAAC;AAEH,IACG,QAAQ,UAAU,sCAAQ,EAC1B,QAAQ,aAAa,EACrB,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,OAAO,IAAI,MAAM,OAAO,sBAAmB;AACnD,QAAM,OAAO;AACf,CAAC;AAKH,IACG,QAAQ,eAAe,+BAAW,EAClC,QAAQ,kBAAkB,EAC1B,OAAO,YAAY;AAClB,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY;AACpB,CAAC;AAIH,IAAI,QAAQ,SAAS,cAAI,EAAE,OAAO,YAAY;AAC5C,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,QAAM,WAAW,gBAAgB;AACnC,CAAC;AACD,IAAI,QAAQ,UAAU,cAAI,EAAE,OAAO,YAAY;AAC7C,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,QAAM,WAAW,kBAAkB;AACrC,CAAC;AACD,IAAI,QAAQ,YAAY,0BAAM,EAAE,OAAO,YAAY;AACjD,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,MAAI,WAAW,QAAQ;AACrB,YAAQ,IAAI,UACP,WAAW,OAAO,KAAK;AAAA,SACvB,WAAW,OAAO,GAAG;AAAA,SACrB,IAAI,KAAK,WAAW,OAAO,WAAW,EAAE,eAAe,CAAC;AAAA,CAChE;AAAA,EACC,OAAO;AACL,YAAQ,IAAI,oBAAK;AACjB,YAAQ,IAAI,sCAAkB;AAAA,EAChC;AACF,CAAC;AAGD,IACG,QAAQ,QAAQ,4CAAS,EACzB,QAAQ,WAAW,EACnB,OAAO,YAAY;AAClB,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,0BAAuB;AAC3D,QAAM,WAAW;AACnB,CAAC;AAEH,IACG,QAAQ,eAAe,gCAAO,EAC9B,QAAQ,kBAAkB,EAC1B,MAAM,GAAG,EACT,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY,IAAI;AACxB,CAAC;AAGH,IAAI,QAAQ,EAAE,EAAE,OAAO,OAAO,SAAS;AACrC,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY,IAAI;AACxB,CAAC;AAED,IAAI,QAAQ,OAAO;AACnB,IAAI,KAAK;AAAA,CAER,YAAY;AACX,MAAI;AAEF,QAAI,MAAM,QAAQ,MAAM,EAAE,KAAK,MAAM,CAAC;AAGtC,UAAM,IAAI,kBAAkB;AAAA,EAC9B,SAAS,OAAO;AAAA,EAKhB;AACF,GAAG;","names":[]}
+{"version":3,"sources":["../package.json","../src/cli.ts"],"sourcesContent":["{\n  \"name\": \"@dune2/cli\",\n  \"version\": \"0.5.3\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/liaoyinglong/next-tools.git\",\n    \"directory\": \"packages/cli\"\n  },\n  \"type\": \"module\",\n  \"exports\": {\n    \".\": {\n      \"import\": \"./dist/index.js\"\n    },\n    \"./cli\": {\n      \"import\": \"./dist/cli.js\"\n    },\n    \"./normalizeConfig\": {\n      \"import\": \"./dist/normalizeConfig.js\"\n    },\n    \"./prettier\": {\n      \"import\": \"./dist/prettier.js\",\n      \"require\": \"./dist/prettier.cjs\"\n    },\n    \"./package.json\": \"./package.json\"\n  },\n  \"types\": \"dist/index.d.ts\",\n  \"bin\": {\n    \"dune\": \"./dist/cli.js\"\n  },\n  \"files\": [\n    \"dist\"\n  ],\n  \"scripts\": {\n    \"build\": \"shx rm -rf ./dist && tsup --splitting\",\n    \"dev\": \"pnpm run build --watch\",\n    \"lint\": \"tsc --diagnostics --noEmit\",\n    \"test\": \"vitest run\",\n    \"test:u\": \"vitest -u\"\n  },\n  \"dependencies\": {\n    \"@apidevtools/swagger-parser\": \"^10.1.0\",\n    \"@dune2/wasm\": \"workspace:*\",\n    \"cac\": \"^6.7.14\",\n    \"cli-table3\": \"^0.6.3\",\n    \"connect\": \"^3.7.0\",\n    \"debug\": \"^4.3.4\",\n    \"enquirer\": \"^2.3.6\",\n    \"fs-extra\": \"^11.2.0\",\n    \"globby\": \"^14.0.1\",\n    \"googleapis\": \"108.0.0\",\n    \"joycon\": \"^3.1.1\",\n    \"json-schema-to-typescript\": \"15.0.0\",\n    \"lodash\": \"^4.17.21\",\n    \"open\": \"^10.1.0\",\n    \"p-map\": \"^7.0.2\",\n    \"path-to-regexp\": \"7.1.0\",\n    \"picocolors\": \"^1.0.0\"\n  },\n  \"devDependencies\": {\n    \"@types/debug\": \"^4.1.7\",\n    \"@types/lodash\": \"^4.14.186\",\n    \"gaxios\": \"*\",\n    \"google-auth-library\": \"*\",\n    \"openapi-types\": \"^12.0.2\",\n    \"prettier\": \"^3\",\n    \"tsup\": \"8\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  }\n}\n","#!/usr/bin/env node\nimport { version } from \"../package.json\";\nimport { cli } from \"./shared\";\n//#region 翻译相关\n\ncli\n  .command(\"download\", \"生成翻译文件\")\n  .example(\"dune download\")\n  .action(async () => {\n    const { download } = await import(\"./commands/download\");\n    await download();\n  });\ncli\n  .command(\"extract\", \"提取代码中的文案\")\n  .option(\"--deleteUnused\", \"删除未使用的文案\")\n  .example(\"dune extract\")\n  .action(async (args) => {\n    const { extract } = await import(\"./commands/extract\");\n    await extract(args);\n  });\n\ncli\n  .command(\"namespaceSwc\", \"添加 namespace 前缀，由 swc 驱动\")\n  .example(\"dune namespaceSwc\")\n  .action(async () => {\n    const { namespace } = await import(\"./commands/namespace\");\n    return namespace({ mode: \"swc\" });\n  });\n\ncli\n  .command(\"namespaceReg\", \"添加 namespace 前缀，由正则驱动\")\n  .example(\"dune namespaceReg\")\n  .action(async () => {\n    const { namespace } = await import(\"./commands/namespace\");\n    return namespace({ mode: \"reg\" });\n  });\n\ncli\n  .command(\"upload\", \"上传翻译文件\")\n  .example(\"dune upload\")\n  .action(async (args) => {\n    const { upload } = await import(\"./commands/upload\");\n    await upload();\n  });\n\n//#endregion\n\n//#region api 相关\ncli\n  .command(\"generateApi\", \"生成 api 文件\")\n  .example(\"dune generateApi\")\n  .action(async () => {\n    const { generateApi } = await import(\"./commands/generateApi\");\n    await generateApi();\n  });\n//#endregion\n\n//#region user 相关\ncli.command(\"login\", \"登录\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  await googleAuth.initCredentials();\n});\ncli.command(\"logout\", \"退出\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  await googleAuth.removeCredentials();\n});\ncli.command(\"userInfo\", \"用户信息\").action(async () => {\n  const { googleAuth } = await import(\"./shared/google/auth\");\n  if (googleAuth.tokens) {\n    console.log(`\\\nemail: ${googleAuth.tokens.email}\naud  : ${googleAuth.tokens.aud}\nexp  : ${new Date(googleAuth.tokens.expiry_date).toLocaleString()}\n`);\n  } else {\n    console.log(\"未登录\");\n    console.log(`运行 dune login 登录`);\n  }\n});\n//#endregion\n\ncli\n  .command(\"init\", \"初始化配置文件\")\n  .example(\"dune init\")\n  .action(async () => {\n    const { initConfig } = await import(\"./commands/initConfig\");\n    await initConfig();\n  });\n\ncli\n  .command(\"interactive\", \"交互式操作\")\n  .example(\"dune interactive\")\n  .alias(\"i\")\n  .action(async (args) => {\n    const { interactive } = await import(\"./commands/interactive\");\n    await interactive(args);\n  });\n\n// make default command run interactive\ncli.command(\"\").action(async (args) => {\n  const { interactive } = await import(\"./commands/interactive\");\n  await interactive(args);\n});\n\ncli.version(version);\ncli.help();\n\n(async () => {\n  try {\n    // Parse CLI args without running the command\n    cli.parse(process.argv, { run: false });\n    // Run the command yourself\n    // You only need `await` when your command action returns a Promise\n    await cli.runMatchedCommand();\n  } catch (error) {\n    // Handle error here..\n    // e.g.\n    // console.error(error.stack)\n    // process.exit(1)\n  }\n})();\n"],"mappings":";;;;;;AAEE,cAAW;;;ACGb,IACG,QAAQ,YAAY,sCAAQ,EAC5B,QAAQ,eAAe,EACvB,OAAO,YAAY;AAClB,QAAM,EAAE,SAAS,IAAI,MAAM,OAAO,wBAAqB;AACvD,QAAM,SAAS;AACjB,CAAC;AACH,IACG,QAAQ,WAAW,kDAAU,EAC7B,OAAO,kBAAkB,kDAAU,EACnC,QAAQ,cAAc,EACtB,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,QAAQ,IAAI,MAAM,OAAO,uBAAoB;AACrD,QAAM,QAAQ,IAAI;AACpB,CAAC;AAEH,IACG,QAAQ,gBAAgB,kEAA0B,EAClD,QAAQ,mBAAmB,EAC3B,OAAO,YAAY;AAClB,QAAM,EAAE,UAAU,IAAI,MAAM,OAAO,yBAAsB;AACzD,SAAO,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,CAAC;AAEH,IACG,QAAQ,gBAAgB,yEAAuB,EAC/C,QAAQ,mBAAmB,EAC3B,OAAO,YAAY;AAClB,QAAM,EAAE,UAAU,IAAI,MAAM,OAAO,yBAAsB;AACzD,SAAO,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,CAAC;AAEH,IACG,QAAQ,UAAU,sCAAQ,EAC1B,QAAQ,aAAa,EACrB,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,OAAO,IAAI,MAAM,OAAO,sBAAmB;AACnD,QAAM,OAAO;AACf,CAAC;AAKH,IACG,QAAQ,eAAe,+BAAW,EAClC,QAAQ,kBAAkB,EAC1B,OAAO,YAAY;AAClB,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY;AACpB,CAAC;AAIH,IAAI,QAAQ,SAAS,cAAI,EAAE,OAAO,YAAY;AAC5C,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,QAAM,WAAW,gBAAgB;AACnC,CAAC;AACD,IAAI,QAAQ,UAAU,cAAI,EAAE,OAAO,YAAY;AAC7C,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,QAAM,WAAW,kBAAkB;AACrC,CAAC;AACD,IAAI,QAAQ,YAAY,0BAAM,EAAE,OAAO,YAAY;AACjD,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAsB;AAC1D,MAAI,WAAW,QAAQ;AACrB,YAAQ,IAAI,UACP,WAAW,OAAO,KAAK;AAAA,SACvB,WAAW,OAAO,GAAG;AAAA,SACrB,IAAI,KAAK,WAAW,OAAO,WAAW,EAAE,eAAe,CAAC;AAAA,CAChE;AAAA,EACC,OAAO;AACL,YAAQ,IAAI,oBAAK;AACjB,YAAQ,IAAI,sCAAkB;AAAA,EAChC;AACF,CAAC;AAGD,IACG,QAAQ,QAAQ,4CAAS,EACzB,QAAQ,WAAW,EACnB,OAAO,YAAY;AAClB,QAAM,EAAE,WAAW,IAAI,MAAM,OAAO,0BAAuB;AAC3D,QAAM,WAAW;AACnB,CAAC;AAEH,IACG,QAAQ,eAAe,gCAAO,EAC9B,QAAQ,kBAAkB,EAC1B,MAAM,GAAG,EACT,OAAO,OAAO,SAAS;AACtB,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY,IAAI;AACxB,CAAC;AAGH,IAAI,QAAQ,EAAE,EAAE,OAAO,OAAO,SAAS;AACrC,QAAM,EAAE,YAAY,IAAI,MAAM,OAAO,2BAAwB;AAC7D,QAAM,YAAY,IAAI;AACxB,CAAC;AAED,IAAI,QAAQ,OAAO;AACnB,IAAI,KAAK;AAAA,CAER,YAAY;AACX,MAAI;AAEF,QAAI,MAAM,QAAQ,MAAM,EAAE,KAAK,MAAM,CAAC;AAGtC,UAAM,IAAI,kBAAkB;AAAA,EAC9B,SAAS,OAAO;AAAA,EAKhB;AACF,GAAG;","names":[]}

package/dist/{generateApi-A4RH4WFR.js → generateApi-B7OSZKPS.js}

@@ -25,18 +25,25 @@ async function generateApi() {
   const config = await getConfig();
   const apiConfigs = await promptApiConfigEnable(config.api);
   for (const apiConfig of apiConfigs) {
-    log.info(`\u6E05\u9664\u65E7\u7684api\u6587\u4EF6: ${apiConfig.output}`);
+    log.info(`\u6E05\u9664\u65E7\u7684 api \u6587\u4EF6\uFF1A${apiConfig.output}`);
     await fs.emptydir(apiConfig.output);
   }
   for (const apiConfig of apiConfigs) {
     log.info("\u5F00\u59CB\u89E3\u6790 %s", apiConfig.swaggerJSONPath);
-    const parsed = await SwaggerParser.dereference(apiConfig.swaggerJSONPath, {
-      resolve: {
-        http: {
-          timeout: 30 * 1e3
+    const dereferenceConfig = _.merge(
+      {
+        resolve: {
+          http: {
+            timeout: 30 * 1e3
+          }
         }
-      }
-    });
+      },
+      apiConfig.dereferenceSwaggerConfig
+    );
+    const parsed = await SwaggerParser.dereference(
+      apiConfig.swaggerJSONPath,
+      dereferenceConfig
+    );
     await pMap(Object.entries(parsed.paths), async ([url, pathItemObject]) => {
       log.info("\u5F00\u59CB\u751F\u6210 %s", url);
       if (pathItemObject) {
@@ -116,9 +123,9 @@ async function generateApiRequestCode(options) {
   }
   code.push(builderCode);
   if (apiConfig.enableTs) {
-    const isGenrateFieldsMap = ["post", "put"].includes(method);
+    const isGenerateFieldsMap = ["post", "put"].includes(method);
     const [requestParamsTypeCode, responseParamsTypeCode] = await Promise.all([
-      compileRequestParams(operationObject, isGenrateFieldsMap),
+      compileRequestParams(operationObject, isGenerateFieldsMap),
       compileResponseParams(operationObject, apiConfig)
     ]);
     code.push(`
@@ -127,11 +134,11 @@ export namespace ${requestBuilderName} {
  
  ${responseParamsTypeCode}
 };`);
-    if (isGenrateFieldsMap && !_.isEmpty(requestParamsTypeCode.fieldsMap)) {
+    if (isGenerateFieldsMap && !_.isEmpty(requestParamsTypeCode.fieldsMap)) {
       code.push(`
 export const ${requestBuilderName}FieldsMap = ${JSON.stringify(
         requestParamsTypeCode.fieldsMap
-      )}
+      )} as const
 `);
     }
   }
@@ -237,13 +244,13 @@ async function compileResponseParams(operationObject, apiConfig) {
           code += `${os.EOL}export type ResultItem = Res['result'][0]`;
         }
       } catch (e) {
-        log.error("\u8F6C\u6362\u54CD\u5E94\u53C2\u6570\u7C7B\u578B\u5931\u8D25, \u8BF7\u68C0\u67E5 %o", {
+        log.error("\u8F6C\u6362\u54CD\u5E94\u53C2\u6570\u7C7B\u578B\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 %o", {
           summary: operationObject.summary,
           error: e.message
         });
       }
     } else {
-      log.error("responseSchemaTransformer \u8FD4\u56DE\u503C\u4E3A\u7A7A, \u8BF7\u68C0\u67E5");
+      log.error("responseSchemaTransformer \u8FD4\u56DE\u503C\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5");
     }
   }
   return code ? code : "export type Res = any;";
@@ -269,4 +276,4 @@ export {
   generateApiRequestCode,
   markCircularToRef
 };
-//# sourceMappingURL=generateApi-A4RH4WFR.js.map
+//# sourceMappingURL=generateApi-B7OSZKPS.js.map

package/dist/generateApi-B7OSZKPS.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/commands/generateApi/index.ts"],"sourcesContent":["import SwaggerParser from \"@apidevtools/swagger-parser\";\nimport fs from \"fs-extra\";\nimport { compile } from \"json-schema-to-typescript\";\nimport _ from \"lodash\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport * as os from \"os\";\nimport pMap from \"p-map\";\nimport path from \"path\";\nimport { createLogger } from \"../../shared\";\nimport { ApiConfig, getConfig } from \"../../shared/config\";\nimport { formatFile } from \"../../shared/formatFile\";\nimport { promptApiConfigEnable } from \"../../shared/promptConfigEnable\";\n\nconst log = createLogger(\"generateApi\");\n\nexport async function generateApi() {\n  const config = await getConfig();\n  const apiConfigs = await promptApiConfigEnable(config.api);\n\n  for (const apiConfig of apiConfigs) {\n    log.info(`清除旧的 api 文件：${apiConfig.output}`);\n    await fs.emptydir(apiConfig.output!);\n  }\n\n  for (const apiConfig of apiConfigs) {\n    log.info(\"开始解析 %s\", apiConfig.swaggerJSONPath);\n    const dereferenceConfig = _.merge(\n      {\n        resolve: {\n          http: {\n            timeout: 30 * 1000,\n          },\n        },\n      },\n      apiConfig.dereferenceSwaggerConfig,\n    );\n    const parsed = (await SwaggerParser.dereference(\n      apiConfig.swaggerJSONPath,\n      dereferenceConfig,\n    )) as OpenAPIV3.Document;\n\n    await pMap(Object.entries(parsed.paths), async ([url, pathItemObject]) => {\n      log.info(\"开始生成 %s\", url);\n      if (pathItemObject) {\n        await pMap(\n          [\"get\", \"put\", \"post\", \"delete\", \"patch\"],\n          async (method) => {\n            const operationObject = pathItemObject[method];\n            if (operationObject) {\n              const code = await generateApiRequestCode({\n                url: url,\n                method: method,\n                operationObject: operationObject,\n                apiConfig,\n              });\n              const outputPath = path\n                .join(\n                  apiConfig.output!,\n                  url,\n                  apiConfig.enableTs ? `${method}.ts` : `${method}.js`,\n                )\n                .replace(/:/g, \"_\");\n              await fs.ensureFile(outputPath);\n              await fs.writeFile(outputPath, code);\n            }\n          },\n        );\n      }\n    });\n\n    if (apiConfig.format) {\n      await formatFile(apiConfig.output!);\n    }\n  }\n\n  log.info(\"generateApi Done\");\n}\n\n/**\n * 根据请求方法，生成请求代码\n */\nexport async function generateApiRequestCode(options: {\n  url: string;\n  method: string;\n  operationObject: OpenAPIV3.OperationObject;\n  apiConfig: ApiConfig;\n}): Promise<string> {\n  const { method, operationObject, apiConfig } = options;\n\n  const url = (() => {\n    if (typeof apiConfig.urlTransformer === \"string\") {\n      return `${apiConfig.urlTransformer}${options.url}`;\n    }\n    if (typeof apiConfig.urlTransformer === \"function\") {\n      return apiConfig.urlTransformer(options.url);\n    }\n    return options.url;\n  })();\n\n  const seeUrl = apiConfig.swaggerUiUrl\n    ? `${apiConfig.swaggerUiUrl}#/${operationObject.tags?.join(\"/\") ?? \"\"}/${\n        operationObject.operationId\n      }`\n    : \"\";\n\n  // 生成的请求构造器的名称，需要使用原始 url\n  let requestBuilderName = _.camelCase(`${options.url}_${method}_api`);\n\n  // 判断是否有效的 js 变量\n  if (!/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(requestBuilderName)) {\n    // 不是有效的 js 变量，使用 _ + 数字\n    requestBuilderName = `_${requestBuilderName}`;\n  }\n\n  //#region url 上参数 例如 /api/v1/users/{userId}\n  const urlPathParams = getUrlPathParams(\n    (operationObject.parameters as never) ?? [],\n  );\n  const urlPathParamsCode = urlPathParams.length\n    ? `urlPathParams: ${JSON.stringify(urlPathParams)},`\n    : \"\";\n  //#endregion\n\n  let code: string[] = [\n    \"// 这个文件由 @dune2/cli 自动生成，不要手动修改，否则会被覆盖\",\n    apiConfig.RequestBuilderImportPath!,\n    apiConfig.requestFnImportPath!,\n    apiConfig.queryClientImportPath!,\n\n    \"/**\",\n    `  * ${operationObject.summary}`,\n    `  * @tags ${operationObject.tags?.join(\",\")}`,\n    seeUrl && `  * @see ${seeUrl}`,\n    `  */`,\n  ].filter(Boolean);\n\n  // builder 代码\n  let builderCode = `\\\nexport const ${requestBuilderName} = new RequestBuilder({\n  url: '${url}',\n  method: '${method}',\n  ${apiConfig.requestFnImportPath ? \"requestFn,\" : \"\"}\n  ${urlPathParamsCode}\n  ${apiConfig.queryClientImportPath ? \"queryClient,\" : \"\"}\n});`\n    // 移除空行\n    .replace(/,\\n\\s*}/, \",\" + os.EOL + \"}\");\n  if (apiConfig.enableTs) {\n    builderCode = builderCode.replace(\n      \"new RequestBuilder(\",\n      `new RequestBuilder<${requestBuilderName}.Req, ${requestBuilderName}.Res>(`,\n    );\n  }\n  code.push(builderCode);\n\n  if (apiConfig.enableTs) {\n    // post 和 put 请求需要生成表单 fieldsMap\n    const isGenerateFieldsMap = [\"post\", \"put\"].includes(method);\n    // 请求参数类型\n    // 响应参数类型\n    const [requestParamsTypeCode, responseParamsTypeCode] = await Promise.all([\n      compileRequestParams(operationObject, isGenerateFieldsMap),\n      compileResponseParams(operationObject, apiConfig),\n    ]);\n\n    code.push(`\nexport namespace ${requestBuilderName} {\n ${requestParamsTypeCode.code}\n \n ${responseParamsTypeCode}\n};`);\n\n    if (isGenerateFieldsMap && !_.isEmpty(requestParamsTypeCode.fieldsMap)) {\n      // 生成表单 fieldsMap\n      code.push(`\nexport const ${requestBuilderName}FieldsMap = ${JSON.stringify(\n        requestParamsTypeCode.fieldsMap,\n      )} as const\n`);\n    }\n  }\n\n  return code.join(os.EOL);\n}\n\nfunction getUrlPathParams(parameters: OpenAPIV3.ParameterObject[]) {\n  return parameters\n    .filter((item) => item.in === \"path\")\n    .map((item) => item.name);\n}\n\n/**\n * 这个方法还不完善，只能处理简单的请求参数\n */\nasync function compileRequestParams(\n  operationObject: OpenAPIV3.OperationObject,\n  generateFieldsMap = false,\n) {\n  let schema;\n  if (operationObject.requestBody) {\n    //TODO: 这里也需要处理其他类型\n    schema = (operationObject.requestBody as OpenAPIV3.RequestBodyObject)\n      .content[\"application/json\"].schema;\n  } else if (operationObject.parameters) {\n    const extraProperties = {};\n    const parameters: OpenAPIV3.ParameterObject[] = [];\n    (operationObject.parameters as OpenAPIV3.ParameterObject[]).forEach(\n      (item) => {\n        if (![\"query\", \"path\"].includes(item.in)) {\n          return;\n        }\n        if (_.get(item.schema, \"type\") === \"object\") {\n          // swagger get 请求上 有些参数是 object 类型 应该拍平\n          _.assign(extraProperties, _.get(item.schema, \"properties\", {}));\n        } else {\n          parameters.push(item);\n        }\n      },\n    );\n\n    // 必填参数中忽略 分页相关的参数\n    const required = parameters\n      .filter(\n        (p) => p.required && ![\"pageNum\", \"pageSize\", \"count\"].includes(p.name),\n      )\n      .map((p) => p.name);\n    const properties = Object.fromEntries(\n      parameters\n        // 后端 swagger 可能出现没有 schema 的情况，这里过滤掉\n        .filter((p) => !!p.schema)\n        .map((p) => {\n          //TODO: 这里也要处理 ref 类型\n          const schema = p.schema as OpenAPIV3.SchemaObject;\n          return [\n            p.name,\n            {\n              ...schema,\n              description: p.description,\n              // enum: schema.enum ?? [],\n            },\n          ];\n        }),\n    );\n    schema = {\n      required,\n      type: \"object\",\n      properties: { ...properties, ...extraProperties },\n    };\n  }\n\n  let code = \"\";\n  const fieldsMap: Record<string, string> = {};\n  if (schema) {\n    try {\n      code = await compile(schema, \"Req\", {\n        bannerComment: \"\",\n        ignoreMinAndMaxItems: !!1,\n        additionalProperties: false,\n        // format: false,\n      });\n\n      // 判断接口是否是分页请求\n      const isPageSearchRequest = (data: any) => {\n        // 入参有这些字段就认为是分页查询接口\n        const keys = [\"pageNum\", \"pageSize\", \"count\"];\n        return (\n          _.get(data, \"type\") === \"object\" &&\n          _.get(data, \"required\", []).filter((item) => keys.includes(item))\n            .length === keys.length\n        );\n      };\n\n      if (generateFieldsMap) {\n        // 分页查询接口取 params 字段\n        const params = isPageSearchRequest(schema)\n          ? _.get(schema, \"properties.params.properties\", {})\n          : schema.properties;\n        _.forEach(params, (_, field) => {\n          fieldsMap[field] = field;\n        });\n      }\n    } catch (e) {\n      log.error(\"生成请求参数类型失败，请检查 %o\", {\n        summary: operationObject.summary,\n        message: e.message,\n      });\n    }\n  }\n\n  return {\n    code: code || \"export type Req = any;\",\n    fieldsMap,\n  };\n}\n\nasync function compileResponseParams(\n  operationObject: OpenAPIV3.OperationObject,\n  apiConfig: ApiConfig,\n) {\n  const temp = operationObject.responses[\"200\"] as OpenAPIV3.ResponseObject;\n  let code = \"\";\n  if (temp?.content) {\n    // FIXME: 可能需要处理其他的 content 类型\n    const temp2 = temp.content[\"application/json\"] || temp.content[\"*/*\"];\n    const schema = temp2.schema as OpenAPIV3.SchemaObject;\n    let data = apiConfig.responseSchemaTransformer!(schema);\n    if (data) {\n      // 这里需要深度 clone 的原因是：\n      // 解析出来的 scheme 会尽可能的被复用，导致影响到下次解析\n      data = _.cloneDeep(data);\n      markCircularToRef(data);\n      try {\n        code = await compile(data, \"Res\", {\n          bannerComment: \"\",\n          ignoreMinAndMaxItems: !!1,\n          additionalProperties: false,\n          // format: false,\n        });\n\n        // 通过响应数据判断是否是分页查询接口\n        const isPageSearchResponse = (data: any) => {\n          // 有 result 字段且为数组，就认为是分页查询接口\n          return (\n            _.get(data, \"type\") === \"object\" &&\n            _.get(data, \"properties.result.type\") === \"array\"\n          );\n        };\n\n        // 新增后端分页查询返回的数据类型\n        if (isPageSearchResponse(data)) {\n          code += `${os.EOL}export type ResultItem = Res['result'][0]`;\n        }\n      } catch (e) {\n        log.error(\"转换响应参数类型失败，请检查 %o\", {\n          summary: operationObject.summary,\n          error: e.message,\n        });\n      }\n    } else {\n      log.error(\"responseSchemaTransformer 返回值为空，请检查\");\n    }\n  }\n\n  return code ? code : \"export type Res = any;\";\n}\n\nexport function markCircularToRef(\n  obj,\n  parentMark = \"#\",\n  map = new Map([[obj, parentMark]]),\n  set = new Set([obj]),\n) {\n  Object.keys(obj).forEach((key) => {\n    const value = obj[key];\n    if (typeof value === \"object\" && !Array.isArray(value)) {\n      if (set.has(value)) {\n        obj[key] = { $ref: map.get(value) };\n        return;\n      }\n      const tempMark = parentMark + \"/\" + key;\n      set.add(value);\n      map.set(value, tempMark);\n      markCircularToRef(value, tempMark, map, set);\n    }\n  });\n  return map;\n}\n"],"mappings":"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","names":["schema","_","data"]}

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-import { C as Config } from './types-DwQTE6Zn.js';
-export { A as ApiConfig, I as I18nConfig } from './types-DwQTE6Zn.js';
+import { C as Config } from './types-D01zR42f.js';
+export { A as ApiConfig, I as I18nConfig } from './types-D01zR42f.js';
 import { GaxiosResponse } from 'gaxios';
 import { sheets_v4 } from 'googleapis';
+import '@apidevtools/swagger-parser';
 import 'openapi-types';
 
 declare function defineConfig<T extends Config = Config>(c: T): T;

package/dist/normalizeConfig.d.ts

@@ -1,4 +1,5 @@
-import { C as Config, A as ApiConfig } from './types-DwQTE6Zn.js';
+import { C as Config, A as ApiConfig } from './types-D01zR42f.js';
+import '@apidevtools/swagger-parser';
 import 'openapi-types';
 
 declare function normalizeConfig(config: Config): Config;

package/dist/{types-DwQTE6Zn.d.ts → types-D01zR42f.d.ts}

@@ -1,3 +1,4 @@
+import SwaggerParser from '@apidevtools/swagger-parser';
 import { OpenAPIV3 } from 'openapi-types';
 
 interface I18nConfig {
@@ -131,6 +132,10 @@ interface ApiConfig {
      * @tips 不会影响文件名，只会影响生成的代码里的url字段
      */
     urlTransformer?: string | ((url: string) => string);
+    /**
+     * 配置 dereference 的参数
+     */
+    dereferenceSwaggerConfig?: SwaggerParser.Options;
 }
 interface Config {
     i18n?: I18nConfig[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/cli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/liaoyinglong/next-tools.git",

package/dist/generateApi-A4RH4WFR.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/commands/generateApi/index.ts"],"sourcesContent":["import SwaggerParser from \"@apidevtools/swagger-parser\";\nimport fs from \"fs-extra\";\nimport { compile } from \"json-schema-to-typescript\";\nimport _ from \"lodash\";\nimport { OpenAPIV3 } from \"openapi-types\";\nimport * as os from \"os\";\nimport pMap from \"p-map\";\nimport path from \"path\";\nimport { createLogger } from \"../../shared\";\nimport { ApiConfig, getConfig } from \"../../shared/config\";\nimport { formatFile } from \"../../shared/formatFile\";\nimport { promptApiConfigEnable } from \"../../shared/promptConfigEnable\";\n\nconst log = createLogger(\"generateApi\");\n\nexport async function generateApi() {\n  const config = await getConfig();\n  const apiConfigs = await promptApiConfigEnable(config.api);\n\n  for (const apiConfig of apiConfigs) {\n    log.info(`清除旧的api文件: ${apiConfig.output}`);\n    await fs.emptydir(apiConfig.output!);\n  }\n\n  for (const apiConfig of apiConfigs) {\n    log.info(\"开始解析 %s\", apiConfig.swaggerJSONPath);\n    const parsed = (await SwaggerParser.dereference(apiConfig.swaggerJSONPath, {\n      resolve: {\n        http: {\n          timeout: 30 * 1000,\n        },\n      },\n    })) as OpenAPIV3.Document;\n\n    await pMap(Object.entries(parsed.paths), async ([url, pathItemObject]) => {\n      log.info(\"开始生成 %s\", url);\n      if (pathItemObject) {\n        await pMap(\n          [\"get\", \"put\", \"post\", \"delete\", \"patch\"],\n          async (method) => {\n            const operationObject = pathItemObject[method];\n            if (operationObject) {\n              const code = await generateApiRequestCode({\n                url: url,\n                method: method,\n                operationObject: operationObject,\n                apiConfig,\n              });\n              const outputPath = path\n                .join(\n                  apiConfig.output!,\n                  url,\n                  apiConfig.enableTs ? `${method}.ts` : `${method}.js`\n                )\n                .replace(/:/g, \"_\");\n              await fs.ensureFile(outputPath);\n              await fs.writeFile(outputPath, code);\n            }\n          }\n        );\n      }\n    });\n\n    if (apiConfig.format) {\n      await formatFile(apiConfig.output!);\n    }\n  }\n\n  log.info(\"generateApi Done\");\n}\n\n/**\n * 根据请求方法，生成请求代码\n */\nexport async function generateApiRequestCode(options: {\n  url: string;\n  method: string;\n  operationObject: OpenAPIV3.OperationObject;\n  apiConfig: ApiConfig;\n}): Promise<string> {\n  const { method, operationObject, apiConfig } = options;\n\n  const url = (() => {\n    if (typeof apiConfig.urlTransformer === \"string\") {\n      return `${apiConfig.urlTransformer}${options.url}`;\n    }\n    if (typeof apiConfig.urlTransformer === \"function\") {\n      return apiConfig.urlTransformer(options.url);\n    }\n    return options.url;\n  })();\n\n  const seeUrl = apiConfig.swaggerUiUrl\n    ? `${apiConfig.swaggerUiUrl}#/${operationObject.tags?.join(\"/\") ?? \"\"}/${\n        operationObject.operationId\n      }`\n    : \"\";\n\n  // 生成的请求构造器的名称，需要使用原始url\n  let requestBuilderName = _.camelCase(`${options.url}_${method}_api`);\n\n  // 判断是否有效的js变量\n  if (!/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(requestBuilderName)) {\n    // 不是有效的js变量，使用 _ + 数字\n    requestBuilderName = `_${requestBuilderName}`;\n  }\n\n  //#region url上参数 例如 /api/v1/users/{userId}\n  const urlPathParams = getUrlPathParams(\n    (operationObject.parameters as never) ?? []\n  );\n  const urlPathParamsCode = urlPathParams.length\n    ? `urlPathParams: ${JSON.stringify(urlPathParams)},`\n    : \"\";\n  //#endregion\n\n  let code: string[] = [\n    \"// 这个文件由 @dune2/cli 自动生成，不要手动修改，否则会被覆盖\",\n    apiConfig.RequestBuilderImportPath!,\n    apiConfig.requestFnImportPath!,\n    apiConfig.queryClientImportPath!,\n\n    \"/**\",\n    `  * ${operationObject.summary}`,\n    `  * @tags ${operationObject.tags?.join(\",\")}`,\n    seeUrl && `  * @see ${seeUrl}`,\n    `  */`,\n  ].filter(Boolean);\n\n  // builder 代码\n  let builderCode = `\\\nexport const ${requestBuilderName} = new RequestBuilder({\n  url: '${url}',\n  method: '${method}',\n  ${apiConfig.requestFnImportPath ? \"requestFn,\" : \"\"}\n  ${urlPathParamsCode}\n  ${apiConfig.queryClientImportPath ? \"queryClient,\" : \"\"}\n});`\n    // 移除空行\n    .replace(/,\\n\\s*}/, \",\" + os.EOL + \"}\");\n  if (apiConfig.enableTs) {\n    builderCode = builderCode.replace(\n      \"new RequestBuilder(\",\n      `new RequestBuilder<${requestBuilderName}.Req, ${requestBuilderName}.Res>(`\n    );\n  }\n  code.push(builderCode);\n\n  if (apiConfig.enableTs) {\n    // post和put请求需要生成表单fieldsMap\n    const isGenrateFieldsMap = [\"post\", \"put\"].includes(method);\n    // 请求参数类型\n    // 响应参数类型\n    const [requestParamsTypeCode, responseParamsTypeCode] = await Promise.all([\n      compileRequestParams(operationObject, isGenrateFieldsMap),\n      compileResponseParams(operationObject, apiConfig),\n    ]);\n\n    code.push(`\nexport namespace ${requestBuilderName} {\n ${requestParamsTypeCode.code}\n \n ${responseParamsTypeCode}\n};`);\n\n    if (isGenrateFieldsMap && !_.isEmpty(requestParamsTypeCode.fieldsMap)) {\n      // 生成表单fieldsMap\n      code.push(`\nexport const ${requestBuilderName}FieldsMap = ${JSON.stringify(\n        requestParamsTypeCode.fieldsMap\n      )}\n`);\n    }\n  }\n\n  return code.join(os.EOL);\n}\n\nfunction getUrlPathParams(parameters: OpenAPIV3.ParameterObject[]) {\n  return parameters\n    .filter((item) => item.in === \"path\")\n    .map((item) => item.name);\n}\n\n/**\n * 这个方法还不完善，只能处理简单的请求参数\n */\nasync function compileRequestParams(\n  operationObject: OpenAPIV3.OperationObject,\n  generateFieldsMap = false\n) {\n  let schema;\n  if (operationObject.requestBody) {\n    //TODO: 这里也需要处理其他类型\n    schema = (operationObject.requestBody as OpenAPIV3.RequestBodyObject)\n      .content[\"application/json\"].schema;\n  } else if (operationObject.parameters) {\n    const extraProperties = {};\n    const parameters: OpenAPIV3.ParameterObject[] = [];\n    (operationObject.parameters as OpenAPIV3.ParameterObject[]).forEach(\n      (item) => {\n        if (![\"query\", \"path\"].includes(item.in)) {\n          return;\n        }\n        if (_.get(item.schema, \"type\") === \"object\") {\n          // swagger get 请求上 有些参数是 object 类型 应该拍平\n          _.assign(extraProperties, _.get(item.schema, \"properties\", {}));\n        } else {\n          parameters.push(item);\n        }\n      }\n    );\n\n    // 必填参数中忽略 分页相关的参数\n    const required = parameters\n      .filter(\n        (p) => p.required && ![\"pageNum\", \"pageSize\", \"count\"].includes(p.name)\n      )\n      .map((p) => p.name);\n    const properties = Object.fromEntries(\n      parameters\n        // 后端 swagger 可能出现没有 schema 的情况，这里过滤掉\n        .filter((p) => !!p.schema)\n        .map((p) => {\n          //TODO: 这里也要处理 ref 类型\n          const schema = p.schema as OpenAPIV3.SchemaObject;\n          return [\n            p.name,\n            {\n              ...schema,\n              description: p.description,\n              // enum: schema.enum ?? [],\n            },\n          ];\n        })\n    );\n    schema = {\n      required,\n      type: \"object\",\n      properties: { ...properties, ...extraProperties },\n    };\n  }\n\n  let code = \"\";\n  const fieldsMap: Record<string, string> = {};\n  if (schema) {\n    try {\n      code = await compile(schema, \"Req\", {\n        bannerComment: \"\",\n        ignoreMinAndMaxItems: !!1,\n        additionalProperties: false,\n        // format: false,\n      });\n\n      // 判断接口是否是分页请求\n      const isPageSearchRequest = (data: any) => {\n        // 入参有这些字段就认为是分页查询接口\n        const keys = [\"pageNum\", \"pageSize\", \"count\"];\n        return (\n          _.get(data, \"type\") === \"object\" &&\n          _.get(data, \"required\", []).filter((item) => keys.includes(item))\n            .length === keys.length\n        );\n      };\n\n      if (generateFieldsMap) {\n        // 分页查询接口取params字段\n        const params = isPageSearchRequest(schema)\n          ? _.get(schema, \"properties.params.properties\", {})\n          : schema.properties;\n        _.forEach(params, (_, field) => {\n          fieldsMap[field] = field;\n        });\n      }\n    } catch (e) {\n      log.error(\"生成请求参数类型失败，请检查 %o\", {\n        summary: operationObject.summary,\n        message: e.message,\n      });\n    }\n  }\n\n  return {\n    code: code || \"export type Req = any;\",\n    fieldsMap,\n  };\n}\n\nasync function compileResponseParams(\n  operationObject: OpenAPIV3.OperationObject,\n  apiConfig: ApiConfig\n) {\n  const temp = operationObject.responses[\"200\"] as OpenAPIV3.ResponseObject;\n  let code = \"\";\n  if (temp?.content) {\n    // FIXME: 可能需要处理其他的content类型\n    const temp2 = temp.content[\"application/json\"] || temp.content[\"*/*\"];\n    const schema = temp2.schema as OpenAPIV3.SchemaObject;\n    let data = apiConfig.responseSchemaTransformer!(schema);\n    if (data) {\n      // 这里需要深度clone的原因是：\n      // 解析出来的scheme会尽可能的被复用，导致影响到下次解析\n      data = _.cloneDeep(data);\n      markCircularToRef(data);\n      try {\n        code = await compile(data, \"Res\", {\n          bannerComment: \"\",\n          ignoreMinAndMaxItems: !!1,\n          additionalProperties: false,\n          // format: false,\n        });\n\n        // 通过响应数据判断是否是分页查询接口\n        const isPageSearchResponse = (data: any) => {\n          // 有result字段且为数组，就认为是分页查询接口\n          return (\n            _.get(data, \"type\") === \"object\" &&\n            _.get(data, \"properties.result.type\") === \"array\"\n          );\n        };\n\n        // 新增后端分页查询返回的数据类型\n        if (isPageSearchResponse(data)) {\n          code += `${os.EOL}export type ResultItem = Res['result'][0]`;\n        }\n      } catch (e) {\n        log.error(\"转换响应参数类型失败, 请检查 %o\", {\n          summary: operationObject.summary,\n          error: e.message,\n        });\n      }\n    } else {\n      log.error(\"responseSchemaTransformer 返回值为空, 请检查\");\n    }\n  }\n\n  return code ? code : \"export type Res = any;\";\n}\n\nexport function markCircularToRef(\n  obj,\n  parentMark = \"#\",\n  map = new Map([[obj, parentMark]]),\n  set = new Set([obj])\n) {\n  Object.keys(obj).forEach((key) => {\n    const value = obj[key];\n    if (typeof value === \"object\" && !Array.isArray(value)) {\n      if (set.has(value)) {\n        obj[key] = { $ref: map.get(value) };\n        return;\n      }\n      const tempMark = parentMark + \"/\" + key;\n      set.add(value);\n      map.set(value, tempMark);\n      markCircularToRef(value, tempMark, map, set);\n    }\n  });\n  return map;\n}\n"],"mappings":"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","names":["schema","_","data"]}