akanjs 2.3.8-rc.1 → 2.3.8-rc.2

package/dictionary/dictInfo.ts

@@ -2,19 +2,39 @@ import type { GetStateObject } 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, EndpointInfo, SliceInfo, SliceInfoArgNames } from "akanjs/signal";
+import type {
+  EndpInfoArgNames,
+  EndpointCls,
+  EndpointInfo,
+  SliceCls,
+  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 DictFilterShape<Filter> = Filter extends FilterInstance
-  ? Filter
-  : Filter extends FilterCls<infer FilterShape>
+type DictFilterShape<Filter> =
+  Filter extends FilterCls<infer FilterShape>
     ? FilterShape
-    : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+    : Filter extends FilterInstance
       ? Filter
-      : AnyFilterShape;
+      : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+        ? Filter
+        : AnyFilterShape;
+type DictSliceShape<Slice> =
+  Slice extends SliceCls<infer _SrvModule, infer SliceInfoObj>
+    ? SliceInfoObj
+    : Slice extends Record<string, SliceInfo>
+      ? Slice
+      : Record<never, never>;
+type DictEndpointShape<Endpoint> =
+  Endpoint extends EndpointCls<infer _SrvModule, infer EndpointInfoObj>
+    ? EndpointInfoObj
+    : Endpoint extends Record<string, EndpointInfo>
+      ? Endpoint
+      : Record<never, never>;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 
@@ -96,7 +116,7 @@ export class ModelDictInfo<
   SortKey extends string = BaseFilterSortKey,
   EnumKey extends string = never,
   BaseSignalKey extends string = never,
-  SliceKey extends string = never,
+  SliceKey extends string = "",
   EndpointKey extends string = never,
   ErrorKey extends string = never,
   EtcKey extends string = never,
@@ -162,7 +182,7 @@ export class ModelDictInfo<
   static baseSliceDictionary: {
     [key in ""]: FunctionTranslation<[string, string], "query">;
   } = {
-    [""]: fn(["Universal", "유니버설"])
+    "": fn(["Universal", "유니버설"])
       .desc(["Universal Slice", "유니버설 슬라이스"])
       .arg((t) => ({
         query: t(["Query", "쿼리"]).desc(["Query Description", "쿼리 설명"]),
@@ -264,7 +284,8 @@ export class ModelDictInfo<
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
       [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<
         infer ArgNames,
-        any
+        infer _Args,
+        infer _Model
       >
         ? FunctionTranslation<Languages, ArgNames[number]>
         : never;
@@ -273,7 +294,9 @@ export class ModelDictInfo<
     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, any> ? ArgNames[number] : never
+        DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args, infer _Model>
+          ? ArgNames[number]
+          : never
       >;
     };
     return this as unknown as ModelDictInfo<
@@ -340,13 +363,14 @@ export class ModelDictInfo<
   }
   slice<Slice>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<keyof Slice, SliceKey>]: Slice[K] extends infer Info extends SliceInfo
+      [K in Exclude<keyof DictSliceShape<Slice>, SliceKey>]: DictSliceShape<Slice>[K] extends infer Info extends
+        SliceInfo
         ? FunctionTranslation<Languages, SliceInfoArgNames<Info>[number]>
         : never;
     },
   ) {
     Object.assign(this.sliceDictionary, translate(fn), ModelDictInfo.baseSliceDictionary) as unknown as {
-      [K in keyof Slice]: FunctionTranslation<Languages>;
+      [K in keyof DictSliceShape<Slice>]: FunctionTranslation<Languages>;
     };
     return this as unknown as ModelDictInfo<
       Languages,
@@ -356,7 +380,7 @@ export class ModelDictInfo<
       SortKey,
       EnumKey,
       BaseSignalKey,
-      keyof Slice & string,
+      keyof DictSliceShape<Slice> & string,
       EndpointKey,
       ErrorKey,
       EtcKey
@@ -364,7 +388,10 @@ export class ModelDictInfo<
   }
   endpoint<Endpoint>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in Exclude<keyof Endpoint, EndpointKey>]: Endpoint[K] extends infer Info extends EndpointInfo
