@gopowerteam/request-generate 0.2.1 → 0.2.3

package/bin/download.mts

@@ -32,7 +32,7 @@ const configFilePaths = [
  * 加载配置文件
  * @param {*} filePath
  */
-async function loadConfigFile(filePath) {
+async function loadConfigFile(filePath: string) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }
@@ -62,7 +62,7 @@ if (RequestGenerate) {
       console.log('接口文件更新完成')
       process.exit(0)
     })
-    .catch((error) => {
+    .catch((error: Error) => {
       console.error(error)
       process.exit(1)
     })

package/bin/generate.mts

@@ -32,7 +32,7 @@ const configFilePaths = [
  * 加载配置文件
  * @param {*} filePath
  */
-async function loadConfigFile(filePath) {
+async function loadConfigFile(filePath: string) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }

package/bin/index.mts

@@ -33,7 +33,7 @@ const configFilePaths = [
  * @param {*} filePath
  * @returns Promise
  */
-async function loadConfigFile(filePath) {
+async function loadConfigFile(filePath: string) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }
@@ -64,7 +64,7 @@ if (RequestGenerate) {
     .then(() => {
       process.exit(0)
     })
-    .catch((error) => {
+    .catch((error: Error) => {
       console.error(error)
       process.exit(1)
     })

package/dist/index.d.ts

@@ -137,7 +137,7 @@ declare class Generate {
      * @returns Promise<void>
      */
     static startup(options: GenerateOptions): Promise<void>;
-    static getApiDocument(url: string, retry?: number): Promise<UnkownVersionDocument>;
+    static getApiDocument(input: string): Promise<UnkownVersionDocument>;
     /**
      * 生成应用
      */

package/dist/index.js

@@ -994,6 +994,10 @@ function updateOptionsFromLocalConfig(options, output) {
       return false;
     }
   });
+  options.forEach((item) => {
+    const file = path2.default.resolve(".request", `${item.name}.json`);
+    item.input = file;
+  });
   writeLocalConfig(toUpdateOptions, config);
   return options;
 }
@@ -1133,17 +1137,15 @@ var _Generate = class {
       _Generate.writeClient(application.client, application.options);
     });
   }
-  static async getApiDocument(url, retry = 0) {
-    if (retry >= 3) {
-      console.error(`\u8BF7\u6C42[${url}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
-      _process2.default.exit(0);
-    }
+  static async getApiDocument(input) {
     try {
-      return await getOpenApiDocument(
-        url
+      const document = await getOpenApiDocument(
+        input
       );
+      return document;
     } catch (e) {
-      return _Generate.getApiDocument(url, retry + 1);
+      console.error(`\u8BF7\u6C42\u6587\u4EF6[${input}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
+      _process2.default.exit(0);
     }
   }
   /**
@@ -1186,7 +1188,7 @@ var _Generate = class {
 var Generate = _Generate;
 _chunkXXPGZHWZjs.__publicField.call(void 0, Generate, "options");
 
-// src/deine-config.ts
+// src/define-config.ts
 function defineConfig(config) {
   return config;
 }

package/dist/index.mjs

@@ -995,6 +995,10 @@ function updateOptionsFromLocalConfig(options, output) {
       return false;
     }
   });
+  options.forEach((item) => {
+    const file = path4.resolve(".request", `${item.name}.json`);
+    item.input = file;
+  });
   writeLocalConfig(toUpdateOptions, config);
   return options;
 }
@@ -1134,17 +1138,15 @@ var _Generate = class {
       _Generate.writeClient(application.client, application.options);
     });
   }
-  static async getApiDocument(url, retry = 0) {
-    if (retry >= 3) {
-      console.error(`\u8BF7\u6C42[${url}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
-      process.exit(0);
-    }
+  static async getApiDocument(input) {
     try {
-      return await getOpenApiDocument(
-        url
+      const document = await getOpenApiDocument(
+        input
       );
+      return document;
     } catch {
-      return _Generate.getApiDocument(url, retry + 1);
+      console.error(`\u8BF7\u6C42\u6587\u4EF6[${input}]\u5931\u8D25,\u8BF7\u7A0D\u540E\u91CD\u8BD5.`);
+      process.exit(0);
     }
   }
   /**
@@ -1187,7 +1189,7 @@ var _Generate = class {
 var Generate = _Generate;
 __publicField(Generate, "options");
 
-// src/deine-config.ts
+// src/define-config.ts
 function defineConfig(config) {
   return config;
 }

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

@@ -1,5 +1,5 @@
 {{#include-query-params operations}}
-namespace RequestQueryParams {
+export namespace RequestQueryParams {
 {{#each operations}}
   {{#if parametersQuery}}
   export type {{to-upper name true}} = {

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

@@ -3,7 +3,7 @@ import { PluginOption } from 'vite';
 interface PluginOptions {
     alias: string;
     dir: string;
-    dts: string;
+    dts: string | boolean;
 }
 /**
  * Request插件

package/dist/vite-plugin/index.js

@@ -1,9 +1,10 @@
-"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');
+"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 }; }require('../chunk-XXPGZHWZ.js');
 
 // src/vite-plugin/index.ts
 var _child_process = require('child_process');
 var _fs = require('fs'); var fs = _interopRequireWildcard(_fs);
 var _path = require('path'); var path = _interopRequireWildcard(_path);
+var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _handlebars = require('handlebars'); var _handlebars2 = _interopRequireDefault(_handlebars);
 
 // src/vite-plugin/templates.ts
@@ -119,13 +120,20 @@ function genretateDeclareAndCode(options) {
   const services = getServiceItems(paths);
   const groups = getServiceGroups(services);
   if (services && services.length) {
-    generateDeclare(services, groups, options);
     generateCode(services, groups);
+    if (options.dts !== false) {
+      generateDeclare(services, groups, options);
+    }
   }
 }
 function generateRequestCode() {
   const generateScript = path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate");
-  _child_process.execSync.call(void 0, `${generateScript}`);
+  _child_process.execSync.call(void 0, `${generateScript}`, {
+    env: {
+      ..._process2.default.env,
+      FORCE_COLOR: "1"
+    }
+  });
 }
 var vite_plugin_default = (options) => {
   return {
@@ -215,7 +223,7 @@ function generateDeclare(services, groups, options) {
     MODULE_ID
   });
   fs.writeFileSync(
-    path.resolve(viteConfig.root, _nullishCoalesce(options.dts, () => ( DECLARATION_FILE))),
+    path.resolve(viteConfig.root, typeof options.dts === "string" ? options.dts : DECLARATION_FILE),
     content.replace(/\r\n/g, "\n"),
     "utf-8"
   );

package/dist/vite-plugin/index.mjs

@@ -4,6 +4,7 @@ import "../chunk-WF3XBEPN.mjs";
 import { execSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import process from "node:process";
 import Handlebars from "handlebars";
 
 // src/vite-plugin/templates.ts
@@ -119,13 +120,20 @@ function genretateDeclareAndCode(options) {
   const services = getServiceItems(paths);
   const groups = getServiceGroups(services);
   if (services && services.length) {
-    generateDeclare(services, groups, options);
     generateCode(services, groups);
+    if (options.dts !== false) {
+      generateDeclare(services, groups, options);
+    }
   }
 }
 function generateRequestCode() {
   const generateScript = path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate");
-  execSync(`${generateScript}`);
+  execSync(`${generateScript}`, {
+    env: {
+      ...process.env,
+      FORCE_COLOR: "1"
+    }
+  });
 }
 var vite_plugin_default = (options) => {
   return {
@@ -215,7 +223,7 @@ function generateDeclare(services, groups, options) {
     MODULE_ID
   });
   fs.writeFileSync(
-    path.resolve(viteConfig.root, options.dts ?? DECLARATION_FILE),
+    path.resolve(viteConfig.root, typeof options.dts === "string" ? options.dts : DECLARATION_FILE),
     content.replace(/\r\n/g, "\n"),
     "utf-8"
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "type": "commonjs",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "private": false,
   "keywords": [
     "gopowerteam",