@gopowerteam/request-generate 0.1.19 → 0.1.21

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/{chunk-LBEPSBX6.mjs → chunk-4OXX5WFT.mjs}

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

@@ -31,11 +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
+
 /**
  * 生成应用选项
  */
@@ -143,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
   };
@@ -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

@@ -1,7 +1,7 @@
 import {
   __dirname,
   __publicField
-} from "./chunk-LBEPSBX6.mjs";
+} from "./chunk-4OXX5WFT.mjs";
 
 // src/utils/get-openapi-document.ts
 import swaggerParse from "@apidevtools/swagger-parser";
@@ -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
   };
@@ -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/dist/templates/partials/export-service-class.hbs

@@ -5,7 +5,7 @@ export class {{{name}}}Service {
 
   private generateRequest(
     requestSendOptions: RequestSendOptions,
-    requestPlugins: RequestPlugin[] = [],
+    requestPlugins: (RequestPlugin | undefined)[] = [],
     requestGenerateOptions?: RequestGenerateOptions
   ){
     switch(true){

package/dist/vite-plugin/index.js

@@ -1,9 +1,9 @@
-"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 _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }require('../chunk-XXPGZHWZ.js');
+"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 _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 var _path = require('path'); var path = _interopRequireWildcard(_path);
-var _handlebars = require('handlebars'); var Handlebars = _interopRequireWildcard(_handlebars);
+var _handlebars = require('handlebars'); var _handlebars2 = _interopRequireDefault(_handlebars);
 
 // src/vite-plugin/templates.ts
 var useRequestFunctionCodeTemplate = `
@@ -190,14 +190,14 @@ function getServiceGroups(services) {
   }, []);
 }
 function generateCode(services, groups) {
-  const template = Handlebars.compile(generateCodeTemplate);
+  const template = _handlebars2.default.compile(generateCodeTemplate);
   return template({
     groups: groups.length ? groups : void 0,
     services
   });
 }
 function generateDeclare(services, groups, options) {
-  const template = Handlebars.compile(generateDeclareTemplate);
+  const template = _handlebars2.default.compile(generateDeclareTemplate);
   const content = template({
     groups: groups.length ? groups : void 0,
     services,

package/dist/vite-plugin/index.mjs

@@ -1,9 +1,9 @@
-import "../chunk-LBEPSBX6.mjs";
+import "../chunk-4OXX5WFT.mjs";
 
 // src/vite-plugin/index.ts
 import * as fs from "fs";
 import * as path from "path";
-import * as Handlebars from "handlebars";
+import Handlebars from "handlebars";
 
 // src/vite-plugin/templates.ts
 var useRequestFunctionCodeTemplate = `

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "private": false,
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "commonjs",
   "files": [
     "dist",
@@ -48,11 +48,11 @@
     "tsup": "^6.6.3",
     "typescript": "^4.9.5",
     "vite": "^4.1.4",
-    "@gopowerteam/request": "0.1.16"
+    "@gopowerteam/request": "0.1.18"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "handlebars": "^4.7.7",
+    "handlebars": "^4.7.8",
     "qs": "^6.11.0",
     "rimraf": "^4.1.2",
     "rxjs": "^7.8.0",