@gopowerteam/request-generate 0.1.8 → 0.1.10

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
   };
@@ -143,6 +147,12 @@ function parseSchemaType(schema) {
       ref: void 0
     };
   }
+  if (!("$ref" in schema) && schema.type === "object") {
+    return {
+      type: getMappedType(schema.type),
+      ref: "any"
+    };
+  }
   throw new Error("\u65E0\u6CD5\u89E3\u6790\u76F8\u5E94\u7684schema");
 }
 
@@ -204,6 +214,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 = []}
   
@@ -322,6 +333,11 @@ function parseParametersQuery(parameters) {
       parameter.required = p.required;
       parameter.imports = imports || [];
       parameter.enums = enums;
+      if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
+        const [name, subName] = p.name.split(".");
+        parameter.name = name;
+        parameter.ref = `{ ${subName}${parameter.required ? "?" : ""}: ${ref || "any"} }`;
+      }
       r.push(parameter);
     }
     return r;
@@ -863,6 +879,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
   };
@@ -144,6 +148,12 @@ function parseSchemaType(schema) {
       ref: void 0
     };
   }
+  if (!("$ref" in schema) && schema.type === "object") {
+    return {
+      type: getMappedType(schema.type),
+      ref: "any"
+    };
+  }
   throw new Error("\u65E0\u6CD5\u89E3\u6790\u76F8\u5E94\u7684schema");
 }
 
@@ -205,6 +215,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;
@@ -323,6 +334,11 @@ function parseParametersQuery(parameters) {
       parameter.required = p.required;
       parameter.imports = imports || [];
       parameter.enums = enums;
+      if (p.name.includes(".") && !p.name.startsWith(".") && !p.name.endsWith(".")) {
+        const [name, subName] = p.name.split(".");
+        parameter.name = name;
+        parameter.ref = `{ ${subName}${parameter.required ? "?" : ""}: ${ref || "any"} }`;
+      }
       r.push(parameter);
     }
     return r;
@@ -864,6 +880,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.8",
+  "version": "0.1.10",
   "type": "commonjs",
   "files": [
     "dist",