@jayfong/x-server 2.30.1 → 2.30.3

package/lib/_cjs/cli/api_generator.js

@@ -5,12 +5,12 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 exports.__esModule = true;
 exports.ApiGenerator = void 0;
 var parseComment = _interopRequireWildcard(require("comment-parser"));
-var ts = _interopRequireWildcard(require("ts-morph"));
 var _debug = _interopRequireDefault(require("debug"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _nodePath = _interopRequireDefault(require("node:path"));
-var _http_method = require("../core/http_method");
+var ts = _interopRequireWildcard(require("ts-morph"));
 var _vtils = require("vtils");
+var _http_method = require("../core/http_method");
 class ApiGenerator {
   constructor() {
     this.debug = (0, _debug.default)('api');
@@ -98,6 +98,7 @@ class ApiGenerator {
     // 将交集类型视为对象
     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 : [];
@@ -123,7 +124,14 @@ class ApiGenerator {
       return symbols.map(symbol => {
         return this.typeToApiData(!symbol.compilerSymbol.declarations ?
         // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
-        compilerFactory.getType(symbol.compilerSymbol.type) : this.getTypeBySymbol(symbol), symbol);
+        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 {

package/lib/_cjs/services/sensitive_words.js

@@ -3,6 +3,10 @@
 exports.__esModule = true;
 exports.SensitiveWordsService = void 0;
 var _vtils = require("vtils");
+var _regexp = require("vtils/regexp");
+const phoneNumberRegExp = _regexp.phoneNumberRegExpBuilder.build();
+const toRegExp = (0, _vtils.memoize)(re => new RegExp(re.substring(1, re.length - 1)), re => re);
+
 /**
  * 敏感词服务。
  */
@@ -28,7 +32,8 @@ class SensitiveWordsService {
       // 转小写
       .toLowerCase()
       // 叠词归一
-      .replace(/(.)\1+/g, '$1')
+      // 排除字母数字以支持qq、手机号等场景
+      .replace(/([^a-zA-Z0-9])\1+/g, '$1')
     );
   }
 
@@ -39,7 +44,11 @@ class SensitiveWordsService {
     text = this.transform(text);
     const words = [];
     for (const word of this.sensitiveWords) {
-      if (text.includes(word)) {
+      if (
+      // 支持 <手机号>
+      word === '<手机号>' ? phoneNumberRegExp.test(text) :
+      // 支持正则
+      word[0] === '/' && word[word.length - 1] === '/' ? toRegExp(word).test(text) : text.includes(word)) {
         words.push(word);
         if (!every) break;
       }

package/lib/cli/api_generator.d.ts

@@ -1,6 +1,6 @@
-import * as ts from 'ts-morph';
 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;

package/lib/cli/api_generator.js

@@ -1,10 +1,10 @@
 import * as parseComment from 'comment-parser';
-import * as ts from 'ts-morph';
 import createDebug from 'debug';
 import fs from 'fs-extra';
 import path from 'node:path';
-import { HandlerMethodToHttpMethod } from "../core/http_method";
+import * as ts from 'ts-morph';
 import { ii, pascalCase, snakeCase } from 'vtils';
+import { HandlerMethodToHttpMethod } from "../core/http_method";
 export class ApiGenerator {
   constructor() {
     this.debug = createDebug('api');
@@ -92,6 +92,7 @@ export class ApiGenerator {
     // 将交集类型视为对象
     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 : [];
@@ -117,7 +118,14 @@ export class ApiGenerator {
       return symbols.map(symbol => {
         return this.typeToApiData(!symbol.compilerSymbol.declarations ?
         // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
-        compilerFactory.getType(symbol.compilerSymbol.type) : this.getTypeBySymbol(symbol), symbol);
+        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 {

package/lib/services/sensitive_words.js

@@ -1,4 +1,8 @@
-import { removeBlankChars, removeNonWordChars, toHalfWidthString, uniq } from 'vtils';
+import { memoize, removeBlankChars, removeNonWordChars, toHalfWidthString, uniq } from 'vtils';
+import { phoneNumberRegExpBuilder } from 'vtils/regexp';
+const phoneNumberRegExp = phoneNumberRegExpBuilder.build();
+const toRegExp = memoize(re => new RegExp(re.substring(1, re.length - 1)), re => re);
+
 /**
  * 敏感词服务。
  */
@@ -24,7 +28,8 @@ export class SensitiveWordsService {
       // 转小写
       .toLowerCase()
       // 叠词归一
-      .replace(/(.)\1+/g, '$1')
+      // 排除字母数字以支持qq、手机号等场景
+      .replace(/([^a-zA-Z0-9])\1+/g, '$1')
     );
   }
 
@@ -35,7 +40,11 @@ export class SensitiveWordsService {
     text = this.transform(text);
     const words = [];
     for (const word of this.sensitiveWords) {
-      if (text.includes(word)) {
+      if (
+      // 支持 <手机号>
+      word === '<手机号>' ? phoneNumberRegExp.test(text) :
+      // 支持正则
+      word[0] === '/' && word[word.length - 1] === '/' ? toRegExp(word).test(text) : text.includes(word)) {
         words.push(word);
         if (!every) break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.30.1",
+  "version": "2.30.3",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -17,7 +17,9 @@
     "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",
     "preinstall": "tnpx only-allow pnpm",
     "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
-    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest"
+    "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"
   },
   "dependencies": {
     "@fastify/cors": "^8.3.0",
@@ -64,7 +66,7 @@
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs-sms": "^4.0.681",
     "ts-morph": "^12.2.0",
-    "tsx": "^3.12.7",
+    "tsx": "^4.6.2",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
     "vtils": "^4.95.0",