@gopowerteam/request-generate 0.1.25 → 0.2.0

package/bin/download.mts

@@ -0,0 +1,67 @@
+#!/usr/bin/env tsx
+
+import path from 'node:path'
+import fs from 'node:fs'
+import { program } from 'commander'
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const RequestGenerate = await import(`file://${path.resolve(
+  __dirname,
+  '..',
+  'dist',
+  'index.mjs'
+)}`)
+
+const params = program
+  .name('@gopowerteam/request-generate')
+  .usage('[options]')
+  .option('--config <value>', '指定配置文件位置')
+  .parse(process.argv)
+  .opts()
+
+const configFilePaths = [
+  'request.config.ts',
+  'request-generate.config.cjs',
+  'request-generate.config.js'
+]
+
+/**
+ * 加载配置文件
+ * @param {*} filePath
+ * @returns
+ */
+async function loadConfigFile(filePath) {
+  if (filePath) {
+    configFilePaths.unshift(filePath)
+  }
+
+  const configFilePath = configFilePaths.find((file) =>
+    fs.existsSync(path.resolve(process.cwd(), file))
+  )
+
+  if(!configFilePath){
+    throw new Error("Not Found Config File.")
+  }
+
+  if (configFilePath.endsWith('.js') || configFilePath.endsWith('.ts')) {
+    return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
+  } else {
+    throw new Error('无法找到RequestGenerate配置文件')
+  }
+}
+
+if (RequestGenerate) {
+  const { default: config } = await loadConfigFile(params.config)
+
+  RequestGenerate.download(config)
+    .then(() => {
+      console.log('接口文件更新完成')
+      process.exit(0)
+    })
+    .catch((error) => {
+      console.error(error)
+      process.exit(1)
+    })
+}

package/bin/generate.mts

