@gopowerteam/request-generate 0.1.7 → 0.1.9

package/dist/index.d.ts

@@ -43,6 +43,8 @@ type GenerateApplicationOptions = Pick<
 > & {
   // 服务名称
   name?: string
+  // 应用名称
+  application?: string
   // OPENAPI地址
   input: string
 }
@@ -98,6 +100,7 @@ declare class Operation {
 declare class Service {
     constructor(name: string);
     name: string;
+    application?: string;
     imports: string[];
     operations: Operation[];
     responseType: 'promise' | 'observable';

package/dist/index.js

@@ -32,7 +32,11 @@ var _path = require('path'); var path2 = _interopRequireWildcard(_path); var pat
 function createOptions(options, name, application = "") {
   return {
     name,
-    input: `${options.gateway}${application}${options.openapi}`,
+    application,
+    input: `${options.gateway}/${application}/${options.openapi}`.replace(
+      /\/{2,3}/g,
+      "/"
+    ),
     output: name ? path2.default.join(options.output, name) : options.output,
     exportModels: options.exportModels
   };
@@ -204,6 +208,7 @@ var Service = (_class = class {
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
   
+  
   __init() {this.imports = []}
   __init2() {this.operations = []}
   
@@ -618,14 +623,25 @@ function parseOperation2(path5, method, operationObject) {
   return operation;
 }
 function parseResponseType2(responses) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const SUCCESS_STATUS_CODE = "200";
   const response = responses == null ? void 0 : responses[SUCCESS_STATUS_CODE];
+  const medias = ["*/*", "application/json"];
   if (response && "$ref" in response) {
     return parseSchemaType2(responses);
   }
-  if (response && "content" in response && ((_b = (_a = response == null ? void 0 : response.content) == null ? void 0 : _a["application/json"]) == null ? void 0 : _b.schema)) {
-    return parseSchemaType2((_d = (_c = response == null ? void 0 : response.content) == null ? void 0 : _c["application/json"]) == null ? void 0 : _d.schema);
+  if (response && "content" in response && medias.some((media) => {
+    var _a2, _b2;
+    return !!((_b2 = (_a2 = response == null ? void 0 : response.content) == null ? void 0 : _a2[media]) == null ? void 0 : _b2.schema);
+  })) {
+    const mediaType = medias.find(
+      (media) => {
+        var _a2, _b2;
+        return !!((_b2 = (_a2 = response == null ? void 0 : response.content) == null ? void 0 : _a2[media]) == null ? void 0 : _b2.schema);
+      }
+    );
+    const schema = (_b = (_a = response == null ? void 0 : response.content) == null ? void 0 : _a[mediaType]) == null ? void 0 : _b.schema;
+    return parseSchemaType2(schema);
   }
   return {
     type: "void",
@@ -852,6 +868,7 @@ function writeServices(client, options) {
   fs4.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
+    service.application = options.application;
     writeService(service, path4.join(output, filename));
   });
 }

package/dist/index.mjs

@@ -33,7 +33,11 @@ import path from "node:path";
 function createOptions(options, name, application = "") {
   return {
     name,
-    input: `${options.gateway}${application}${options.openapi}`,
+    application,
+    input: `${options.gateway}/${application}/${options.openapi}`.replace(
+      /\/{2,3}/g,
+      "/"
+    ),
     output: name ? path.join(options.output, name) : options.output,
     exportModels: options.exportModels
   };
@@ -205,6 +209,7 @@ var Service = class {
     this.responseType = ((_b = (_a = Generate.options) == null ? void 0 : _a.exportServices) == null ? void 0 : _b.responseType) || "promise";
   }
   name;
+  application;
   imports = [];
   operations = [];
   responseType;
@@ -619,14 +624,25 @@ function parseOperation2(path5, method, operationObject) {
   return operation;
 }
 function parseResponseType2(responses) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const SUCCESS_STATUS_CODE = "200";
   const response = responses == null ? void 0 : responses[SUCCESS_STATUS_CODE];
+  const medias = ["*/*", "application/json"];
   if (response && "$ref" in response) {
     return parseSchemaType2(responses);
   }
-  if (response && "content" in response && ((_b = (_a = response == null ? void 0 : response.content) == null ? void 0 : _a["application/json"]) == null ? void 0 : _b.schema)) {
-    return parseSchemaType2((_d = (_c = response == null ? void 0 : response.content) == null ? void 0 : _c["application/json"]) == null ? void 0 : _d.schema);
+  if (response && "content" in response && medias.some((media) => {
+    var _a2, _b2;
+    return !!((_b2 = (_a2 = response == null ? void 0 : response.content) == null ? void 0 : _a2[media]) == null ? void 0 : _b2.schema);
+  })) {
+    const mediaType = medias.find(
+      (media) => {
+        var _a2, _b2;
+        return !!((_b2 = (_a2 = response == null ? void 0 : response.content) == null ? void 0 : _a2[media]) == null ? void 0 : _b2.schema);
+      }
+    );
+    const schema = (_b = (_a = response == null ? void 0 : response.content) == null ? void 0 : _a[mediaType]) == null ? void 0 : _b.schema;
+    return parseSchemaType2(schema);
   }
   return {
     type: "void",
@@ -853,6 +869,7 @@ function writeServices(client, options) {
   fs4.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
+    service.application = options.application;
     writeService(service, path4.join(output, filename));
   });
 }

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

@@ -1,6 +1,7 @@
 export class {{{name}}}Service {
   // 请求实例
   private request = RequestService.getInstance();
+  private service = '{{{application}}}'
 
   {{#each operations}}
   {{>export-service-operation}}

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

@@ -8,6 +8,7 @@ public {{{name}}}(
   // 请求数据
   const result = this.request.send(
     {
+      service: this.service,
       path: '{{{path}}}',
       method: '{{{method}}}',
       {{#if parametersPath}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "private": false,
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "commonjs",
   "files": [
     "dist",