akanjs 2.3.8-rc.2 → 2.3.8-rc.4

package/base/symbols.ts

@@ -4,6 +4,9 @@ export const FILTER_META = Symbol.for("akan.filter");
 export const LOADER_META = Symbol.for("akan.loader");
 export const INJECT_META = Symbol.for("akan.inject");
 export const ENDPOINT_META = Symbol.for("akan.endpoint");
+export const ENDPOINT_DICT_SHAPE: unique symbol = Symbol.for("akan.endpoint.dictShape") as never;
+export const SLICE_DICT_SHAPE: unique symbol = Symbol.for("akan.slice.dictShape") as never;
+export const FILTER_DICT_SHAPE: unique symbol = Symbol.for("akan.filter.dictShape") as never;
 export const INTERNAL_META = Symbol.for("akan.internal");
 export const STATE_META = Symbol.for("akan.state");
 export const STATE_INIT_META = Symbol.for("akan.state.init");

package/dictionary/dictInfo.ts

@@ -1,40 +1,62 @@
-import type { GetStateObject } from "akanjs/base";
+import type { ENDPOINT_DICT_SHAPE, FILTER_DICT_SHAPE, GetStateObject, SLICE_DICT_SHAPE } from "akanjs/base";
 import { capitalize } from "akanjs/common";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { BaseFilterQueryKey, BaseFilterSortKey, FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
 import type {
-  EndpInfoArgNames,
+  BaseFilterQueryKey,
+  BaseFilterSortKey,
+  FilterCls,
+  FilterDictShape as FilterCompactShape,
+  FilterDictArgShape,
+  FilterInfo,
+  FilterInstance,
+} from "akanjs/document";
+import type {
   EndpointCls,
+  EndpointDictShape as EndpointCompactShape,
   EndpointInfo,
   SliceCls,
+  SliceDictShape as SliceCompactShape,
   SliceInfo,
-  SliceInfoArgNames,
 } from "akanjs/signal";
 import type { DictionaryNode, RootDictionary } from "./trans";
 
 type MutableDictionaryNode = DictionaryNode & { t?: string; desc?: DictionaryNode };
 type EnumValueKey = string | number;
-type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictArgShape = { [key: string]: readonly string[] };
+type AnyFilterShape = FilterCompactShape<FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>>;
 type DictFilterShape<Filter> =
   Filter extends FilterCls<infer FilterShape>
-    ? FilterShape
-    : Filter extends FilterInstance
-      ? Filter
-      : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
-        ? Filter
-        : AnyFilterShape;
+    ? FilterCompactShape<FilterShape>
+    : Filter extends { readonly [FILTER_DICT_SHAPE]: infer CompactShape extends FilterDictArgShape }
+      ? CompactShape
+      : Filter extends FilterInstance
+        ? FilterCompactShape<Filter>
+        : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+          ? FilterCompactShape<Filter>
+          : Filter extends { query: DictArgShape; sort: Record<string, true> }
+            ? Filter
+            : AnyFilterShape;
 type DictSliceShape<Slice> =
   Slice extends SliceCls<infer _SrvModule, infer SliceInfoObj>
-    ? SliceInfoObj
-    : Slice extends Record<string, SliceInfo>
-      ? Slice
-      : Record<never, never>;
+    ? SliceCompactShape<SliceInfoObj>
+    : Slice extends { readonly [SLICE_DICT_SHAPE]: infer CompactShape extends DictArgShape }
+      ? CompactShape
+      : Slice extends DictArgShape
+        ? Slice
+        : Slice extends Record<string, SliceInfo>
+          ? SliceCompactShape<Slice>
+          : Record<never, never>;
 type DictEndpointShape<Endpoint> =
   Endpoint extends EndpointCls<infer _SrvModule, infer EndpointInfoObj>
-    ? EndpointInfoObj
-    : Endpoint extends Record<string, EndpointInfo>
-      ? Endpoint
-      : Record<never, never>;
+    ? EndpointCompactShape<EndpointInfoObj>
+    : Endpoint extends { readonly [ENDPOINT_DICT_SHAPE]: infer CompactShape extends DictArgShape }
+      ? CompactShape
+      : Endpoint extends DictArgShape
+        ? Endpoint
+        : Endpoint extends Record<string, EndpointInfo>
+          ? EndpointCompactShape<Endpoint>
+          : Record<never, never>;
+type DictArgNames<ArgNames> = ArgNames extends readonly string[] ? ArgNames[number] : never;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 
@@ -282,22 +304,14 @@ export class ModelDictInfo<
   }
   query<Filter>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<
