@jayfong/x-server 2.45.0 → 2.45.2

package/lib/_cjs/cli/env_util.js

@@ -3,8 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.EnvUtil = void 0;
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _nodePath = _interopRequireDefault(require("node:path"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
@@ -85,7 +85,7 @@ class EnvUtil {
     await _fsExtra.default.outputFile(outFile, types);
   }
   static getTypesFromValue(value) {
-    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : (0, _vtils.isPlainObject)(value) ? Object.keys(value).length ? `Record<any, ${EnvUtil.getTypesFromValue(value[Object.keys(value)[0]])}>` : `Record<any, any>` : typeof value;
+    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : (0, _vtils.isPlainObject)(value) ? Object.keys(value).length ? `{${Object.keys(value).map(key => `'${key}':${EnvUtil.getTypesFromValue(value[key])}`).join(',')}}` : `Record<any, any>` : typeof value;
   }
 }
 exports.EnvUtil = EnvUtil;

package/lib/_cjs/services/jwt.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.JwtService = void 0;
 var _jsonwebtoken = _interopRequireDefault(require("jsonwebtoken"));
-var _date = require("vtils/date");
-var _http_error = require("../core/http_error");
 var _lruCache = require("lru-cache");
 var _vtils = require("vtils");
+var _date = require("vtils/date");
+var _http_error = require("../core/http_error");
 class JwtService {
   constructor(options) {
     this.options = options;

package/lib/cli/env_util.js

@@ -1,5 +1,5 @@
-import fs from 'fs-extra';
 import path from 'node:path';
+import fs from 'fs-extra';
 import { dedent, escapeRegExp, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
@@ -80,7 +80,7 @@ export class EnvUtil {
     await fs.outputFile(outFile, types);
   }
   static getTypesFromValue(value) {
-    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : isPlainObject(value) ? Object.keys(value).length ? `Record<any, ${EnvUtil.getTypesFromValue(value[Object.keys(value)[0]])}>` : `Record<any, any>` : typeof value;
+    return Array.isArray(value) ? `Array<${value[0] ? EnvUtil.getTypesFromValue(value[0]) : 'any'}>` : isPlainObject(value) ? Object.keys(value).length ? `{${Object.keys(value).map(key => `'${key}':${EnvUtil.getTypesFromValue(value[key])}`).join(',')}}` : `Record<any, any>` : typeof value;
   }
 }
 EnvUtil.NEWLINE = '\n';

package/lib/services/jwt.d.ts

@@ -1,26 +1,28 @@
 /// <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 { BaseService } from './base';
 import { LRUCache } from 'lru-cache';
 import { MsValue } from 'vtils';
-import type { IncomingHttpHeaders } from 'http';
 import type { RequiredBy } from 'vtils/types';
+import { BaseService } from './base';
+export interface JwtServiceJwtPayload extends Record<string, any> {
+}
 export interface JwtServiceOptions {
     secret: string;
     ttl: MsValue;
-    cache?: LRUCache.Options<string, Record<string, any>, any>;
-    onVerify?: (payload: RequiredBy<jwt.JwtPayload, 'iat' | 'exp'>) => any;
+    cache?: LRUCache.Options<string, JwtServiceJwtPayload, any>;
+    onVerify?: (payload: JwtServiceJwtPayload & RequiredBy<jwt.JwtPayload, 'iat' | 'exp'>) => any;
 }
 export declare class JwtService implements BaseService {
     private options;
     serviceName: string;
     private cache;
     constructor(options: JwtServiceOptions);
-    sign<T extends Record<string, any>>(payload: T, ttl?: MsValue): string;
-    verify<T extends Record<string, any>>(token: string): Promise<T>;
-    verifyFromHttpHeaders<T extends Record<string, any>>(headers: IncomingHttpHeaders): Promise<T>;
+    sign<T extends JwtServiceJwtPayload>(payload: T, ttl?: MsValue): string;
+    verify<T extends JwtServiceJwtPayload>(token: string): Promise<T>;
+    verifyFromHttpHeaders<T extends JwtServiceJwtPayload>(headers: IncomingHttpHeaders): Promise<T>;
 }
 declare module '../x' {
     interface X {

package/lib/services/jwt.js

@@ -1,8 +1,8 @@
 import jwt from 'jsonwebtoken';
-import { differenceInMilliseconds, fromUnixTime } from 'vtils/date';
-import { HttpError } from "../core/http_error";
 import { LRUCache } from 'lru-cache';
 import { ms } from 'vtils';
+import { differenceInMilliseconds, fromUnixTime } from 'vtils/date';
+import { HttpError } from "../core/http_error";
 export class JwtService {
   constructor(options) {
     this.options = options;

package/package.json

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