@jayfong/x-server 2.92.2 → 2.94.0

package/lib/_cjs/cli/api_generator.js

@@ -17,8 +17,9 @@ var _http_method = require("../core/http_method");
 /** 接口数据 */
 
 class ApiGenerator {
-  constructor(cwd = process.cwd()) {
-    this.cwd = cwd;
+  constructor(options = {}) {
+    this.options = options;
+    this.cwd = void 0;
     this.debug = (0, _debug.default)('api');
     // 几种情况:
     // /index.ts
@@ -27,6 +28,7 @@ class ApiGenerator {
     // /user/list.ts
     this.categoryUrlRe = /^.+\/src\/handlers\/(?:index\.ts|(.*)\/index\.ts|(.*)\.ts)$/;
     this.checker = void 0;
+    this.cwd = this.options.cwd || process.cwd();
   }
   async start() {
     this.debug('启动项目...');
@@ -62,6 +64,14 @@ class ApiGenerator {
       // 忽略仅开发时生效的路由
       if (/@dev[\/\.]/.test(categorySourceFilePath)) continue;
 
+      // 支持 include, exclude
+      if (this.options.include?.length) {
+        if (this.options.include.every(item => !categorySourceFilePath.includes(item))) continue;
+      }
+      if (this.options.exclude?.length) {
+        if (this.options.exclude.some(item => categorySourceFilePath.includes(item))) continue;
+      }
+
       // 分类 URL
       const categoryUrlMatch = categorySourceFilePath.match(this.categoryUrlRe);
       let categoryUrl = categoryUrlMatch[1] ?? categoryUrlMatch[2] ?? '';
@@ -133,11 +143,12 @@ class ApiGenerator {
       }
     }
     this.debug('写入文件...');
-    await Promise.all([_fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/api.json'), apiData, {
+    const prefix = this.options.name ? `${this.options.name}_` : '';
+    await Promise.all([_fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}api.json`), apiData, {
       spaces: 2
-    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/yapi.json'), this.apiDataToYApiData(apiData), {
+    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}yapi.json`), this.apiDataToYApiData(apiData), {
       spaces: 2
-    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/openapi31.json'), this.apiDataToOpenAPI31Data(apiData), {
+    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, `temp/${prefix}openapi31.json`), this.apiDataToOpenAPI31Data(apiData), {
       spaces: 2
     })]);
   }

package/lib/_cjs/cli/cli.js

@@ -238,6 +238,20 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'h',
   describe: '渠道',
   type: 'string'
+}).positional('include', {
+  alias: 'i',
+  describe: '包括',
+  type: 'string',
+  array: true
+}).positional('exclude', {
+  alias: 'e',
+  describe: '排除',
+  type: 'string',
+  array: true
+}).positional('name', {
+  alias: 'n',
+  describe: '名称',
+  type: 'string'
 }), async argv => {
   await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -250,7 +264,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         file: envFiles,
         channel: channel
       });
-      await new _api_generator.ApiGenerator().start();
+      await new _api_generator.ApiGenerator({
+        cwd: process.cwd(),
+        include: argv.include?.flatMap(v => v.split(',')),
+        exclude: argv.exclude?.flatMap(v => v.split(',')),
+        name: argv.name
+      }).start();
     }
   });
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {

package/lib/cli/api_generator.d.ts

@@ -31,9 +31,16 @@ type ApiData = {
     requestDataJsonSchema: JSONSchema4;
     responseDataJsonSchema: JSONSchema4;
 };
+export type ApiGeneratorOptions = {
+    cwd?: string;
+    include?: string[];
+    exclude?: string[];
+    name?: string;
+};
 export declare class ApiGenerator {
+    private options;
     private cwd;
-    constructor(cwd?: string);
+    constructor(options?: ApiGeneratorOptions);
     debug: createDebug.Debugger;
     categoryUrlRe: RegExp;
     checker: ts.TypeChecker;

package/lib/cli/api_generator.js

@@ -12,8 +12,9 @@ import { HandlerMethodToHttpMethod } from "../core/http_method";
 /** 接口数据 */
 
 export class ApiGenerator {
-  constructor(cwd = process.cwd()) {
-    this.cwd = cwd;
+  constructor(options = {}) {
+    this.options = options;
+    this.cwd = void 0;
     this.debug = createDebug('api');
     // 几种情况:
     // /index.ts
@@ -22,6 +23,7 @@ export class ApiGenerator {
     // /user/list.ts
     this.categoryUrlRe = /^.+\/src\/handlers\/(?:index\.ts|(.*)\/index\.ts|(.*)\.ts)$/;
     this.checker = void 0;
+    this.cwd = this.options.cwd || process.cwd();
   }
   async start() {
     this.debug('启动项目...');
@@ -57,6 +59,14 @@ export class ApiGenerator {
       // 忽略仅开发时生效的路由
       if (/@dev[\/\.]/.test(categorySourceFilePath)) continue;
 
+      // 支持 include, exclude
+      if (this.options.include?.length) {
+        if (this.options.include.every(item => !categorySourceFilePath.includes(item))) continue;
+      }
+      if (this.options.exclude?.length) {
+        if (this.options.exclude.some(item => categorySourceFilePath.includes(item))) continue;
+      }
+
       // 分类 URL
       const categoryUrlMatch = categorySourceFilePath.match(this.categoryUrlRe);
       let categoryUrl = categoryUrlMatch[1] ?? categoryUrlMatch[2] ?? '';
@@ -128,11 +138,12 @@ export class ApiGenerator {
       }
     }
     this.debug('写入文件...');
-    await Promise.all([fs.outputJSON(path.join(this.cwd, 'temp/api.json'), apiData, {
+    const prefix = this.options.name ? `${this.options.name}_` : '';
+    await Promise.all([fs.outputJSON(path.join(this.cwd, `temp/${prefix}api.json`), apiData, {
       spaces: 2
-    }), fs.outputJSON(path.join(this.cwd, 'temp/yapi.json'), this.apiDataToYApiData(apiData), {
+    }), fs.outputJSON(path.join(this.cwd, `temp/${prefix}yapi.json`), this.apiDataToYApiData(apiData), {
       spaces: 2
-    }), fs.outputJSON(path.join(this.cwd, 'temp/openapi31.json'), this.apiDataToOpenAPI31Data(apiData), {
+    }), fs.outputJSON(path.join(this.cwd, `temp/${prefix}openapi31.json`), this.apiDataToOpenAPI31Data(apiData), {
       spaces: 2
     })]);
   }

package/lib/cli/cli.js

@@ -236,6 +236,20 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'h',
   describe: '渠道',
   type: 'string'
+}).positional('include', {
+  alias: 'i',
+  describe: '包括',
+  type: 'string',
+  array: true
+}).positional('exclude', {
+  alias: 'e',
+  describe: '排除',
+  type: 'string',
+  array: true
+}).positional('name', {
+  alias: 'n',
+  describe: '名称',
+  type: 'string'
 }), async argv => {
   await EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -248,7 +262,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         file: envFiles,
         channel: channel
       });
-      await new ApiGenerator().start();
+      await new ApiGenerator({
+        cwd: process.cwd(),
+        include: argv.include?.flatMap(v => v.split(',')),
+        exclude: argv.exclude?.flatMap(v => v.split(',')),
+        name: argv.name
+      }).start();
     }
   });
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.92.2",
+  "version": "2.94.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",