@gopowerteam/request-generate 0.1.11 → 0.1.13

package/dist/{chunk-7BMEVKSG.mjs → chunk-LBEPSBX6.mjs}

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/tsup@6.3.0_mwhvu7sfp6vq5ryuwb6hlbjfka/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@6.6.3_6qtx7vkbdhwvdm4crzlegk4mvi/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

@@ -113,7 +113,7 @@ type GenerateClient = {
   services: Service[]
 }
 
-declare type UnkownVersionDocument = OpenAPIV3.Document & OpenAPIV2.Document;
+type UnkownVersionDocument = OpenAPIV3.Document & OpenAPIV2.Document;
 declare class Generate {
     static options: GenerateOptions;
     /**

package/dist/index.js

@@ -58,8 +58,11 @@ function getCamelName(value) {
 
 // src/entities/model.ts
 var Model = class {
+  // Model名称
   
+  // 字段列表
   
+  // 导入列表
   
   constructor(name) {
     this.name = name;
@@ -68,12 +71,19 @@ var Model = class {
 
 // src/entities/field.ts
 var Field = class {
+  // 字段名称
   
+  // 是否必填
   
+  // 字段类型
   
+  // 引用类型
   
+  // 字段枚举
   
+  // 描述信息
   
+  // 导入类型
   
   constructor(name, required) {
     this.name = name;
@@ -213,10 +223,15 @@ var Service = (_class = class {
     this.name = name;
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
+  // 服务名称
   
+  // 应用名称
   
+  // 导出Model
   __init() {this.imports = []}
+  // 操作列表
   __init2() {this.operations = []}
+  // 返回类型
   
 }, _class);
 
@@ -233,15 +248,25 @@ function getServiceName(path5, method, operationObject, tags) {
 
 // src/entities/operation.ts
 var Operation = (_class2 = class {
+  // Operation名称
   
+  // Operation Method
   
+  // Operation地址
   
+  // Operation注释
   
+  // response类型
   
+  // 返回类型
   
+  // Query参数
   __init3() {this.parametersPath = []}
+  // Body参数
   __init4() {this.parametersQuery = []}
+  // path参数
   
+  // 导入操作
   __init5() {this.imports = []}
   constructor(name, method, path5) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
     var _a, _b;
@@ -265,13 +290,21 @@ function getOperationName(path5, method, operationObject) {
 
 // src/entities/operation-parameter.ts
 var OperationParameter = (_class3 = class {constructor() { _class3.prototype.__init6.call(this); }
+  // 参数位置
   
+  // 参数名称
   
+  // 参数类型
   
+  // 参数引用
   
+  // 参数枚举
   
+  // 参数注释
   
+  // 是否必填
   
+  // 导入类型
   __init6() {this.imports = []}
 }, _class3);
 
@@ -886,6 +919,11 @@ function writeServices(client, options) {
 
 // src/generate/index.ts
 var _Generate = class {
+  /**
+   * 生成入口
+   * @param options
+   * @returns
+   */
   static startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
@@ -896,6 +934,9 @@ var _Generate = class {
       )
     );
   }