-        infer ArgNames,
-        infer _Args,
-        infer _Model
-      >
-        ? FunctionTranslation<Languages, ArgNames[number]>
-        : never;
+      [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: FunctionTranslation<
+        Languages,
+        DictArgNames<DictFilterQuery<Filter>[K]>
+      >;
     },
   ) {
     Object.assign(this.queryDictionary, translate(fn), ModelDictInfo.baseQueryDictionary) as unknown as {
-      [K in keyof DictFilterQuery<Filter>]: FunctionTranslation<
-        Languages,
-        DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args, infer _Model>
-          ? ArgNames[number]
-          : never
-      >;
+      [K in keyof DictFilterQuery<Filter>]: FunctionTranslation<Languages, DictArgNames<DictFilterQuery<Filter>[K]>>;
     };
     return this as unknown as ModelDictInfo<
       Languages,
@@ -363,10 +377,10 @@ export class ModelDictInfo<
   }
   slice<Slice>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<keyof DictSliceShape<Slice>, SliceKey>]: DictSliceShape<Slice>[K] extends infer Info extends
-        SliceInfo
-        ? FunctionTranslation<Languages, SliceInfoArgNames<Info>[number]>
-        : never;
+      [K in Exclude<keyof DictSliceShape<Slice>, SliceKey>]: FunctionTranslation<
+        Languages,
+        DictArgNames<DictSliceShape<Slice>[K]>
+      >;
     },
   ) {
     Object.assign(this.sliceDictionary, translate(fn), ModelDictInfo.baseSliceDictionary) as unknown as {
@@ -388,12 +402,10 @@ export class ModelDictInfo<
   }
   endpoint<Endpoint>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<
-        keyof DictEndpointShape<Endpoint>,
-        EndpointKey
-      >]: DictEndpointShape<Endpoint>[K] extends infer Info extends EndpointInfo
-        ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]>
-        : never;
+      [K in Exclude<keyof DictEndpointShape<Endpoint>, EndpointKey>]: FunctionTranslation<
+        Languages,
+        DictArgNames<DictEndpointShape<Endpoint>[K]>
+      >;
     },
   ) {
     Object.assign(this.endpointDictionary, translate(fn)) as unknown as {
@@ -1009,9 +1021,10 @@ export class ServiceDictInfo<
   }
   endpoint<Endpoint>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in keyof DictEndpointShape<Endpoint>]: DictEndpointShape<Endpoint>[K] extends infer Info extends EndpointInfo
