akanjs 2.1.1-rc.1 → 2.1.1

package/client/router.ts

@@ -64,6 +64,11 @@ const getConfiguredBasePaths = () => new Set(parseBasePaths(process.env.AKAN_PUB
 
 const shouldExposeBasePath = () => getEnv().operationMode === "local";
 
+const getLocaleFromPathname = (pathname: string) => {
+  const [firstSegment] = pathname.split("/").filter(Boolean);
+  return parseAkanI18nEnv().locales.find((locale) => locale === firstSegment);
+};
+
 const getServerBasePath = (reqPathname: string, lang: string, headerBasePath: string | undefined, fallback: string) => {
   return (
     getBasePathFromPathname(reqPathname, {
@@ -195,6 +200,9 @@ class Router {
   #getNavigationPathInfo(href: string) {
     return this.#getPathInfo(href, shouldExposeBasePath() ? this.#prefix : "");
   }
+  #getVisiblePathInfo(href: string, lang = this.#lang) {
+    return getPathInfo(href, lang, shouldExposeBasePath() ? this.#prefix : "");
+  }
   #postPathChange({ path, pathname, hash }: { path: string; pathname: string; hash: string }) {
     Logger.log(`pathChange-start:${path}${hash ? `#${hash}` : ""}`);
     window.parent.postMessage({ type: "pathChange", path, pathname, hash }, "*");
@@ -251,9 +259,13 @@ class Router {
   setLang(lang: string) {
     if (getEnv().side === "server") throw new Error("setLang is only available in client side");
     this.#checkInitialized();
-    const { path } = getPathInfo(window.location.pathname, this.#lang, this.#prefix);
+    const currentLang = getLocaleFromPathname(window.location.pathname) ?? this.#lang;
+    const { path, search, hash } = this.#getVisiblePathInfo(
+      `${window.location.pathname}${window.location.search ?? ""}${window.location.hash ?? ""}`,
+      currentLang,
+    );
     this.#lang = lang;
-    this.#instance.replace(`/${lang}${path}`);
+    this.#instance.replace(`${path}${search ? `?${search}` : ""}${hash ? `#${hash}` : ""}`);
     return undefined as never;
   }
   getPath(pathname = window.location.pathname) {

package/constant/purify.ts

@@ -13,7 +13,13 @@ import {
 } from "akanjs/base";
 import { Logger } from "akanjs/common";
 
-import { type BaseObject, type ConstantCls, ConstantRegistry, type DefaultOf, type FieldProps } from ".";
+import {
+  type BaseObject,
+  type ConstantCls,
+  ConstantRegistry,
+  type DefaultOf,
+  type FieldProps,
+} from ".";
 
 type Purified<O> = O extends BaseObject
   ? string
@@ -24,10 +30,15 @@ type Purified<O> = O extends BaseObject
       : O extends object
         ? PurifiedModel<O>
         : O;
-type PurifiedWithObjectToId<T, StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>> = {
+type PurifiedWithObjectToId<
+  T,
+  StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>,
+> = {
   [K in StateKeys as null extends T[K] ? never : K]: Purified<T[K]>;
 } & {
-  [K in StateKeys as null extends T[K] ? K : never]?: Purified<T[K]> | undefined;
+  [K in StateKeys as null extends T[K] ? K : never]?:
+    | Purified<T[K]>
+    | undefined;
 };
 export type PurifiedModel<T> = T extends Upload[]
   ? FileList
@@ -39,20 +50,29 @@ export type PurifiedModel<T> = T extends Upload[]
         ? Map<K, PurifiedModel<V>>
         : PurifiedWithObjectToId<T>;
 
-export type PurifyFunc<Input, _DefaultInput = DefaultOf<Input>, _PurifiedInput = PurifiedModel<Input>> = (
-  self: _DefaultInput,
-  isChild?: boolean,
-) => _PurifiedInput | null;
+export type PurifyFunc<
+  Input,
+  _DefaultInput = DefaultOf<Input>,
+  _PurifiedInput = PurifiedModel<Input>,
+> = (self: _DefaultInput, isChild?: boolean) => _PurifiedInput | null;
 
 const getPurifyFn = (modelRef: Cls): ((value: unknown) => unknown) => {
   const [valueRef] = getNonArrayModel(modelRef);
   const purifyFn = PrimitiveRegistry.has(valueRef)
-    ? (value: unknown) => (valueRef as unknown as typeof PrimitiveScalar)._serialize(value as never)
+    ? (value: unknown) =>
+        (valueRef as unknown as typeof PrimitiveScalar)._serialize(
+          value as never,
+        )
     : (value: unknown) => value as object;
   return purifyFn;
 };
 
-const purify = (field: FieldProps, key: string, value: unknown, self: Record<string, unknown>): unknown => {
+const purify = (
+  field: FieldProps,
+  key: string,
+  value: unknown,
+  self: Record<string, unknown>,
+): unknown => {
   
   if (
     field.nullable &&
@@ -63,30 +83,67 @@ const purify = (field: FieldProps, key: string, value: unknown, self: Record<str
   )
     return null;
   if (field.isArray) {
-    if (!Array.isArray(value)) throw new Error(`Invalid Array Value in ${key} for value ${value}`);
+    if (!Array.isArray(value))
+      throw new Error(`Invalid Array Value in ${key} for value ${value}`);
     if (field.minlength && value.length < field.minlength)
-      throw new Error(`Invalid Array Length (Min) in ${key} for value ${value}`);
+      throw new Error(
+        `Invalid Array Length (Min) in ${key} for value ${value}`,
+      );
     else if (field.maxlength && value.length > field.maxlength)
-      throw new Error(`Invalid Array Length (Max) in ${key} for value ${value}`);
-    else if (field.optArrDepth === 0 && field.validate && !field.validate(value, self))
-      throw new Error(`Invalid Array Value (Failed to pass validation) in ${key} for value ${value}`);
-    return value.map((v) => purify({ ...field, isArray: field.arrDepth > 1, arrDepth: field.arrDepth - 1 }, key, v, v));
+      throw new Error(
+        `Invalid Array Length (Max) in ${key} for value ${value}`,
+      );
+    else if (
+      field.optArrDepth === 0 &&
+      field.validate &&
+      !field.validate(value, self)
+    )
+      throw new Error(
+        `Invalid Array Value (Failed to pass validation) in ${key} for value ${value}`,
+      );
+    return value.map((v) =>
+      purify(
+        { ...field, isArray: field.arrDepth > 1, arrDepth: field.arrDepth - 1 },
+        key,
+        v,
+        v,
+      ),
+    );
   }
   if (field.isMap && field.of) {
     const purifyFn = PrimitiveRegistry.has(field.of as Cls)
       ? getPurifyFn(field.of as Cls)
-      : (value: unknown) => makePurify(field.of as ConstantCls)(value as object);
+      : (value: unknown) =>
+          makePurify(field.of as ConstantCls)(value as object);
     return Object.fromEntries(
-      [...(value as Map<string, unknown>).entries()].map(([key, val]) => [key, applyFnToArrayObjects(val, purifyFn)]),
+      [...(value as Map<string, unknown>).entries()].map(([key, val]) => [
+        key,
+        applyFnToArrayObjects(val, purifyFn),
+      ]),
     );
   }
-  if (field.isClass) return makePurify(field.modelRef)(value as object, true) as object;
-  if (field.modelRef === Date && dayjs(value as Date).isBefore(dayjs(new Date("0000"))))
-    throw new Error(`Invalid Date Value (Default) in ${key} for value ${value}`);
-  if ([String, ID].includes(field.modelRef as unknown as StringConstructor | typeof ID) && (value === "" || !value))
-    throw new Error(`Invalid String Value (Default) in ${key} for value ${value}`);
+  if (field.isClass)
+    return makePurify(field.modelRef)(value as object, true) as object;
+  if (
+    field.modelRef === Date &&
+    dayjs(value as Date).isBefore(dayjs(new Date("0000")))
+  )
+    throw new Error(
+      `Invalid Date Value (Default) in ${key} for value ${value}`,
+    );
+  if (
+    [String, ID].includes(
+      field.modelRef as unknown as StringConstructor | typeof ID,
+    ) &&
+    (value === "" || !value)
+  )
+    throw new Error(
+      `Invalid String Value (Default) in ${key} for value ${value}`,
+    );
   if (field.validate && !field.validate(value, self))
-    throw new Error(`Invalid Value (Failed to pass validation) / ${value} in ${key}`);
+    throw new Error(
+      `Invalid Value (Failed to pass validation) / ${value} in ${key}`,
+    );
   if (!field.nullable && !value && value !== 0 && value !== false)
     throw new Error(`Invalid Value (Nullable) in ${key} for value ${value}`);
 

package/package.json

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

package/ui/System/Client.tsx

@@ -241,6 +241,7 @@ interface ClientSsrBridgeProps {
 }
 export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) => {
   useEffect(() => {
+    const visiblePrefix = getEnv().operationMode === "local" ? prefix : "";
     const navigateRscWithFallback = (
       href: string,
       routeOptions: Parameters<typeof navigateRsc>[1],
@@ -258,7 +259,7 @@ export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) =>
     };
     const syncHref = (href: string) => {
       const url = new URL(href, window.location.origin);
-      const { path } = getPathInfo(`${url.pathname}${url.search}${url.hash}`, lang, prefix);
+      const { path } = getPathInfo(`${url.pathname}${url.search}${url.hash}`, lang, visiblePrefix);
       const searchParams = buildSearchParams(url.searchParams.entries());
       st.set({ pathname: url.pathname, path, searchParams });
     };
@@ -290,9 +291,10 @@ export const ClientSsrBridge = ({ lang, prefix = "" }: ClientSsrBridgeProps) =>
   }, [lang, prefix]);
 
   useEffect(() => {
+    const visiblePrefix = getEnv().operationMode === "local" ? prefix : "";
     const sync = () => {
       const { pathname, search, hash } = window.location;
-      const { path } = getPathInfo(`${pathname}${search}${hash}`, lang, prefix);
+      const { path } = getPathInfo(`${pathname}${search}${hash}`, lang, visiblePrefix);
       const searchParams = buildSearchParams(new URLSearchParams(search).entries());
       st.set({ pathname: window.location.pathname, path, searchParams });
     };