akanjs 2.3.8-rc.3 → 2.3.8-rc.4

package/document/database.ts

@@ -1,16 +1,12 @@
-import type { Dayjs, MergedValues, PromiseOrObject } from "akanjs/base";
+import type { MergedValues, PromiseOrObject } from "akanjs/base";
 import { Logger } from "akanjs/common";
 import type { DocumentModel, QueryOf } from "akanjs/constant";
-import type { CacheAdaptor } from "akanjs/service";
+import type { CacheAdaptor, CacheSetOptions } from "akanjs/service";
 import type { DataLoader } from "./dataLoader";
 import type { ExtractQuery, ExtractSort, FilterInstance } from "./filterMeta";
 import type { CRUDEventType, Mdl, SaveEventType } from "./into";
 import type { DataInputOf, FindQueryOption, ListQueryOption } from "./types";
 
-export interface RedisSetOptions {
-  expireAt?: Dayjs;
-}
-
 export class CacheDatabase<T = unknown> {
   private logger: Logger;
   constructor(
@@ -19,7 +15,7 @@ export class CacheDatabase<T = unknown> {
   ) {
     this.logger = new Logger(`${refName}Cache`);
   }
-  async set(topic: string, key: string, value: string | number | Buffer, option: RedisSetOptions = {}) {
+  async set(topic: string, key: string, value: string | number | Buffer, option: CacheSetOptions = {}) {
     await this.cache.set(this.refName, `${topic}:${key}`, value, option);
   }
   async get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.8-rc.3",
+  "version": "2.3.8-rc.4",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/service/injectInfo.ts

@@ -16,7 +16,7 @@ import type {
   SliceCls,
 } from "akanjs/signal";
 import type { Adaptor, AdaptorCls, Service, ServiceCls } from ".";
-import type { CacheAdaptor } from "./predefinedAdaptor";
+import type { CacheAdaptor, CacheSetOptions } from "./predefinedAdaptor";
 
 export type InjectType = "database" | "service" | "use" | "signal" | "plug" | "env" | "memory";
 
@@ -29,6 +29,7 @@ interface InjectBuilderOptions<ReturnType> {
   local?: boolean;
   default?: unknown;
   isMap?: boolean;
+  cacheOption?: CacheSetOptions;
   parentRefName: string;
 }
 
@@ -99,6 +100,7 @@ export class InjectInfo<
   readonly adaptor?: AdaptorCls;
   readonly default?: unknown;
   readonly isMap?: boolean;
+  readonly cacheOption?: CacheSetOptions;
   readonly parentRefName: string;
   constructor(type: Type, options: InjectBuilderOptions<ReturnType>) {
     this.type = type;
@@ -110,6 +112,7 @@ export class InjectInfo<
     this.set = options.set;
     this.default = options.default;
     this.isMap = options.isMap ?? false;
+    this.cacheOption = options.cacheOption;
     this.parentRefName = options.parentRefName;
   }
   static async resolveInjection(
@@ -261,9 +264,9 @@ export class InjectInfo<
         const value = await cacheAdaptor.hget(topic, propKey, key);
         return value === undefined || value === null ? undefined : getter(value);
       };
-      const set = async (key: string, value: unknown) => {
+      const set = async (key: string, value: unknown, option?: CacheSetOptions) => {
         const setValue = setter(value);
-        await cacheAdaptor.hset(topic, propKey, key, setValue);
+        await cacheAdaptor.hset(topic, propKey, key, setValue, option ?? injectInfo.cacheOption);
       };
       Object.defineProperty(instance, propKey, {
         value: {
@@ -272,17 +275,21 @@ export class InjectInfo<
           delete: async (key: string) => {
             await cacheAdaptor.hdelete(topic, propKey, key);
           },
-          getOrInsert: async (key: string, value: unknown) => {
+          getOrInsert: async (key: string, value: unknown, option?: CacheSetOptions) => {
             const existingValue = await get(key);
             if (existingValue !== undefined) return existingValue;
-            await set(key, value);
+            await set(key, value, option);
             return value;
           },
-          getOrInsertComputed: async (key: string, compute: (key: string) => unknown | Promise<unknown>) => {
+          getOrInsertComputed: async (
+            key: string,
+            compute: (key: string) => unknown | Promise<unknown>,
+            option?: CacheSetOptions,
+          ) => {
             const existingValue = await get(key);
             if (existingValue !== undefined) return existingValue;
             const value = await compute(key);
-            await set(key, value);
+            await set(key, value, option);
             return value;
           },
           keys: async () => await cacheAdaptor.hkeys(topic, propKey),
@@ -306,10 +313,10 @@ export class InjectInfo<
             const value = await cacheAdaptor.get("akan:memory", propKey);
             return value === null ? value : getter(value);
           },
-          set: async (value: unknown) => {
+          set: async (value: unknown, option?: CacheSetOptions) => {
             const setter = injectInfo.set as unknown as (value: unknown) => string | number | Buffer;
             const setValue = setter(value);
-            await cacheAdaptor.set("akan:memory", propKey, setValue);
+            await cacheAdaptor.set("akan:memory", propKey, setValue, option ?? injectInfo.cacheOption);
           },
           delete: async () => {
             await cacheAdaptor.delete("akan:memory", propKey);
@@ -362,6 +369,7 @@ export const injectionBuilder = (parentRefName: string) => ({
       local?: Local;
       default?: DefaultValue;
       of?: MapValue;
+      expireAt?: CacheSetOptions["expireAt"];
       get?: GetFn;
       set?: (value: ReturnType<GetFn>) => GetFieldValue<ValueRef, ExplicitType>;
     } = {},
@@ -385,19 +393,24 @@ export const injectionBuilder = (parentRefName: string) => ({
         : MapConstructor extends ValueRef
           ? {
               get: (key: string) => Promise<MapFieldValue | undefined>;
-              set: (key: string, value: MapFieldValue) => Promise<void>;
+              set: (key: string, value: MapFieldValue, option?: CacheSetOptions) => Promise<void>;
               delete: (key: string) => Promise<void>;
-              getOrInsert: (key: string, value: MapFieldValue) => Promise<MapFieldValue>;
+              getOrInsert: (key: string, value: MapFieldValue, option?: CacheSetOptions) => Promise<MapFieldValue>;
               getOrInsertComputed: (
                 key: string,
                 compute: (key: string) => MapFieldValue | Promise<MapFieldValue>,
+                option?: CacheSetOptions,
               ) => Promise<MapFieldValue>;
               keys: () => Promise<string[]>;
               entries: () => Promise<[string, MapFieldValue][]>;
               forEach: (callback: (value: MapFieldValue, key: string) => void | Promise<void>) => Promise<void>;
               clear: () => Promise<void>;
             }
-          : { get: () => Promise<UseValue>; set: (value: UseValue) => Promise<void>; delete: () => Promise<void> },
+          : {
+              get: () => Promise<UseValue>;
+              set: (value: UseValue, option?: CacheSetOptions) => Promise<void>;
+              delete: () => Promise<void>;
+            },
       never,
       ValueRef
     >("memory", {
@@ -416,6 +429,7 @@ export const injectionBuilder = (parentRefName: string) => ({
       },
       default: opts.default as unknown,
       isMap,
+      cacheOption: opts.expireAt ? { expireAt: opts.expireAt } : undefined,
       parentRefName,
     });
   },

package/service/predefinedAdaptor/cache.adaptor.ts

@@ -2,8 +2,12 @@ import type { BaseEnv, Dayjs, SshOptions } from "akanjs/base";
 import type { Redis } from "ioredis";
 import { adapt } from "../adapt";
 
+export interface CacheSetOptions {
+  expireAt?: Dayjs;
+}
+
 export interface CacheAdaptor {
-  set(topic: string, key: string, value: string | number | Buffer, option?: { expireAt?: Dayjs }): Promise<void>;
+  set(topic: string, key: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
   get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined>;
   delete(topic: string, key: string): Promise<void>;
   getClient?(): Redis;
@@ -12,7 +16,7 @@ export interface CacheAdaptor {
     key: string,
     subKey: string,
     value: string | number | Buffer,
-    option?: { expireAt?: Dayjs },
+    option?: CacheSetOptions,
   ): Promise<void>;
   hget<T extends string | number | Buffer>(topic: string, key: string, subKey: string): Promise<T | undefined>;
   hdelete(topic: string, key: string, subKey: string): Promise<void>;
@@ -63,12 +67,7 @@ export class RedisCache
   }))
   implements CacheAdaptor
 {
-  async set(
-    topic: string,
-    key: string,
-    value: string | number | Buffer,
-    option: { expireAt?: Dayjs } = {},
-  ): Promise<void> {
+  async set(topic: string, key: string, value: string | number | Buffer, option: CacheSetOptions = {}): Promise<void> {
     const expireTime = option.expireAt?.toDate().getTime();
     if (expireTime) await this.redis.set(`${topic}:${key}`, value, "PXAT", expireTime);
     else await this.redis.set(`${topic}:${key}`, value);
@@ -85,7 +84,7 @@ export class RedisCache
     key: string,
     subKey: string,
     value: string | number | Buffer,
-    option?: { expireAt?: Dayjs },
+    option?: CacheSetOptions,
   ): Promise<void> {
     const expireTime = option?.expireAt?.toDate().getTime();
     const redisKey = `${topic}:${key}`;

package/service/predefinedAdaptor/solidCache.adaptor.ts

@@ -1,7 +1,6 @@
 import type { Database } from "bun:sqlite";
-import type { Dayjs } from "akanjs/base";
 import { adapt } from "../adapt";
-import type { CacheAdaptor } from "./cache.adaptor";
+import type { CacheAdaptor, CacheSetOptions } from "./cache.adaptor";
 import {
   decodeSolidValue,
   encodeSolidValue,
@@ -62,7 +61,7 @@ export class SolidCache
     this.#db?.close();
   }
 
-  async set(topic: string, key: string, value: string | number | Buffer, option: { expireAt?: Dayjs } = {}) {
+  async set(topic: string, key: string, value: string | number | Buffer, option: CacheSetOptions = {}) {
     const encoded = encodeSolidValue(value);
     const now = Date.now();
     this.#db
@@ -99,7 +98,7 @@ export class SolidCache
     key: string,
     subKey: string,
     value: string | number | Buffer,
-    option: { expireAt?: Dayjs } = {},
+    option: CacheSetOptions = {},
   ) {
     const encoded = encodeSolidValue(value);
     const now = Date.now();

package/types/document/database.d.ts

@@ -1,20 +1,17 @@
-import type { Dayjs, MergedValues, PromiseOrObject } from "akanjs/base";
+import type { MergedValues, PromiseOrObject } from "akanjs/base";
 import { Logger } from "akanjs/common";
 import type { DocumentModel, QueryOf } from "akanjs/constant";
-import type { CacheAdaptor } from "akanjs/service";
+import type { CacheAdaptor, CacheSetOptions } from "akanjs/service";
 import type { DataLoader } from "./dataLoader.d.ts";
 import type { ExtractQuery, ExtractSort, FilterInstance } from "./filterMeta.d.ts";
 import type { CRUDEventType, Mdl, SaveEventType } from "./into.d.ts";
 import type { DataInputOf, FindQueryOption, ListQueryOption } from "./types.d.ts";
-export interface RedisSetOptions {
-    expireAt?: Dayjs;
-}
 export declare class CacheDatabase<T = unknown> {
     private readonly refName;
     private readonly cache;
     private logger;
     constructor(refName: string, cache: CacheAdaptor);
-    set(topic: string, key: string, value: string | number | Buffer, option?: RedisSetOptions): Promise<void>;
+    set(topic: string, key: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined>;
     delete(topic: string, key: string): Promise<void>;
 }

package/types/service/injectInfo.d.ts

@@ -3,6 +3,7 @@ import { type ConstantFieldTypeInput, type FieldToValue, type PlainTypeToFieldTy
 import type { DatabaseModel } from "akanjs/document";
 import type { Endpoint, EndpointCls, Internal, InternalCls, ServerSignal, ServerSignalCls, SliceCls } from "akanjs/signal";
 import type { Adaptor, AdaptorCls, Service, ServiceCls } from ".";
+import type { CacheSetOptions } from "./predefinedAdaptor.d.ts";
 export type InjectType = "database" | "service" | "use" | "signal" | "plug" | "env" | "memory";
 interface InjectBuilderOptions<ReturnType> {
     generateFactory?: (options: any) => ReturnType;
@@ -13,6 +14,7 @@ interface InjectBuilderOptions<ReturnType> {
     local?: boolean;
     default?: unknown;
     isMap?: boolean;
+    cacheOption?: CacheSetOptions;
     parentRefName: string;
 }
 export interface InjectRegistry {
@@ -55,6 +57,7 @@ export declare class InjectInfo<Type extends InjectType = any, ReturnType = any,
     readonly adaptor?: AdaptorCls;
     readonly default?: unknown;
     readonly isMap?: boolean;
+    readonly cacheOption?: CacheSetOptions;
     readonly parentRefName: string;
     constructor(type: Type, options: InjectBuilderOptions<ReturnType>);
     static resolveInjection(instance: Adaptor | Service, applyCls: AdaptorCls | ServiceCls, registry: InjectRegistry, env: BaseEnv): Promise<void>;
@@ -73,21 +76,22 @@ export declare const injectionBuilder: (parentRefName: string) => {
         local?: Local;
         default?: DefaultValue;
         of?: MapValue;
+        expireAt?: CacheSetOptions["expireAt"];
         get?: GetFn;
         set?: (value: ReturnType<GetFn>) => GetFieldValue<ValueRef, ExplicitType>;
     }) => InjectInfo<"memory", Local extends true ? MapConstructor extends ValueRef ? Map<string, FieldToValue<MapValue>> : (DefaultValue extends never ? true : false) extends true ? (never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>) | null : never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn> : MapConstructor extends ValueRef ? {
         get: (key: string) => Promise<(never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>) | undefined>;
-        set: (key: string, value: never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>) => Promise<void>;
+        set: (key: string, value: never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>, option?: CacheSetOptions) => Promise<void>;
         delete: (key: string) => Promise<void>;
-        getOrInsert: (key: string, value: never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>) => Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>;
-        getOrInsertComputed: (key: string, compute: (key: string) => (never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>) | Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>) => Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>;
+        getOrInsert: (key: string, value: never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>, option?: CacheSetOptions) => Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>;
+        getOrInsertComputed: (key: string, compute: (key: string) => (never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>) | Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>, option?: CacheSetOptions) => Promise<never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>>;
         keys: () => Promise<string[]>;
         entries: () => Promise<[string, never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>][]>;
         forEach: (callback: (value: never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>, key: string) => void | Promise<void>) => Promise<void>;
         clear: () => Promise<void>;
     } : {
         get: () => Promise<(DefaultValue extends never ? true : false) extends true ? (never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>) | null : never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>>;
-        set: (value: (DefaultValue extends never ? true : false) extends true ? (never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>) | null : never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>) => Promise<void>;
+        set: (value: (DefaultValue extends never ? true : false) extends true ? (never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>) | null : never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>, option?: CacheSetOptions) => Promise<void>;
         delete: () => Promise<void>;
     }, never, ValueRef>;
 };

package/types/service/predefinedAdaptor/cache.adaptor.d.ts

@@ -1,15 +1,14 @@
 import type { BaseEnv, Dayjs, SshOptions } from "akanjs/base";
 import type { Redis } from "ioredis";
+export interface CacheSetOptions {
+    expireAt?: Dayjs;
+}
 export interface CacheAdaptor {
-    set(topic: string, key: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    set(topic: string, key: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined>;
     delete(topic: string, key: string): Promise<void>;
     getClient?(): Redis;
-    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     hget<T extends string | number | Buffer>(topic: string, key: string, subKey: string): Promise<T | undefined>;
     hdelete(topic: string, key: string, subKey: string): Promise<void>;
     hkeys(topic: string, key: string): Promise<string[]>;
@@ -27,14 +26,10 @@ declare const RedisCache_base: import("..").AdaptorCls<{}, {
     redis: import("..").InjectInfo<"env", Redis, RedisEnv, never>;
 }>;
 export declare class RedisCache extends RedisCache_base implements CacheAdaptor {
-    set(topic: string, key: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    set(topic: string, key: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined>;
     delete(topic: string, key: string): Promise<void>;
-    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     hget<T extends string | number | Buffer>(topic: string, key: string, subKey: string): Promise<T | undefined>;
     hdelete(topic: string, key: string, subKey: string): Promise<void>;
     hkeys(topic: string, key: string): Promise<string[]>;

package/types/service/predefinedAdaptor/solidCache.adaptor.d.ts

@@ -1,5 +1,4 @@
-import type { Dayjs } from "akanjs/base";
-import type { CacheAdaptor } from "./cache.adaptor";
+import type { CacheAdaptor, CacheSetOptions } from "./cache.adaptor";
 import { type SolidConfig, type SolidEnv } from "./solidSqlite.d.ts";
 declare const SolidCache_base: import("..").AdaptorCls<{}, {
     config: import("..").InjectInfo<"env", Required<SolidConfig>, SolidEnv, never>;
@@ -8,14 +7,10 @@ export declare class SolidCache extends SolidCache_base implements CacheAdaptor
     #private;
     onInit(): Promise<void>;
     onDestroy(): Promise<void>;
-    set(topic: string, key: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    set(topic: string, key: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     get<T extends string | number | Buffer>(topic: string, key: string): Promise<T | undefined>;
     delete(topic: string, key: string): Promise<void>;
-    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: {
-        expireAt?: Dayjs;
-    }): Promise<void>;
+    hset(topic: string, key: string, subKey: string, value: string | number | Buffer, option?: CacheSetOptions): Promise<void>;
     hget<T extends string | number | Buffer>(topic: string, key: string, subKey: string): Promise<T | undefined>;
     hdelete(topic: string, key: string, subKey: string): Promise<void>;
     hkeys(topic: string, key: string): Promise<string[]>;