@jayfong/x-server 2.51.1 → 2.52.1

package/lib/_cjs/plugins/cors.js

@@ -29,7 +29,8 @@ class CorsPlugin {
     });
     fastify.register(_cors.default, {
       origin: (origin, cb) => allowAll ? cb(null, true) : cb(null, origin ? check(origin) : true),
-      maxAge: (0, _vtils.ms)(this.options.ttl, true)
+      maxAge: (0, _vtils.ms)(this.options.ttl, true),
+      ...(0, _vtils.omitStrict)(this.options, ['allow', 'ttl'])
     });
   }
 }

package/lib/_cjs/services/cache.js

@@ -247,7 +247,7 @@ class CacheService {
     }
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(prefix))) {
+        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
           this.memoryCache.delete(k);
         }
       });

package/lib/plugins/cors.d.ts

@@ -1,7 +1,8 @@
-import { BasePlugin } from './base';
+import { FastifyCorsOptions } from '@fastify/cors';
 import { FastifyInstance } from 'fastify';
 import { MsValue } from 'vtils';
-export interface CorsPluginOptions {
+import { BasePlugin } from './base';
+export interface CorsPluginOptions extends FastifyCorsOptions {
     /**
      * 允许的来源，支持位于开头的 * 通配符
      */

package/lib/plugins/cors.js

@@ -1,5 +1,5 @@
 import FastifyCors from '@fastify/cors';
-import { memoize } from 'vtils';
+import { memoize, omitStrict } from 'vtils';
 import { ms } from 'vtils';
 /**
  * CORS 支持插件
@@ -25,7 +25,8 @@ export class CorsPlugin {
     });
     fastify.register(FastifyCors, {
       origin: (origin, cb) => allowAll ? cb(null, true) : cb(null, origin ? check(origin) : true),
-      maxAge: ms(this.options.ttl, true)
+      maxAge: ms(this.options.ttl, true),
+      ...omitStrict(this.options, ['allow', 'ttl'])
     });
   }
 }

package/lib/services/cache.d.ts

@@ -18,11 +18,14 @@ type KeyPathForNumberValue<T extends Data> = {
     [K in keyof T]: T[K] extends (...args: infer X) => number ? IsEmptyArray<X> extends true ? K : [K, ...X] : never;
 }[keyof T];
 type Value<T extends Data, P extends KeyPath<T>> = ReturnType<T[P extends any[] ? P[0] : P]>;
+type KeyPartialPath<T extends Data> = {
+    [K in keyof T]: T[K] extends (...args: infer X) => any ? IsEmptyArray<X> extends true ? K : [K, ...Partial<X>] : never;
+}[keyof T];
 type CacheSetTTL<V> = MsValue | ((data: V, defaultTTL: MsValue) => MsValue);
 type CacheSetOptions<V> = CacheSetTTL<V> | {
     ttl?: CacheSetTTL<V>;
 };
-export declare class CacheService<TData extends Data = Data, TKey extends Key<TData> = any, TKeyPath extends KeyPath<TData> = any, TKeyPathForNumberValue extends KeyPathForNumberValue<TData> = any> implements BaseService {
+export declare class CacheService<TData extends Data = Data, TKey extends Key<TData> = any, TKeyPath extends KeyPath<TData> = any, TKeyPathForNumberValue extends KeyPathForNumberValue<TData> = any, TKeyPartialPath extends KeyPartialPath<TData> = any> implements BaseService {
     options: CacheServiceOptions;
     serviceName: string;
     private prefix;
@@ -118,11 +121,11 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
     /**
      * 清空指定前缀的缓存。
      */
-    clear<K extends TKey>(...prefixes: K[]): Promise<number>;
+    clear(...prefixes: Array<TKey | TKeyPartialPath>): Promise<number>;
     /**
      * 派生出一个指定类型的缓存服务。
      */
-    fork<TNextData extends Data>(options?: Partial<CacheServiceOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>>;
+    fork<TNextData extends Data>(options?: Partial<CacheServiceOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>, KeyPartialPath<TNextData>>;
 }
 declare module '../x' {
     interface X {

package/lib/services/cache.js

@@ -242,7 +242,7 @@ export class CacheService {
     }
     if (this.options.memory) {
       this.memoryCache.forEach((_v, k) => {
-        if (prefixes.some(prefix => k.startsWith(prefix))) {
+        if (prefixes.some(prefix => k.startsWith(Array.isArray(prefix) ? prefix.join('_') : String(prefix)))) {
           this.memoryCache.delete(k);
         }
       });

package/package.json

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