@jayfong/x-server 2.32.0 → 2.35.0

package/lib/core/define_task.js

@@ -34,58 +34,74 @@ export function defineSliceTask(options) {
       }
     }
   });
-  const redisKeyPrefix = `${x.appId}_batch_task_${options.name}`;
-  const res = {
-    add: async (data, addOptions) => {
-      const key = (addOptions == null ? void 0 : addOptions.key) || '';
-      const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? ms(addOptions.duration) : typeof options.duration === 'function' ? ms(options.duration(key)) : options.duration && ms(options.duration);
-      const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
-      const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? ms(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? ms(options.thresholdTimeout(key)) : options.thresholdTimeout && ms(options.thresholdTimeout);
-      assert(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
-      const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
-      const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1;
+  const addAction = async (data, addOptions) => {
+    const redisKeyPrefix = `${x.appId}_batch_task_${options.name}`;
+    const key = (addOptions == null ? void 0 : addOptions.key) || '';
+    const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? ms(addOptions.duration) : typeof options.duration === 'function' ? ms(options.duration(key)) : options.duration && ms(options.duration);
+    const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+    const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? ms(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? ms(options.thresholdTimeout(key)) : options.thresholdTimeout && ms(options.thresholdTimeout);
+    assert(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
+    const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
+    const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
+    const count = parseInt(res[0][1], 10) + 1;
 
-      // 仅时段
-      // 1分钟内的合并推送
-      if (duration != null) {
-        if (count === 1) {
-          await task.add({
-            key: key,
-            redisKey: redisKey
-          }, {
-            delay: duration
-          });
-        }
+    // 仅时段
+    // 1分钟内的合并推送
+    if (duration != null) {
+      if (count === 1) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: duration
+        });
       }
-      // 仅阈值
-      // 满10条推送
-      else if (threshold != null) {
-        const delayTaskId = redisKey;
-        const prevJob = await task.getJob(delayTaskId);
+    }
+    // 仅阈值
+    // 满10条推送
+    else if (threshold != null) {
+      const delayTaskId = redisKey;
+      const prevJob = await task.getJob(delayTaskId);
 
-        // 到达阈值，立即发送
-        if (count === threshold) {
-          await (prevJob == null ? void 0 : prevJob.remove());
+      // 到达阈值，立即发送
+      if (count === threshold) {
+        await (prevJob == null ? void 0 : prevJob.remove());
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        });
+      }
+      // 存在超时设置
+      else if (thresholdTimeout) {
+        if (!prevJob) {
           await task.add({
             key: key,
             redisKey: redisKey
+          }, {
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-        // 存在超时设置
-        else if (thresholdTimeout) {
-          if (!prevJob) {
-            await task.add({
-              key: key,
-              redisKey: redisKey
-            }, {
-              jobId: delayTaskId,
-              delay: thresholdTimeout
-            });
-          }
-        }
       }
     }
   };
+  const addTask = defineTask({
+    name: `${options.name}_add`,
+    concurrency: 1,
+    handle: async payload => {
+      await addAction(payload.data, payload.options);
+    }
+  });
+  const res = {
+    add: async (data, addOptions) => {
+      const delay = addOptions.delay && ms(addOptions.delay) || 0;
+      await addTask.add({
+        data: data,
+        options: addOptions
+      }, {
+        delay: delay
+      });
+    }
+  };
   return res;
 }

package/lib/core/handler.d.ts

@@ -1,6 +1,6 @@
 import * as vae from 'vtils/vae';
 import type { XHandler } from './types';
-export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap } from '.x/routes';
+export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap, } from '.x/routes';
 export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method> {
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
     private requestDataSchema;

package/lib/core/handler.js

@@ -1,12 +1,10 @@
 import LZString from 'lz-string';
-import { DataPacker } from 'vtils';
+import { DataPacker, base64UrlEncode, rot13 } from 'vtils';
 import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
 import { DisposeService } from "../services/dispose";
-
-// @ts-ignore
-// prettier-ignore
+import { Server } from "./server";
 yup.setLocale(getZhCN({
   getLabel: params => params.label || params.path
 }));
@@ -74,9 +72,18 @@ export class Handler {
           '_#': LZString.compress(JSON.stringify(res))
         };
       }
+
+      // 加密返回数据
+      if (this.options.responseDataEncrypt && Server.options.responseEncryptAlgorithm) {
+        if (Server.options.responseEncryptAlgorithm === 'simple') {
+          res = {
+            _$: rot13(base64UrlEncode(`${Date.now()}${JSON.stringify(res)}`))
+          };
+        }
+      }
       return res == null ? {} : res;
     };
-    this.handleWs = async (data, ctx) => {
+    this.handleWs = async (_data, ctx) => {
       const dispose = new DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {

package/lib/core/server.js

@@ -1,8 +1,8 @@
 import Fastify from 'fastify';
 import { base64UrlDecode, castArray, keyBy, noop, rot13 } from 'vtils';
-import { HandlerMethodToHttpMethod } from "./http_method";
-import { HttpError } from "./http_error";
 import { x } from "../x";
+import { HttpError } from "./http_error";
+import { HandlerMethodToHttpMethod } from "./http_method";
 export class Server {
   constructor(options) {
     this.options = options;
@@ -91,7 +91,6 @@ export class Server {
         if (handlerMethod === 'FILE') {
           const part = await req.file();
           files = Object.keys(part.fields).reduce((res, name) => {
-            ;
             res[name] = castArray(part.fields[name]).map(item => item.file ? item : item.value)[0];
             return res;
           }, {});

package/lib/core/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
 /// <reference types="got/dist/source/core/utils/timed-out" />
+import type { IncomingHttpHeaders } from 'http';
 import type { MultipartFile } from '@fastify/multipart';
 import type { SocketStream } from '@fastify/websocket';
 import type { Queue } from 'bull';
 import { CronJob } from 'cron';
 import { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
-import type { IncomingHttpHeaders } from 'http';
 import type { MsValue } from 'vtils';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
 import * as vae from 'vtils/vae';
@@ -36,6 +36,14 @@ export declare namespace XServer {
          * 监听端口
          */
         port: number;
+        /**
+         * 响应加密算法
+         */
+        responseEncryptAlgorithm?: 'simple';
+        /**
+         * 响应加密密钥
+         */
+        responseEncryptKey?: string;
         /**
          * 透传给 Fastify 的选项
          */
@@ -126,6 +134,7 @@ export declare namespace XHandler {
          * @default false
          */
         responseDataObfuscate?: boolean;
+        responseDataEncrypt?: boolean;
         /**
          * 响应的 Content-Type 头
          */
@@ -199,6 +208,7 @@ export declare namespace XTask {
             duration?: MsValue;
             threshold?: number;
             thresholdTimeout?: MsValue;
+            delay?: MsValue;
         }) => Promise<void>;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.32.0",
+  "version": "2.35.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,9 +9,7 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": [
-    "lib"
-  ],
+  "files": ["lib"],
   "scripts": {
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -19,16 +17,14 @@
     "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
     "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
     "test_api_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
-    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
-    "test_api1_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api1 tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api1",
-    "test_api1_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api1 tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api1"
+    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api"
   },
   "dependencies": {
     "@fastify/cors": "^8.3.0",
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
-    "@prisma/client": "^4.8.0",
+    "@prisma/client": "^5.8.0",
     "@types/busboy": "^0.3.2",
     "@types/http-errors": "^1.8.2",
     "@types/jsonwebtoken": "^8.5.8",
@@ -62,7 +58,7 @@
     "nodemailer": "^6.7.3",
     "pino-pretty": "^10.0.1",
     "pirates": "^4.0.6",
-    "prisma": "^4.8.0",
+    "prisma": "^5.8.0",
     "select-run": "^1.1.2",
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",
@@ -85,7 +81,8 @@
     "ioredis-mock": "^8.7.0",
     "json-xml-parse": "^1.2.4",
     "node-fetch": "^3.3.1",
-    "npm-check-updates": "^12.5.9"
+    "npm-check-updates": "^12.5.9",
+    "openapi-types": "^12.1.3"
   },
   "publishConfig": {
     "access": "public"

package/lib/_cjs/cli/api_generator1.js

@@ -1,286 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-exports.__esModule = true;
-exports.ApiGenerator1 = void 0;
-var _nodePath = _interopRequireDefault(require("node:path"));
-var parseComment = _interopRequireWildcard(require("comment-parser"));
-var _debug = _interopRequireDefault(require("debug"));
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-var ts = _interopRequireWildcard(require("ts-morph"));
-var _vtils = require("vtils");
-var _http_method = require("../core/http_method");
-class ApiGenerator1 {
-  constructor() {
-    this.debug = (0, _debug.default)('api1');
-    this.cwd = process.cwd();
-    // cwd = '/Users/admin/Documents/jfWorks/x-server-test'
-    this.project = void 0;
-  }
-  getTypeBySymbol(symbol) {
-    return symbol.getTypeAtLocation(symbol.getDeclarations()[0] || symbol.getValueDeclarationOrThrow());
-  }
-  getComment(declaration) {
-    var _declaration$getLeadi;
-    const text = ((declaration == null || (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
-    const comment = parseComment.parse(text)[0];
-    const description = (comment == null ? void 0 : comment.description) || '';
-    const tags = new Map();
-    comment == null ? void 0 : comment.tags.forEach(tag => {
-      tags.set(tag.tag, tag.description);
-    });
-    return {
-      existing: !!comment,
-      description: description,
-      tags: tags
-    };
-  }
-  getCommentBySymbol(symbol) {
-    var _this$getComment;
-    return ((_this$getComment = this.getComment(symbol.getDeclarations()[0])) == null ? void 0 : _this$getComment.description) || '';
-  }
-  typeToApiData(type, _symbol) {
-    var _type$getSymbol, _type$getSymbol2, _type$getSymbol3;
-    // ws
-    if (((_type$getSymbol = type.getSymbol()) == null ? void 0 : _type$getSymbol.getName()) === 'SocketStream') {
-      return {
-        name: 'ws',
-        desc: 'ws',
-        required: false,
-        type: 'object',
-        children: [],
-        enum: []
-      };
-    }
-
-    // XFile
-    if (((_type$getSymbol2 = type.getSymbol()) == null ? void 0 : _type$getSymbol2.getName()) === 'MultipartFile') {
-      const symbol = _symbol || type.getSymbol();
-      return {
-        name: 'file',
-        desc: symbol && this.getCommentBySymbol(symbol) || '',
-        required: !!symbol && !(symbol.getFlags() & ts.SymbolFlags.Optional),
-        type: 'file',
-        children: [],
-        enum: []
-      };
-    }
-    let isRequired = true;
-    let isUnion = type.isUnion();
-    const unionTypes = isUnion ? type.getUnionTypes().filter(item => !item.isBooleanLiteral() && !item.isNull() && !item.isUndefined()) : [];
-    isUnion = !!unionTypes.length;
-    if (isUnion) {
-      if (unionTypes.length === 1 && !unionTypes[0].isLiteral()) {
-        isUnion = false;
-      }
-      // 兼容 prisma 生成的类型用 null 表示可选
-      isRequired = unionTypes.length === type.getUnionTypes().length;
-      // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
-      type = unionTypes[0].getBaseTypeOfLiteralType();
-    }
-    const isEnum = type.isEnum();
-    const enumData = isEnum ?
-    // @ts-ignore
-    type.compilerType.types.reduce((res, item) => {
-      res[item.getSymbol().getName()] = item.value;
-      return res;
-    }, {}) : {};
-    const enumKeys = Object.keys(enumData);
-    const enumValues = Object.values(enumData);
-    const isIntersection = type.isIntersection();
-    const intersectionTypes = isIntersection && type.getIntersectionTypes();
-    const isArray = type.isArray();
-    const isString = isEnum ? typeof enumValues[0] === 'string' : type.isString() || ['Date'].includes(((_type$getSymbol3 = type.getSymbol()) == null ? void 0 : _type$getSymbol3.getName()) || '');
-    const isNumber = isEnum ? typeof enumValues[0] === 'number' : type.isNumber();
-    const isBoolean = type.isBoolean() || type.isUnion() && type.getUnionTypes().some(item => item.isBooleanLiteral()) && type.getUnionTypes().every(item => item.isBooleanLiteral() || item.isNull() || item.isUndefined());
-    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() ||
-    // 将交集类型视为对象
-    isIntersection;
-    const symbol = _symbol || type.getSymbol();
-    const parentSymbol = symbol;
-    const apiName = (symbol == null ? void 0 : symbol.getName()) || '__type';
-    const apiDesc = [symbol && this.getCommentBySymbol(symbol), isEnum && `枚举：${enumKeys.map((key, index) => `${key}->${enumValues[index]}`).join('; ')}`].filter(Boolean).join('\n');
-    const apiEnum = isUnion ? unionTypes.map(t => t.getLiteralValue()) : isEnum ? enumValues : [];
-    const apiType = isArray ? 'array' : isString ? 'string' : isNumber ? 'number' : isBoolean ? 'boolean' : 'object';
-    const apiRequired = isRequired === false ? false : !!symbol && !(symbol.getFlags() & ts.SymbolFlags.Optional);
-    const apiChildren = isArray ? [this.typeToApiData(type.getArrayElementTypeOrThrow())] : isObject ? (0, _vtils.ii)(() => {
-      const context = type._context;
-      const compilerFactory = context.compilerFactory;
-      const rawChecker = type.compilerType.checker;
-      let symbols = [];
-      if (intersectionTypes) {
-        // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType))
-        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
-        .map(symbol => compilerFactory.getSymbol(symbol));
-      } else {
-        // symbols = type.getApparentProperties()
-        // https://github.com/microsoft/TypeScript/issues/38184
-        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType])
-        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
-        .map(symbol => compilerFactory.getSymbol(symbol));
-      }
-      return symbols.map(symbol => {
-        return this.typeToApiData(!symbol.compilerSymbol.declarations ?
-        // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
-        symbol.compilerSymbol.type ? compilerFactory.getType(symbol.compilerSymbol.type) :
-        // fix: symbol.compilerSymbol.type 为 undefined
-        // https://github.com/styleguidist/react-docgen-typescript/blob/master/src/parser.ts#L696
-        compilerFactory.getType(rawChecker.getTypeOfSymbolAtLocation(
-        // @ts-ignore
-        symbol.compilerSymbol,
-        // @ts-ignore
-        parentSymbol.compilerSymbol.declarations[0])) : this.getTypeBySymbol(symbol), symbol);
-      });
-    }) : [];
-    return {
-      name: apiName,
-      desc: apiDesc,
-      enum: apiEnum,
-      type: apiType,
-      required: apiRequired,
-      children: apiChildren
-    };
-  }
-  apiDataToJsonSchema(apiData, jsonSchema = {}) {
-    jsonSchema.description = apiData.desc;
-    if (apiData.type === 'object') {
-      jsonSchema.type = 'object';
-      jsonSchema.properties = apiData.children.reduce((res, item) => {
-        res[item.name] = this.apiDataToJsonSchema(item);
-        return res;
-      }, {});
-      jsonSchema.required = apiData.children.filter(item => item.required).map(item => item.name);
-    } else if (apiData.type === 'array') {
-      jsonSchema.type = 'array';
-      jsonSchema.items = apiData.children.map(item => this.apiDataToJsonSchema(item))[0];
-    } else {
-      jsonSchema.type = apiData.type;
-      if (apiData.enum.length) {
-        jsonSchema.enum = apiData.enum;
-      }
-    }
-    return jsonSchema;
-  }
-  genYApiData(handles) {
-    const data = {};
-    for (const handle of handles) {
-      data[handle.category] = data[handle.category] || [];
-      data[handle.category].push(handle.handlerMethod === 'GET' ? {
-        method: handle.method.toUpperCase(),
-        title: handle.name,
-        path: handle.path,
-        res_body_type: 'json',
-        req_body_is_json_schema: false,
-        res_body_is_json_schema: true,
-        req_params: [],
-        req_query: handle.requestData.children.map(item => ({
-          required: item.required ? 1 : 0,
-          name: item.name,
-          desc: item.desc,
-          type: 'string'
-        })),
-        req_headers: [],
-        req_body_form: [],
-        res_body: JSON.stringify(handle.responseDataJsonSchema)
-      } : handle.handlerMethod === 'FILE' ? {
-        method: handle.method.toUpperCase(),
-        title: handle.name,
-        path: handle.path,
-        req_body_type: 'form',
-        res_body_type: 'json',
-        req_body_is_json_schema: false,
-        res_body_is_json_schema: true,
-        req_params: [],
-        req_query: [],
-        req_headers: [],
-        req_body_form: handle.requestData.children.map(item => ({
-          required: item.required ? 1 : 0,
-          name: item.name,
-          desc: item.desc,
-          type: item.type === 'file' ? 'file' : 'text'
-        })),
-        res_body: JSON.stringify(handle.responseDataJsonSchema)
-      } : {
-        method: handle.method.toUpperCase(),
-        title: handle.name,
-        path: handle.path,
-        req_body_type: 'json',
-        res_body_type: 'json',
-        req_body_is_json_schema: true,
-        res_body_is_json_schema: true,
-        req_params: [],
-        req_query: [],
-        req_headers: [],
-        req_body_form: [],
-        req_body_other: JSON.stringify(handle.requestDataJsonSchema),
-        res_body: JSON.stringify(handle.responseDataJsonSchema)
-      });
-    }
-    return Object.keys(data).map(cat => ({
-      name: cat,
-      desc: cat,
-      list: data[cat]
-    }));
-  }
-  async generate() {
-    this.debug('启动项目...');
-    this.project = new ts.Project({
-      tsConfigFilePath: _nodePath.default.join(this.cwd, 'tsconfig.json')
-    });
-    this.debug('加载文件...');
-    const sourceFile = this.project.createSourceFile(_nodePath.default.join(this.cwd, 'src/generated/handlers.ts'), await _fsExtra.default.readFile(_nodePath.default.join(this.cwd, 'node_modules/.x/handlers.ts'), 'utf-8'));
-    this.debug('导出处理器...');
-    const handlerGroup = sourceFile.getExportSymbols();
-    const handles = [];
-    this.debug('生成API文档...');
-    for (const handlerList of handlerGroup) {
-      const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
-      const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => (0, _vtils.snakeCase)(v)).join('/')}/`.replace(/\/{2,}/g, '/');
-      for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
-        // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
-        handler.getDeclarations().forEach(exp => {
-          exp.getType().getText();
-        });
-        const handlerExp = handler.getDeclarations()[0];
-        const handlerPath = `${basePath}${handlerExp.getName()}`;
-        this.debug('生成接口: %s ...', handlerPath);
-        const [requestType, responseType, methodType] = handlerExp.getType().getTypeArguments();
-        const handlerComment = this.getComment(handlerExp.getParent().getParent());
-        if (handlerComment.tags.has('private')) {
-          this.debug('跳过生成接口: %s', `${handlerPath}`);
-          continue;
-        }
-        const handlerCategory = (0, _vtils.pascalCase)(basePath) || 'Index';
-        const handlerName = handlerComment.description || handlerPath;
-        const handlerMethod = methodType.getLiteralValueOrThrow();
-        const serverMethod = _http_method.HandlerMethodToHttpMethod[handlerMethod];
-        const requestData = this.typeToApiData(requestType);
-        const responseData = this.typeToApiData(responseType);
-        const requestDataJsonSchema = this.apiDataToJsonSchema(requestData);
-        const responseDataJsonSchema = this.apiDataToJsonSchema(responseData);
-        handles.push({
-          category: handlerCategory,
-          name: handlerName,
-          path: handlerPath,
-          handlerMethod: handlerMethod,
-          method: serverMethod,
-          requestData: requestData,
-          responseData: responseData,
-          requestDataJsonSchema: requestDataJsonSchema,
-          responseDataJsonSchema: responseDataJsonSchema
-        });
-      }
-    }
-    this.debug('写入文件...');
-    await Promise.all([_fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, 'temp/api1.json'), handles, {
-      spaces: 2
-    }), _fsExtra.default.outputJSON(_nodePath.default.join(this.cwd, 'temp/yapi1.json'), this.genYApiData(handles), {
-      spaces: 2
-    })]);
-  }
-}
-
-// new ApiGenerator().generate()
-exports.ApiGenerator1 = ApiGenerator1;

package/lib/cli/api_generator1.d.ts

@@ -1,44 +0,0 @@
-import createDebug from 'debug';
-import type { JSONSchema4 } from 'json-schema';
-import * as ts from 'ts-morph';
-import type { XHandler } from '../core/types';
-interface ApiData {
-    name: string;
-    desc: string;
-    type: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file';
-    enum: any[];
-    required: boolean;
-    children: ApiData[];
-}
-type ApiHandles = Array<{
-    category: string;
-    name: string;
-    path: string;
-    handlerMethod: XHandler.Method;
-    method: string;
-    requestData: ApiData;
-    responseData: ApiData;
-    requestDataJsonSchema: JSONSchema4;
-    responseDataJsonSchema: JSONSchema4;
-}>;
-export declare class ApiGenerator1 {
-    debug: createDebug.Debugger;
-    cwd: string;
-    project: ts.Project;
-    getTypeBySymbol(symbol: ts.Symbol): ts.Type;
-    getComment(declaration?: ts.Node): {
-        existing: boolean;
-        description: string;
-        tags: Map<string, string>;
-    };
-    getCommentBySymbol(symbol: ts.Symbol): string;
-    typeToApiData(type: ts.Type, _symbol?: ts.Symbol): ApiData;
-    apiDataToJsonSchema(apiData: ApiData, jsonSchema?: JSONSchema4): JSONSchema4;
-    genYApiData(handles: ApiHandles): {
-        name: string;
-        desc: string;
-        list: any;
-    }[];
-    generate(): Promise<void>;
-}
-export {};