akanjs 2.2.7-rc.3 → 2.2.7

package/CHANGELOG.md

@@ -1,13 +1,11 @@
 # akanjs
 
-## 2.2.5
+## 2.2.7
 
 ### Patch Changes
 
-- d636456: add rich Map methods on memory() helper service
-- a1ee4e8: fill nested constant defaults for arrays on document save and load, normalize date fields to a consistent epoch representation on store (accepting legacy ISO-string values on read), and correct falsy defaults in getDefault
-- 5cdb05e: reverse dependency of file upload api
-- a7da50e: remove dependency from radix dialog
+- fix: base dictionary translation failed in some cases
+- fix: file upload contract workaround on shared Field.Img component
 
 ## 2.2.3
 

package/client/makePageProto.tsx

@@ -25,11 +25,8 @@ const getPageInfo = (): { locale: string; path: string } => {
   const localeSet = new Set(locales);
   if (getEnv().side !== "server") {
     const [, firstSegment = "", ...rest] = window.location.pathname.split("/");
-    const hasLocalePrefix = localeSet.has(firstSegment);
-
-    const activeLocale = Translator.getActiveLocale();
-    const locale = activeLocale ?? (hasLocalePrefix ? firstSegment : defaultLocale);
-    return { locale, path: hasLocalePrefix ? `/${rest.join("/")}` : window.location.pathname };
+    if (localeSet.has(firstSegment)) return { locale: firstSegment, path: `/${rest.join("/")}` };
+    return { locale: defaultLocale, path: window.location.pathname };
   }
   const h = headers();
 

package/common/fileUpload.ts

@@ -2,7 +2,7 @@ interface FileUploadSerializedEndpoint {
   fileUpload?: boolean;
 }
 
-interface FileUploadSerializedSignal {
+export interface FileUploadSerializedSignal {
   prefix?: string;
   endpoint: Record<string, FileUploadSerializedEndpoint>;
 }

package/common/index.ts

@@ -1,11 +1,7 @@
 export { applyMixins } from "./applyMixins";
 export { capitalize } from "./capitalize";
 export { deepObjectify } from "./deepObjectify";
-export {
-  type FileUploadCapability,
-  fileUploadContract,
-  resolveFileUploadCapability,
-} from "./fileUpload";
+export * from "./fileUpload";
 export { formatNumber } from "./formatNumber";
 export { formatPhone } from "./formatPhone";
 export { getAllPropertyDescriptors } from "./getAllPropertyDescriptors";

package/constant/getDefault.ts

@@ -6,7 +6,7 @@ export const getDefault = <T>(fieldObj: FieldObject): DefaultOf<T> => {
   const result: Record<string, unknown> = {};
   for (const [key, field] of Object.entries(fieldObj)) {
     if (field.fieldType === "hidden") result[key] = null;
-    else if (field.default !== undefined && field.default !== null) {
+    else if (field.default) {
       if (typeof field.default === "function") result[key] = (field.default as () => object)();
       else result[key] = field.default as object;
     } else if (field.isArray) result[key] = [];

package/fetch/client/fetchClient.ts

@@ -1,5 +1,12 @@
 import { DataList, getEnv, PrimitiveRegistry, type PromiseOrObject } from "akanjs/base";
-import { capitalize, type FetchPolicy, fileUploadContract, Logger, resolveFileUploadCapability } from "akanjs/common";
+import {
+  capitalize,
+  type FetchPolicy,
+  type FileUploadSerializedSignal,
+  fileUploadContract,
+  Logger,
+  resolveFileUploadCapability,
+} from "akanjs/common";
 import { type BaseInsight, type BaseObject, ConstantRegistry, deserialize, serialize } from "akanjs/constant";
 import type {
   DatabaseSignal,
@@ -472,7 +479,7 @@ export class FetchClient {
       names.addModelFiles,
       () =>
         (async (fileList: FileList, parentId?: string, option?: FetchPolicy) => {
-          const cap = resolveFileUploadCapability(this.serializedSignal);
+          const cap = resolveFileUploadCapability(this.serializedSignal as Record<string, FileUploadSerializedSignal>);
           const endpoint = cap ? this.serializedSignal[cap.refName]?.endpoint[cap.endpointKey] : undefined;
           if (!cap || !endpoint)
             throw new Error(
@@ -691,7 +698,8 @@ export class FetchClient {
     const sig = {} as any;
     Object.entries(serializedSignal).forEach(([refName, serializedSignal]) => {
       if (!serializedSignal.slice) return;
-      const cnst = ConstantRegistry.getDatabase(refName);
+      const cnst = ConstantRegistry.getDatabase(refName, { allowEmpty: true });
+      if (!cnst) return;
       const slices = Object.entries(serializedSignal.slice).map(([suffix, serializedSlice]) => {
         const sliceName = `${refName}${capitalize(suffix)}`;
         proxy.slice[sliceName] = { refName, sliceName, argLength: serializedSlice.args.length };

package/fetch/serializer/fetch.serializer.ts

@@ -67,7 +67,6 @@ export class FetchSerializer {
       ...(endpointInfo.signalOption.globalPrefix !== undefined
         ? { globalPrefix: endpointInfo.signalOption.globalPrefix }
         : {}),
-      ...(endpointInfo.signalOption.fileUpload ? { fileUpload: true } : {}),
       ...(guards?.length ? { guards } : {}),
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.2.7-rc.3",
+  "version": "2.2.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -175,6 +175,7 @@
     "@capgo/capacitor-updater": "^8.46.1",
     "@libsql/client": "^0.17.3",
     "@playwright/test": "^1.60.0",
+    "@radix-ui/react-dialog": "^1.1.15",
     "@react-spring/web": "^10.1.0",
     "@use-gesture/react": "^10.3.1",
     "bullmq": "^5.76.10",
@@ -249,6 +250,9 @@
     "@playwright/test": {
       "optional": true
     },
+    "@radix-ui/react-dialog": {
+      "optional": true
+    },
     "@react-spring/web": {
       "optional": true
     },

package/service/injectInfo.ts

@@ -254,47 +254,20 @@ export class InjectInfo<
         enumerable: true,
       });
     } else if (injectInfo.isMap) {
-      const topic = `akan:memory:${injectInfo.parentRefName}`;
-      const getter = injectInfo.get as unknown as (value: unknown) => unknown;
-      const setter = injectInfo.set as unknown as (value: unknown) => string | number | Buffer;
-      const get = async (key: string) => {
-        const value = await cacheAdaptor.hget(topic, propKey, key);
-        return value === undefined || value === null ? undefined : getter(value);
-      };
-      const set = async (key: string, value: unknown) => {
-        const setValue = setter(value);
-        await cacheAdaptor.hset(topic, propKey, key, setValue);
-      };
       Object.defineProperty(instance, propKey, {
         value: {
-          get,
-          set,
-          delete: async (key: string) => {
-            await cacheAdaptor.hdelete(topic, propKey, key);
-          },
-          getOrInsert: async (key: string, value: unknown) => {
-            const existingValue = await get(key);
-            if (existingValue !== undefined) return existingValue;
-            await set(key, value);
-            return value;
-          },
-          getOrInsertComputed: async (key: string, compute: (key: string) => unknown | Promise<unknown>) => {
-            const existingValue = await get(key);
-            if (existingValue !== undefined) return existingValue;
-            const value = await compute(key);
-            await set(key, value);
-            return value;
-          },
-          keys: async () => await cacheAdaptor.hkeys(topic, propKey),
-          entries: async () => {
-            const entries = await cacheAdaptor.hentries(topic, propKey);
-            return entries.map(([key, value]) => [key, getter(value)]);
+          get: async (key: string) => {
+            const getter = injectInfo.get as unknown as (value: unknown) => unknown;
+            const value = await cacheAdaptor.hget(`akan:memory:${injectInfo.parentRefName}`, propKey, key);
+            return value === null ? value : getter(value);
           },
-          forEach: async (callback: (value: unknown, key: string) => void | Promise<void>) => {
-            for (const [key, value] of await cacheAdaptor.hentries(topic, propKey)) await callback(getter(value), key);
+          set: async (key: string, value: unknown) => {
+            const setter = injectInfo.set as unknown as (value: unknown) => string | number | Buffer;
+            const setValue = setter(value);
+            await cacheAdaptor.hset(`akan:memory:${injectInfo.parentRefName}`, propKey, key, setValue);
           },
-          clear: async () => {
-            await cacheAdaptor.hclear(topic, propKey);
+          delete: async (key: string) => {
+            await cacheAdaptor.hdelete(`akan:memory:${injectInfo.parentRefName}`, propKey, key);
           },
         },
       });
@@ -373,7 +346,6 @@ export const injectionBuilder = (parentRefName: string) => ({
     const isMap = modelRef === Map;
     if (isMap && !opts.of) throw new Error("of should be provided when modelRef is Map");
     type FieldValue = never extends GetFn ? GetFieldValue<ValueRef, ExplicitType, MapValue> : ReturnType<GetFn>;
-    type MapFieldValue = never extends GetFn ? FieldToValue<MapValue> : ReturnType<GetFn>;
     type IsNullable = DefaultValue extends never ? true : false;
     type UseValue = IsNullable extends true ? FieldValue | null : FieldValue;
     return new InjectInfo<
@@ -384,18 +356,9 @@ export const injectionBuilder = (parentRefName: string) => ({
           : UseValue
         : MapConstructor extends ValueRef
           ? {
-              get: (key: string) => Promise<MapFieldValue | undefined>;
-              set: (key: string, value: MapFieldValue) => Promise<void>;
+              get: (key: string) => Promise<FieldToValue<MapValue>>;
+              set: (key: string, value: FieldToValue<MapValue>) => Promise<void>;
               delete: (key: string) => Promise<void>;
-              getOrInsert: (key: string, value: MapFieldValue) => Promise<MapFieldValue>;
-              getOrInsertComputed: (
-                key: string,
-                compute: (key: string) => MapFieldValue | Promise<MapFieldValue>,
-              ) => 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> },
       never,

package/service/predefinedAdaptor/cache.adaptor.ts

@@ -16,9 +16,6 @@ export interface CacheAdaptor {
   ): 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[]>;
-  hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]>;
-  hclear(topic: string, key: string): Promise<void>;
 }
 
 interface RedisEnv extends BaseEnv {
@@ -99,16 +96,6 @@ export class RedisCache
   async hdelete(topic: string, key: string, subKey: string): Promise<void> {
     await this.redis.hdel(`${topic}:${key}`, subKey);
   }
-  async hkeys(topic: string, key: string): Promise<string[]> {
-    return await this.redis.hkeys(`${topic}:${key}`);
-  }
-  async hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]> {
-    const values = await this.redis.hgetall(`${topic}:${key}`);
-    return Object.entries(values) as [string, T][];
-  }
-  async hclear(topic: string, key: string): Promise<void> {
-    await this.redis.del(`${topic}:${key}`);
-  }
   getClient(): Redis {
     return this.redis;
   }

package/service/predefinedAdaptor/database.adaptor.ts

@@ -4,7 +4,7 @@ import { mkdir } from "node:fs/promises";
 import path from "node:path";
 import type { InArgs, InValue, Client as LibsqlClient } from "@libsql/client";
 import { type BaseEnv, dayjs, FIELD_META, type PromiseOrObject } from "akanjs/base";
-import { type ConstantModel, getDefault } from "akanjs/constant";
+import type { ConstantModel } from "akanjs/constant";
 import {
   createDocumentId,
   type DatabaseModel,
@@ -300,13 +300,6 @@ const jsonPath = (path: string) =>
     .map((part) => part.replaceAll('"', '\\"'))
     .join(".")}`;
 const encodeSqlValue = (value: unknown) => encodeDocumentValue(value);
-
-const decodeDateValue = (value: unknown) => {
-  if (value === null || value === undefined) return value;
-  if (typeof value === "number") return dayjs(value);
-  const epoch = Number(value);
-  return Number.isNaN(epoch) ? dayjs(value as never) : dayjs(epoch);
-};
 const QUERY_OPERATOR_KEYS = new Set([
   "eq",
   "ne",
@@ -780,9 +773,6 @@ export class SqliteDocumentStore {
       } else {
         doc[key] = value;
       }
-      if (doc[key] !== undefined && doc[key] !== null) {
-        doc[key] = this.normalizeWriteValue(doc[key], props);
-      }
       if (props.enum && doc[key] !== undefined && doc[key] !== null) {
         const values = Array.isArray(doc[key]) ? doc[key] : [doc[key]];
         const fieldEnum = props.enum as { has: (value: unknown) => boolean } | undefined;
@@ -968,28 +958,12 @@ export class SqliteDocumentStore {
 
   private decodeDocumentPayload(payload: Record<string, unknown>) {
     const fields = this.database.doc[FIELD_META] as unknown as FieldMap;
-    const result: Record<string, unknown> = {};
-    for (const [key, fieldMeta] of Object.entries(fields)) {
-      if (BASE_COLUMNS.has(key)) continue;
-      const props = fieldMeta.getProps();
-      const value = payload[key];
-      if (value === undefined) {
-        const def = props.default;
-        if (def !== undefined && def !== null) {
-          result[key] = typeof def === "function" ? (def as (data: unknown) => unknown)(payload) : def;
-        } else if (props.nullable) {
-          result[key] = null;
-        }
-      } else {
-        result[key] = this.decodeFieldValue(value, props);
-      }
-    }
-    for (const [key, value] of Object.entries(payload)) {
-      if (key in result || BASE_COLUMNS.has(key)) continue;
-      const props = fields[key]?.getProps?.();
-      result[key] = props ? this.decodeFieldValue(value, props) : value;
-    }
-    return result;
+    return Object.fromEntries(
+      Object.entries(payload).map(([key, value]) => {
+        const props = fields[key]?.getProps?.();
+        return [key, props ? this.decodeFieldValue(value, props) : value];
+      }),
+    );
   }
 
   private decodeFieldValue(value: unknown, props: Record<string, unknown>): unknown {
@@ -999,8 +973,8 @@ export class SqliteDocumentStore {
       return new Map(entries.map(([key, item]) => [key, this.decodeMapValue(item, props)]));
     }
     if (props.modelRef === Date) {
-      if (Array.isArray(value)) return value.map((item) => (item === null ? item : decodeDateValue(item)));
-      return decodeDateValue(value);
+      if (Array.isArray(value)) return value.map((item) => (item === null ? item : dayjs(Number(item))));
+      return dayjs(Number(value));
     }
     if (Array.isArray(value)) return value.map((item) => this.decodeNestedValue(item, props));
     return this.decodeNestedValue(value, props);
@@ -1008,7 +982,7 @@ export class SqliteDocumentStore {
 
   private decodeMapValue(value: unknown, props: Record<string, unknown>) {
     if (value === undefined || value === null) return value;
-    if (props.of === Date) return decodeDateValue(value);
+    if (props.of === Date) return dayjs(Number(value));
     return value;
   }
 
@@ -1017,44 +991,12 @@ export class SqliteDocumentStore {
     if (!props.isClass || !props.isScalar) return value;
     const scalarFields = (props.modelRef as { [FIELD_META]?: FieldMap } | undefined)?.[FIELD_META];
     if (!scalarFields) return value;
-    const source = value as Record<string, unknown>;
-    const defaults = getDefault(scalarFields as never) as Record<string, unknown>;
-    const result: Record<string, unknown> = {};
-    for (const [key, fieldMeta] of Object.entries(scalarFields)) {
-      const nestedProps = fieldMeta.getProps();
-      const nested = source[key];
-      result[key] = nested === undefined ? defaults[key] : this.decodeFieldValue(nested, nestedProps);
-    }
-    for (const [key, nested] of Object.entries(source)) {
-      if (!(key in result)) result[key] = nested;
-    }
-    return result;
-  }
-
-  private normalizeWriteValue(value: unknown, props: Record<string, unknown>): unknown {
-    if (value === undefined || value === null) return value;
-    if (props.modelRef === Date) {
-      if (Array.isArray(value))
-        return value.map((item) => (item === null || item === undefined ? item : dayjs(item as never)));
-      return dayjs(value as never);
-    }
-    if (!props.isClass || !props.isScalar) return value;
-    if (Array.isArray(value)) return value.map((item) => this.fillScalarDefaults(item, props));
-    return this.fillScalarDefaults(value, props);
-  }
-
-  private fillScalarDefaults(value: unknown, props: Record<string, unknown>): unknown {
-    if (!value || typeof value !== "object") return value;
-    const scalarFields = (props.modelRef as { [FIELD_META]?: FieldMap } | undefined)?.[FIELD_META];
-    if (!scalarFields) return value;
-    const defaults = getDefault(scalarFields as never) as Record<string, unknown>;
-    const result = { ...(value as Record<string, unknown>) };
-    for (const [key, fieldMeta] of Object.entries(scalarFields)) {
-      const nestedProps = fieldMeta.getProps();
-      if (result[key] === undefined) result[key] = defaults[key];
-      else result[key] = this.normalizeWriteValue(result[key], nestedProps);
-    }
-    return result;
+    return Object.fromEntries(
+      Object.entries(value as Record<string, unknown>).map(([key, nested]) => {
+        const nestedProps = scalarFields[key]?.getProps?.();
+        return [key, nestedProps ? this.decodeFieldValue(nested, nestedProps) : nested];
+      }),
+    );
   }
 
   hydrate(data: DocumentRecord, originalData: DocumentRecord = data) {

package/service/predefinedAdaptor/solidCache.adaptor.ts

@@ -14,7 +14,6 @@ import {
 } from "./solidSqlite";
 
 type CacheRow = { value: string | Buffer | null; valueType: SolidValueType; expiresAt: number | null };
-type CacheEntryRow = CacheRow & { subKey: string };
 
 export class SolidCache
   extends adapt("solidCache", ({ env }) => ({
@@ -136,28 +135,6 @@ export class SolidCache
       .run(topic, key, subKey);
   }
 
-  async hkeys(topic: string, key: string): Promise<string[]> {
-    this.#cleanup();
-    const rows = this.#db
-      .query(`SELECT "subKey" FROM "_akan_solid_cache_hash" WHERE "topic" = ? AND "key" = ? ORDER BY "subKey" ASC`)
-      .all(topic, key) as { subKey: string }[];
-    return rows.map((row) => row.subKey);
-  }
-
-  async hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]> {
-    this.#cleanup();
-    const rows = this.#db
-      .query(
-        `SELECT "subKey", "value", "valueType", "expiresAt" FROM "_akan_solid_cache_hash" WHERE "topic" = ? AND "key" = ? ORDER BY "subKey" ASC`,
-      )
-      .all(topic, key) as CacheEntryRow[];
-    return rows.map((row) => [row.subKey, decodeSolidValue<T>(row.valueType, row.value) as T]);
-  }
-
-  async hclear(topic: string, key: string): Promise<void> {
-    this.#db.query(`DELETE FROM "_akan_solid_cache_hash" WHERE "topic" = ? AND "key" = ?`).run(topic, key);
-  }
-
   #cleanup() {
     const now = Date.now();
     this.#db.query(`DELETE FROM "_akan_solid_cache" WHERE "expiresAt" IS NOT NULL AND "expiresAt" <= ?`).run(now);

package/signal/serializer/fetch.serializer.ts

@@ -64,7 +64,6 @@ export class FetchSerializer {
       args: endpointInfo.args.map(FetchSerializer.#serializeArg),
       returns: FetchSerializer.#serializeReturns(endpointInfo),
       ...(endpointInfo.signalOption.path ? { path: endpointInfo.signalOption.path } : {}),
-      ...(endpointInfo.signalOption.fileUpload ? { fileUpload: true } : {}),
       ...(guards?.length ? { guards } : {}),
     };
   }

package/signal/types.ts

@@ -70,8 +70,6 @@ export interface SignalOption<Response = any, Nullable extends boolean = false,
   middlewares?: MiddlewareCls[];
   prefix?: false | string;
   globalPrefix?: false;
-  /** Marks this mutation as the framework file-upload endpoint (see resolveFileUploadCapability). */
-  fileUpload?: boolean;
 
   scheduleType?: "init" | "destroy" | "cron" | "interval" | "timeout";
   scheduleCron?: string;
@@ -86,7 +84,6 @@ interface SerializedSignalOption {
   prefix?: false | string;
   globalPrefix?: false;
   guards?: string[];
-  fileUpload?: boolean;
 }
 export interface SerializedSlice extends SerializedSignalOption {}
 

package/store/action.ts

@@ -1,14 +1,5 @@
 import { DataList, type Dayjs, FIELD_META, type GetStateObject, type SLICE_META } from "akanjs/base";
-import {
-  capitalize,
-  deepObjectify,
-  type FetchPolicy,
-  isQueryEqual,
-  Logger,
-  lowerlize,
-  pathSet,
-  resolveFileUploadCapability,
-} from "akanjs/common";
+import { capitalize, deepObjectify, type FetchPolicy, isQueryEqual, Logger, lowerlize, pathSet } from "akanjs/common";
 import {
   type BaseInsight,
   type BaseObject,
@@ -286,7 +277,6 @@ export const makeFormSetter = (refName: string, fetch: FetchProxy<any>) => {
   type Light = BaseObject;
   const [fieldName, className] = [refName, capitalize(refName)];
   const modelRef = ConstantRegistry.getDatabase(refName).full;
-  const fileUploadRefName = resolveFileUploadCapability(fetch.serializedSignal)?.refName;
 
   const names = {
     model: fieldName,
@@ -366,7 +356,7 @@ export const makeFormSetter = (refName: string, fetch: FetchProxy<any>) => {
             },
           }
         : {}),
-      ...(field.isClass && !!fileUploadRefName && ConstantRegistry.getRefName(field.modelRef) === fileUploadRefName
+      ...(field.isClass && ConstantRegistry.getRefName(field.modelRef) === "file"
         ? {
             [namesOfField.uploadFieldOnModel]: async function (this: SetGet, fileList: FileList, index?: number) {
               const form = (this.get() as { [key: string]: any })[names.modelForm] as { [key: string]: any };
@@ -393,9 +383,7 @@ export const makeFormSetter = (refName: string, fetch: FetchProxy<any>) => {
                 const intervalKey = setInterval(() => {
                   void (async () => {
                     const currentFile = await (
-                      (fetch as { [key: string]: any })[fileUploadRefName as string] as (
-                        id: string,
-                      ) => Promise<ProtoFile>
+                      (fetch as { [key: string]: any }).file as (id: string) => Promise<ProtoFile>
                     )(file.id);
                     if (field.isArray)
                       this.set((state: { [key: string]: { [key: string]: ProtoFile[] } }) => {

package/types/common/fileUpload.d.ts

@@ -1,7 +1,7 @@
 interface FileUploadSerializedEndpoint {
     fileUpload?: boolean;
 }
-interface FileUploadSerializedSignal {
+export interface FileUploadSerializedSignal {
     prefix?: string;
     endpoint: Record<string, FileUploadSerializedEndpoint>;
 }

package/types/common/index.d.ts

@@ -1,7 +1,7 @@
 export { applyMixins } from "./applyMixins.d.ts";
 export { capitalize } from "./capitalize.d.ts";
 export { deepObjectify } from "./deepObjectify.d.ts";
-export { type FileUploadCapability, fileUploadContract, resolveFileUploadCapability, } from "./fileUpload.d.ts";
+export * from "./fileUpload.d.ts";
 export { formatNumber } from "./formatNumber.d.ts";
 export { formatPhone } from "./formatPhone.d.ts";
 export { getAllPropertyDescriptors } from "./getAllPropertyDescriptors.d.ts";

package/types/service/injectInfo.d.ts

@@ -76,15 +76,9 @@ export declare const injectionBuilder: (parentRefName: string) => {
         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>;
+        get: (key: string) => Promise<FieldToValue<MapValue>>;
+        set: (key: string, value: FieldToValue<MapValue>) => 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>>;
-        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>;

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

@@ -12,9 +12,6 @@ export interface CacheAdaptor {
     }): 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[]>;
-    hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]>;
-    hclear(topic: string, key: string): Promise<void>;
 }
 interface RedisEnv extends BaseEnv {
     redis?: {
@@ -37,9 +34,6 @@ export declare class RedisCache extends RedisCache_base implements CacheAdaptor
     }): 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[]>;
-    hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]>;
-    hclear(topic: string, key: string): Promise<void>;
     getClient(): Redis;
     onDestroy(): Promise<void>;
 }

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

@@ -1,7 +1,7 @@
 import { Database } from "bun:sqlite";
 import type { Client as LibsqlClient } from "@libsql/client";
 import { type BaseEnv, type PromiseOrObject } from "akanjs/base";
-import { type ConstantModel } from "akanjs/constant";
+import type { ConstantModel } from "akanjs/constant";
 import { type DatabaseModel, type DocumentQuery, type DocumentSchema, type DocumentUpdate, type DocumentUpdateOptions, type SchemaOf } from "akanjs/document";
 import type { Sql } from "postgres";
 export interface SqliteDatabaseConfig {
@@ -256,8 +256,6 @@ export declare class SqliteDocumentStore {
     private decodeFieldValue;
     private decodeMapValue;
     private decodeNestedValue;
-    private normalizeWriteValue;
-    private fillScalarDefaults;
     hydrate(data: DocumentRecord, originalData?: DocumentRecord): any;
     private runHooks;
     private insertStmt;

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

@@ -18,8 +18,5 @@ export declare class SolidCache extends SolidCache_base implements CacheAdaptor
     }): 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[]>;
-    hentries<T extends string | number | Buffer>(topic: string, key: string): Promise<[string, T][]>;
-    hclear(topic: string, key: string): Promise<void>;
 }
 export {};

package/types/signal/types.d.ts

@@ -60,8 +60,6 @@ export interface SignalOption<Response = any, Nullable extends boolean = false,
     middlewares?: MiddlewareCls[];
     prefix?: false | string;
     globalPrefix?: false;
-    /** Marks this mutation as the framework file-upload endpoint (see resolveFileUploadCapability). */
-    fileUpload?: boolean;
     scheduleType?: "init" | "destroy" | "cron" | "interval" | "timeout";
     scheduleCron?: string;
     scheduleTime?: number;
@@ -74,7 +72,6 @@ interface SerializedSignalOption {
     prefix?: false | string;
     globalPrefix?: false;
     guards?: string[];
-    fileUpload?: boolean;
 }
 export interface SerializedSlice extends SerializedSignalOption {
 }

package/types/ui/Dialog/Modal.d.ts

@@ -6,4 +6,4 @@ export interface ModalProps {
     children?: ReactNode;
     onCancel?: () => void;
 }
-export declare const Modal: ({ className, bodyClassName, confirmClose, children, onCancel }: ModalProps) => import("react").ReactPortal | null;
+export declare const Modal: ({ className, bodyClassName, confirmClose, children, onCancel }: ModalProps) => import("react/jsx-runtime").JSX.Element;

package/types/ui/Dialog/index.d.ts

@@ -1,7 +1,7 @@
 import { type ProviderProps } from "./Provider.d.ts";
 export declare const Dialog: {
     ({ children, ...props }: ProviderProps): import("react/jsx-runtime").JSX.Element;
-    Modal: ({ className, bodyClassName, confirmClose, children, onCancel }: import("./Modal.d.ts").ModalProps) => import("react").ReactPortal | null;
+    Modal: ({ className, bodyClassName, confirmClose, children, onCancel }: import("./Modal.d.ts").ModalProps) => import("react/jsx-runtime").JSX.Element;
     Title: ({ children }: import("./Title.d.ts").TitleProps) => null;
     Action: ({ children }: import("./Action.d.ts").ActionProps) => null;
     Trigger: ({ className, children }: import("./Trigger.d.ts").TriggerProps) => import("react/jsx-runtime").JSX.Element;

package/types/ui/Modal.d.ts

@@ -16,4 +16,15 @@ export interface ModalProps {
     /** Ask for close confirmation before dismissing. */
     confirmClose?: boolean;
 }
-export declare const Modal: ({ className, title, action, open, onCancel, bodyClassName, children, confirmClose, }: ModalProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Modal: {
+    ({ className, title, action, open, onCancel, bodyClassName, children, confirmClose, }: ModalProps): import("react/jsx-runtime").JSX.Element;
+    Window: ({ open, onCancel, title, children }: WindowProps) => import("react/jsx-runtime").JSX.Element | null;
+};
+interface WindowProps {
+    open: boolean;
+    onCancel: () => void;
+    title: ReactNode;
+    children: ReactNode;
+}
+export declare const Window: ({ open, onCancel, title, children }: WindowProps) => import("react/jsx-runtime").JSX.Element | null;
+export {};

package/types/ui/System/Client.d.ts

@@ -6,9 +6,9 @@ import { type HTMLAttributes, type ReactNode, type RefObject } from "react";
 export declare const Client: {
     (): import("react/jsx-runtime").JSX.Element;
     Wrapper: ({ children, theme, lang, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
-    Bridge: ({ env, lang, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
+    Bridge: ({ env, lang, theme, prefix, gaTrackingId, }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
     Inner: () => import("react/jsx-runtime").JSX.Element;
-    SsrBridge: ({ lang, prefix }: ClientSsrBridgeProps) => null;
+    SsrBridge: ({ lang, prefix, }: ClientSsrBridgeProps) => null;
 };
 interface ClientWrapperProps {
     children: ReactNode;
@@ -37,11 +37,11 @@ interface ClientBridgeProps {
     prefix?: string;
     gaTrackingId?: string;
 }
-export declare const ClientBridge: ({ env, lang, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
+export declare const ClientBridge: ({ env, lang, theme, prefix, gaTrackingId, }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
 export declare const ClientInner: () => import("react/jsx-runtime").JSX.Element;
 interface ClientSsrBridgeProps {
     lang: string;
     prefix?: string;
 }
-export declare const ClientSsrBridge: ({ lang, prefix }: ClientSsrBridgeProps) => null;
+export declare const ClientSsrBridge: ({ lang, prefix, }: ClientSsrBridgeProps) => null;
 export {};

package/ui/Dialog/Modal.tsx

@@ -1,9 +1,9 @@
 "use client";
+import * as Dialog from "@radix-ui/react-dialog";
 import { useDrag } from "@use-gesture/react";
 import { clsx, usePage } from "akanjs/client";
 import { animated } from "akanjs/ui";
-import { type ReactNode, useCallback, useContext, useEffect, useId, useRef, useState } from "react";
-import { createPortal } from "react-dom";
+import { type ReactNode, useContext, useEffect, useRef, useState } from "react";
 import { BiX } from "react-icons/bi";
 import { config, useSpring } from "react-spring";
 
@@ -11,8 +11,6 @@ import { DialogContext } from "./context";
 
 const MODAL_MARGIN = 0; 
 const OPACITY = { START: 0, END: 1 };
-let bodyScrollLockCount = 0;
-let previousBodyOverflow = "";
 
 const interpolate = (o: number, i: number, t: number) => {
   return o + (i - o) * t;
@@ -27,80 +25,41 @@ export interface ModalProps {
 }
 export const Modal = ({ className, bodyClassName, confirmClose, children, onCancel }: ModalProps) => {
   const { open, setOpen, title, action } = useContext(DialogContext);
+  const openRef = useRef<boolean>(open);
   const { l } = usePage();
   const ref = useRef<HTMLDivElement>(null);
-  const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const closingRef = useRef(false);
-  const focusedElementRef = useRef<HTMLElement | null>(null);
-  const titleId = useId();
-  const contentId = useId();
   const [{ translate }, api] = useSpring(() => ({ translate: 1 }));
-  const [portalElement, setPortalElement] = useState<HTMLElement | null>(null);
-  const [isMounted, setIsMounted] = useState(open);
   const [showBackground, setShowBackground] = useState(false);
-
-  const openModal = useCallback(
-    async ({ canceled }: { canceled?: boolean } = {}) => {
-      closingRef.current = false;
-      setIsMounted(true);
-      if (closeTimerRef.current) clearTimeout(closeTimerRef.current);
-      closeTimerRef.current = setTimeout(() => {
-        setShowBackground(true);
-      }, 100);
-      await Promise.all(api.start({ translate: 0, immediate: false, config: canceled ? config.wobbly : config.stiff }));
-    },
-    [api],
-  );
-
-  const closeModal = useCallback(
-    async ({
-      velocity = 0,
-      confirmClose,
-      notifyCancel = true,
-    }: {
-      velocity?: number;
-      confirmClose?: boolean;
-      notifyCancel?: boolean;
-    }) => {
-      if (closingRef.current) return;
-      if (confirmClose && !window.confirm(l("base.confirmClose"))) {
-        return;
-      }
-
-      closingRef.current = true;
-      if (closeTimerRef.current) clearTimeout(closeTimerRef.current);
-      closeTimerRef.current = setTimeout(() => {
-        setShowBackground(false);
-      }, 100);
-      await Promise.all(api.start({ translate: 1, immediate: false, config: { ...config.stiff, velocity } }));
-      setIsMounted(false);
-      setOpen(false);
-      if (notifyCancel) onCancel?.();
-      closingRef.current = false;
-    },
-    [api, l, onCancel, setOpen],
-  );
-
-  const requestClose = useCallback(
-    (options?: { velocity?: number }) => {
-      void closeModal({ velocity: options?.velocity, confirmClose });
-    },
-    [closeModal, confirmClose],
-  );
-
+  const openModal = async ({ canceled }: { canceled?: boolean } = {}) => {
+    setTimeout(() => {
+      setShowBackground(true);
+    }, 100);
+    await Promise.all(api.start({ translate: 0, immediate: false, config: canceled ? config.wobbly : config.stiff }));
+  };
+  const closeModal = async ({ velocity = 0, confirmClose }: { velocity?: number; confirmClose?: boolean }) => {
+    if (confirmClose && !window.confirm(l("base.confirmClose"))) {
+      return;
+    }
+    setTimeout(() => {
+      setShowBackground(false);
+    }, 100);
+    await Promise.all(api.start({ translate: 1, immediate: false, config: { ...config.stiff, velocity } }));
+    setOpen(false);
+    onCancel?.();
+  };
   const bind = useDrag(
     ({ last, velocity: [, vy], direction: [, dy], offset: [, oy], movement: [, my], cancel, canceled }) => {
       if (!ref.current) return;
-      const height = Math.max((ref.current.clientHeight || MODAL_MARGIN) - MODAL_MARGIN, 1);
+      const height = (ref.current.clientHeight || MODAL_MARGIN) - MODAL_MARGIN;
       if (my > 70) cancel();
       if (last) {
-        if (my > height * 0.5 || (vy > 0.5 && dy > 0)) requestClose({ velocity: vy / height });
+        if (my > height * 0.5 || (vy > 0.5 && dy > 0))
+          void closeModal({ velocity: vy / height, confirmClose: confirmClose });
         else void openModal({ canceled });
       } else void api.start({ translate: oy / height, immediate: true });
     },
     { from: () => [0, translate.get()], filterTaps: true, bounds: { top: 0 }, rubberband: true },
   );
-
   const opacity = translate.to((t) => {
     return interpolate(OPACITY.END, OPACITY.START, t);
   });
@@ -109,104 +68,33 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
   });
 
   useEffect(() => {
-    if (typeof document === "undefined") return;
-    setPortalElement(document.body);
-  }, []);
-
-  useEffect(() => {
-    if (open) {
-      void openModal();
-    }
-  }, [open, openModal]);
-
-  useEffect(() => {
-    if (!open && isMounted) {
-      void closeModal({ notifyCancel: false });
-    }
-  }, [closeModal, isMounted, open]);
-
-  useEffect(() => {
-    if (!isMounted || typeof document === "undefined") return;
-
-    bodyScrollLockCount += 1;
-    if (bodyScrollLockCount === 1) {
-      previousBodyOverflow = document.body.style.overflow;
-      document.body.style.overflow = "hidden";
-    }
-
-    return () => {
-      bodyScrollLockCount -= 1;
-      if (bodyScrollLockCount === 0) {
-        document.body.style.overflow = previousBodyOverflow;
-        previousBodyOverflow = "";
-      }
-    };
-  }, [isMounted]);
-
-  useEffect(() => {
-    if (!isMounted || !portalElement || typeof document === "undefined") return;
-
-    focusedElementRef.current = document.activeElement instanceof HTMLElement ? document.activeElement : null;
-    queueMicrotask(() => {
-      ref.current?.focus();
-    });
-
-    return () => {
-      if (focusedElementRef.current && document.contains(focusedElementRef.current)) {
-        focusedElementRef.current.focus();
-      }
-      focusedElementRef.current = null;
-    };
-  }, [isMounted, portalElement]);
-
-  useEffect(() => {
-    if (!isMounted) return;
-
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.key !== "Escape") return;
-      event.preventDefault();
-      requestClose();
-    };
-
-    window.addEventListener("keydown", onKeyDown);
-    return () => {
-      window.removeEventListener("keydown", onKeyDown);
-    };
-  }, [isMounted, requestClose]);
-
-  useEffect(() => {
-    return () => {
-      if (closeTimerRef.current) clearTimeout(closeTimerRef.current);
-    };
-  }, []);
-
-  if (!isMounted || !portalElement) return null;
-
-  return createPortal(
-    <>
-      <div
-        className={clsx("fixed inset-0 z-10", showBackground && "animate-fadeIn bg-black/50 backdrop-blur-md")}
-        onClick={(event) => {
-          if (event.target !== event.currentTarget) return;
-          requestClose();
+    if (openRef.current === open) return;
+    openRef.current = open;
+    if (open) void openModal();
+    else void closeModal({});
+  }, [open]);
+
+  return (
+    <Dialog.Portal>
+      <Dialog.Overlay
+        onClick={() => {
+          void closeModal({ confirmClose });
         }}
-      />
-      <div className="fixed top-1/2 left-1/2 z-10 flex -translate-x-1/2 -translate-y-1/2 items-center justify-center">
+      >
+        {showBackground ? (
+          <div className={"fixed inset-0 z-10 bg-base-content/50 backdrop-blur-md data-[state=open]:animate-fadeIn"} />
+        ) : null}
+      </Dialog.Overlay>
+      <Dialog.Content
+        className="fixed top-1/2 left-1/2 flex -translate-x-1/2 -translate-y-1/2 items-center justify-center"
+        asChild
+        forceMount
+      >
         <div className="z-10">
-          <animated.div
-            ref={ref}
-            style={{ translateY, opacity }}
-            role="dialog"
-            aria-modal="true"
-            aria-labelledby={title ? titleId : undefined}
-            aria-describedby={contentId}
-            tabIndex={-1}
-          >
+          <animated.div ref={ref} style={{ translateY, opacity }}>
             <button
-              type="button"
-              aria-label="Close"
               className="btn btn-circle btn-sm absolute top-[-16px] right-0 z-20 md:top-[-40px]"
-              onClick={() => requestClose()}
+              onClick={() => void closeModal({ confirmClose })}
             >
               <BiX className="text-3xl" />
             </button>
@@ -216,33 +104,34 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
                 className,
               )}
             >
-              <animated.div
-                {...bind()}
-                id={titleId}
-                className="relative z-10 flex w-full animate-fadeIn cursor-pointer touch-pan-y flex-col items-center justify-center px-4 pt-1"
-              >
-                <div className="flex w-full cursor-pointer items-center justify-center pt-1 opacity-50">
-                  <div className="h-1 w-24 rounded-full bg-gray-500" />
-                </div>
-                <div className="flex w-full items-center justify-start">
-                  <div className="w-full text-start font-bold text-lg">{title}</div>
+              <Dialog.Title asChild>
+                <animated.div
+                  {...bind()}
+                  className="relative z-10 flex w-full animate-fadeIn cursor-pointer touch-pan-y flex-col items-center justify-center px-4 pt-1"
+                >
+                  <div className="flex w-full cursor-pointer items-center justify-center pt-1 opacity-50">
+                    <div className="h-1 w-24 rounded-full bg-gray-500" />
+                  </div>
+                  <div className="flex w-full items-center justify-start">
+                    <div className="w-full text-start font-bold text-lg">{title}</div>
+                  </div>
+                </animated.div>
+              </Dialog.Title>
+              <Dialog.Description asChild>
+                <div
+                  className={clsx(
+                    "scrollbar-none relative m-2 flex size-full min-w-[90vw] overflow-x-hidden overflow-y-scroll border-base-content/30 border-t-[0.1px] p-4 sm:p-4 md:min-w-[384px] md:px-8 lg:min-w-[576px] xl:min-w-[768px]",
+                    bodyClassName,
+                  )}
+                >
+                  {children}
                 </div>
-              </animated.div>
-              <div
-                id={contentId}
-                className={clsx(
-                  "scrollbar-none relative m-2 flex size-full min-w-[90vw] overflow-x-hidden overflow-y-scroll border-base-content/30 border-t-[0.1px] p-4 sm:p-4 md:min-w-[384px] md:px-8 lg:min-w-[576px] xl:min-w-[768px]",
-                  bodyClassName,
-                )}
-              >
-                {children}
-              </div>
+              </Dialog.Description>
               {action ? <div className="w-full">{action}</div> : null}
             </div>
           </animated.div>
         </div>
-      </div>
-    </>,
-    portalElement,
+      </Dialog.Content>
+    </Dialog.Portal>
   );
 };

package/ui/Dialog/Provider.tsx

@@ -1,4 +1,5 @@
 "use client";
+import * as Dialog from "@radix-ui/react-dialog";
 import { clsx } from "akanjs/client";
 import { type ReactNode, useEffect, useState } from "react";
 
@@ -22,9 +23,11 @@ export const Provider = ({ className, defaultOpen = false, open = defaultOpen, c
   }, [open]);
   return (
     <DialogContext.Provider value={{ open: openState, setOpen: setOpenState, title, setTitle, action, setAction }}>
-      <div data-open={openState} className={clsx("group/dialog", className)}>
-        {children}
-      </div>
+      <Dialog.Root open={openState}>
+        <div data-open={openState} className={clsx("group/dialog", className)}>
+          {children}
+        </div>
+      </Dialog.Root>
     </DialogContext.Provider>
   );
 };

package/ui/Modal.tsx

@@ -1,5 +1,7 @@
 "use client";
+import * as RadixDialog from "@radix-ui/react-dialog";
 import type { ReactNode } from "react";
+import { BiX } from "react-icons/bi";
 
 import { Dialog } from "./Dialog";
 
@@ -41,3 +43,45 @@ export const Modal = ({
     </Dialog>
   );
 };
+
+interface WindowProps {
+  open: boolean;
+  onCancel: () => void;
+  title: ReactNode;
+  children: ReactNode;
+}
+
+export const Window = ({ open, onCancel, title, children }: WindowProps) => {
+  if (!open) return null;
+
+  return (
+    <RadixDialog.Root open={open}>
+      <RadixDialog.Portal>
+        <RadixDialog.Overlay className="fixed inset-0 bg-black/40" />
+        <RadixDialog.Content
+          className="fixed top-1/2 left-1/2 z-[2] w-[90%] min-w-auto -translate-x-1/2 -translate-y-1/2 animate-fadeIn rounded-[10px] border-[3px] border-black text-black backdrop-blur-lg md:w-fit"
+          style={{
+            background: `rgba(255, 255, 255, 0.3)`,
+            width: "406px",
+          }}
+        >
+          <RadixDialog.Title className="height-[36px] relative overflow-hidden rounded-t-[6px] border-black border-b-2 bg-white/60 text-center">
+            <div className="m-0 text-[22px]">{title}</div>
+            <RadixDialog.Close
+              onClick={() => {
+                onCancel();
+              }}
+              className="absolute top-0 right-0 flex h-[34px] w-[40px] cursor-pointer items-center justify-center border-black border-l-2"
+            >
+              <BiX className="text-[32px]" />
+            </RadixDialog.Close>
+          </RadixDialog.Title>
+          <RadixDialog.Description className="overflow-y-hidden rounded-b-[10px] p-2">
+            {children}
+          </RadixDialog.Description>
+        </RadixDialog.Content>
+      </RadixDialog.Portal>
+    </RadixDialog.Root>
+  );
+};
+Modal.Window = Window;

package/ui/System/Client.tsx

@@ -55,10 +55,8 @@ export const ClientWrapper = ({
   reconnect = true,
 }: ClientWrapperProps) => {
 
-  if (dictionary) {
-    Translator.seed(lang, dictionary);
-
-    if (typeof window !== "undefined") Translator.setActiveLocale(lang);
+  if (dictionary) Translator.seed(lang, dictionary);
+  if (getEnv().renderMode === "ssr") {
   }
   useLayoutEffect(() => {
     Logger.rawLog(logo);
@@ -73,7 +71,8 @@ export const ClientWrapper = ({
 };
 Client.Wrapper = ClientWrapper;
 
-interface ClientPathWrapperProps extends Omit<HTMLAttributes<HTMLDivElement>, "style"> {
+interface ClientPathWrapperProps
+  extends Omit<HTMLAttributes<HTMLDivElement>, "style"> {
   bind?: () => HTMLAttributes<HTMLDivElement>;
   wrapperRef?: RefObject<HTMLDivElement | null> | null;
   pageType?: "current" | "prev" | "cached";
@@ -94,12 +93,18 @@ export const ClientPathWrapper = ({
   layoutStyle = "web",
   ...props
 }: ClientPathWrapperProps) => {
-  const href = location?.href ?? (typeof window !== "undefined" ? window.location.href : "");
-  const hash = location?.hash ?? (typeof window !== "undefined" ? window.location.hash : "");
+  const href =
+    location?.href ??
+    (typeof window !== "undefined" ? window.location.href : "");
+  const hash =
+    location?.hash ??
+    (typeof window !== "undefined" ? window.location.hash : "");
   const pathname = location?.pathname ?? "/"; 
   const params = location?.params ?? {}; 
   const searchParams = location?.searchParams ?? {}; 
-  const search = location?.search ?? (typeof window !== "undefined" ? window.location.search : "");
+  const search =
+    location?.search ??
+    (typeof window !== "undefined" ? window.location.search : "");
   const lang = params.lang;
   const firstPath = pathname.split("/")[2];
   const pathRoute: PathRoute = location?.pathRoute ?? {
@@ -132,7 +137,9 @@ export const ClientPathWrapper = ({
       }}
     >
       <animated.div
-        {...(bind && pathRoute.pageState.gesture && gestureEnabled ? bind() : {})}
+        {...(bind && pathRoute.pageState.gesture && gestureEnabled
+          ? bind()
+          : {})}
         className={clsx("group/path", className)}
         ref={wrapperRef}
         {...props}
@@ -154,7 +161,13 @@ interface ClientBridgeProps {
   gaTrackingId?: string;
 }
 
-export const ClientBridge = ({ env, lang, theme, prefix, gaTrackingId }: ClientBridgeProps) => {
+export const ClientBridge = ({
+  env,
+  lang,
+  theme,
+  prefix,
+  gaTrackingId,
+}: ClientBridgeProps) => {
   const uiOperation = st.use.uiOperation();
   const pathname = st.use.pathname();
   const params = st.use.params();
@@ -221,18 +234,26 @@ function applyThemePolicy(theme: AkanTheme): void {
   }
   if (theme === "system") {
     const dark = window.matchMedia("(prefers-color-scheme: dark)").matches;
-    document.documentElement.setAttribute("data-theme", dark ? "dark" : "light");
+    document.documentElement.setAttribute(
+      "data-theme",
+      dark ? "dark" : "light",
+    );
     return;
   }
   document.documentElement.setAttribute("data-theme", theme);
 }
 
-function buildSearchParams(entries: Iterable<[string, string]>): Record<string, string | string[]> {
+function buildSearchParams(
+  entries: Iterable<[string, string]>,
+): Record<string, string | string[]> {
   const params: Record<string, string | string[]> = {};
   for (const [key, value] of entries) {
     const current = params[key];
     if (current === undefined) params[key] = value;
-    else params[key] = Array.isArray(current) ? [...current, value] : [current, value];
+    else
+      params[key] = Array.isArray(current)
+        ? [...current, value]
+        : [current, value];
   }
   return params;
 }
@@ -252,7 +273,10 @@ interface ClientSsrBridgeProps {
   lang: string;
   prefix?: string;
 }
-export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) => {
+export const ClientSsrBridge = ({
+  lang,
+  prefix = "",
+}: ClientSsrBridgeProps) => {
   useEffect(() => {
     const visiblePrefix = getEnv().operationMode === "local" ? prefix : "";
     const navigateRscWithFallback = (
@@ -266,13 +290,19 @@ export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) =>
         return;
       }
       void navigation.catch((error) => {
-        Logger.warn(`RSC navigation failed, falling back to document navigation: ${String(error)}`);
+        Logger.warn(
+          `RSC navigation failed, falling back to document navigation: ${String(error)}`,
+        );
         fallback();
       });
     };
     const syncHref = (href: string) => {
       const url = new URL(href, window.location.origin);
-      const { path } = getPathInfo(`${url.pathname}${url.search}${url.hash}`, lang, visiblePrefix);
+      const { path } = getPathInfo(
+        `${url.pathname}${url.search}${url.hash}`,
+        lang,
+        visiblePrefix,
+      );
       const searchParams = buildSearchParams(url.searchParams.entries());
       st.set({ pathname: url.pathname, path, searchParams });
     };
@@ -284,11 +314,17 @@ export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) =>
       router: {
         push: (href, routeOptions) => {
           syncHref(href);
-          navigateRscWithFallback(href, routeOptions, () => window.location.assign(href));
+          navigateRscWithFallback(href, routeOptions, () =>
+            window.location.assign(href),
+          );
         },
         replace: (href, routeOptions) => {
           syncHref(href);
-          navigateRscWithFallback(href, { ...routeOptions, replace: true }, () => window.location.replace(href));
+          navigateRscWithFallback(
+            href,
+            { ...routeOptions, replace: true },
+            () => window.location.replace(href),
+          );
         },
         back: () => {
           window.history.back();
@@ -310,8 +346,14 @@ export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) =>
     const visiblePrefix = getEnv().operationMode === "local" ? prefix : "";
     const sync = () => {
       const { pathname, search, hash } = window.location;
-      const { path } = getPathInfo(`${pathname}${search}${hash}`, lang, visiblePrefix);
-      const searchParams = buildSearchParams(new URLSearchParams(search).entries());
+      const { path } = getPathInfo(
+        `${pathname}${search}${hash}`,
+        lang,
+        visiblePrefix,
+      );
+      const searchParams = buildSearchParams(
+        new URLSearchParams(search).entries(),
+      );
       st.set({ pathname: window.location.pathname, path, searchParams });
     };
     sync();