@jayfong/x-server 2.61.4 → 2.62.1

package/lib/_cjs/cli/build_util.js

@@ -1,12 +1,13 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireWildcard3 = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.BuildUtil = void 0;
+var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _compressing = _interopRequireDefault(require("compressing"));
-var esbuild = _interopRequireWildcard(require("esbuild"));
+var esbuild = _interopRequireWildcard3(require("esbuild"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
@@ -60,6 +61,10 @@ class BuildUtil {
 
     // 构建
     await _fsExtra.default.emptyDir(distDir);
+    // @ts-ignore
+    const {
+      default: macrosPlugin
+    } = await Promise.resolve().then(() => (0, _interopRequireWildcard2.default)(require('unplugin-macros/esbuild')));
     await esbuild.build({
       entryPoints: [mainFile],
       bundle: true,
@@ -125,7 +130,9 @@ class BuildUtil {
             };
           });
         }
-      }],
+      },
+      // @ts-ignore
+      macrosPlugin()],
       loader: {
         // 兼容 x-text-render 在服务端使用
         // dev 时用 css_register 兼容

package/lib/_cjs/services/pay.js

@@ -3,9 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.PayService = void 0;
-var _form = _interopRequireDefault(require("alipay-sdk/lib/form"));
-var _alipaySdk = _interopRequireDefault(require("alipay-sdk"));
 var _crypto = _interopRequireDefault(require("crypto"));
+var _alipaySdk = _interopRequireDefault(require("alipay-sdk"));
+var _form = _interopRequireDefault(require("alipay-sdk/lib/form"));
 var _got = _interopRequireDefault(require("got"));
 var _http_error = require("../core/http_error");
 class PayService {

package/lib/cli/api_generator.d.ts

@@ -55,11 +55,11 @@ export declare class ApiGenerator {
         servers?: OpenAPIV3_1.ServerObject[];
     } & Pick<{
         paths: OpenAPIV3_1.PathsObject<{}, {}>;
-        webhooks: Record<string, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.PathItemObject<{}>>;
+        webhooks: Record<string, OpenAPIV3_1.PathItemObject | OpenAPIV3_1.ReferenceObject>;
         components: OpenAPIV3_1.ComponentsObject;
     }, "paths"> & Omit<Partial<{
         paths: OpenAPIV3_1.PathsObject<{}, {}>;
-        webhooks: Record<string, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.PathItemObject<{}>>;
+        webhooks: Record<string, OpenAPIV3_1.PathItemObject | OpenAPIV3_1.ReferenceObject>;
         components: OpenAPIV3_1.ComponentsObject;
     }>, "paths">;
 }

package/lib/cli/build_util.js

@@ -54,6 +54,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,
@@ -119,7 +123,9 @@ export class BuildUtil {
             };
           });
         }
-      }],
+      },
+      // @ts-ignore
+      macrosPlugin()],
       loader: {
         // 兼容 x-text-render 在服务端使用
         // dev 时用 css_register 兼容

package/lib/core/ctx_storage.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { XHandler } from './types';
 export declare const ctxStorage: AsyncLocalStorage<XHandler.Context>;

package/lib/core/define_bus.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'node:events';
 declare class EventBus extends EventEmitter {
     onReturnOff(event: string, listener: (...args: any[]) => any): () => any;

package/lib/core/types.d.ts

@@ -1,6 +1,3 @@
-/// <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';

package/lib/services/jwt.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node/http" />
-/// <reference types="got/dist/source/core/utils/timed-out" />
 import type { IncomingHttpHeaders } from 'http';
 import jwt from 'jsonwebtoken';
 import { LRUCache } from 'lru-cache';

package/lib/services/pay.js

@@ -1,6 +1,6 @@
-import AlipayFormData from 'alipay-sdk/lib/form';
-import AlipaySdk from 'alipay-sdk';
 import crypto from 'crypto';
+import AlipaySdk from 'alipay-sdk';
+import AlipayFormData from 'alipay-sdk/lib/form';
 import got from 'got';
 import { HttpError } from "../core/http_error";
 export class PayService {

package/lib/x.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { XHandler } from './core/types';
 import { BaseService } from './services/base';
 import './services/db_value';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.61.4",
+  "version": "2.62.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -67,6 +67,7 @@
     "tencentcloud-sdk-nodejs-sms": "^4.0.681",
     "ts-morph": "^21.0.1",
     "tsx": "^4.19.2",
+    "unplugin-macros": "^0.16.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
     "vtils": "^4.128.0",