@@ -0,0 +1,68 @@
+#!/usr/bin/env tsx
+
+import path from 'node:path'
+import fs from 'node:fs'
+import { program } from 'commander'
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const RequestGenerate = await import(`file://${path.resolve(
+  __dirname,
+  '..',
+  'dist',
+  'index.mjs'
+)}`)
+
+const params = program
+  .name('@gopowerteam/request-generate')
+  .usage('[options]')
+  .option('--config <value>', '指定配置文件位置')
+  .parse(process.argv)
+  .opts()
+
+const configFilePaths = [
+  'request.config.ts',
+  'request-generate.config.cjs',
+  'request-generate.config.js'
+]
+
+/**
+ * 加载配置文件
+ * @param {*} filePath
+ * @returns
+ */
+async function loadConfigFile(filePath) {
+  if (filePath) {
+    configFilePaths.unshift(filePath)
+  }
+
+  const configFilePath = configFilePaths.find((file) =>
+    fs.existsSync(path.resolve(process.cwd(), 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')) {
+    return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
+  } else {
+    throw new Error('无法找到RequestGenerate配置文件')
+  }
+}
+
+if (RequestGenerate) {
+  const { default: config } = await loadConfigFile(params.config)
+
+  try {
+    await RequestGenerate.generate(config)
+    console.log('接口文件生成完成')
+    process.exit(0)
+  } catch (error) {
+    console.error(error)
+    process.exit(1)
+  }
+}

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

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../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
+// ../../node_modules/.pnpm/tsup@6.6.3_postcss@8.5.3_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,5 +1,69 @@
 import { OpenAPIV2, OpenAPIV3 } from 'openapi-types';
 
+/**
+ * 生成全局选项
+ */
+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
+}
+
+declare class Download {
+    static options: GenerateOptions;
+    static startup(options: GenerateOptions): Promise<void>;
+    static downloadOpenAPIFile(option: GenerateApplicationOptions): Promise<unknown>;
+}
+
 declare enum OpenAPIVersion {
     V2 = 2,
     V3 = 3
@@ -64,64 +128,6 @@ interface GenerateClient {
   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;
@@ -153,6 +159,7 @@ declare class Generate {
 
 declare function defineConfig(config: GenerateOptions): GenerateOptions;
 
-declare const _default: typeof Generate.startup;
+declare const generate: typeof Generate.startup;
+declare const download: typeof Download.startup;
 
-export { GenerateOptions, _default as default, defineConfig };
+export { GenerateOptions, defineConfig, download, generate };

package/dist/index.js

@@ -2,6 +2,73 @@
 
 var _chunkXXPGZHWZjs = require('./chunk-XXPGZHWZ.js');
 
+// src/download/index.ts
+var _fs = require('fs'); var fs = _interopRequireWildcard(_fs); var fs2 = _interopRequireWildcard(_fs); var fs5 = _interopRequireWildcard(_fs); var fs4 = _interopRequireWildcard(_fs); var fs6 = _interopRequireWildcard(_fs);
+var _path = require('path'); var path2 = _interopRequireWildcard(_path); var path3 = _interopRequireWildcard(_path); var path5 = _interopRequireWildcard(_path); var path6 = _interopRequireWildcard(_path);
+
+// 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 ? 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/download/index.ts
+var DefaultDownloadDir = ".request";
+var _Download = class {
+  static async startup(options) {
+    const applicationOptions = generateServiceOptions(options);
+    if (!fs.existsSync(DefaultDownloadDir)) {
+      fs.mkdirSync(DefaultDownloadDir);
+    }
+    await Promise.all(
+      applicationOptions.map((options2) => _Download.downloadOpenAPIFile(options2))
+    );
+  }
+  static async downloadOpenAPIFile(option) {
+    const response = await fetch(option.input);
+    const data = await response.json();
+    const filePath = path2.join(".request", `${option.name}.json`);
+    fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
+    return data;
+  }
+};
+var Download = _Download;
+_chunkXXPGZHWZjs.__publicField.call(void 0, Download, "options");
+
 // src/generate/index.ts
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 
@@ -206,11 +273,11 @@ var Service = (_class = class {
 }, _class);
 
 // src/utils/get-service-name.ts
-function getServiceName(path5, method, operationObject, tags) {
+function getServiceName(path7, method, operationObject, tags) {
   var _a, _b, _c;
   const resolve2 = (_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.serviceResolve;
   if (resolve2) {
-    return resolve2({ path: path5, method, object: operationObject, tags });
+    return resolve2({ path: path7, method, object: operationObject, tags });
   } else {
     return ((_c = operationObject.tags) == null ? void 0 : _c.map((tag) => getCamelName(tag))) || "Default";
   }
@@ -238,21 +305,21 @@ var Operation = (_class2 = class {
   
   // 导入操作
   __init5() {this.imports = []}
-  constructor(name, method, path5) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
+  constructor(name, method, path7) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
     var _a, _b;
     this.name = name;
     this.method = method;
-    this.path = path5;
+    this.path = path7;
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
 }, _class2);
 
 // src/utils/get-operation-name.ts
-function getOperationName(path5, method, operationObject) {
+function getOperationName(path7, method, operationObject) {
   var _a, _b;
   const resolve2 = (_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.operationResolve;
   if (resolve2) {
-    return resolve2({ path: path5, method, object: operationObject });
+    return resolve2({ path: path7, method, object: operationObject });
   } else {
     return operationObject.operationId || "";
   }
@@ -345,10 +412,10 @@ function parseParametersQuery(parameters) {
 }
 
 // src/parse/v2/parse-operation.ts
-function parseOperation(path5, method, operationObject) {
+function parseOperation(path7, method, operationObject) {
   var _a;
-  const name = getOperationName(path5, method, operationObject);
-  const operation = new Operation(name, method, path5);
+  const name = getOperationName(path7, method, operationObject);
+  const operation = new Operation(name, method, path7);
   operation.description = operationObject.summary || operation.description;
   if (operationObject.parameters) {
     operation.parametersBody = parseParametersBody(operationObject.parameters);
@@ -384,17 +451,17 @@ function parseResponseType(responses) {
 }
 
 // src/parse/v2/parse-service.ts
-function parseService(path5, method, operationObject, tags, services) {
+function parseService(path7, method, operationObject, tags, services) {
   const toNames = (name) => Array.isArray(name) ? name : [name];
   const names = toNames(
     getServiceName(
-      path5,
+      path7,
       method,
       operationObject,
       tags || []
     )
   );
-  const operation = parseOperation(path5, method, operationObject);
+  const operation = parseOperation(path7, method, operationObject);
   names.forEach((name) => {
     let service = services.find((service2) => service2.name === name);
     if (!service) {
@@ -415,11 +482,11 @@ function parseService(path5, method, operationObject, tags, services) {
 // src/parse/v2/parse-services.ts
 function parseServices(document) {
   const services = [];
-  Object.entries(document.paths).forEach(([path5, pathObject]) => {
+  Object.entries(document.paths).forEach(([path7, pathObject]) => {
     if (pathObject) {
       Object.entries(pathObject).forEach(([method, operationObject]) => {
         parseService(
-          path5,
+          path7,
           method,
           operationObject,
           document.tags || [],
@@ -616,10 +683,10 @@ function parseParametersQuery2(parameters) {
 }
 
 // src/parse/v3/parse-operation.ts
-function parseOperation2(path5, method, operationObject) {
+function parseOperation2(path7, method, operationObject) {
   var _a;
-  const name = getOperationName(path5, method, operationObject);
-  const operation = new Operation(name, method, path5);
+  const name = getOperationName(path7, method, operationObject);
+  const operation = new Operation(name, method, path7);
   operation.description = operationObject.summary;
   if (operationObject.requestBody) {
     operation.parametersBody = parseParametersBody2(operationObject.requestBody);
@@ -637,7 +704,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) {
@@ -669,17 +736,17 @@ function parseResponseType2(responses) {
 }
 
 // src/parse/v3/parse-service.ts
-function parseService2(path5, method, operationObject, tags, services) {
+function parseService2(path7, method, operationObject, tags, services) {
   const toNames = (name) => Array.isArray(name) ? name : [name];
   const names = toNames(
     getServiceName(
-      path5,
+      path7,
       method,
       operationObject,
       tags || []
     )
   );
-  const operation = parseOperation2(path5, method, operationObject);
+  const operation = parseOperation2(path7, method, operationObject);
   names.forEach((name) => {
     let service = services.find((service2) => service2.name === name);
     if (!service) {
@@ -700,11 +767,11 @@ function parseService2(path5, method, operationObject, tags, services) {
 // src/parse/v3/parse-services.ts
 function parseServices2(document) {
   const services = [];
-  Object.entries(document.paths).forEach(([path5, pathObject]) => {
+  Object.entries(document.paths).forEach(([path7, pathObject]) => {
     if (pathObject) {
       Object.entries(pathObject).forEach(([method, operationObject]) => {
         parseService2(
-          path5,
+          path7,
           method,
           operationObject,
           document.tags || [],
@@ -796,8 +863,8 @@ function updateProgress(name, type) {
 }
 
 // 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
@@ -812,6 +879,18 @@ var equalHelper = {
   }
 };
 
+// src/template-helpers/include-query-params.ts
+var includeQueryParams = {
+  name: "include-query-params",
+  fn(operations, options) {
+    if (operations.some((x) => x.parametersQuery.length > 0)) {
+      return options.fn(this);
+    } else {
+      return options.inverse(this);
+    }
+  }
+};
+
 // src/template-helpers/is-array.helper.ts
 var isArrayHelper = {
   name: "is-array",
@@ -865,6 +944,7 @@ function registerHandlebarHelpers() {
   registerHandlebarHelper(equalHelper);
   registerHandlebarHelper(isArrayHelper);
   registerHandlebarHelper(toUpperHelper);
+  registerHandlebarHelper(includeQueryParams);
 }
 function registerHandlebarHelper(helper) {
   _handlebars2.default.registerHelper(helper.name, helper.fn);
@@ -874,8 +954,8 @@ function registerHandlebarPartial(input) {
   _handlebars2.default.registerPartial(input, template);
 }
 function loadHandlebarTemplate(input) {
-  const templatePath = path.resolve(__dirname, "templates", `${input}.hbs`);
-  return fs.readFileSync(templatePath, "utf-8");
+  const templatePath = path3.resolve(__dirname, "templates", `${input}.hbs`);
+  return fs2.readFileSync(templatePath, "utf-8");
 }
 
 // src/utils/get-openapi-document.ts
@@ -896,44 +976,59 @@ function getOpenAPIVersion(document) {
   throw new Error(`\u65E0\u6CD5\u8BC6\u522B\u7684OPENAPI\u7248\u672C: "${String(version)}"`);
 }
 
-// src/utils/get-services-options.ts
+// src/generate/write-config.ts
+var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
 
-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
-      };
+
+var ConfigFileName = ".config.json";
+var ConfigFilePath = path2.default.resolve(".request", ConfigFileName);
+function updateOptionsFromLocalConfig(options) {
+  const config = readLocalConfig();
+  const toUpdateOptions = /* @__PURE__ */ new Map();
+  options = options.filter((item) => {
+    const md5 = isFindNewMd5(item.name, config);
+    if (md5) {
+      toUpdateOptions.set(item.name, md5);
+      return true;
     } else {
-      return {
-        service: application.key,
-        openapi: application.openapi
-      };
+      return false;
     }
-  })();
-  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
-  };
+  });
+  writeLocalConfig(toUpdateOptions, config);
+  return options;
 }
-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)];
+function isFindNewMd5(name, config) {
+  const file = path2.default.resolve(".request", `${name}.json`);
+  if (!fs.default.existsSync(file)) {
+    throw new Error(`\u672A\u627E\u5230\u76F8\u5E94\u7684\u914D\u7F6E\u6587\u4EF6: ${name}.json`);
   }
+  const data = fs.default.readFileSync(file);
+  const md5 = _crypto2.default.createHash("md5").update(data.toString()).digest("hex");
+  const configItem = config.find((x) => x.name === name);
+  return !configItem || configItem.md5 !== md5 ? md5 : "";
+}
+function readLocalConfig() {
+  if (!fs.default.existsSync(ConfigFilePath)) {
+    return [];
+  }
+  const data = fs.default.readFileSync(ConfigFilePath, "utf-8");
+  return JSON.parse(data);
+}
+function writeLocalConfig(toUpdateOptions, config) {
+  toUpdateOptions.forEach((md5, name) => {
+    const configItem = config.find((x) => x.name === name);
+    if (configItem) {
+      configItem.md5 = md5;
+      configItem.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    } else {
+      config.push({
+        name,
+        md5,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+  });
+  fs.default.writeFileSync(ConfigFilePath, JSON.stringify(config, null, 2));
 }
 
 // src/generate/write-models.ts
@@ -947,7 +1042,7 @@ var _rimraf = require('rimraf'); var _rimraf2 = _interopRequireDefault(_rimraf);
 // src/generate/write-file.ts
 
 function writeFile(output, content) {
-  fs2.writeFileSync(output, content, "utf-8");
+  fs4.writeFileSync(output, content, "utf-8");
 }
 
 // src/generate/write-model.ts
@@ -963,14 +1058,14 @@ function writeModels(client, options) {
   if (!options.exportModels || !client.models) {
     return;
   }
-  const output = path3.join(options.output, "models");
-  if (fs3.existsSync(output)) {
+  const output = path5.join(options.output, "models");
+  if (fs5.existsSync(output)) {
     _rimraf2.default.sync(output);
   }
-  fs3.mkdirSync(output, { recursive: true });
+  fs5.mkdirSync(output, { recursive: true });
   client.models.forEach((model) => {
     const filename = `${model.name}.ts`;
-    writeModel(model, path3.join(output, filename));
+    writeModel(model, path5.join(output, filename));
     updateProgress(options.name || "default", "model");
   });
 }
@@ -994,15 +1089,15 @@ function writeServices(client, options) {
   if (!client.services) {
     return;
   }
-  const output = path4.join(options.output, "services");
-  if (fs4.existsSync(output)) {
+  const output = path6.join(options.output, "services");
+  if (fs6.existsSync(output)) {
     _rimraf2.default.sync(output);
   }
-  fs4.mkdirSync(output, { recursive: true });
+  fs6.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
     service.application = Generate.options.appendService === false ? "" : options.application;
-    writeService(service, path4.join(output, filename));
+    writeService(service, path6.join(output, filename));
     updateProgress(options.name || "default", "service");
   });
 }
@@ -1017,7 +1112,8 @@ var _Generate = class {
   static async startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
-    const applicationOptions = generateServiceOptions(options);
+    let applicationOptions = generateServiceOptions(options);
+    applicationOptions = updateOptionsFromLocalConfig(applicationOptions);
     const applications = [];
     for (const applicationOption of applicationOptions) {
       const client = await _Generate.generateApplicationClient(applicationOption);
@@ -1090,8 +1186,10 @@ function defineConfig(config) {
 }
 
 // src/index.ts
-var src_default = Generate.startup;
+var generate = Generate.startup;
+var download = Download.startup;
+
 
 
 
-exports.default = src_default; exports.defineConfig = defineConfig;
+exports.defineConfig = defineConfig; exports.download = download; exports.generate = generate;

package/dist/index.mjs

@@ -1,7 +1,74 @@
 import {
   __dirname,
   __publicField
-} from "./chunk-3T6NC7NX.mjs";
+} from "./chunk-WF3XBEPN.mjs";
+
+// src/download/index.ts
+import * as fs from "node:fs";
+import * as path2 from "node:path";
+
+// 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/download/index.ts
+var DefaultDownloadDir = ".request";
+var _Download = class {
+  static async startup(options) {
+    const applicationOptions = generateServiceOptions(options);
+    if (!fs.existsSync(DefaultDownloadDir)) {
+      fs.mkdirSync(DefaultDownloadDir);
+    }
+    await Promise.all(
+      applicationOptions.map((options2) => _Download.downloadOpenAPIFile(options2))
+    );
+  }
+  static async downloadOpenAPIFile(option) {
+    const response = await fetch(option.input);
+    const data = await response.json();
+    const filePath = path2.join(".request", `${option.name}.json`);
+    fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
+    return data;
+  }
+};
+var Download = _Download;
+__publicField(Download, "options");
 
 // src/generate/index.ts
 import process from "node:process";
@@ -207,11 +274,11 @@ var Service = class {
 };
 
 // src/utils/get-service-name.ts
-function getServiceName(path5, method, operationObject, tags) {
+function getServiceName(path7, method, operationObject, tags) {
   var _a, _b, _c;
   const resolve2 = (_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.serviceResolve;
   if (resolve2) {
-    return resolve2({ path: path5, method, object: operationObject, tags });
+    return resolve2({ path: path7, method, object: operationObject, tags });
   } else {
     return ((_c = operationObject.tags) == null ? void 0 : _c.map((tag) => getCamelName(tag))) || "Default";
   }
@@ -239,21 +306,21 @@ var Operation = class {
   parametersBody;
   // 导入操作
   imports = [];
-  constructor(name, method, path5) {
+  constructor(name, method, path7) {
     var _a, _b;
     this.name = name;
     this.method = method;
-    this.path = path5;
+    this.path = path7;
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
 };
 
 // src/utils/get-operation-name.ts
-function getOperationName(path5, method, operationObject) {
+function getOperationName(path7, method, operationObject) {
   var _a, _b;
   const resolve2 = (_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.operationResolve;
   if (resolve2) {
-    return resolve2({ path: path5, method, object: operationObject });
+    return resolve2({ path: path7, method, object: operationObject });
   } else {
     return operationObject.operationId || "";
   }
@@ -346,10 +413,10 @@ function parseParametersQuery(parameters) {
 }
 
 // src/parse/v2/parse-operation.ts
-function parseOperation(path5, method, operationObject) {
+function parseOperation(path7, method, operationObject) {
   var _a;
-  const name = getOperationName(path5, method, operationObject);
-  const operation = new Operation(name, method, path5);
+  const name = getOperationName(path7, method, operationObject);
+  const operation = new Operation(name, method, path7);
   operation.description = operationObject.summary || operation.description;
   if (operationObject.parameters) {
     operation.parametersBody = parseParametersBody(operationObject.parameters);
@@ -385,17 +452,17 @@ function parseResponseType(responses) {
 }
 
 // src/parse/v2/parse-service.ts
-function parseService(path5, method, operationObject, tags, services) {
+function parseService(path7, method, operationObject, tags, services) {
   const toNames = (name) => Array.isArray(name) ? name : [name];
   const names = toNames(
     getServiceName(
-      path5,
+      path7,
       method,
       operationObject,
       tags || []
     )
   );
-  const operation = parseOperation(path5, method, operationObject);
+  const operation = parseOperation(path7, method, operationObject);
   names.forEach((name) => {
     let service = services.find((service2) => service2.name === name);
     if (!service) {
@@ -416,11 +483,11 @@ function parseService(path5, method, operationObject, tags, services) {
 // src/parse/v2/parse-services.ts
 function parseServices(document) {
   const services = [];
-  Object.entries(document.paths).forEach(([path5, pathObject]) => {
+  Object.entries(document.paths).forEach(([path7, pathObject]) => {
     if (pathObject) {
       Object.entries(pathObject).forEach(([method, operationObject]) => {
         parseService(
-          path5,
+          path7,
           method,
           operationObject,
           document.tags || [],
@@ -617,10 +684,10 @@ function parseParametersQuery2(parameters) {
 }
 
 // src/parse/v3/parse-operation.ts
-function parseOperation2(path5, method, operationObject) {
+function parseOperation2(path7, method, operationObject) {
   var _a;
-  const name = getOperationName(path5, method, operationObject);
-  const operation = new Operation(name, method, path5);
+  const name = getOperationName(path7, method, operationObject);
+  const operation = new Operation(name, method, path7);
   operation.description = operationObject.summary;
   if (operationObject.requestBody) {
     operation.parametersBody = parseParametersBody2(operationObject.requestBody);
@@ -638,7 +705,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) {
@@ -670,17 +737,17 @@ function parseResponseType2(responses) {
 }
 
 // src/parse/v3/parse-service.ts
-function parseService2(path5, method, operationObject, tags, services) {
+function parseService2(path7, method, operationObject, tags, services) {
   const toNames = (name) => Array.isArray(name) ? name : [name];
   const names = toNames(
     getServiceName(
-      path5,
+      path7,
       method,
       operationObject,
       tags || []
     )
   );
-  const operation = parseOperation2(path5, method, operationObject);
+  const operation = parseOperation2(path7, method, operationObject);
   names.forEach((name) => {
     let service = services.find((service2) => service2.name === name);
     if (!service) {
@@ -701,11 +768,11 @@ function parseService2(path5, method, operationObject, tags, services) {
 // src/parse/v3/parse-services.ts
 function parseServices2(document) {
   const services = [];
-  Object.entries(document.paths).forEach(([path5, pathObject]) => {
+  Object.entries(document.paths).forEach(([path7, pathObject]) => {
     if (pathObject) {
       Object.entries(pathObject).forEach(([method, operationObject]) => {
         parseService2(
-          path5,
+          path7,
           method,
           operationObject,
           document.tags || [],
@@ -797,8 +864,8 @@ function updateProgress(name, type) {
 }
 
 // src/template.ts
-import * as fs from "node:fs";
-import * as path from "node:path";
+import * as fs2 from "node:fs";
+import * as path3 from "node:path";
 import Handlebars from "handlebars";
 
 // src/template-helpers/equal.helper.ts
@@ -813,6 +880,18 @@ var equalHelper = {
   }
 };
 
+// src/template-helpers/include-query-params.ts
+var includeQueryParams = {
+  name: "include-query-params",
+  fn(operations, options) {
+    if (operations.some((x) => x.parametersQuery.length > 0)) {
+      return options.fn(this);
+    } else {
+      return options.inverse(this);
+    }
+  }
+};
+
 // src/template-helpers/is-array.helper.ts
 var isArrayHelper = {
   name: "is-array",
@@ -866,6 +945,7 @@ function registerHandlebarHelpers() {
   registerHandlebarHelper(equalHelper);
   registerHandlebarHelper(isArrayHelper);
   registerHandlebarHelper(toUpperHelper);
+  registerHandlebarHelper(includeQueryParams);
 }
 function registerHandlebarHelper(helper) {
   Handlebars.registerHelper(helper.name, helper.fn);
@@ -875,8 +955,8 @@ function registerHandlebarPartial(input) {
   Handlebars.registerPartial(input, template);
 }
 function loadHandlebarTemplate(input) {
-  const templatePath = path.resolve(__dirname, "templates", `${input}.hbs`);
-  return fs.readFileSync(templatePath, "utf-8");
+  const templatePath = path3.resolve(__dirname, "templates", `${input}.hbs`);
+  return fs2.readFileSync(templatePath, "utf-8");
 }
 
 // src/utils/get-openapi-document.ts
@@ -897,58 +977,73 @@ function getOpenAPIVersion(document) {
   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
-      };
+// src/generate/write-config.ts
+import crypto from "node:crypto";
+import fs3 from "node:fs";
+import path4 from "node:path";
+var ConfigFileName = ".config.json";
+var ConfigFilePath = path4.resolve(".request", ConfigFileName);
+function updateOptionsFromLocalConfig(options) {
+  const config = readLocalConfig();
+  const toUpdateOptions = /* @__PURE__ */ new Map();
+  options = options.filter((item) => {
+    const md5 = isFindNewMd5(item.name, config);
+    if (md5) {
+      toUpdateOptions.set(item.name, md5);
+      return true;
     } else {
-      return {
-        service: application.key,
-        openapi: application.openapi
-      };
+      return false;
     }
-  })();
-  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
-  };
+  });
+  writeLocalConfig(toUpdateOptions, config);
+  return options;
 }
-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)];
+function isFindNewMd5(name, config) {
+  const file = path4.resolve(".request", `${name}.json`);
+  if (!fs3.existsSync(file)) {
+    throw new Error(`\u672A\u627E\u5230\u76F8\u5E94\u7684\u914D\u7F6E\u6587\u4EF6: ${name}.json`);
+  }
+  const data = fs3.readFileSync(file);
+  const md5 = crypto.createHash("md5").update(data.toString()).digest("hex");
+  const configItem = config.find((x) => x.name === name);
+  return !configItem || configItem.md5 !== md5 ? md5 : "";
+}
+function readLocalConfig() {
+  if (!fs3.existsSync(ConfigFilePath)) {
+    return [];
   }
+  const data = fs3.readFileSync(ConfigFilePath, "utf-8");
+  return JSON.parse(data);
+}
+function writeLocalConfig(toUpdateOptions, config) {
+  toUpdateOptions.forEach((md5, name) => {
+    const configItem = config.find((x) => x.name === name);
+    if (configItem) {
+      configItem.md5 = md5;
+      configItem.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    } else {
+      config.push({
+        name,
+        md5,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+  });
+  fs3.writeFileSync(ConfigFilePath, JSON.stringify(config, null, 2));
 }
 
 // src/generate/write-models.ts
-import * as fs3 from "node:fs";
-import * as path3 from "node:path";
+import * as fs5 from "node:fs";
+import * as path5 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";
+import * as fs4 from "node:fs";
 function writeFile(output, content) {
-  fs2.writeFileSync(output, content, "utf-8");
+  fs4.writeFileSync(output, content, "utf-8");
 }
 
 // src/generate/write-model.ts
@@ -964,21 +1059,21 @@ function writeModels(client, options) {
   if (!options.exportModels || !client.models) {
     return;
   }
-  const output = path3.join(options.output, "models");
-  if (fs3.existsSync(output)) {
+  const output = path5.join(options.output, "models");
+  if (fs5.existsSync(output)) {
     rimraf.sync(output);
   }
-  fs3.mkdirSync(output, { recursive: true });
+  fs5.mkdirSync(output, { recursive: true });
   client.models.forEach((model) => {
     const filename = `${model.name}.ts`;
-    writeModel(model, path3.join(output, filename));
+    writeModel(model, path5.join(output, filename));
     updateProgress(options.name || "default", "model");
   });
 }
 
 // src/generate/write-services.ts
-import * as fs4 from "node:fs";
-import * as path4 from "node:path";
+import * as fs6 from "node:fs";
+import * as path6 from "node:path";
 import rimraf2 from "rimraf";
 
 // src/generate/write-service.ts
@@ -995,15 +1090,15 @@ function writeServices(client, options) {
   if (!client.services) {
     return;
   }
-  const output = path4.join(options.output, "services");
-  if (fs4.existsSync(output)) {
+  const output = path6.join(options.output, "services");
+  if (fs6.existsSync(output)) {
     rimraf2.sync(output);
   }
-  fs4.mkdirSync(output, { recursive: true });
+  fs6.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
     service.application = Generate.options.appendService === false ? "" : options.application;
-    writeService(service, path4.join(output, filename));
+    writeService(service, path6.join(output, filename));
     updateProgress(options.name || "default", "service");
   });
 }
@@ -1018,7 +1113,8 @@ var _Generate = class {
   static async startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
-    const applicationOptions = generateServiceOptions(options);
+    let applicationOptions = generateServiceOptions(options);
+    applicationOptions = updateOptionsFromLocalConfig(applicationOptions);
     const applications = [];
     for (const applicationOption of applicationOptions) {
       const client = await _Generate.generateApplicationClient(applicationOption);
@@ -1091,8 +1187,10 @@ function defineConfig(config) {
 }
 
 // src/index.ts
-var src_default = Generate.startup;
+var generate = Generate.startup;
+var download = Download.startup;
 export {
-  src_default as default,
-  defineConfig
+  defineConfig,
+  download,
+  generate
 };

package/dist/templates/partials/export-service-namespace.hbs

@@ -1,3 +1,4 @@
+{{#include-query-params operations}}
 namespace RequestQueryParams {
 {{#each operations}}
   {{#if parametersQuery}}
@@ -9,3 +10,4 @@ namespace RequestQueryParams {
   {{/if}}
 {{/each}}
 }
+{{/include-query-params}}

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

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import { PluginOption } from 'vite';
 
 interface PluginOptions {
     alias: string;
@@ -8,6 +8,6 @@ interface PluginOptions {
 /**
  * Request插件
  */
-declare const _default: (options: PluginOptions) => Plugin;
+declare const _default: (options: PluginOptions) => PluginOption;
 
 export { _default as default };

package/dist/vite-plugin/index.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }require('../chunk-XXPGZHWZ.js');
 
 // src/vite-plugin/index.ts
+var _child_process = require('child_process');
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 var _path = require('path'); var path = _interopRequireWildcard(_path);
 var _handlebars = require('handlebars'); var _handlebars2 = _interopRequireDefault(_handlebars);
@@ -112,28 +113,38 @@ var generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
 var MODULE_ID = "virtual:request";
 var DECLARATION_FILE = "request.d.ts";
 var viteConfig;
+var GerneratedCodeStr = "";
+function genretateDeclareAndCode(options) {
+  const paths = getServicePaths(options);
+  const services = getServiceItems(paths);
+  const groups = getServiceGroups(services);
+  if (services && services.length) {
+    generateDeclare(services, groups, options);
+    generateCode(services, groups);
+  }
+}
+function generateRequestCode() {
+  const generateScript = path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate");
+  _child_process.execSync.call(void 0, `${generateScript}`);
+}
 var vite_plugin_default = (options) => {
   return {
-    name: "vite-plugin-request",
+    name: "vite-plugin-vue-request",
     enforce: "pre",
+    configResolved(config) {
+      viteConfig = config;
+    },
     resolveId(id) {
       return id === MODULE_ID ? MODULE_ID : void 0;
     },
-    configResolved(config) {
-      viteConfig = config;
+    async buildStart() {
+      await generateRequestCode();
+      await genretateDeclareAndCode(options);
     },
     load(id) {
       if (id !== MODULE_ID)
         return;
-      const paths = getServicePaths(options);
-      const services = getServiceItems(paths);
-      const groups = getServiceGroups(services);
-      if (services && services.length) {
-        generateDeclare(services, groups, options);
-        return generateCode(services, groups);
-      } else {
-        return void 0;
-      }
+      return GerneratedCodeStr;
     }
   };
 };
@@ -191,7 +202,7 @@ function getServiceGroups(services) {
 }
 function generateCode(services, groups) {
   const template = _handlebars2.default.compile(generateCodeTemplate);
-  return template({
+  GerneratedCodeStr = template({
     groups: groups.length ? groups : void 0,
     services
   });

package/dist/vite-plugin/index.mjs

@@ -1,6 +1,7 @@
-import "../chunk-3T6NC7NX.mjs";
+import "../chunk-WF3XBEPN.mjs";
 
 // src/vite-plugin/index.ts
+import { execSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import Handlebars from "handlebars";
@@ -112,28 +113,38 @@ var generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
 var MODULE_ID = "virtual:request";
 var DECLARATION_FILE = "request.d.ts";
 var viteConfig;
+var GerneratedCodeStr = "";
+function genretateDeclareAndCode(options) {
+  const paths = getServicePaths(options);
+  const services = getServiceItems(paths);
+  const groups = getServiceGroups(services);
+  if (services && services.length) {
+    generateDeclare(services, groups, options);
+    generateCode(services, groups);
+  }
+}
+function generateRequestCode() {
+  const generateScript = path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate");
+  execSync(`${generateScript}`);
+}
 var vite_plugin_default = (options) => {
   return {
-    name: "vite-plugin-request",
+    name: "vite-plugin-vue-request",
     enforce: "pre",
+    configResolved(config) {
+      viteConfig = config;
+    },
     resolveId(id) {
       return id === MODULE_ID ? MODULE_ID : void 0;
     },
-    configResolved(config) {
-      viteConfig = config;
+    async buildStart() {
+      await generateRequestCode();
+      await genretateDeclareAndCode(options);
     },
     load(id) {
       if (id !== MODULE_ID)
         return;
-      const paths = getServicePaths(options);
-      const services = getServiceItems(paths);
-      const groups = getServiceGroups(services);
-      if (services && services.length) {
-        generateDeclare(services, groups, options);
-        return generateCode(services, groups);
-      } else {
-        return void 0;
-      }
+      return GerneratedCodeStr;
     }
   };
 };
@@ -191,7 +202,7 @@ function getServiceGroups(services) {
 }
 function generateCode(services, groups) {
   const template = Handlebars.compile(generateCodeTemplate);
-  return template({
+  GerneratedCodeStr = template({
     groups: groups.length ? groups : void 0,
     services
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "type": "commonjs",
-  "version": "0.1.25",
+  "version": "0.2.0",
   "private": false,
   "keywords": [
     "gopowerteam",
@@ -23,7 +23,8 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "bin": {
-    "request-generate": "bin/index.mts"
+    "request-download": "bin/download.mts",
+    "request-generate": "bin/generate.mts"
   },
   "files": [
     "README.md",
@@ -61,6 +62,7 @@
     "@gopowerteam/request": "0.1.20"
   },
   "scripts": {
+    "dev": "tsup --watch",
     "build": "tsup",
     "lint": "eslint . --fix"
   }