@gopowerteam/request-generate 0.1.18 → 0.1.20

package/bin/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 'use strict'
+require('ts-node').register()
 
 const path = require('node:path')
 const fs = require('node:fs')
@@ -20,6 +21,7 @@ const params = program
   .opts()
 
 const configFilePaths = [
+  'request.config.ts',
   'request-generate.config.cjs',
   'request-generate.config.js'
 ]
@@ -38,8 +40,10 @@ function loadConfigFile(filePath) {
     fs.existsSync(path.resolve(process.cwd(), file))
   )
 
-  if (configFilePath) {
+  if (configFilePath.endsWith('js')) {
     return require(path.resolve(process.cwd(), configFilePath))
+  } else if (configFilePath.endsWith('ts')) {
+    return require(path.resolve(process.cwd(), configFilePath)).default
   } else {
     throw new Error('无法找到RequestGenerate配置文件')
   }

package/dist/index.d.ts

@@ -31,9 +31,18 @@ type GenerateOptions = {
     responseType?: 'promise' | 'observable'
   }
   // 多应用列表
-  applications?: Record<string, string>
+  applications?: Record<string, ApplicationConfig>
+  // 追加service
+  appendService?: boolean
 }
 
+type ApplicationConfig =
+  | {
+      key: string
+      openapi: string
+    }
+  | string
+
 /**
  * 生成应用选项
  */
@@ -141,6 +150,8 @@ declare class Generate {
     static writeClient(client: GenerateClient, options: GenerateApplicationOptions): void;
 }
 
+declare function defineConfig(config: GenerateOptions): GenerateOptions;
+
 declare const _default: typeof Generate.startup;
 
-export { GenerateOptions, _default as default };
+export { GenerateOptions, _default as default, defineConfig };

package/dist/index.js

@@ -29,14 +29,30 @@ function getOpenAPIVersion(document) {
 
 // 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 = "") {
+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,
-    input: `${options.gateway}/${application}/${options.openapi}`.replace(
-      /\/{2,3}/g,
-      "/"
-    ),
+    application: service,
+    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
     output: name ? path2.default.join(options.output, name) : options.output,
     exportModels: options.exportModels
   };
@@ -923,7 +939,7 @@ function writeServices(client, options) {
   fs4.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
-    service.application = options.application;
+    service.application = Generate.options.appendService === false ? "" : options.application;
     writeService(service, path4.join(output, filename));
   });
 }
@@ -983,8 +999,14 @@ var _Generate = class {
 var Generate = _Generate;
 _chunkXXPGZHWZjs.__publicField.call(void 0, Generate, "options");
 
+// src/deine-config.ts
+function defineConfig(config) {
+  return config;
+}
+
 // src/index.ts
 var src_default = Generate.startup;
 
 
-exports.default = src_default;
+
+exports.default = src_default; exports.defineConfig = defineConfig;

package/dist/index.mjs

@@ -30,14 +30,30 @@ function getOpenAPIVersion(document) {
 
 // src/utils/get-services-options.ts
 import path from "node:path";
-function createOptions(options, name, application = "") {
+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,
-    input: `${options.gateway}/${application}/${options.openapi}`.replace(
-      /\/{2,3}/g,
-      "/"
-    ),
+    application: service,
+    input: `${options.gateway}/${service}/${openapi}`.replace(/\/{2,3}/g, "/"),
     output: name ? path.join(options.output, name) : options.output,
     exportModels: options.exportModels
   };
@@ -924,7 +940,7 @@ function writeServices(client, options) {
   fs4.mkdirSync(output, { recursive: true });
   client.services.forEach((service) => {
     const filename = `${service.name}Service.ts`;
-    service.application = options.application;
+    service.application = Generate.options.appendService === false ? "" : options.application;
     writeService(service, path4.join(output, filename));
   });
 }
@@ -984,8 +1000,14 @@ var _Generate = class {
 var Generate = _Generate;
 __publicField(Generate, "options");
 
+// src/deine-config.ts
+function defineConfig(config) {
+  return config;
+}
+
 // src/index.ts
 var src_default = Generate.startup;
 export {
-  src_default as default
+  src_default as default,
+  defineConfig
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "private": false,
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "commonjs",
   "files": [
     "dist",
@@ -48,7 +48,7 @@
     "tsup": "^6.6.3",
     "typescript": "^4.9.5",
     "vite": "^4.1.4",
-    "@gopowerteam/request": "0.1.16"
+    "@gopowerteam/request": "0.1.17"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",