@gopowerteam/request-generate 0.1.24 → 0.1.26

package/bin/index.mts

@@ -1,17 +1,18 @@
 #!/usr/bin/env tsx
 
-import path from 'node:path'
 import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
+import { fileURLToPath } from 'node:url'
 import { program } from 'commander'
-import { fileURLToPath } from 'node:url';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 const RequestGenerate = await import(`file://${path.resolve(
   __dirname,
   '..',
   'dist',
-  'index.mjs'
+  'index.mjs',
 )}`)
 
 const params = program
@@ -24,32 +25,34 @@ const params = program
 const configFilePaths = [
   'request.config.ts',
   'request-generate.config.cjs',
-  'request-generate.config.js'
+  'request-generate.config.js',
 ]
 
 /**
  * 加载配置文件
  * @param {*} filePath
- * @returns
+ * @returns Promise
  */
 async function loadConfigFile(filePath) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }
 
-  const configFilePath = configFilePaths.find((file) =>
-    fs.existsSync(path.resolve(process.cwd(), file))
+  const configFilePath = configFilePaths.find(file =>
+    fs.existsSync(path.resolve(process.cwd(), file)),
   )
 
-  if(!configFilePath){
-    throw new Error("Not Find Config File.")
+  if (!configFilePath) {
+    throw new Error('Not Find Config File.')
   }
 
   if (configFilePath.endsWith('js')) {
     return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
-  } else if (configFilePath.endsWith('ts')) {
+  }
+  else if (configFilePath.endsWith('ts')) {
     return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
-  } else {
+  }
+  else {
     throw new Error('无法找到RequestGenerate配置文件')
   }
 }
@@ -59,7 +62,6 @@ if (RequestGenerate) {
 
   RequestGenerate.default(config)
     .then(() => {
-      console.log('接口文件生成完成')
       process.exit(0)
     })
     .catch((error) => {

package/dist/{chunk-4OXX5WFT.mjs → chunk-3T6NC7NX.mjs}

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/tsup@6.6.3_ts-node@10.9.1_typescript@4.9.5/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@6.6.3_postcss@8.4.45_ts-node@10.9.1_@types+node@20.16.5_typescript@4.9.5__typescript@4.9.5/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/index.d.ts

@@ -1,63 +1,5 @@
 import { OpenAPIV2, OpenAPIV3 } from 'openapi-types';
 
-/**
- * 生成全局选项
- */
-type GenerateOptions = {
-  // 网关地址
-  gateway: string
-  // OpenAPI地址
-  openapi: string
-  // 输出目录
-  output: string
-  // 输出Model路径
-  exportModels: boolean
-  // 开启日志输出
-  logger?: boolean
-  // 输出Model路径
-  exportServices?: {
-    serviceResolve?: (options: {
-      path: string
-      method: string
-      object: OpenAPIV2.OperationObject | OpenAPIV3.OperationObject
-      tags: OpenAPIV2.TagObject[]
-    }) => string
-    operationResolve?: (options: {
-      path: string
-      method: string
-      object: OpenAPIV2.OperationObject | OpenAPIV3.OperationObject
-    }) => string
-    excludeQueryParams?: string[]
-    responseType?: 'promise' | 'observable'
-  }
-  // 多应用列表
-  applications?: Record<string, ApplicationConfig>
-  // 追加service
-  appendService?: boolean
-}
-
-type ApplicationConfig =
-  | {
-      key: string
-      openapi: string
-    }
-  | string
-
-/**
- * 生成应用选项
- */
-type GenerateApplicationOptions = Pick<
-  GenerateOptions,
-  'exportModels' | 'output'
-> & {
-  // 服务名称
-  name?: string
-  // 应用名称
-  application?: string
-  // OPENAPI地址
-  input: string
-}
-
 declare enum OpenAPIVersion {
     V2 = 2,
     V3 = 3
@@ -115,31 +57,90 @@ declare class Service {
     responseType: 'promise' | 'observable';
 }
 
-type GenerateClient = {
+interface GenerateClient {
   // 模型列表
   models: Model[]
   // 服务列表
   services: Service[]
 }
 
+/**
+ * 生成全局选项
+ */
+interface GenerateOptions {
+  // 网关地址
+  gateway: string
+  // OpenAPI地址
+  openapi: string
+  // 输出目录
+  output: string
+  // 输出Model路径
+  exportModels: boolean
+  // 开启日志输出
+  logger?: boolean
+  // 输出Model路径
+  exportServices?: {
+    serviceResolve?: (options: {
+      path: string
+      method: string
+      object: OpenAPIV2.OperationObject | OpenAPIV3.OperationObject
+      tags: OpenAPIV2.TagObject[]
+    }) => string
+    operationResolve?: (options: {
+      path: string
+      method: string
+      object: OpenAPIV2.OperationObject | OpenAPIV3.OperationObject
+    }) => string
+    excludeQueryParams?: string[]
+    responseType?: 'promise' | 'observable'
+  }
+  // 多应用列表
+  applications?: Record<string, ApplicationConfig>
+  // 追加service
+  appendService?: boolean
+}
+
+type ApplicationConfig =
+  | {
+    key: string
+    openapi: string
+  }
+  | string
+
+/**
+ * 生成应用选项
+ */
+type GenerateApplicationOptions = Pick<
+  GenerateOptions,
+  'exportModels' | 'output'
+> & {
+  // 服务名称
+  name?: string
+  // 应用名称
+  application?: string
+  // OPENAPI地址
+  input: string
+}
+
 type UnkownVersionDocument = OpenAPIV3.Document & OpenAPIV2.Document;
 declare class Generate {
     static options: GenerateOptions;
     /**
      * 生成入口
      * @param options
-     * @returns
+     * @returns Promise<void>
      */
-    static startup(options: GenerateOptions): Promise<void[]>;
+    static startup(options: GenerateOptions): Promise<void>;
+    static getApiDocument(url: string, retry?: number): Promise<UnkownVersionDocument>;
     /**
      * 生成应用
      */
-    static generateApplication(options: GenerateApplicationOptions): Promise<void>;
+    static generateApplicationClient(options: GenerateApplicationOptions): Promise<GenerateClient>;
     /**
      * 生成对象信息
      * @param document
      * @param version
-     * @returns
+     * @returns GenerateClient
      */
     static generateClient(document: UnkownVersionDocument, version: OpenAPIVersion): GenerateClient;
     /**

package/dist/index.js

@@ -2,11 +2,8 @@
 
 var _chunkXXPGZHWZjs = require('./chunk-XXPGZHWZ.js');
 
-// src/utils/get-openapi-document.ts
-var _swaggerparser = require('@apidevtools/swagger-parser'); var _swaggerparser2 = _interopRequireDefault(_swaggerparser);
-var getOpenApiDocument = async (input) => {
-  return await _swaggerparser2.default.parse(input);
-};
+// src/generate/index.ts
+var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 
 // src/config/enum.config.ts
 var OpenAPIVersion = /* @__PURE__ */ ((OpenAPIVersion2) => {
@@ -15,61 +12,9 @@ var OpenAPIVersion = /* @__PURE__ */ ((OpenAPIVersion2) => {
   return OpenAPIVersion2;
 })(OpenAPIVersion || {});
 
-// src/utils/get-openapi-version.ts
-function getOpenAPIVersion(document) {
-  const version = (document == null ? void 0 : document.swagger) || (document == null ? void 0 : document.openapi);
-  if (typeof version === "string") {
-    const v = Number.parseInt(version.charAt(0));
-    if (Object.values(OpenAPIVersion).includes(v)) {
-      return v;
-    }
-  }
-  throw new Error(`\u65E0\u6CD5\u8BC6\u522B\u7684OPENAPI\u7248\u672C: "${String(version)}"`);
-}
-
-// src/utils/get-services-options.ts
-var _path = require('path'); var path2 = _interopRequireWildcard(_path); var path3 = _interopRequireWildcard(_path); var path4 = _interopRequireWildcard(_path);
-function createOptions(options, name, application) {
-  const { service, openapi } = (() => {
-    if (!application) {
-      return {
-        service: "",
-        openapi: options.openapi
-      };
-    }
-    if (typeof application === "string") {
-      return {
-        service: application,
-        openapi: options.openapi
-      };
-    } else {
-      return {
-        service: application.key,
-        openapi: application.openapi
-      };
-    }
-  })();
-  return {
-    name,
-    application: service,
-    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
-    output: name ? path2.default.join(options.output, name) : options.output,
-    exportModels: options.exportModels
-  };
-}
-function generateServiceOptions(options) {
-  if (options.applications && Object.keys(options.applications).length) {
-    return Object.entries(options.applications).map(
-      ([name, application]) => createOptions(options, name, application)
-    );
-  } else {
-    return [createOptions(options)];
-  }
-}
-
 // src/utils/get-camel-name.ts
 function getCamelName(value) {
-  return value.replace(/^[^a-zA-Z]+/g, "").replace(/[^\w_]+/g, "_").replace(/[^\w-]+/g, "_").replace(/^\S/, (s) => s.toUpperCase()).replace(/_[a-zA-Z]/g, (s) => s.toUpperCase()).replace(/_/g, "").trim();
+  return value.replace(/^[^a-z]+/gi, "").replace(/\W+/g, "_").replace(/[^\w-]+/g, "_").replace(/^\S/, (s) => s.toUpperCase()).replace(/_[a-z]/gi, (s) => s.toUpperCase()).replace(/_/g, "").trim();
 }
 
 // src/entities/model.ts
@@ -111,9 +56,9 @@ var Field = class {
 var TYPE_MAPPINGS = /* @__PURE__ */ new Map([
   ["MapStringObject", "Record<string, any>"]
 ]);
-var getBuiltInType = (ref) => {
+function getBuiltInType(ref) {
   return TYPE_MAPPINGS.get(ref);
-};
+}
 
 // src/utils/get-mapped-type.ts
 var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
@@ -138,17 +83,17 @@ var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
   ["void", "void"],
   ["null", "null"]
 ]);
-var getMappedType = (type = "object", format) => {
+function getMappedType(type = "object", format) {
   if (format === "binary") {
     return "binary";
   }
   return TYPE_MAPPINGS2.get(type) || "any";
-};
+}
 
 // src/parse/v2/strip-namespace.ts
-var stripNamespace = (value) => {
+function stripNamespace(value) {
   return value.trim().replace(/^#\/definitions\//, "").replace(/^#\/parameters\//, "").replace(/^#\/responses\//, "").replace(/^#\/securityDefinitions\//, "");
-};
+}
 
 // src/parse/v2/parse-schema-type.ts
 function parseSchemaType(schema) {
@@ -347,9 +292,8 @@ function parseParametersBody(parameters) {
     parameter.ref = ref;
     parameter.imports = imports || [];
     return parameter;
-  } else {
-    return;
   }
+  return void 0;
 }
 
 // src/parse/v2/parse-parameters-path.ts
@@ -498,9 +442,9 @@ function parseV2(document) {
 }
 
 // src/parse/v3/strip-namespace.ts
-var stripNamespace2 = (value) => {
+function stripNamespace2(value) {
   return value.trim().replace(/^#\/components\/schemas\//, "").replace(/^#\/components\/responses\//, "").replace(/^#\/components\/parameters\//, "").replace(/^#\/components\/examples\//, "").replace(/^#\/components\/requestBodies\//, "").replace(/^#\/components\/headers\//, "").replace(/^#\/components\/securitySchemes\//, "").replace(/^#\/components\/links\//, "").replace(/^#\/components\/callbacks\//, "");
-};
+}
 
 // src/parse/v3/parse-schema-type.ts
 function parseSchemaType2(schema) {
@@ -543,7 +487,10 @@ function parseSchemaType2(schema) {
         type: hasRef ? "any" : ofSchemaArray.map((s) => s.type).join("|"),
         ref: hasRef ? ofSchemaArray.map((s) => s.ref && getCamelName(s.ref) || s.type).join("|") : void 0,
         imports: hasRef ? ofSchemaArray.reduce(
-          (r, s) => (s.ref && !r.includes(s.ref) && r.push(getCamelName(s.ref)), r),
+          (r, s) => (
+            // eslint-disable-next-line no-sequences
+            (s.ref && !r.includes(s.ref) && r.push(getCamelName(s.ref)), r)
+          ),
           []
         ) : void 0
       };
@@ -690,7 +637,7 @@ function parseOperation2(path5, method, operationObject) {
       ...(responseSchema == null ? void 0 : responseSchema.imports) || []
     ])
   );
-  operation.responseRef = (responseSchema == null ? void 0 : responseSchema.ref) || "void";
+  operation.responseRef = (responseSchema == null ? void 0 : responseSchema.ref) || (responseSchema == null ? void 0 : responseSchema.type) || "void";
   return operation;
 }
 function parseResponseType2(responses) {
@@ -779,9 +726,78 @@ function parseV3(document) {
   };
 }
 
+// src/progress.ts
+var _chalk = require('chalk'); var _chalk2 = _interopRequireDefault(_chalk);
+var _ora = require('ora'); var _ora2 = _interopRequireDefault(_ora);
+var progressMaps = /* @__PURE__ */ new Map();
+function createProgress(name) {
+  const spinner = _ora2.default.call(void 0, 
+    formatProgressText(name)
+  ).start();
+  progressMaps.set(name, {
+    spinner,
+    model: {
+      total: 0,
+      value: 0
+    },
+    service: {
+      total: 0,
+      value: 0
+    }
+  });
+}
+function startProgress(name, options) {
+  const progress = progressMaps.get(name);
+  if (progress) {
+    progress.model = {
+      total: options.models,
+      value: 0
+    };
+    progress.service = {
+      total: options.services,
+      value: 0
+    };
+    updateProgressText(name, progress);
+  }
+}
+function formatProgressText(name, progress) {
+  const toStateText = (text) => `${_chalk2.default.green(text)}`;
+  const toNameText = (text) => `${_chalk2.default.cyan(text).padEnd(20, " ")}`;
+  const toModelText = (text) => `${_chalk2.default.greenBright("Model")}:${_chalk2.default.gray(text).padEnd(10, " ")}`;
+  const toServiceText = (text) => `${_chalk2.default.greenBright("Service")}:${_chalk2.default.gray(text).padEnd(10, " ")}`;
+  const isFinish = (progress == null ? void 0 : progress.model.value) === (progress == null ? void 0 : progress.model.total) && (progress == null ? void 0 : progress.service.value) === (progress == null ? void 0 : progress.service.total);
+  if (progress) {
+    const stateText = toStateText(isFinish ? "\u751F\u6210\u5B8C\u6210" : "\u751F\u6210\u4E2D");
+    const nameText = toNameText(name);
+    const modelText = toModelText(`${progress.model.value} / ${progress.model.total}`);
+    const serviceText = toServiceText(`${progress.service.value} / ${progress.service.total}`);
+    return `${stateText} | ${nameText} | ${modelText} | ${serviceText}`;
+  } else {
+    const stateText = toStateText("\u5F00\u59CB\u8BF7\u6C42");
+    const nameText = toNameText(name);
+    return `${stateText} | ${nameText}`;
+  }
+}
+function updateProgressText(name, progress) {
+  const isFinish = (progress == null ? void 0 : progress.model.value) === (progress == null ? void 0 : progress.model.total) && (progress == null ? void 0 : progress.service.value) === (progress == null ? void 0 : progress.service.total);
+  if (isFinish) {
+    progress.spinner.succeed(formatProgressText(name, progress));
+  } else {
+    progress.spinner.text = formatProgressText(name, progress);
+  }
+}
+function updateProgress(name, type) {
+  const progress = progressMaps.get(name);
+  if (!progress) {
+    return;
+  }
+  progress[type].value++;
+  updateProgressText(name, progress);
+}
+
 // src/template.ts
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs); var fs3 = _interopRequireWildcard(_fs); var fs2 = _interopRequireWildcard(_fs); var fs4 = _interopRequireWildcard(_fs);
-
+var _path = require('path'); var path = _interopRequireWildcard(_path); var path3 = _interopRequireWildcard(_path); var path4 = _interopRequireWildcard(_path);
 var _handlebars = require('handlebars'); var _handlebars2 = _interopRequireDefault(_handlebars);
 
 // src/template-helpers/equal.helper.ts
@@ -813,7 +829,7 @@ var toUpperHelper = {
   name: "to-upper",
   fn(v1, onlyFirst) {
     if (onlyFirst) {
-      return v1.replace(/^\S/, function(s) {
+      return v1.replace(/^\S/, (s) => {
         return s.toUpperCase();
       });
     } else {
@@ -858,34 +874,80 @@ function registerHandlebarPartial(input) {
   _handlebars2.default.registerPartial(input, template);
 }
 function loadHandlebarTemplate(input) {
-  const templatePath = path2.resolve(__dirname, "templates", `${input}.hbs`);
+  const templatePath = path.resolve(__dirname, "templates", `${input}.hbs`);
   return fs.readFileSync(templatePath, "utf-8");
 }
 
+// src/utils/get-openapi-document.ts
+var _swaggerparser = require('@apidevtools/swagger-parser'); var _swaggerparser2 = _interopRequireDefault(_swaggerparser);
+async function getOpenApiDocument(input) {
+  return await _swaggerparser2.default.parse(input);
+}
+
+// src/utils/get-openapi-version.ts
+function getOpenAPIVersion(document) {
+  const version = (document == null ? void 0 : document.swagger) || (document == null ? void 0 : document.openapi);
+  if (typeof version === "string") {
+    const v = Number.parseInt(version.charAt(0));
+    if (Object.values(OpenAPIVersion).includes(v)) {
+      return v;
+    }
+  }
+  throw new Error(`\u65E0\u6CD5\u8BC6\u522B\u7684OPENAPI\u7248\u672C: "${String(version)}"`);
+}
+
+// src/utils/get-services-options.ts
+
+function createOptions(options, name, application) {
+  const { service, openapi } = (() => {
+    if (!application) {
+      return {
+        service: "",
+        openapi: options.openapi
+      };
+    }
+    if (typeof application === "string") {
+      return {
+        service: application,
+        openapi: options.openapi
+      };
+    } else {
+      return {
+        service: application.key,
+        openapi: application.openapi
+      };
+    }
+  })();
+  return {
+    name,
+    application: service,
+    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
+    output: name ? path.default.join(options.output, name) : options.output,
+    exportModels: options.exportModels
+  };
+}
+function generateServiceOptions(options) {
+  if (options.applications && Object.keys(options.applications).length) {
+    return Object.entries(options.applications).map(
+      ([name, application]) => createOptions(options, name, application)
+    );
+  } else {
+    return [createOptions(options)];
+  }
+}
+
 // src/generate/write-models.ts
 
 
+var _rimraf = require('rimraf'); var _rimraf2 = _interopRequireDefault(_rimraf);
 
 // src/generate/write-model.ts
 
 
 // src/generate/write-file.ts
 
-var ConsoleLogBlue = "\x1B[34m";
-var ConsoleLogGreen = "\x1B[32m";
-var ConsoleLogReset = "\x1B[0m";
 function writeFile(output, content) {
-  var _a;
   fs2.writeFileSync(output, content, "utf-8");
-  if ((_a = Generate.options) == null ? void 0 : _a.logger) {
-    console.log(
-      ConsoleLogBlue,
-      "Generate File: ",
-      ConsoleLogGreen,
-      output,
-      ConsoleLogReset
-    );
-  }
 }
 
 // src/generate/write-model.ts
@@ -897,7 +959,6 @@ function writeModel(model, output) {
 }
 
 // src/generate/write-models.ts
-var _rimraf = require('rimraf'); var _rimraf2 = _interopRequireDefault(_rimraf);
 function writeModels(client, options) {
   if (!options.exportModels || !client.models) {
     return;
@@ -910,6 +971,7 @@ function writeModels(client, options) {
   client.models.forEach((model) => {
     const filename = `${model.name}.ts`;
     writeModel(model, path3.join(output, filename));
+    updateProgress(options.name || "default", "model");
   });
 }
 
@@ -941,6 +1003,7 @@ function writeServices(client, options) {
     const filename = `${service.name}Service.ts`;
     service.application = Generate.options.appendService === false ? "" : options.application;
     writeService(service, path4.join(output, filename));
+    updateProgress(options.name || "default", "service");
   });
 }
 
@@ -949,34 +1012,52 @@ var _Generate = class {
   /**
    * 生成入口
    * @param options
-   * @returns
+   * @returns Promise<void>
    */
-  static startup(options) {
+  static async startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
     const applicationOptions = generateServiceOptions(options);
-    return Promise.all(
-      applicationOptions.map(
-        (applicationOption) => _Generate.generateApplication(applicationOption)
-      )
-    );
+    const applications = [];
+    for (const applicationOption of applicationOptions) {
+      const client = await _Generate.generateApplicationClient(applicationOption);
+      applications.push({
+        client,
+        options: applicationOption
+      });
+    }
+    applications.forEach((application) => {
+      createProgress(application.options.name || "default");
+      _Generate.writeClient(application.client, application.options);
+    });
+  }
+  static async getApiDocument(url, retry = 0) {
+    if (retry >= 3) {
+      console.error(`\u8BF7\u6C42[${url}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
+      _process2.default.exit(0);
+    }
+    try {
+      return await getOpenApiDocument(
+        url
+      );
+    } catch (e) {
+      return _Generate.getApiDocument(url, retry + 1);
+    }
   }
   /**
    * 生成应用
    */
-  static async generateApplication(options) {
-    const document = await getOpenApiDocument(
-      options.input
-    );
+  static async generateApplicationClient(options) {
+    const document = await _Generate.getApiDocument(options.input);
     const version = getOpenAPIVersion(document);
     const client = _Generate.generateClient(document, version);
-    _Generate.writeClient(client, options);
+    return client;
   }
   /**
    * 生成对象信息
    * @param document
    * @param version
-   * @returns
+   * @returns GenerateClient
    */
   static generateClient(document, version) {
     switch (version) {
@@ -992,6 +1073,10 @@ var _Generate = class {
    * @param options
    */
   static writeClient(client, options) {
+    startProgress(options.name || "default", {
+      models: client.models.length,
+      services: client.services.length
+    });
     writeModels(client, options);
     writeServices(client, options);
   }

package/dist/index.mjs

@@ -1,13 +1,10 @@
 import {
   __dirname,
   __publicField
-} from "./chunk-4OXX5WFT.mjs";
+} from "./chunk-3T6NC7NX.mjs";
 
-// src/utils/get-openapi-document.ts
-import swaggerParse from "@apidevtools/swagger-parser";
-var getOpenApiDocument = async (input) => {
-  return await swaggerParse.parse(input);
-};
+// src/generate/index.ts
+import process from "node:process";
 
 // src/config/enum.config.ts
 var OpenAPIVersion = /* @__PURE__ */ ((OpenAPIVersion2) => {
@@ -16,61 +13,9 @@ var OpenAPIVersion = /* @__PURE__ */ ((OpenAPIVersion2) => {
   return OpenAPIVersion2;
 })(OpenAPIVersion || {});
 
-// src/utils/get-openapi-version.ts
-function getOpenAPIVersion(document) {
-  const version = (document == null ? void 0 : document.swagger) || (document == null ? void 0 : document.openapi);
-  if (typeof version === "string") {
-    const v = Number.parseInt(version.charAt(0));
-    if (Object.values(OpenAPIVersion).includes(v)) {
-      return v;
-    }
-  }
-  throw new Error(`\u65E0\u6CD5\u8BC6\u522B\u7684OPENAPI\u7248\u672C: "${String(version)}"`);
-}
-
-// src/utils/get-services-options.ts
-import path from "node:path";
-function createOptions(options, name, application) {
-  const { service, openapi } = (() => {
-    if (!application) {
-      return {
-        service: "",
-        openapi: options.openapi
-      };
-    }
-    if (typeof application === "string") {
-      return {
-        service: application,
-        openapi: options.openapi
-      };
-    } else {
-      return {
-        service: application.key,
-        openapi: application.openapi
-      };
-    }
-  })();
-  return {
-    name,
-    application: service,
-    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
-    output: name ? path.join(options.output, name) : options.output,
-    exportModels: options.exportModels
-  };
-}
-function generateServiceOptions(options) {
-  if (options.applications && Object.keys(options.applications).length) {
-    return Object.entries(options.applications).map(
-      ([name, application]) => createOptions(options, name, application)
-    );
-  } else {
-    return [createOptions(options)];
-  }
-}
-
 // src/utils/get-camel-name.ts
 function getCamelName(value) {
-  return value.replace(/^[^a-zA-Z]+/g, "").replace(/[^\w_]+/g, "_").replace(/[^\w-]+/g, "_").replace(/^\S/, (s) => s.toUpperCase()).replace(/_[a-zA-Z]/g, (s) => s.toUpperCase()).replace(/_/g, "").trim();
+  return value.replace(/^[^a-z]+/gi, "").replace(/\W+/g, "_").replace(/[^\w-]+/g, "_").replace(/^\S/, (s) => s.toUpperCase()).replace(/_[a-z]/gi, (s) => s.toUpperCase()).replace(/_/g, "").trim();
 }
 
 // src/entities/model.ts
@@ -112,9 +57,9 @@ var Field = class {
 var TYPE_MAPPINGS = /* @__PURE__ */ new Map([
   ["MapStringObject", "Record<string, any>"]
 ]);
-var getBuiltInType = (ref) => {
+function getBuiltInType(ref) {
   return TYPE_MAPPINGS.get(ref);
-};
+}
 
 // src/utils/get-mapped-type.ts
 var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
@@ -139,17 +84,17 @@ var TYPE_MAPPINGS2 = /* @__PURE__ */ new Map([
   ["void", "void"],
   ["null", "null"]
 ]);
-var getMappedType = (type = "object", format) => {
+function getMappedType(type = "object", format) {
   if (format === "binary") {
     return "binary";
   }
   return TYPE_MAPPINGS2.get(type) || "any";
-};
+}
 
 // src/parse/v2/strip-namespace.ts
-var stripNamespace = (value) => {
+function stripNamespace(value) {
   return value.trim().replace(/^#\/definitions\//, "").replace(/^#\/parameters\//, "").replace(/^#\/responses\//, "").replace(/^#\/securityDefinitions\//, "");
-};
+}
 
 // src/parse/v2/parse-schema-type.ts
 function parseSchemaType(schema) {
@@ -348,9 +293,8 @@ function parseParametersBody(parameters) {
     parameter.ref = ref;
     parameter.imports = imports || [];
     return parameter;
-  } else {
-    return;
   }
+  return void 0;
 }
 
 // src/parse/v2/parse-parameters-path.ts
@@ -499,9 +443,9 @@ function parseV2(document) {
 }
 
 // src/parse/v3/strip-namespace.ts
-var stripNamespace2 = (value) => {
+function stripNamespace2(value) {
   return value.trim().replace(/^#\/components\/schemas\//, "").replace(/^#\/components\/responses\//, "").replace(/^#\/components\/parameters\//, "").replace(/^#\/components\/examples\//, "").replace(/^#\/components\/requestBodies\//, "").replace(/^#\/components\/headers\//, "").replace(/^#\/components\/securitySchemes\//, "").replace(/^#\/components\/links\//, "").replace(/^#\/components\/callbacks\//, "");
-};
+}
 
 // src/parse/v3/parse-schema-type.ts
 function parseSchemaType2(schema) {
@@ -544,7 +488,10 @@ function parseSchemaType2(schema) {
         type: hasRef ? "any" : ofSchemaArray.map((s) => s.type).join("|"),
         ref: hasRef ? ofSchemaArray.map((s) => s.ref && getCamelName(s.ref) || s.type).join("|") : void 0,
         imports: hasRef ? ofSchemaArray.reduce(
-          (r, s) => (s.ref && !r.includes(s.ref) && r.push(getCamelName(s.ref)), r),
+          (r, s) => (
+            // eslint-disable-next-line no-sequences
+            (s.ref && !r.includes(s.ref) && r.push(getCamelName(s.ref)), r)
+          ),
           []
         ) : void 0
       };
@@ -691,7 +638,7 @@ function parseOperation2(path5, method, operationObject) {
       ...(responseSchema == null ? void 0 : responseSchema.imports) || []
     ])
   );
-  operation.responseRef = (responseSchema == null ? void 0 : responseSchema.ref) || "void";
+  operation.responseRef = (responseSchema == null ? void 0 : responseSchema.ref) || (responseSchema == null ? void 0 : responseSchema.type) || "void";
   return operation;
 }
 function parseResponseType2(responses) {
@@ -780,9 +727,78 @@ function parseV3(document) {
   };
 }
 
+// src/progress.ts
+import chalk from "chalk";
+import ora from "ora";
+var progressMaps = /* @__PURE__ */ new Map();
+function createProgress(name) {
+  const spinner = ora(
+    formatProgressText(name)
+  ).start();
+  progressMaps.set(name, {
+    spinner,
+    model: {
+      total: 0,
+      value: 0
+    },
+    service: {
+      total: 0,
+      value: 0
+    }
+  });
+}
+function startProgress(name, options) {
+  const progress = progressMaps.get(name);
+  if (progress) {
+    progress.model = {
+      total: options.models,
+      value: 0
+    };
+    progress.service = {
+      total: options.services,
+      value: 0
+    };
+    updateProgressText(name, progress);
+  }
+}
+function formatProgressText(name, progress) {
+  const toStateText = (text) => `${chalk.green(text)}`;
+  const toNameText = (text) => `${chalk.cyan(text).padEnd(20, " ")}`;
+  const toModelText = (text) => `${chalk.greenBright("Model")}:${chalk.gray(text).padEnd(10, " ")}`;
+  const toServiceText = (text) => `${chalk.greenBright("Service")}:${chalk.gray(text).padEnd(10, " ")}`;
+  const isFinish = (progress == null ? void 0 : progress.model.value) === (progress == null ? void 0 : progress.model.total) && (progress == null ? void 0 : progress.service.value) === (progress == null ? void 0 : progress.service.total);
+  if (progress) {
+    const stateText = toStateText(isFinish ? "\u751F\u6210\u5B8C\u6210" : "\u751F\u6210\u4E2D");
+    const nameText = toNameText(name);
+    const modelText = toModelText(`${progress.model.value} / ${progress.model.total}`);
+    const serviceText = toServiceText(`${progress.service.value} / ${progress.service.total}`);
+    return `${stateText} | ${nameText} | ${modelText} | ${serviceText}`;
+  } else {
+    const stateText = toStateText("\u5F00\u59CB\u8BF7\u6C42");
+    const nameText = toNameText(name);
+    return `${stateText} | ${nameText}`;
+  }
+}
+function updateProgressText(name, progress) {
+  const isFinish = (progress == null ? void 0 : progress.model.value) === (progress == null ? void 0 : progress.model.total) && (progress == null ? void 0 : progress.service.value) === (progress == null ? void 0 : progress.service.total);
+  if (isFinish) {
+    progress.spinner.succeed(formatProgressText(name, progress));
+  } else {
+    progress.spinner.text = formatProgressText(name, progress);
+  }
+}
+function updateProgress(name, type) {
+  const progress = progressMaps.get(name);
+  if (!progress) {
+    return;
+  }
+  progress[type].value++;
+  updateProgressText(name, progress);
+}
+
 // src/template.ts
 import * as fs from "node:fs";
-import * as path2 from "node:path";
+import * as path from "node:path";
 import Handlebars from "handlebars";
 
 // src/template-helpers/equal.helper.ts
@@ -814,7 +830,7 @@ var toUpperHelper = {
   name: "to-upper",
   fn(v1, onlyFirst) {
     if (onlyFirst) {
-      return v1.replace(/^\S/, function(s) {
+      return v1.replace(/^\S/, (s) => {
         return s.toUpperCase();
       });
     } else {
@@ -859,34 +875,80 @@ function registerHandlebarPartial(input) {
   Handlebars.registerPartial(input, template);
 }
 function loadHandlebarTemplate(input) {
-  const templatePath = path2.resolve(__dirname, "templates", `${input}.hbs`);
+  const templatePath = path.resolve(__dirname, "templates", `${input}.hbs`);
   return fs.readFileSync(templatePath, "utf-8");
 }
 
+// src/utils/get-openapi-document.ts
+import swaggerParse from "@apidevtools/swagger-parser";
+async function getOpenApiDocument(input) {
+  return await swaggerParse.parse(input);
+}
+
+// src/utils/get-openapi-version.ts
+function getOpenAPIVersion(document) {
+  const version = (document == null ? void 0 : document.swagger) || (document == null ? void 0 : document.openapi);
+  if (typeof version === "string") {
+    const v = Number.parseInt(version.charAt(0));
+    if (Object.values(OpenAPIVersion).includes(v)) {
+      return v;
+    }
+  }
+  throw new Error(`\u65E0\u6CD5\u8BC6\u522B\u7684OPENAPI\u7248\u672C: "${String(version)}"`);
+}
+
+// src/utils/get-services-options.ts
+import path2 from "node:path";
+function createOptions(options, name, application) {
+  const { service, openapi } = (() => {
+    if (!application) {
+      return {
+        service: "",
+        openapi: options.openapi
+      };
+    }
+    if (typeof application === "string") {
+      return {
+        service: application,
+        openapi: options.openapi
+      };
+    } else {
+      return {
+        service: application.key,
+        openapi: application.openapi
+      };
+    }
+  })();
+  return {
+    name,
+    application: service,
+    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
+    output: name ? path2.join(options.output, name) : options.output,
+    exportModels: options.exportModels
+  };
+}
+function generateServiceOptions(options) {
+  if (options.applications && Object.keys(options.applications).length) {
+    return Object.entries(options.applications).map(
+      ([name, application]) => createOptions(options, name, application)
+    );
+  } else {
+    return [createOptions(options)];
+  }
+}
+
 // src/generate/write-models.ts
 import * as fs3 from "node:fs";
 import * as path3 from "node:path";
+import rimraf from "rimraf";
 
 // src/generate/write-model.ts
 import Handlebars2 from "handlebars";
 
 // src/generate/write-file.ts
 import * as fs2 from "node:fs";
-var ConsoleLogBlue = "\x1B[34m";
-var ConsoleLogGreen = "\x1B[32m";
-var ConsoleLogReset = "\x1B[0m";
 function writeFile(output, content) {
-  var _a;
   fs2.writeFileSync(output, content, "utf-8");
-  if ((_a = Generate.options) == null ? void 0 : _a.logger) {
-    console.log(
-      ConsoleLogBlue,
-      "Generate File: ",
-      ConsoleLogGreen,
-      output,
-      ConsoleLogReset
-    );
-  }
 }
 
 // src/generate/write-model.ts
@@ -898,7 +960,6 @@ function writeModel(model, output) {
 }
 
 // src/generate/write-models.ts
-import rimraf from "rimraf";
 function writeModels(client, options) {
   if (!options.exportModels || !client.models) {
     return;
@@ -911,12 +972,13 @@ function writeModels(client, options) {
   client.models.forEach((model) => {
     const filename = `${model.name}.ts`;
     writeModel(model, path3.join(output, filename));
+    updateProgress(options.name || "default", "model");
   });
 }
 
 // src/generate/write-services.ts
-import * as path4 from "node:path";
 import * as fs4 from "node:fs";
+import * as path4 from "node:path";
 import rimraf2 from "rimraf";
 
 // src/generate/write-service.ts
@@ -942,6 +1004,7 @@ function writeServices(client, options) {
     const filename = `${service.name}Service.ts`;
     service.application = Generate.options.appendService === false ? "" : options.application;
     writeService(service, path4.join(output, filename));
+    updateProgress(options.name || "default", "service");
   });
 }
 
@@ -950,34 +1013,52 @@ var _Generate = class {
   /**
    * 生成入口
    * @param options
-   * @returns
+   * @returns Promise<void>
    */
-  static startup(options) {
+  static async startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
     const applicationOptions = generateServiceOptions(options);
-    return Promise.all(
-      applicationOptions.map(
-        (applicationOption) => _Generate.generateApplication(applicationOption)
-      )
-    );
+    const applications = [];
+    for (const applicationOption of applicationOptions) {
+      const client = await _Generate.generateApplicationClient(applicationOption);
+      applications.push({
+        client,
+        options: applicationOption
+      });
+    }
+    applications.forEach((application) => {
+      createProgress(application.options.name || "default");
+      _Generate.writeClient(application.client, application.options);
+    });
+  }
+  static async getApiDocument(url, retry = 0) {
+    if (retry >= 3) {
+      console.error(`\u8BF7\u6C42[${url}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
+      process.exit(0);
+    }
+    try {
+      return await getOpenApiDocument(
+        url
+      );
+    } catch {
+      return _Generate.getApiDocument(url, retry + 1);
+    }
   }
   /**
    * 生成应用
    */
-  static async generateApplication(options) {
-    const document = await getOpenApiDocument(
-      options.input
-    );
+  static async generateApplicationClient(options) {
+    const document = await _Generate.getApiDocument(options.input);
     const version = getOpenAPIVersion(document);
     const client = _Generate.generateClient(document, version);
-    _Generate.writeClient(client, options);
+    return client;
   }
   /**
    * 生成对象信息
    * @param document
    * @param version
-   * @returns
+   * @returns GenerateClient
    */
   static generateClient(document, version) {
     switch (version) {
@@ -993,6 +1074,10 @@ var _Generate = class {
    * @param options
    */
   static writeClient(client, options) {
+    startProgress(options.name || "default", {
+      models: client.models.length,
+      services: client.services.length
+    });
     writeModels(client, options);
     writeServices(client, options);
   }

package/dist/vite-plugin/index.d.ts

@@ -1,10 +1,10 @@
 import { Plugin } from 'vite';
 
-type PluginOptions = {
+interface PluginOptions {
     alias: string;
     dir: string;
     dts: string;
-};
+}
 /**
  * Request插件
  */

package/dist/vite-plugin/index.js

@@ -140,7 +140,7 @@ var vite_plugin_default = (options) => {
 function getServicePaths(options) {
   const paths = [];
   const walk = (dir) => {
-    fs.readdirSync(dir).forEach(function(file) {
+    fs.readdirSync(dir).forEach((file) => {
       const fullpath = path.join(dir, file).replace(/\\/g, "/");
       const stat = fs.statSync(fullpath);
       if (stat.isFile() && fullpath.endsWith("Service.ts")) {

package/dist/vite-plugin/index.mjs

@@ -1,8 +1,8 @@
-import "../chunk-4OXX5WFT.mjs";
+import "../chunk-3T6NC7NX.mjs";
 
 // src/vite-plugin/index.ts
-import * as fs from "fs";
-import * as path from "path";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import Handlebars from "handlebars";
 
 // src/vite-plugin/templates.ts
@@ -140,7 +140,7 @@ var vite_plugin_default = (options) => {
 function getServicePaths(options) {
   const paths = [];
   const walk = (dir) => {
-    fs.readdirSync(dir).forEach(function(file) {
+    fs.readdirSync(dir).forEach((file) => {
       const fullpath = path.join(dir, file).replace(/\\/g, "/");
       const stat = fs.statSync(fullpath);
       if (stat.isFile() && fullpath.endsWith("Service.ts")) {

package/package.json

@@ -1,43 +1,54 @@
 {
   "name": "@gopowerteam/request-generate",
-  "private": false,
-  "version": "0.1.24",
   "type": "commonjs",
-  "files": [
-    "dist",
-    "bin",
-    "vite-plugin.d.ts",
-    "README.md"
-  ],
-  "bin": {
-    "request-generate": "bin/index.mts"
-  },
+  "version": "0.1.26",
+  "private": false,
   "keywords": [
     "gopowerteam",
     "request-generate"
   ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org",
-    "access": "public"
-  },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     },
     "./vite-plugin": {
-      "require": "./dist/vite-plugin/index.js",
+      "types": "./dist/vite-plugin/index.d.ts",
       "import": "./dist/vite-plugin/index.mjs",
-      "types": "./dist/vite-plugin/index.d.ts"
+      "require": "./dist/vite-plugin/index.js"
     }
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "request-generate": "bin/index.mts"
+  },
+  "files": [
+    "README.md",
+    "bin",
+    "dist",
+    "vite-plugin.d.ts"
+  ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
+  },
+  "dependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "chalk": "^5.3.0",
+    "commander": "^10.0.0",
+    "handlebars": "^4.7.8",
+    "ora": "^8.1.0",
+    "qs": "^6.11.0",
+    "rimraf": "^4.1.2",
+    "rxjs": "^7.8.0",
+    "tsx": "^4.7.0"
+  },
   "devDependencies": {
     "@types/jest": "^29.4.0",
-    "@types/node": "18",
+    "@types/node": "20",
     "@types/qs": "^6.9.7",
     "@types/rimraf": "^3.0.2",
     "fs-extra": "^11.1.0",
@@ -47,18 +58,10 @@
     "tsup": "^6.6.3",
     "typescript": "^4.9.5",
     "vite": "^4.1.4",
-    "@gopowerteam/request": "0.1.19"
-  },
-  "dependencies": {
-    "@apidevtools/swagger-parser": "^10.1.0",
-    "commander": "^10.0.0",
-    "handlebars": "^4.7.8",
-    "qs": "^6.11.0",
-    "rimraf": "^4.1.2",
-    "rxjs": "^7.8.0",
-    "tsx": "^4.7.0"
+    "@gopowerteam/request": "0.1.20"
   },
   "scripts": {
-    "build": "tsup"
+    "build": "tsup",
+    "lint": "eslint . --fix"
   }
 }