+      [K in Exclude<
+        keyof DictEndpointShape<Endpoint>,
+        EndpointKey
+      >]: DictEndpointShape<Endpoint>[K] extends infer Info extends EndpointInfo
         ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]>
         : never;
     },
@@ -381,7 +408,7 @@ export class ModelDictInfo<
       EnumKey,
       BaseSignalKey,
       SliceKey,
-      keyof Endpoint & string,
+      keyof DictEndpointShape<Endpoint> & string,
       ErrorKey,
       EtcKey
     >;
@@ -777,7 +804,7 @@ type MergeTwoModelDicts<ModelDict1, ModelDict2> =
     infer EtcKey1
   >
     ? ModelDict2 extends ModelDictInfo<
-        any,
+        infer _Languages2,
         infer ModelKey2,
         infer InsightKey2,
         infer QueryKey2,
@@ -980,15 +1007,17 @@ export class ServiceDictInfo<
   constructor(languages: Languages) {
     this.languages = languages;
   }
-  endpoint<Endpoint extends { [key: string]: EndpointInfo }>(
+  endpoint<Endpoint>(
     translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-      [K in keyof Endpoint]: FunctionTranslation<Languages, EndpInfoArgNames<Endpoint[K]>[number]>;
+      [K in keyof DictEndpointShape<Endpoint>]: DictEndpointShape<Endpoint>[K] extends infer Info extends EndpointInfo
+        ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]>
+        : never;
     },
   ) {
     Object.assign(this.endpointDictionary, translate(fn)) as unknown as {
       [K in EndpointKey]: FunctionTranslation<Languages>;
     };
-    return this as unknown as ServiceDictInfo<Languages, keyof Endpoint & string, ErrorKey, EtcKey>;
+    return this as unknown as ServiceDictInfo<Languages, keyof DictEndpointShape<Endpoint> & string, ErrorKey, EtcKey>;
   }
   error<ErrorDict extends { [key: string]: Languages }>(errorDictionary: ErrorDict) {
     Object.assign(this.errorDictionary, errorDictionary);

package/dictionary/locale.ts

@@ -17,20 +17,21 @@ interface FnTrans<ArgKey extends string> {
   arg?: { [key in ArgKey]: FieldTrans };
 }
 type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
-type DictFilterShape<Filter> = Filter extends FilterInstance
-  ? Filter
-  : Filter extends FilterCls<infer FilterShape>
+type DictFilterShape<Filter> =
+  Filter extends FilterCls<infer FilterShape>
     ? FilterShape
-    : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+    : Filter extends FilterInstance
       ? Filter
-      : AnyFilterShape;
+      : Filter extends { query: Record<string, FilterInfo>; sort: Record<string, unknown> }
+        ? Filter
+        : AnyFilterShape;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 type FilterTranslatorKey<Filter> = {
   [Key in keyof DictFilterQuery<Filter> & string]:
     | `${Key}`
     | `${Key}.desc`
-    | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, any>
+    | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, infer _Args>
         ? ArgNames[number] extends string
           ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc`
           : never
@@ -94,7 +95,7 @@ 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, any>
+    [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args>
       ? FnTrans<ArgNames[number]>
       : never;
   };
@@ -125,7 +126,7 @@ export type ModelTranslatorKey<
   | `${T}.signal.${EndpointTranslatorKey<Endpoint> | SliceTranslatorKey<Slice>}`
   | `${T}.${EtcKey}`;
 
-export type ScalarTrans<T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
+export type ScalarTrans<_T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
   name: Trans;
   desc: Trans;
   model: { [K in keyof GetStateObject<Model>]: FieldTrans };
@@ -138,7 +139,7 @@ export type ScalarTranslatorKey<T extends string, Model, EtcKey extends string>
   | `${T}.${EtcKey}`;
 
 export type ServiceTrans<
-  T extends string,
+  _T extends string,
   Endpoint extends { [key: string]: EndpointInfo },
   ErrorKey extends string,
   EtcKey extends string,
@@ -162,7 +163,10 @@ export type EnumTranslatorKey<EnumKey extends string> = `${EnumKey}.${string}${"
 export interface DictModule<DictKey extends string, ErrorKey extends string> {
   __Dict_Key__: DictKey;
   __Error_Key__: ErrorKey;
-  dict: ModelDictInfo<any> | ScalarDictInfo<any> | ServiceDictInfo<any>;
+  dict:
+    | ModelDictInfo<[string, ...string[]]>
+    | ScalarDictInfo<[string, ...string[]]>
+    | ServiceDictInfo<[string, ...string[]]>;
 }
 
 export const registerModelTrans = <
@@ -172,25 +176,37 @@ export const registerModelTrans = <
   Filter,
   Slice extends { [key: string]: SliceInfo },
   Endpoint extends { [key: string]: EndpointInfo },
-  ModelDict extends ModelDictInfo<any>,
+  ModelDict,
 >(
   modelDict: ModelDict,
-): ModelDict extends ModelDictInfo<any, any, any, any, any, infer EnumKey, any, any, any, infer ErrorKey, infer EtcKey>
+): ModelDict extends ModelDictInfo<
+  infer _Languages,
+  infer _ModelKey,
+  infer _InsightKey,
+  infer _QueryKey,
+  infer _SortKey,
+  infer EnumKey,
+  infer _BaseSignalKey,
+  infer _SliceKey,
+  infer _EndpointKey,
+  infer ErrorKey,
+  infer EtcKey
+>
   ? DictModule<
       ModelTranslatorKey<RefName, Model, Insight, Filter, Slice, Endpoint, EtcKey> | EnumTranslatorKey<EnumKey>,
       `${RefName}.error.${ErrorKey}`
     >
   : never => {
   return { dict: modelDict } as unknown as ModelDict extends ModelDictInfo<
-    any,
-    any,
-    any,
-    any,
-    any,
+    infer _Languages,
+    infer _ModelKey,
+    infer _InsightKey,
+    infer _QueryKey,
+    infer _SortKey,
     infer EnumKey,
-    any,
-    any,
-    any,
+    infer _BaseSignalKey,
+    infer _SliceKey,
+    infer _EndpointKey,
     infer ErrorKey,
     infer EtcKey
   >
@@ -203,12 +219,12 @@ export const registerModelTrans = <
 
 export const registerScalarTrans = <T extends string, Model, ScalarDict>(
   scalarDict: ScalarDict,
-): ScalarDict extends ScalarDictInfo<any, any, infer EnumKey, infer ErrorKey, infer EtcKey>
+): ScalarDict extends ScalarDictInfo<infer _Languages, infer _ModelKey, infer EnumKey, infer ErrorKey, infer EtcKey>
   ? DictModule<ScalarTranslatorKey<T, Model, EtcKey> | EnumTranslatorKey<EnumKey>, `${T}.error.${ErrorKey}`>
   : never => {
   return { dict: scalarDict } as unknown as ScalarDict extends ScalarDictInfo<
-    any,
-    any,
+    infer _Languages,
+    infer _ModelKey,
     infer EnumKey,
     infer ErrorKey,
     infer EtcKey
@@ -219,10 +235,15 @@ export const registerScalarTrans = <T extends string, Model, ScalarDict>(
 
 export const registerServiceTrans = <T extends string, Endpoint extends { [key: string]: EndpointInfo }, ServiceDict>(
   serviceDict: ServiceDict,
-): ServiceDict extends ServiceDictInfo<any, any, infer ErrorKey, infer EtcKey>
+): ServiceDict extends ServiceDictInfo<infer _Languages, infer _EndpointKey, infer ErrorKey, infer EtcKey>
   ? DictModule<ServiceTranslatorKey<T, Endpoint, EtcKey>, `${T}.error.${ErrorKey}`>
   : never => {
-  return { dict: serviceDict } as unknown as ServiceDict extends ServiceDictInfo<any, any, infer ErrorKey, infer EtcKey>
+  return { dict: serviceDict } as unknown as ServiceDict extends ServiceDictInfo<
+    infer _Languages,
+    infer _EndpointKey,
+    infer ErrorKey,
+    infer EtcKey
+  >
     ? DictModule<ServiceTranslatorKey<T, Endpoint, EtcKey>, `${T}.error.${ErrorKey}`>
     : never;
 };

package/package.json

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

package/types/dictionary/dictInfo.d.ts

@@ -1,14 +1,16 @@
 import type { GetStateObject } from "akanjs/base";
 import type { BaseInsight, BaseObject } from "akanjs/constant";
 import type { BaseFilterQueryKey, BaseFilterSortKey, FilterCls, FilterInfo, FilterInstance } from "akanjs/document";
-import type { EndpInfoArgNames, EndpointInfo, SliceInfo, SliceInfoArgNames } from "akanjs/signal";
+import type { EndpInfoArgNames, EndpointCls, EndpointInfo, SliceCls, SliceInfo, SliceInfoArgNames } from "akanjs/signal";
 import type { RootDictionary } from "./trans.d.ts";
 type EnumValueKey = string | number;
 type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
-type DictFilterShape<Filter> = Filter extends FilterInstance ? Filter : Filter extends FilterCls<infer FilterShape> ? FilterShape : Filter extends {
+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;
+type DictSliceShape<Slice> = Slice extends SliceCls<infer _SrvModule, infer SliceInfoObj> ? SliceInfoObj : Slice extends Record<string, SliceInfo> ? Slice : Record<never, never>;
+type DictEndpointShape<Endpoint> = Endpoint extends EndpointCls<infer _SrvModule, infer EndpointInfoObj> ? EndpointInfoObj : Endpoint extends Record<string, EndpointInfo> ? Endpoint : Record<never, never>;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 declare class FieldTranslation<Languages extends [string, ...string[]]> {
@@ -42,7 +44,7 @@ type BaseModelCrudGetSignalTranslation<T extends string, Languages extends [stri
     [K in `remove${_CapitalizedRefName}`]: FunctionTranslation<Languages, `${T}Id`>;
 };
 type GetBaseSignalKey<T extends string> = keyof BaseModelCrudGetSignalTranslation<T>;
-export declare class ModelDictInfo<Languages extends [string, ...string[]] = [string], ModelKey extends string = keyof BaseObject, InsightKey extends string = keyof BaseInsight, QueryKey extends string = BaseFilterQueryKey, SortKey extends string = BaseFilterSortKey, EnumKey extends string = never, BaseSignalKey extends string = never, SliceKey extends string = never, EndpointKey extends string = never, ErrorKey extends string = never, EtcKey extends string = never> {
+export declare class ModelDictInfo<Languages extends [string, ...string[]] = [string], ModelKey extends string = keyof BaseObject, InsightKey extends string = keyof BaseInsight, QueryKey extends string = BaseFilterQueryKey, SortKey extends string = BaseFilterSortKey, EnumKey extends string = never, BaseSignalKey extends string = never, SliceKey extends string = "", EndpointKey extends string = never, ErrorKey extends string = never, EtcKey extends string = never> {
     #private;
     static baseModelDictionary: {
         [key in keyof BaseObject]: FieldTranslation<[string, string]>;
@@ -103,7 +105,7 @@ export declare class ModelDictInfo<Languages extends [string, ...string[]] = [st
         [K in Exclude<keyof GetStateObject<Insight>, InsightKey>]: FieldTranslation<Languages>;
     }): ModelDictInfo<Languages, ModelKey, keyof GetStateObject<Insight> & string, QueryKey, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
     query<Filter>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-        [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any> ? FunctionTranslation<Languages, ArgNames[number]> : never;
+        [K in Exclude<keyof DictFilterQuery<Filter>, QueryKey>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args, infer _Model> ? FunctionTranslation<Languages, ArgNames[number]> : never;
     }): ModelDictInfo<Languages, ModelKey, InsightKey, keyof DictFilterQuery<Filter> & string, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
     sort<Filter>(translate: (t: (trans: Languages) => FieldTranslation<Languages>) => {
         [K in Exclude<keyof DictFilterSort<Filter>, SortKey>]: FieldTranslation<Languages>;
@@ -115,11 +117,11 @@ export declare class ModelDictInfo<Languages extends [string, ...string[]] = [st
         [K in Enum["value"]]: FieldTranslation<Languages>;
     }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey | Enum["refName"], BaseSignalKey, SliceKey, EndpointKey, ErrorKey, EtcKey>;
     slice<Slice>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-        [K in Exclude<keyof Slice, SliceKey>]: Slice[K] extends infer Info extends SliceInfo ? FunctionTranslation<Languages, SliceInfoArgNames<Info>[number]> : never;
-    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey, BaseSignalKey, keyof Slice & string, EndpointKey, ErrorKey, EtcKey>;
+        [K in Exclude<keyof DictSliceShape<Slice>, SliceKey>]: DictSliceShape<Slice>[K] extends infer Info extends SliceInfo ? FunctionTranslation<Languages, SliceInfoArgNames<Info>[number]> : never;
+    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey, BaseSignalKey, keyof DictSliceShape<Slice> & string, EndpointKey, ErrorKey, EtcKey>;
     endpoint<Endpoint>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-        [K in Exclude<keyof Endpoint, EndpointKey>]: Endpoint[K] extends infer Info extends EndpointInfo ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]> : never;
-    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey, BaseSignalKey, SliceKey, keyof Endpoint & string, ErrorKey, EtcKey>;
+        [K in Exclude<keyof DictEndpointShape<Endpoint>, EndpointKey>]: DictEndpointShape<Endpoint>[K] extends infer Info extends EndpointInfo ? FunctionTranslation<Languages, EndpInfoArgNames<Info>[number]> : never;
+    }): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey, BaseSignalKey, SliceKey, keyof DictEndpointShape<Endpoint> & string, ErrorKey, EtcKey>;
     error<ErrorDict extends {
         [key: string]: Languages;
     }>(errorDictionary: ErrorDict): ModelDictInfo<Languages, ModelKey, InsightKey, QueryKey, SortKey, EnumKey, BaseSignalKey, SliceKey, EndpointKey, ErrorKey | (keyof ErrorDict & string), EtcKey>;
@@ -136,7 +138,7 @@ export declare class ModelDictInfo<Languages extends [string, ...string[]] = [st
     };
 }
 type AnyModelDictInfo = ModelDictInfo<any, any, any, any, any, any, any, any, any, any, any>;
-type MergeTwoModelDicts<ModelDict1, ModelDict2> = ModelDict1 extends ModelDictInfo<infer Languages1, infer ModelKey1, infer InsightKey1, infer QueryKey1, infer SortKey1, infer EnumKey1, infer BaseSignalKey1, infer SliceKey1, infer EndpointKey1, infer ErrorKey1, infer EtcKey1> ? ModelDict2 extends ModelDictInfo<any, infer ModelKey2, infer InsightKey2, infer QueryKey2, infer SortKey2, infer EnumKey2, infer BaseSignalKey2, infer SliceKey2, infer EndpointKey2, infer ErrorKey2, infer EtcKey2> ? ModelDictInfo<Languages1, ModelKey1 | ModelKey2, InsightKey1 | InsightKey2, QueryKey1 | QueryKey2, SortKey1 | SortKey2, EnumKey1 | EnumKey2, BaseSignalKey1 | BaseSignalKey2, SliceKey1 | SliceKey2, EndpointKey1 | EndpointKey2, ErrorKey1 | ErrorKey2, EtcKey1 | EtcKey2> : ModelDict1 : never;
+type MergeTwoModelDicts<ModelDict1, ModelDict2> = ModelDict1 extends ModelDictInfo<infer Languages1, infer ModelKey1, infer InsightKey1, infer QueryKey1, infer SortKey1, infer EnumKey1, infer BaseSignalKey1, infer SliceKey1, infer EndpointKey1, infer ErrorKey1, infer EtcKey1> ? ModelDict2 extends ModelDictInfo<infer _Languages2, infer ModelKey2, infer InsightKey2, infer QueryKey2, infer SortKey2, infer EnumKey2, infer BaseSignalKey2, infer SliceKey2, infer EndpointKey2, infer ErrorKey2, infer EtcKey2> ? ModelDictInfo<Languages1, ModelKey1 | ModelKey2, InsightKey1 | InsightKey2, QueryKey1 | QueryKey2, SortKey1 | SortKey2, EnumKey1 | EnumKey2, BaseSignalKey1 | BaseSignalKey2, SliceKey1 | SliceKey2, EndpointKey1 | EndpointKey2, ErrorKey1 | ErrorKey2, EtcKey1 | EtcKey2> : ModelDict1 : never;
 type MergeModelDicts<ModelDicts extends AnyModelDictInfo[]> = ModelDicts extends [
     infer First extends AnyModelDictInfo,
     ...infer Rest extends AnyModelDictInfo[]
@@ -193,11 +195,9 @@ export declare class ServiceDictInfo<Languages extends [string, ...string[]] = [
         [K in EtcKey]: Languages;
     };
     constructor(languages: Languages);
-    endpoint<Endpoint extends {
-        [key: string]: EndpointInfo;
-    }>(translate: (fn: (trans: Languages) => FunctionTranslation<Languages>) => {
-        [K in keyof Endpoint]: FunctionTranslation<Languages, EndpInfoArgNames<Endpoint[K]>[number]>;
-    }): ServiceDictInfo<Languages, keyof Endpoint & string, ErrorKey, EtcKey>;
+    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;
+    }): ServiceDictInfo<Languages, keyof DictEndpointShape<Endpoint> & string, ErrorKey, EtcKey>;
     error<ErrorDict extends {
         [key: string]: Languages;
     }>(errorDictionary: ErrorDict): ServiceDictInfo<Languages, EndpointKey, keyof ErrorDict & string, EtcKey>;

package/types/dictionary/locale.d.ts

@@ -18,14 +18,14 @@ interface FnTrans<ArgKey extends string> {
     };
 }
 type AnyFilterShape = FilterInstance<Record<string, FilterInfo>, Record<string, unknown>>;
-type DictFilterShape<Filter> = Filter extends FilterInstance ? Filter : Filter extends FilterCls<infer FilterShape> ? FilterShape : Filter extends {
+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;
 type DictFilterQuery<Filter> = DictFilterShape<Filter>["query"];
 type DictFilterSort<Filter> = DictFilterShape<Filter>["sort"];
 type FilterTranslatorKey<Filter> = {
-    [Key in keyof DictFilterQuery<Filter> & string]: `${Key}` | `${Key}.desc` | (DictFilterQuery<Filter>[Key] extends FilterInfo<infer ArgNames, any> ? ArgNames[number] extends string ? `${Key}.arg.${ArgNames[number]}` | `${Key}.arg.${ArgNames[number]}.desc` : never : never);
+    [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 : never);
 }[keyof DictFilterQuery<Filter> & string];
 type EndpointTranslatorKey<Endpoint extends {
     [key: string]: EndpointInfo;
@@ -65,7 +65,7 @@ export type ModelTrans<T extends string, Model extends BaseObject, Insight exten
         [K in keyof GetStateObject<Insight>]: FieldTrans;
     };
     query: {
-        [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, any> ? FnTrans<ArgNames[number]> : never;
+        [K in keyof DictFilterQuery<Filter>]: DictFilterQuery<Filter>[K] extends FilterInfo<infer ArgNames, infer _Args> ? FnTrans<ArgNames[number]> : never;
     };
     sort: {
         [K in keyof DictFilterSort<Filter>]: FieldTrans;
@@ -86,7 +86,7 @@ export type ModelTranslatorKey<T extends string, Model, Insight, Filter, Slice e
 }, Endpoint extends {
     [key: string]: EndpointInfo;
 }, 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}.${EtcKey}`;
-export type ScalarTrans<T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
+export type ScalarTrans<_T extends string, Model, ErrorKey extends string, EtcKey extends string> = {
     name: Trans;
     desc: Trans;
     model: {
@@ -99,7 +99,7 @@ export type ScalarTrans<T extends string, Model, ErrorKey extends string, EtcKey
     [K in EtcKey]: Trans;
 };
 export type ScalarTranslatorKey<T extends string, Model, EtcKey extends string> = `${T}.modelName` | `${T}.modelDesc` | `${T}.${keyof GetStateObject<Model> & string}${"" | ".desc"}` | `${T}.${EtcKey}`;
-export type ServiceTrans<T extends string, Endpoint extends {
+export type ServiceTrans<_T extends string, Endpoint extends {
     [key: string]: EndpointInfo;
 }, ErrorKey extends string, EtcKey extends string> = {
     api: {
@@ -121,15 +121,15 @@ export type EnumTranslatorKey<EnumKey extends string> = `${EnumKey}.${string}${"
 export interface DictModule<DictKey extends string, ErrorKey extends string> {
     __Dict_Key__: DictKey;
     __Error_Key__: ErrorKey;
-    dict: ModelDictInfo<any> | ScalarDictInfo<any> | ServiceDictInfo<any>;
+    dict: ModelDictInfo<[string, ...string[]]> | ScalarDictInfo<[string, ...string[]]> | ServiceDictInfo<[string, ...string[]]>;
 }
 export declare const registerModelTrans: <RefName extends string, Model extends BaseObject, Insight extends BaseInsight, Filter, Slice extends {
     [key: string]: SliceInfo;
 }, Endpoint extends {
     [key: string]: EndpointInfo;
-}, ModelDict extends ModelDictInfo<any>>(modelDict: ModelDict) => ModelDict extends ModelDictInfo<any, any, any, any, any, infer EnumKey, any, any, any, infer ErrorKey, infer EtcKey> ? DictModule<ModelTranslatorKey<RefName, Model, Insight, Filter, Slice, Endpoint, EtcKey> | EnumTranslatorKey<EnumKey>, `${RefName}.error.${ErrorKey}`> : never;
-export declare const registerScalarTrans: <T extends string, Model, ScalarDict>(scalarDict: ScalarDict) => ScalarDict extends ScalarDictInfo<any, any, infer EnumKey, infer ErrorKey, infer EtcKey> ? DictModule<ScalarTranslatorKey<T, Model, EtcKey> | EnumTranslatorKey<EnumKey>, `${T}.error.${ErrorKey}`> : never;
+}, ModelDict>(modelDict: ModelDict) => ModelDict extends ModelDictInfo<infer _Languages, infer _ModelKey, infer _InsightKey, infer _QueryKey, infer _SortKey, infer EnumKey, infer _BaseSignalKey, infer _SliceKey, infer _EndpointKey, infer ErrorKey, infer EtcKey> ? DictModule<ModelTranslatorKey<RefName, Model, Insight, Filter, Slice, Endpoint, EtcKey> | EnumTranslatorKey<EnumKey>, `${RefName}.error.${ErrorKey}`> : never;
+export declare const registerScalarTrans: <T extends string, Model, ScalarDict>(scalarDict: ScalarDict) => ScalarDict extends ScalarDictInfo<infer _Languages, infer _ModelKey, infer EnumKey, infer ErrorKey, infer EtcKey> ? DictModule<ScalarTranslatorKey<T, Model, EtcKey> | EnumTranslatorKey<EnumKey>, `${T}.error.${ErrorKey}`> : never;
 export declare const registerServiceTrans: <T extends string, Endpoint extends {
     [key: string]: EndpointInfo;
-}, ServiceDict>(serviceDict: ServiceDict) => ServiceDict extends ServiceDictInfo<any, any, infer ErrorKey, infer EtcKey> ? DictModule<ServiceTranslatorKey<T, Endpoint, EtcKey>, `${T}.error.${ErrorKey}`> : never;
+}, ServiceDict>(serviceDict: ServiceDict) => ServiceDict extends ServiceDictInfo<infer _Languages, infer _EndpointKey, infer ErrorKey, infer EtcKey> ? DictModule<ServiceTranslatorKey<T, Endpoint, EtcKey>, `${T}.error.${ErrorKey}`> : never;
 export {};