@gopowerteam/request-generate 0.2.0 → 0.2.2

package/bin/download.mts

@@ -1,17 +1,18 @@
 #!/usr/bin/env tsx
 
-import path from 'node:path'
 import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
+import { fileURLToPath } from 'node:url'
 import { program } from 'commander'
-import { fileURLToPath } from 'node:url';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 const RequestGenerate = await import(`file://${path.resolve(
   __dirname,
   '..',
   'dist',
-  'index.mjs'
+  'index.mjs',
 )}`)
 
 const params = program
@@ -24,30 +25,30 @@ const params = program
 const configFilePaths = [
   'request.config.ts',
   'request-generate.config.cjs',
-  'request-generate.config.js'
+  'request-generate.config.js',
 ]
 
 /**
  * 加载配置文件
  * @param {*} filePath
- * @returns
  */
 async function loadConfigFile(filePath) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }
 
-  const configFilePath = configFilePaths.find((file) =>
-    fs.existsSync(path.resolve(process.cwd(), file))
+  const configFilePath = configFilePaths.find(file =>
+    fs.existsSync(path.resolve(process.cwd(), file)),
   )
 
-  if(!configFilePath){
-    throw new Error("Not Found Config File.")
+  if (!configFilePath) {
+    throw new Error('Not Found Config File.')
   }
 
   if (configFilePath.endsWith('.js') || configFilePath.endsWith('.ts')) {
     return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
-  } else {
+  }
+  else {
     throw new Error('无法找到RequestGenerate配置文件')
   }
 }
@@ -57,6 +58,7 @@ if (RequestGenerate) {
 
   RequestGenerate.download(config)
     .then(() => {
+      // eslint-disable-next-line no-console
       console.log('接口文件更新完成')
       process.exit(0)
     })

package/bin/generate.mts

@@ -1,17 +1,18 @@
 #!/usr/bin/env tsx
 
-import path from 'node:path'
 import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
+import { fileURLToPath } from 'node:url'
 import { program } from 'commander'
-import { fileURLToPath } from 'node:url';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 const RequestGenerate = await import(`file://${path.resolve(
   __dirname,
   '..',
   'dist',
-  'index.mjs'
+  'index.mjs',
 )}`)
 
 const params = program
@@ -24,32 +25,33 @@ const params = program
 const configFilePaths = [
   'request.config.ts',
   'request-generate.config.cjs',
-  'request-generate.config.js'
+  'request-generate.config.js',
 ]
 
 /**
  * 加载配置文件
  * @param {*} filePath
- * @returns
  */
 async function loadConfigFile(filePath) {
   if (filePath) {
     configFilePaths.unshift(filePath)
   }
 
-  const configFilePath = configFilePaths.find((file) =>
-    fs.existsSync(path.resolve(process.cwd(), file))
+  const configFilePath = configFilePaths.find(file =>
+    fs.existsSync(path.resolve(process.cwd(), file)),
   )
 
-  if(!configFilePath){
-    throw new Error("Not Find Config File.")
+  if (!configFilePath) {
+    throw new Error('Not Find Config File.')
   }
 
   if (configFilePath.endsWith('js')) {
     return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
-  } else if (configFilePath.endsWith('ts')) {
+  }
+  else if (configFilePath.endsWith('ts')) {
     return import(`file://${path.resolve(process.cwd(), configFilePath)}`)
-  } else {
+  }
+  else {
     throw new Error('无法找到RequestGenerate配置文件')
   }
 }
@@ -59,9 +61,11 @@ if (RequestGenerate) {
 
   try {
     await RequestGenerate.generate(config)
+    // eslint-disable-next-line no-console
     console.log('接口文件生成完成')
     process.exit(0)
-  } catch (error) {
+  }
+  catch (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

@@ -982,11 +982,11 @@ var _crypto = require('crypto'); var _crypto2 = _interopRequireDefault(_crypto);
 
 var ConfigFileName = ".config.json";
 var ConfigFilePath = path2.default.resolve(".request", ConfigFileName);
-function updateOptionsFromLocalConfig(options) {
+function updateOptionsFromLocalConfig(options, output) {
   const config = readLocalConfig();
   const toUpdateOptions = /* @__PURE__ */ new Map();
   options = options.filter((item) => {
-    const md5 = isFindNewMd5(item.name, config);
+    const md5 = isNeedUpdate(item.name, config, output);
     if (md5) {
       toUpdateOptions.set(item.name, md5);
       return true;
@@ -994,18 +994,28 @@ function updateOptionsFromLocalConfig(options) {
       return false;
     }
   });
+  options.forEach((item) => {
+    const file = path2.default.resolve(".request", `${item.name}.json`);
+    item.input = file;
+  });
   writeLocalConfig(toUpdateOptions, config);
   return options;
 }
-function isFindNewMd5(name, config) {
+function isNeedUpdate(name, config, output) {
   const file = path2.default.resolve(".request", `${name}.json`);
+  const outputDir = path2.default.resolve(output);
   if (!fs.default.existsSync(file)) {
     throw new Error(`\u672A\u627E\u5230\u76F8\u5E94\u7684\u914D\u7F6E\u6587\u4EF6: ${name}.json`);
   }
   const data = fs.default.readFileSync(file);
   const md5 = _crypto2.default.createHash("md5").update(data.toString()).digest("hex");
+  if (!fs.default.existsSync(path2.default.join(outputDir, name))) {
+    return md5;
+  }
   const configItem = config.find((x) => x.name === name);
-  return !configItem || configItem.md5 !== md5 ? md5 : "";
+  if (!configItem || configItem.md5 !== md5) {
+    return md5;
+  }
 }
 function readLocalConfig() {
   if (!fs.default.existsSync(ConfigFilePath)) {
@@ -1113,7 +1123,7 @@ var _Generate = class {
     _Generate.options = options;
     registerHandlebarTemplates();
     let applicationOptions = generateServiceOptions(options);
-    applicationOptions = updateOptionsFromLocalConfig(applicationOptions);
+    applicationOptions = updateOptionsFromLocalConfig(applicationOptions, options.output);
     const applications = [];
     for (const applicationOption of applicationOptions) {
       const client = await _Generate.generateApplicationClient(applicationOption);
@@ -1127,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);
     }
   }
   /**

package/dist/index.mjs

@@ -983,11 +983,11 @@ import fs3 from "node:fs";
 import path4 from "node:path";
 var ConfigFileName = ".config.json";
 var ConfigFilePath = path4.resolve(".request", ConfigFileName);
-function updateOptionsFromLocalConfig(options) {
+function updateOptionsFromLocalConfig(options, output) {
   const config = readLocalConfig();
   const toUpdateOptions = /* @__PURE__ */ new Map();
   options = options.filter((item) => {
-    const md5 = isFindNewMd5(item.name, config);
+    const md5 = isNeedUpdate(item.name, config, output);
     if (md5) {
       toUpdateOptions.set(item.name, md5);
       return true;
@@ -995,18 +995,28 @@ function updateOptionsFromLocalConfig(options) {
       return false;
     }
   });
+  options.forEach((item) => {
+    const file = path4.resolve(".request", `${item.name}.json`);
+    item.input = file;
+  });
   writeLocalConfig(toUpdateOptions, config);
   return options;
 }
-function isFindNewMd5(name, config) {
+function isNeedUpdate(name, config, output) {
   const file = path4.resolve(".request", `${name}.json`);
+  const outputDir = path4.resolve(output);
   if (!fs3.existsSync(file)) {
     throw new Error(`\u672A\u627E\u5230\u76F8\u5E94\u7684\u914D\u7F6E\u6587\u4EF6: ${name}.json`);
   }
   const data = fs3.readFileSync(file);
   const md5 = crypto.createHash("md5").update(data.toString()).digest("hex");
+  if (!fs3.existsSync(path4.join(outputDir, name))) {
+    return md5;
+  }
   const configItem = config.find((x) => x.name === name);
-  return !configItem || configItem.md5 !== md5 ? md5 : "";
+  if (!configItem || configItem.md5 !== md5) {
+    return md5;
+  }
 }
 function readLocalConfig() {
   if (!fs3.existsSync(ConfigFilePath)) {
@@ -1114,7 +1124,7 @@ var _Generate = class {
     _Generate.options = options;
     registerHandlebarTemplates();
     let applicationOptions = generateServiceOptions(options);
-    applicationOptions = updateOptionsFromLocalConfig(applicationOptions);
+    applicationOptions = updateOptionsFromLocalConfig(applicationOptions, options.output);
     const applications = [];
     for (const applicationOption of applicationOptions) {
       const client = await _Generate.generateApplicationClient(applicationOption);
@@ -1128,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);
     }
   }
   /**

package/dist/vite-plugin/index.js

@@ -4,6 +4,7 @@
 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
@@ -125,7 +126,12 @@ function genretateDeclareAndCode(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 {

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
@@ -125,7 +126,12 @@ function genretateDeclareAndCode(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 {

package/package.json

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