@jayfong/x-server 2.62.0 → 2.62.2

package/lib/_cjs/cli/api_generator.js

@@ -47,7 +47,6 @@ class ApiGenerator {
     const categorySymbols = checker.getExportsOfModule(moduleSymbol);
     const apiData = [];
     for (const categorySymbol of categorySymbols) {
-      var _ref, _categoryUrlMatch$;
       // 分类的类型
       const categoryType = checker.getTypeOfSymbol(categorySymbol);
 
@@ -62,7 +61,7 @@ class ApiGenerator {
 
       // 分类 URL
       const categoryUrlMatch = categorySourceFilePath.match(this.categoryUrlRe);
-      let categoryUrl = (_ref = (_categoryUrlMatch$ = categoryUrlMatch[1]) != null ? _categoryUrlMatch$ : categoryUrlMatch[2]) != null ? _ref : '';
+      let categoryUrl = categoryUrlMatch[1] ?? categoryUrlMatch[2] ?? '';
       categoryUrl = categoryUrl === '' ? '/' : `/${categoryUrl}/`;
       for (const handlerSymbol of handlerSymbols) {
         // 处理器路径
@@ -78,10 +77,7 @@ class ApiGenerator {
         // defineHandler({})
         _tsMorph.ts.isObjectLiteralExpression(handlerNode.initializer.arguments[0])) {
           const props = handlerNode.initializer.arguments[0].properties;
-          const requestPathNode = props.find(item => {
-            var _item$name;
-            return ((_item$name = item.name) == null ? void 0 : _item$name.getText()) === 'requestPath';
-          });
+          const requestPathNode = props.find(item => item.name?.getText() === 'requestPath');
           if (requestPathNode &&
           // requestPath: ''
           _tsMorph.ts.isPropertyAssignment(requestPathNode)) {
@@ -172,11 +168,10 @@ class ApiGenerator {
     type,
     keySymbol = type.symbol || type.aliasSymbol
   }) {
-    var _valueSymbol;
     const hasTypeFlag = (flag, _type = type) => (_type.flags & flag) === flag;
     let valueSymbol = type.symbol || type.aliasSymbol;
-    const keySymbolName = (keySymbol == null ? void 0 : keySymbol.getName()) || '';
-    let valueSymbolName = ((_valueSymbol = valueSymbol) == null ? void 0 : _valueSymbol.getName()) || '';
+    const keySymbolName = keySymbol?.getName() || '';
+    let valueSymbolName = valueSymbol?.getName() || '';
     const comment = this.getComment(keySymbol);
     let isRequired = keySymbol ? !(keySymbol.getFlags() & _tsMorph.ts.SymbolFlags.Optional) : false;
 
@@ -222,13 +217,12 @@ class ApiGenerator {
     const unionTypes = rawUnionTypes.filter(item => !hasTypeFlag(_tsMorph.ts.TypeFlags.Null, item) && !hasTypeFlag(_tsMorph.ts.TypeFlags.Undefined, item));
     const isUnion = !!unionTypes.length;
     if (isUnion) {
-      var _this$checker$getBase;
       if (unionTypes.length !== rawUnionTypes.length) {
         isRequired = false;
       }
       type = unionTypes[0];
       valueSymbol = type.symbol || type.aliasSymbol;
-      valueSymbolName = ((_this$checker$getBase = this.checker.getBaseTypeOfLiteralType(type).getSymbol()) == null ? void 0 : _this$checker$getBase.getName()) || '';
+      valueSymbolName = this.checker.getBaseTypeOfLiteralType(type).getSymbol()?.getName() || '';
     }
     const isIntersection = type.isIntersection();
     const intersectionTypes = isIntersection && type.types || [];

package/lib/_cjs/cli/build_util.js

@@ -10,11 +10,9 @@ var esbuild = _interopRequireWildcard(require("esbuild"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
-var _esbuild2 = _interopRequireDefault(require("unplugin-macros/esbuild"));
 var _vtils = require("vtils");
 class BuildUtil {
   static async build(options) {
-    var _options$minify;
     const mainFile = _nodePath.default.join(options.cwd, 'src/main.ts');
     const pkgFile = _nodePath.default.join(options.cwd, 'package.json');
     const pkgContent = await _fsExtra.default.readJson(pkgFile);
@@ -61,6 +59,10 @@ class BuildUtil {
 
     // 构建
     await _fsExtra.default.emptyDir(distDir);
+    // @ts-ignore
+    const {
+      default: macrosPlugin
+    } = await import('unplugin-macros/esbuild');
     await esbuild.build({
       entryPoints: [mainFile],
       bundle: true,
@@ -73,7 +75,7 @@ class BuildUtil {
       mainFields: ['module', 'main'],
       target: `node${process.version.slice(1)}`,
       external: external,
-      minify: (_options$minify = options.minify) != null ? _options$minify : true,
+      minify: options.minify ?? true,
       format: 'cjs',
       sourcemap: false,
       treeShaking: true,
@@ -128,7 +130,7 @@ class BuildUtil {
         }
       },
       // @ts-ignore
-      (0, _esbuild2.default)()],
+      macrosPlugin()],
       loader: {
         // 兼容 x-text-render 在服务端使用
         // dev 时用 css_register 兼容

package/lib/_cjs/cli/env_util.js

@@ -12,11 +12,10 @@ class EnvUtil {
     const envs = [];
     const envObj = (0, _yaml.parse)(src);
     Object.keys(envObj).forEach(key => {
-      var _src$match;
       envs.push({
         key: key,
         value: envObj[key],
-        comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${(0, _vtils.escapeRegExp)(key)}:`))) == null || (_src$match = _src$match[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()) == null ? void 0 : _src$match.replace(/^#/gm, '').trim()) || ''
+        comment: src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${(0, _vtils.escapeRegExp)(key)}:`))?.[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()?.replace(/^#/gm, '').trim() || ''
       });
     });
     return envs;

package/lib/_cjs/core/define_task.js

@@ -42,10 +42,10 @@ function defineSliceTask(options) {
   });
   const addAction = async (data, addOptions) => {
     const redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
-    const key = (addOptions == null ? void 0 : addOptions.key) || '';
-    const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.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 ? (0, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.ms)(options.thresholdTimeout);
+    const key = addOptions?.key || '';
+    const duration = addOptions?.duration != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.ms)(options.duration);
+    const threshold = addOptions?.threshold || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+    const thresholdTimeout = addOptions?.thresholdTimeout != null ? (0, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.ms)(options.thresholdTimeout);
     (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
     const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
     const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
@@ -71,7 +71,7 @@ function defineSliceTask(options) {
 
       // 到达阈值，立即发送
       if (count === threshold) {
-        await (prevJob == null ? void 0 : prevJob.remove());
+        await prevJob?.remove();
         await task.add({
           key: key,
           redisKey: redisKey

package/lib/_cjs/core/server.js

@@ -3,7 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.Server = void 0;
-var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
 var _nodeProcess = _interopRequireDefault(require("node:process"));
 var _fastify = _interopRequireDefault(require("fastify"));
 var _vtils = require("vtils");
@@ -33,8 +32,7 @@ class Server {
     await this.applyAutoClose();
   }
   async close() {
-    var _this$fastify;
-    await ((_this$fastify = this.fastify) == null ? void 0 : _this$fastify.close());
+    await this.fastify?.close();
   }
   async prepareFastify() {
     this.fastify = await (0, _fastify.default)({
@@ -59,12 +57,12 @@ class Server {
     // @ts-ignore
     const {
       routes
-    } = await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('.x/routes')));
+    } = await import('.x/routes');
     this.routes = routes;
   }
   async applyHooks() {
     // @ts-ignore
-    await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('.x/hooks')));
+    await import('.x/hooks');
   }
   applyServices() {
     _x2.x.register(...(this.options.services || []));
@@ -83,8 +81,9 @@ class Server {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
         const isWS = handlerMethod === 'WS';
-        const url = `${appUrl}${// 结构：/test/sss?x=2
-        path != null ? path : isWS ? res.url : req.url}`;
+        const url = `${appUrl}${
+        // 结构：/test/sss?x=2
+        path ?? (isWS ? res.url : req.url)}`;
         if (isWS) {
           await item.handler.handle(undefined, {
             traceId: (0, _x.cuid2)(),
@@ -212,7 +211,7 @@ class Server {
   }
   async startCrons() {
     // @ts-ignore
-    await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('.x/crons')));
+    await import('.x/crons');
   }
   async applyAutoClose() {
     _x2.x.dispose.add(() => this.close());

package/lib/_cjs/plugins/file_parser.js

@@ -16,12 +16,11 @@ class FileParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    var _this$options;
     fastify.register(_multipart.default, {
       ...this.options,
       limits: {
         fileSize: (0, _vtils.bytes)(1, 'MB'),
-        ...((_this$options = this.options) == null ? void 0 : _this$options.limits)
+        ...this.options?.limits
       }
     });
   }

package/lib/_cjs/services/captcha.js

@@ -23,7 +23,6 @@ class CaptchaService {
     };
   }
   async generate(payload) {
-    var _payload$retryCount;
     const chars = this.charsetMap[payload.charset];
     let code = '';
     for (let i = 0; i < payload.size; i++) {
@@ -32,7 +31,7 @@ class CaptchaService {
     const token = await _x.x.cache.save({
       code: code,
       scene: payload.scene,
-      retryCount: (_payload$retryCount = payload.retryCount) != null ? _payload$retryCount : 0,
+      retryCount: payload.retryCount ?? 0,
       extra: payload.extra
     }, payload.ttl);
     return {

package/lib/_cjs/services/db_value.js

@@ -23,9 +23,9 @@ class DbValueService {
           const text = !value || !Array.isArray(value) ? undefined : value.filter(v => v != null && v !== '').join(this.separator);
           return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
         };
-        this.separator = (options == null ? void 0 : options.separator) || ',';
-        this.affix = (options == null ? void 0 : options.affix) || '';
-        this.number = !!(options != null && options.number);
+        this.separator = options?.separator || ',';
+        this.affix = options?.affix || '';
+        this.number = !!options?.number;
       }
     };
     this.JsonArray = class {

package/lib/_cjs/services/dispose.js

@@ -6,11 +6,10 @@ exports.DisposeService = void 0;
 var _exitHook = _interopRequireDefault(require("exit-hook"));
 class DisposeService {
   constructor(options) {
-    var _this$options;
     this.options = options;
     this.serviceName = 'dispose';
     this.disposes = [];
-    if ((_this$options = this.options) != null && _this$options.disposeOnExit) {
+    if (this.options?.disposeOnExit) {
       (0, _exitHook.default)(() => this.dispose());
     }
   }

package/lib/_cjs/services/jwt.js

@@ -29,7 +29,6 @@ class JwtService {
     return token;
   }
   async verify(token) {
-    var _this$options$onVerif, _this$options;
     const data = await new Promise((resolve, reject) => {
       if (this.cache && this.cache.has(token)) {
         resolve(this.cache.get(token));
@@ -50,7 +49,7 @@ class JwtService {
         });
       }
     });
-    await ((_this$options$onVerif = (_this$options = this.options).onVerify) == null ? void 0 : _this$options$onVerif.call(_this$options, data));
+    await this.options.onVerify?.(data);
     return data;
   }
   async verifyFromHttpHeaders(headers) {

package/lib/_cjs/services/pay.js

@@ -86,8 +86,7 @@ class PayService {
       // 支付宝
       // https://opendocs.alipay.com/open/270/105902
       if (data.passback_params === 'alipay') {
-        var _this$alipaySdk;
-        if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
+        if (!this.alipaySdk?.checkNotifySign(data)) {
           return false;
         }
         return {

package/lib/_cjs/services/rate_limit.js

@@ -47,8 +47,7 @@ class RateLimitService {
   async limitByManyCountOrFail(options) {
     const pass = await this.limitByManyCount(options);
     if (pass !== true) {
-      var _options$limits$pass$;
-      throw new _http_error.HttpError.Forbidden((_options$limits$pass$ = options.limits[pass].message) != null ? _options$limits$pass$ : options.message);
+      throw new _http_error.HttpError.Forbidden(options.limits[pass].message ?? options.message);
     }
   }
 }

package/lib/cli/api_generator.js

@@ -42,7 +42,6 @@ export class ApiGenerator {
     const categorySymbols = checker.getExportsOfModule(moduleSymbol);
     const apiData = [];
     for (const categorySymbol of categorySymbols) {
-      var _ref, _categoryUrlMatch$;
       // 分类的类型
       const categoryType = checker.getTypeOfSymbol(categorySymbol);
 
@@ -57,7 +56,7 @@ export class ApiGenerator {
 
       // 分类 URL
       const categoryUrlMatch = categorySourceFilePath.match(this.categoryUrlRe);
-      let categoryUrl = (_ref = (_categoryUrlMatch$ = categoryUrlMatch[1]) != null ? _categoryUrlMatch$ : categoryUrlMatch[2]) != null ? _ref : '';
+      let categoryUrl = categoryUrlMatch[1] ?? categoryUrlMatch[2] ?? '';
       categoryUrl = categoryUrl === '' ? '/' : `/${categoryUrl}/`;
       for (const handlerSymbol of handlerSymbols) {
         // 处理器路径
@@ -73,10 +72,7 @@ export class ApiGenerator {
         // defineHandler({})
         ts.isObjectLiteralExpression(handlerNode.initializer.arguments[0])) {
           const props = handlerNode.initializer.arguments[0].properties;
-          const requestPathNode = props.find(item => {
-            var _item$name;
-            return ((_item$name = item.name) == null ? void 0 : _item$name.getText()) === 'requestPath';
-          });
+          const requestPathNode = props.find(item => item.name?.getText() === 'requestPath');
           if (requestPathNode &&
           // requestPath: ''
           ts.isPropertyAssignment(requestPathNode)) {
@@ -167,11 +163,10 @@ export class ApiGenerator {
     type,
     keySymbol = type.symbol || type.aliasSymbol
   }) {
-    var _valueSymbol;
     const hasTypeFlag = (flag, _type = type) => (_type.flags & flag) === flag;
     let valueSymbol = type.symbol || type.aliasSymbol;
-    const keySymbolName = (keySymbol == null ? void 0 : keySymbol.getName()) || '';
-    let valueSymbolName = ((_valueSymbol = valueSymbol) == null ? void 0 : _valueSymbol.getName()) || '';
+    const keySymbolName = keySymbol?.getName() || '';
+    let valueSymbolName = valueSymbol?.getName() || '';
     const comment = this.getComment(keySymbol);
     let isRequired = keySymbol ? !(keySymbol.getFlags() & ts.SymbolFlags.Optional) : false;
 
@@ -217,13 +212,12 @@ export class ApiGenerator {
     const unionTypes = rawUnionTypes.filter(item => !hasTypeFlag(ts.TypeFlags.Null, item) && !hasTypeFlag(ts.TypeFlags.Undefined, item));
     const isUnion = !!unionTypes.length;
     if (isUnion) {
-      var _this$checker$getBase;
       if (unionTypes.length !== rawUnionTypes.length) {
         isRequired = false;
       }
       type = unionTypes[0];
       valueSymbol = type.symbol || type.aliasSymbol;
-      valueSymbolName = ((_this$checker$getBase = this.checker.getBaseTypeOfLiteralType(type).getSymbol()) == null ? void 0 : _this$checker$getBase.getName()) || '';
+      valueSymbolName = this.checker.getBaseTypeOfLiteralType(type).getSymbol()?.getName() || '';
     }
     const isIntersection = type.isIntersection();
     const intersectionTypes = isIntersection && type.types || [];

package/lib/cli/build_util.js

@@ -4,11 +4,9 @@ import * as esbuild from 'esbuild';
 import exec from 'execa';
 import fs from 'fs-extra';
 import globby from 'globby';
-import macrosPlugin from 'unplugin-macros/esbuild';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
-    var _options$minify;
     const mainFile = path.join(options.cwd, 'src/main.ts');
     const pkgFile = path.join(options.cwd, 'package.json');
     const pkgContent = await fs.readJson(pkgFile);
@@ -55,6 +53,10 @@ export class BuildUtil {
 
     // 构建
     await fs.emptyDir(distDir);
+    // @ts-ignore
+    const {
+      default: macrosPlugin
+    } = await import('unplugin-macros/esbuild');
     await esbuild.build({
       entryPoints: [mainFile],
       bundle: true,
@@ -67,7 +69,7 @@ export class BuildUtil {
       mainFields: ['module', 'main'],
       target: `node${process.version.slice(1)}`,
       external: external,
-      minify: (_options$minify = options.minify) != null ? _options$minify : true,
+      minify: options.minify ?? true,
       format: 'cjs',
       sourcemap: false,
       treeShaking: true,

package/lib/cli/env_util.js

@@ -7,11 +7,10 @@ export class EnvUtil {
     const envs = [];
     const envObj = yamlParse(src);
     Object.keys(envObj).forEach(key => {
-      var _src$match;
       envs.push({
         key: key,
         value: envObj[key],
-        comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${escapeRegExp(key)}:`))) == null || (_src$match = _src$match[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()) == null ? void 0 : _src$match.replace(/^#/gm, '').trim()) || ''
+        comment: src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${escapeRegExp(key)}:`))?.[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()?.replace(/^#/gm, '').trim() || ''
       });
     });
     return envs;

package/lib/core/define_task.js

@@ -36,10 +36,10 @@ export function defineSliceTask(options) {
   });
   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);
+    const key = addOptions?.key || '';
+    const duration = addOptions?.duration != null ? ms(addOptions.duration) : typeof options.duration === 'function' ? ms(options.duration(key)) : options.duration && ms(options.duration);
+    const threshold = addOptions?.threshold || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+    const thresholdTimeout = 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();
@@ -65,7 +65,7 @@ export function defineSliceTask(options) {
 
       // 到达阈值，立即发送
       if (count === threshold) {
-        await (prevJob == null ? void 0 : prevJob.remove());
+        await prevJob?.remove();
         await task.add({
           key: key,
           redisKey: redisKey

package/lib/core/http_redirect.d.ts

@@ -1,5 +1,5 @@
 export declare class HttpRedirect {
     url: string;
-    permanently?: boolean;
-    constructor(url: string, permanently?: boolean);
+    permanently?: boolean | undefined;
+    constructor(url: string, permanently?: boolean | undefined);
 }

package/lib/core/server.js

@@ -27,8 +27,7 @@ export class Server {
     await this.applyAutoClose();
   }
   async close() {
-    var _this$fastify;
-    await ((_this$fastify = this.fastify) == null ? void 0 : _this$fastify.close());
+    await this.fastify?.close();
   }
   async prepareFastify() {
     this.fastify = await Fastify({
@@ -77,8 +76,9 @@ export class Server {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
         const isWS = handlerMethod === 'WS';
-        const url = `${appUrl}${// 结构：/test/sss?x=2
-        path != null ? path : isWS ? res.url : req.url}`;
+        const url = `${appUrl}${
+        // 结构：/test/sss?x=2
+        path ?? (isWS ? res.url : req.url)}`;
         if (isWS) {
           await item.handler.handle(undefined, {
             traceId: cuid2(),

package/lib/plugins/cookie.d.ts

@@ -8,6 +8,6 @@ export interface CookiePluginOptions extends FastifyCookieOptions {
  */
 export declare class CookiePlugin implements BasePlugin {
     private options?;
-    constructor(options?: CookiePluginOptions);
+    constructor(options?: CookiePluginOptions | undefined);
     register(fastify: FastifyInstance<any, any, any, any, any>): void;
 }

package/lib/plugins/file_parser.d.ts

@@ -11,6 +11,6 @@ export interface FileParserPluginOptions extends FastifyMultipartOptions {
  */
 export declare class FileParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: FileParserPluginOptions);
+    constructor(options?: FileParserPluginOptions | undefined);
     register(fastify: FastifyInstance<any, any, any, any, any>): void;
 }

package/lib/plugins/file_parser.js

@@ -11,12 +11,11 @@ export class FileParserPlugin {
     this.options = options;
   }
   register(fastify) {
-    var _this$options;
     fastify.register(FastifyMultipart, {
       ...this.options,
       limits: {
         fileSize: bytes(1, 'MB'),
-        ...((_this$options = this.options) == null ? void 0 : _this$options.limits)
+        ...this.options?.limits
       }
     });
   }

package/lib/plugins/form_body_parser.d.ts

@@ -8,6 +8,6 @@ export interface FormBodyParserPluginOptions extends FastifyFormbodyOptions {
  */
 export declare class FormBodyParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: FormBodyParserPluginOptions);
+    constructor(options?: FormBodyParserPluginOptions | undefined);
     register(fastify: FastifyInstance<any, any, any, any, any>): void;
 }

package/lib/plugins/ws_parser.d.ts

@@ -8,6 +8,6 @@ export interface WsParserPluginOptions extends WebsocketPluginOptions {
  */
 export declare class WsParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: WsParserPluginOptions);
+    constructor(options?: WsParserPluginOptions | undefined);
     register(fastify: FastifyInstance<any, any, any, any, any>): void;
 }

package/lib/plugins/xml_parser.d.ts

@@ -14,6 +14,6 @@ export interface XmlParserPluginOptions extends Partial<X2jOptions> {
  */
 export declare class XmlParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: XmlParserPluginOptions);
+    constructor(options?: XmlParserPluginOptions | undefined);
     register(fastify: FastifyInstance<any, any, any, any, any>): void;
 }

package/lib/services/captcha.js

@@ -18,7 +18,6 @@ export class CaptchaService {
     };
   }
   async generate(payload) {
-    var _payload$retryCount;
     const chars = this.charsetMap[payload.charset];
     let code = '';
     for (let i = 0; i < payload.size; i++) {
@@ -27,7 +26,7 @@ export class CaptchaService {
     const token = await x.cache.save({
       code: code,
       scene: payload.scene,
-      retryCount: (_payload$retryCount = payload.retryCount) != null ? _payload$retryCount : 0,
+      retryCount: payload.retryCount ?? 0,
       extra: payload.extra
     }, payload.ttl);
     return {

package/lib/services/db_value.js

@@ -19,9 +19,9 @@ export class DbValueService {
           const text = !value || !Array.isArray(value) ? undefined : value.filter(v => v != null && v !== '').join(this.separator);
           return !text || !this.affix ? text : `${this.affix}${text}${this.affix}`;
         };
-        this.separator = (options == null ? void 0 : options.separator) || ',';
-        this.affix = (options == null ? void 0 : options.affix) || '';
-        this.number = !!(options != null && options.number);
+        this.separator = options?.separator || ',';
+        this.affix = options?.affix || '';
+        this.number = !!options?.number;
       }
     };
     this.JsonArray = class {

package/lib/services/dispose.d.ts

@@ -5,7 +5,7 @@ export interface DisposeServiceOptions {
 export declare class DisposeService implements BaseService {
     private options?;
     serviceName: string;
-    constructor(options?: DisposeServiceOptions);
+    constructor(options?: DisposeServiceOptions | undefined);
     private disposes;
     add(fn: () => any): void;
     dispose(): Promise<any[]>;

package/lib/services/dispose.js

@@ -1,11 +1,10 @@
 import onExit from 'exit-hook';
 export class DisposeService {
   constructor(options) {
-    var _this$options;
     this.options = options;
     this.serviceName = 'dispose';
     this.disposes = [];
-    if ((_this$options = this.options) != null && _this$options.disposeOnExit) {
+    if (this.options?.disposeOnExit) {
       onExit(() => this.dispose());
     }
   }

package/lib/services/jwt.js

@@ -24,7 +24,6 @@ export class JwtService {
     return token;
   }
   async verify(token) {
-    var _this$options$onVerif, _this$options;
     const data = await new Promise((resolve, reject) => {
       if (this.cache && this.cache.has(token)) {
         resolve(this.cache.get(token));
@@ -45,7 +44,7 @@ export class JwtService {
         });
       }
     });
-    await ((_this$options$onVerif = (_this$options = this.options).onVerify) == null ? void 0 : _this$options$onVerif.call(_this$options, data));
+    await this.options.onVerify?.(data);
     return data;
   }
   async verifyFromHttpHeaders(headers) {

package/lib/services/pay.js

@@ -81,8 +81,7 @@ export class PayService {
       // 支付宝
       // https://opendocs.alipay.com/open/270/105902
       if (data.passback_params === 'alipay') {
-        var _this$alipaySdk;
-        if (!((_this$alipaySdk = this.alipaySdk) != null && _this$alipaySdk.checkNotifySign(data))) {
+        if (!this.alipaySdk?.checkNotifySign(data)) {
           return false;
         }
         return {

package/lib/services/rate_limit.js

@@ -43,8 +43,7 @@ export class RateLimitService {
   async limitByManyCountOrFail(options) {
     const pass = await this.limitByManyCount(options);
     if (pass !== true) {
-      var _options$limits$pass$;
-      throw new HttpError.Forbidden((_options$limits$pass$ = options.limits[pass].message) != null ? _options$limits$pass$ : options.message);
+      throw new HttpError.Forbidden(options.limits[pass].message ?? options.message);
     }
   }
 }

package/package.json

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