+  /**
+   * 生成应用
+   */
   static async generateApplication(options) {
     const document = await getOpenApiDocument(
       options.input
@@ -904,6 +945,12 @@ var _Generate = class {
     const client = _Generate.generateClient(document, version);
     _Generate.writeClient(client, options);
   }
+  /**
+   * 生成对象信息
+   * @param document
+   * @param version
+   * @returns
+   */
   static generateClient(document, version) {
     switch (version) {
       case 2 /* V2 */:
@@ -912,6 +959,11 @@ var _Generate = class {
         return parseV3(document);
     }
   }
+  /**
+   * 写入Client对象
+   * @param client
+   * @param options
+   */
   static writeClient(client, options) {
     writeModels(client, options);
     writeServices(client, options);

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   __dirname,
   __publicField
-} from "./chunk-7BMEVKSG.mjs";
+} from "./chunk-LBEPSBX6.mjs";
 
 // src/utils/get-openapi-document.ts
 import swaggerParse from "@apidevtools/swagger-parser";
@@ -59,8 +59,11 @@ function getCamelName(value) {
 
 // src/entities/model.ts
 var Model = class {
+  // Model名称
   name;
+  // 字段列表
   fields;
+  // 导入列表
   imports;
   constructor(name) {
     this.name = name;
@@ -69,12 +72,19 @@ var Model = class {
 
 // src/entities/field.ts
 var Field = class {
+  // 字段名称
   name;
+  // 是否必填
   required;
+  // 字段类型
   type;
+  // 引用类型
   ref;
+  // 字段枚举
   enums;
+  // 描述信息
   description;
+  // 导入类型
   imports;
   constructor(name, required) {
     this.name = name;
@@ -214,10 +224,15 @@ var Service = class {
     this.name = name;
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
+  // 服务名称
   name;
+  // 应用名称
   application;
+  // 导出Model
   imports = [];
+  // 操作列表
   operations = [];
+  // 返回类型
   responseType;
 };
 
@@ -234,15 +249,25 @@ function getServiceName(path5, method, operationObject, tags) {
 
 // src/entities/operation.ts
 var Operation = class {
+  // Operation名称
   name;
+  // Operation Method
   method;
+  // Operation地址
   path;
+  // Operation注释
   description;
+  // response类型
   responseRef;
+  // 返回类型
   responseType;
+  // Query参数
   parametersPath = [];
+  // Body参数
   parametersQuery = [];
+  // path参数
   parametersBody;
+  // 导入操作
   imports = [];
   constructor(name, method, path5) {
     var _a, _b;
@@ -266,13 +291,21 @@ function getOperationName(path5, method, operationObject) {
 
 // src/entities/operation-parameter.ts
 var OperationParameter = class {
+  // 参数位置
   in;
+  // 参数名称
   name;
+  // 参数类型
   type;
+  // 参数引用
   ref;
+  // 参数枚举
   enums;
+  // 参数注释
   description;
+  // 是否必填
   required;
+  // 导入类型
   imports = [];
 };
 
@@ -887,6 +920,11 @@ function writeServices(client, options) {
 
 // src/generate/index.ts
 var _Generate = class {
+  /**
+   * 生成入口
+   * @param options
+   * @returns
+   */
   static startup(options) {
     _Generate.options = options;
     registerHandlebarTemplates();
@@ -897,6 +935,9 @@ var _Generate = class {
       )
     );
   }
+  /**
+   * 生成应用
+   */
   static async generateApplication(options) {
     const document = await getOpenApiDocument(
       options.input
@@ -905,6 +946,12 @@ var _Generate = class {
     const client = _Generate.generateClient(document, version);
     _Generate.writeClient(client, options);
   }
+  /**
+   * 生成对象信息
+   * @param document
+   * @param version
+   * @returns
+   */
   static generateClient(document, version) {
     switch (version) {
       case 2 /* V2 */:
@@ -913,6 +960,11 @@ var _Generate = class {
         return parseV3(document);
     }
   }
+  /**
+   * 写入Client对象
+   * @param client
+   * @param options
+   */
   static writeClient(client, options) {
     writeModels(client, options);
     writeServices(client, options);

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

@@ -3,6 +3,34 @@ export class {{{name}}}Service {
   private request = RequestService.getInstance();
   private service = '{{{application}}}'
 
+  private generateRequest(
+    requestSendOptions: RequestSendOptions,
+    requestPlugins: RequestPlugin[] = [],
+    requestGenerateOptions?: RequestGenerateOptions
+  ){
+    switch(true){
+      case requestGenerateOptions?.type === RequestGenerateType.URL:
+        // 生成URL
+        return this.request.toURL(
+          requestSendOptions,
+          requestPlugins
+        );
+      default: {
+        // 请求数据
+        const result =  this.request.send(
+          requestSendOptions,
+          requestPlugins
+        );
+
+        {{#equal responseType 'observable'}}
+        return from(result)
+        {{else}}
+        return result
+        {{/equal}}
+      }
+    }
+  }
+
   {{#each operations}}
   {{>export-service-operation}}
   {{/each}}

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

@@ -6,4 +6,4 @@ import type { {{{this}}} } from '../models/{{{this}}}';
 {{#equal responseType 'observable'}}
 import { from, type Observable } from 'rxjs';
 {{/equal}}
-import { RequestService, type RequestPlugin } from '@gopowerteam/request';
+import { RequestService, RequestGenerateType, type RequestSendOptions, type RequestPlugin, type RequestGenerateOptions } from '@gopowerteam/request';

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

@@ -3,35 +3,48 @@ public {{{name}}}(
   {{>export-operation-params-path}}
   {{>export-operation-params-query}}
   {{>export-operation-params-body}}
-  requestPlugins: RequestPlugin[] = []
-): {{>export-operation-response }} {
-  // 请求数据
-  const result = this.request.send(
-    {
-      service: this.service,
-      path: '{{{path}}}',
-      method: '{{{method}}}',
-      {{#if parametersPath}}
-      paramsPath: {
-        {{#each parametersPath}}
-        {{{name}}},
-        {{/each}}
-      },
-      {{/if}}
-      {{#if parametersQuery}}
-      paramsQuery: requestQuery,
-      {{/if}}
-      {{#if parametersBody}}
-      paramsBody: requestBody,
-      {{/if}}
+  requestPlugins: RequestPlugin[],
+  requestGenerateOptions: RequestGenerateOptions & { type: RequestGenerateType.URL }
+): string
+public {{{name}}}(
+  {{>export-operation-params-path}}
+  {{>export-operation-params-query}}
+  {{>export-operation-params-body}}
+  requestPlugins?: RequestPlugin[],
+  requestGenerateOptions?: RequestGenerateOptions
+): {{>export-operation-response }}
+public {{{name}}}(
+  {{>export-operation-params-path}}
+  {{>export-operation-params-query}}
+  {{>export-operation-params-body}}
+  requestPlugins: RequestPlugin[] = [],
+  requestGenerateOptions?: RequestGenerateOptions
+): {{>export-operation-response }} | string {
+  const requestSendOptions = {
+    service: this.service,
+    path: '{{{path}}}',
+    method: '{{{method}}}',
+    {{#if parametersPath}}
+    paramsPath: {
+      {{#each parametersPath}}
+      {{{name}}},
+      {{/each}}
     },
-    requestPlugins
-  );
+    {{/if}}
+    {{#if parametersQuery}}
+    paramsQuery: requestQuery,
+    {{/if}}
+    {{#if parametersBody}}
+    paramsBody: requestBody,
+    {{/if}}
+  }
+
+  return this.generateRequest(
+    requestSendOptions,
+    requestPlugins,
+    requestGenerateOptions
+  )
+
 
-  {{#equal responseType 'observable'}}
-  return from(result)
-  {{else}}
-  return result
-  {{/equal}}
 }
 

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

@@ -1,6 +1,6 @@
 import { Plugin } from 'vite';
 
-declare type PluginOptions = {
+type PluginOptions = {
     alias: string;
     dir: string;
     dts: string;

package/dist/vite-plugin/index.mjs

@@ -1,4 +1,4 @@
-import "../chunk-7BMEVKSG.mjs";
+import "../chunk-LBEPSBX6.mjs";
 
 // src/vite-plugin/index.ts
 import * as fs from "fs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "private": false,
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "commonjs",
   "files": [
     "dist",
@@ -32,27 +32,27 @@
     }
   },
   "devDependencies": {
-    "@gopowerteam/request": "*",
-    "@types/jest": "^29.1.2",
-    "@types/node": "16",
+    "@types/jest": "^29.4.0",
+    "@types/node": "18",
     "@types/qs": "^6.9.7",
     "@types/rimraf": "^3.0.2",
-    "commander": "^9.4.1",
-    "fs-extra": "^10.1.0",
-    "jest": "^29.1.2",
-    "openapi-types": "^12.0.2",
-    "ts-jest": "^29.0.3",
+    "commander": "^10.0.0",
+    "fs-extra": "^11.1.0",
+    "jest": "^29.4.3",
+    "openapi-types": "^12.1.0",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "tsup": "^6.2.3",
-    "typescript": "^4.8.4",
-    "vite": "^3.1.8"
+    "tsup": "^6.6.3",
+    "typescript": "^4.9.5",
+    "vite": "^4.1.4",
+    "@gopowerteam/request": "0.1.12"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "handlebars": "^4.7.7",
     "qs": "^6.11.0",
-    "rimraf": "^3.0.2",
-    "rxjs": "^7.5.7"
+    "rimraf": "^4.1.2",
+    "rxjs": "^7.8.0"
   },
   "scripts": {
     "build": "tsup"