-        ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]>
-        : never;
+      [K in keyof DictEndpointShape<Endpoint>]: FunctionTranslation<
+        Languages,
+        DictArgNames<DictEndpointShape<Endpoint>[K]>
+      >;
     },
   ) {
     Object.assign(this.endpointDictionary, translate(fn)) as unknown as {

package/dictionary/locale.ts

@@ -1,7 +1,28 @@
-import type { GetStateObject, MergedValues } from "akanjs/base";
+import type {
+  ENDPOINT_DICT_SHAPE,
+  FILTER_DICT_SHAPE,
+  GetStateObject,
+  MergedValues,
+  SLICE_DICT_SHAPE,
+} from "akanjs/base";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
-import type { FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
-import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames, SliceInfoRefName } from "akanjs/signal";
+import type {
+  FilterCls,
+  FilterDictShape as FilterCompactShape,
+  FilterDictArgShape,
+  FilterInfo,
+  FilterInstance,
+} from "akanjs/document";
+import type {
+  EndpointCls,
+  EndpointDictShape as EndpointCompactShape,
+  EndpointInfo,
+  SliceCls,
+  SliceDictShape as SliceCompactShape,
+  SliceInfo,
+  SliceInfoArgNames,
+  SliceInfoRefName,
+} from "akanjs/signal";
 import type { ModelDictInfo, ScalarDictInfo, ServiceDictInfo } from ".";
 
 interface Trans {
@@ -16,35 +37,61 @@ interface FnTrans<ArgKey extends string> {
   desc?: string;
   arg?: { [key in ArgKey]: FieldTrans };
 }
-type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
+type DictArgShape = { [key: string]: readonly string[] };
+type AnyFilterShape = FilterCompactShape<FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>>;
 type DictFilterShape<Filter> =
   Filter extends FilterCls<infer FilterShape>
-    ? FilterShape
-    : Filter extends FilterInstance
-      ? Filter
-      : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
-        ? Filter
-        : AnyFilterShape;
+    ? FilterCompactShape<FilterShape>
+    : Filter extends { readonly [FILTER_DICT_SHAPE]: infer CompactShape extends FilterDictArgShape }
+      ? CompactShape
+      : Filter extends FilterInstance
+        ? FilterCompactShape<Filter>
+        : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+          ? FilterCompactShape<Filter>
+          : Filter extends { query: DictArgShape; sort: Record<string, true> }
+            ? Filter
+            : AnyFilterShape;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
+type DictArgNames<ArgNames> = ArgNames extends readonly string[] ? ArgNames[number] : never;
+type DictEndpointShape<Endpoint> =
+  Endpoint extends EndpointCls<infer _SrvModule, infer EndpointInfoObj>
+    ? EndpointCompactShape<EndpointInfoObj>
+    : Endpoint extends { readonly [ENDPOINT_DICT_SHAPE]: infer CompactShape extends DictArgShape }
+      ? CompactShape
+      : Endpoint extends DictArgShape
+        ? Endpoint
+        : Endpoint extends Record<string, EndpointInfo>
+          ? EndpointCompactShape<Endpoint>
+          : Record<never, never>;
+type DictSliceShape<Slice> =
+  Slice extends SliceCls<infer _SrvModule, infer SliceInfoObj>
+    ? SliceCompactShape<SliceInfoObj>
+    : Slice extends { readonly [SLICE_DICT_SHAPE]: infer CompactShape extends DictArgShape }
+      ? CompactShape
+      : Slice extends DictArgShape
+        ? Slice
+        : Slice extends Record<string, SliceInfo>
+          ? SliceCompactShape<Slice>
+          : Record<never, never>;
 type FilterTranslatorKey<Filter> = {
   [Key in keyof DictFilterQuery<Filter> & string]:
     | `${Key}`
     | `${Key}.desc`
-    | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, infer _Args>
-        ? ArgNames[number] extends string
-          ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc`
-          : never
+    | (DictArgNames<DictFilterQuery<Filter>[Key]> extends string
+        ?
+            | `${Key}.arg.${DictArgNames<DictFilterQuery<Filter>[Key]>}`
+            | `${Key}.arg.${DictArgNames<DictFilterQuery<Filter>[Key]>}.desc`
         : never);
 }[keyof DictFilterQuery<Filter> & string];
-type EndpointTranslatorKey<Endpoint extends { [key: string]: EndpointInfo }> = {
-  [Key in keyof Endpoint & string]:
+type EndpointTranslatorKey<Endpoint> = {
+  [Key in keyof DictEndpointShape<Endpoint> & string]:
     | `${Key}`
     | `${Key}.desc`
-    | `${Key}.arg.${EndpInfoArgNames<Endpoint[Key]>[number]}`
-    | `${Key}.arg.${EndpInfoArgNames<Endpoint[Key]>[number]}.desc`;
-}[keyof Endpoint & string];
-type SliceTranslatorKey<Slice> = {
+    | `${Key}.arg.${DictArgNames<DictEndpointShape<Endpoint>[Key]>}`
+    | `${Key}.arg.${DictArgNames<DictEndpointShape<Endpoint>[Key]>}.desc`;
+}[keyof DictEndpointShape<Endpoint> & string];
+type FullSliceTranslatorKey<Slice> = {
   [Key in keyof Slice & string]: Slice[Key] extends infer Info extends SliceInfo
     ?
         | `${SliceInfoRefName<Info>}List${Capitalize<Key>}`
@@ -57,6 +104,21 @@ type SliceTranslatorKey<Slice> = {
         | `${SliceInfoRefName<Info>}Insight${Capitalize<Key>}.arg.${SliceInfoArgNames<Info>[number]}.desc`
     : never;
 }[keyof Slice & string];
+type CompactSliceTranslatorKey<T extends string, Slice> = {
+  [Key in keyof DictSliceShape<Slice> & string]: Key extends ""
+    ? never
+    :
+        | `${T}List${Capitalize<Key>}`
+        | `${T}List${Capitalize<Key>}.desc`
+        | `${T}List${Capitalize<Key>}.arg.${DictArgNames<DictSliceShape<Slice>[Key]> | "skip" | "limit" | "sort"}`
+        | `${T}List${Capitalize<Key>}.arg.${DictArgNames<DictSliceShape<Slice>[Key]> | "skip" | "limit" | "sort"}.desc`
+        | `${T}Insight${Capitalize<Key>}`
+        | `${T}Insight${Capitalize<Key>}.desc`
+        | `${T}Insight${Capitalize<Key>}.arg.${DictArgNames<DictSliceShape<Slice>[Key]>}`
+        | `${T}Insight${Capitalize<Key>}.arg.${DictArgNames<DictSliceShape<Slice>[Key]>}.desc`;
+}[keyof DictSliceShape<Slice> & string];
+type SliceTranslatorKey<T extends string, Slice> =
+  Slice extends Record<string, SliceInfo> ? FullSliceTranslatorKey<Slice> : CompactSliceTranslatorKey<T, Slice>;
 
 type SliceApiTrans<
   T extends string,
@@ -85,8 +147,8 @@ export type ModelTrans<
   Model extends BaseObject,
   Insight extends BaseInsight,
   Filter,
-  Slice extends { [key: string]: SliceInfo },
-  Endpoint extends { [key: string]: EndpointInfo },
+  Slice,
+  Endpoint,
   ErrorKey extends string,
   EtcKey extends string,
 > = {
@@ -95,35 +157,25 @@ export type ModelTrans<
   model: { [K in keyof GetStateObject<Model>]: FieldTrans };
   insight: { [K in keyof GetStateObject<Insight>]: FieldTrans };
   query: {
-    [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args>
-      ? FnTrans<ArgNames[number]>
-      : never;
+    [K in keyof DictFilterQuery<Filter>]: FnTrans<DictArgNames<DictFilterQuery<Filter>[K]>>;
   };
   sort: { [K in keyof DictFilterSort<Filter>]: FieldTrans };
   api: {
-    [K in keyof Endpoint]: FnTrans<EndpInfoArgNames<Endpoint[K]>[number]>;
+    [K in keyof DictEndpointShape<Endpoint>]: FnTrans<DictArgNames<DictEndpointShape<Endpoint>[K]>>;
   } & BaseModelCrudGetApiTrans<T> &
     MergedValues<{
-      [K in keyof Slice]: SliceApiTrans<SliceInfoRefName<Slice[K]>, K & string, SliceInfoArgNames<Slice[K]>[number]>;
+      [K in keyof DictSliceShape<Slice>]: SliceApiTrans<T, K & string, DictArgNames<DictSliceShape<Slice>[K]>>;
     }>;
   error: { [K in ErrorKey]: Trans };
 } & { [K in EtcKey]: Trans };
-export type ModelTranslatorKey<
-  T extends string,
-  Model,
-  Insight,
-  Filter,
-  Slice extends { [key: string]: SliceInfo },
-  Endpoint extends { [key: string]: EndpointInfo },
-  EtcKey extends string,
-> =
+export type ModelTranslatorKey<T extends string, Model, Insight, Filter, Slice, Endpoint, EtcKey extends string> =
   | `${T}.modelName`
   | `${T}.modelDesc`
   | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}`
   | `${T}.insight.${keyof GetStateObject<Insight> & string}${"" | ".desc"}`
   | `${T}.query.${FilterTranslatorKey<Filter>}`
   | `${T}.sort.${keyof DictFilterSort<Filter> & string}${"" | ".desc"}`
-  | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<Slice>}`
+  | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<T, Slice>}`
   | `${T}.${EtcKey}`;
 
 export type ScalarTrans<_T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
@@ -138,22 +190,15 @@ export type ScalarTranslatorKey<T extends string, Model, EtcKey extends string>
   | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}`
   | `${T}.${EtcKey}`;
 
-export type ServiceTrans<
-  _T extends string,
-  Endpoint extends { [key: string]: EndpointInfo },
-  ErrorKey extends string,
-  EtcKey extends string,
-> = {
+export type ServiceTrans<_T extends string, Endpoint, ErrorKey extends string, EtcKey extends string> = {
   api: {
-    [K in keyof Endpoint]: FnTrans<EndpInfoArgNames<Endpoint[K]>[number]>;
+    [K in keyof DictEndpointShape<Endpoint>]: FnTrans<DictArgNames<DictEndpointShape<Endpoint>[K]>>;
   };
   error: { [K in ErrorKey]: Trans };
 } & { [K in EtcKey]: Trans };
-export type ServiceTranslatorKey<
-  T extends string,
-  Endpoint extends { [key: string]: EndpointInfo },
-  EtcKey extends string,
-> = `${T}.signal.${EndpointTranslatorKey<Endpoint>}` | `${T}.${EtcKey}`;
+export type ServiceTranslatorKey<T extends string, Endpoint, EtcKey extends string> =
+  | `${T}.signal.${EndpointTranslatorKey<Endpoint>}`
+  | `${T}.${EtcKey}`;
 
 export type EnumTrans<EnumValue extends string | number> = {
   [key in EnumValue]: Trans;
@@ -174,8 +219,8 @@ export const registerModelTrans = <
   Model extends BaseObject,
   Insight extends BaseInsight,
   Filter,
-  Slice extends { [key: string]: SliceInfo },
-  Endpoint extends { [key: string]: EndpointInfo },
+  Slice,
+  Endpoint,
   ModelDict,
 >(
   modelDict: ModelDict,
@@ -233,7 +278,7 @@ export const registerScalarTrans = <T extends string, Model, ScalarDict>(
     : never;
 };
 
-export const registerServiceTrans = <T extends string, Endpoint extends { [key: string]: EndpointInfo }, ServiceDict>(
+export const registerServiceTrans = <T extends string, Endpoint, ServiceDict>(
   serviceDict: ServiceDict,
 ): ServiceDict extends ServiceDictInfo<infer _Languages, infer _EndpointKey, infer ErrorKey, infer EtcKey>
   ? DictModule<ServiceTranslatorKey<T, Endpoint, EtcKey>, `${T}.error.${ErrorKey}`>

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/document/filterMeta.ts

@@ -1,5 +1,5 @@
 import type { Cls, MergeAllDoubleKeyOfObjects, MergeAllKeyOfTypes } from "akanjs/base";
-import { FILTER_META } from "akanjs/base";
+import { FILTER_DICT_SHAPE, FILTER_META } from "akanjs/base";
 import type {
   BaseObject,
   ConstantFieldTypeInput,
@@ -109,6 +109,21 @@ export type FilterInstance<
   query: Query;
   sort: Sort;
 };
+export type FilterDictArgShape = {
+  query: { [key: string]: readonly string[] };
+  sort: { [key: string]: true };
+};
+export type FilterDictShape<Filter extends FilterInstance> = {
+  query: {
+    [K in keyof Filter["query"]]: Filter["query"][K] extends FilterInfo<infer ArgNames, infer _Args, infer _Model>
+      ? ArgNames
+      : never;
+  };
+  sort: { [K in keyof Filter["sort"]]: true };
+};
+export interface FilterDictShapeCarrier<DictShape extends FilterDictArgShape = FilterDictArgShape> {
+  readonly [FILTER_DICT_SHAPE]: DictShape;
+}
 interface BaseQuery<Model> {
   any: FilterInfo<[], [], Model>;
 }
@@ -140,8 +155,9 @@ export type ExtractQuery<Filter extends FilterInstance> = {
 };
 export type ExtractSort<Filter extends FilterInstance> = keyof Filter["sort"];
 export interface FilterCls<Filter extends FilterInstance = any, Query = unknown, Sort = unknown>
-  extends Cls<{ [key: string]: any }> {
+  extends Cls<FilterDictShapeCarrier<FilterDictShape<Filter>> & { [key: string]: unknown }> {
   [FILTER_META]: Filter;
+  prototype: FilterDictShapeCarrier<FilterDictShape<Filter>> & { [key: string]: unknown };
   sortField: Set<string>;
   _Query: Query;
   _Sort: Sort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.8-rc.2",
+  "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}`;