akanjs 2.2.2 → 2.2.3-rc.1

package/fetch/client/fetchClient.ts

@@ -142,8 +142,12 @@ export class FetchClient {
           const argMap = new Map(serializerMap.entries().map(([key, serializer], idx) => [key, serializer(args[idx])]));
           const url = FetchClient.makeHttpUrl(key, endpoint, prefix, argMap);
           const headers = this.#makeAuthHeaders(option);
-          const cacheKey = FetchClient.#makeRequestQueryCacheKey(this.origin, url, headers);
-          const response = await memoizeRequestQuery(cacheKey, () => this.http.get(url, { headers }));
+          const baseUrl = option?.url;
+
+          const requestQuery = () => this.http.get(url, { headers, baseUrl });
+          const response = baseUrl
+            ? await requestQuery()
+            : await memoizeRequestQuery(FetchClient.#makeRequestQueryCacheKey(this.origin, url, headers), requestQuery);
           const parsedReturn = parseReturn(FetchClient.#deepCopy(response), { crystalize: option?.crystalize ?? true });
           return parsedReturn;
         };
@@ -158,6 +162,7 @@ export class FetchClient {
           const body = HttpClient.makeBody(bodyArgs, uploadArgs, argMap);
           const response = await this.http.post(url, body, {
             headers: this.#makeAuthHeaders(option),
+            baseUrl: option?.url,
           });
           const parsedReturn = parseReturn(response, { crystalize: option?.crystalize ?? true });
           return parsedReturn;

package/fetch/client/httpClient.ts

@@ -24,6 +24,7 @@ export interface ErrorConstructor {
 
 interface FetchOptions {
   headers?: Record<string, string>;
+  baseUrl?: string;
 }
 
 export class HttpClient {
@@ -38,8 +39,11 @@ export class HttpClient {
   setErrorConstructor(ErrorCls?: ErrorConstructor) {
     this.ErrorCls = ErrorCls;
   }
+  #resolveBaseUrl(baseUrl?: string) {
+    return (baseUrl ?? this.baseUrl).replace(/\/$/, "");
+  }
   async get<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       headers: { "Content-Type": "application/json", ...options.headers },
     });
     return await this.#readJsonResponse<Returns>(res);
@@ -55,7 +59,7 @@ export class HttpClient {
     options: FetchOptions = {},
   ): Promise<Returns> {
     const { body, headers } = this.#makeReqContent(data);
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "PUT",
       body,
       headers: { ...headers, ...options.headers },
@@ -68,7 +72,7 @@ export class HttpClient {
     options: FetchOptions = {},
   ): Promise<Returns> {
     const { body, headers } = this.#makeReqContent(data);
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "POST",
       body,
       headers: { ...headers, ...options.headers },
@@ -76,7 +80,7 @@ export class HttpClient {
     return await this.#readJsonResponse<Returns>(res);
   }
   async delete<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
-    const res = await fetch(`${this.baseUrl}${url}`, {
+    const res = await fetch(`${this.#resolveBaseUrl(options.baseUrl)}${url}`, {
       method: "DELETE",
       headers: { "Content-Type": "application/json", ...options.headers },
     });

package/package.json

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

package/types/fetch/client/httpClient.d.ts

@@ -20,6 +20,7 @@ export interface ErrorConstructor {
 }
 interface FetchOptions {
     headers?: Record<string, string>;
+    baseUrl?: string;
 }
 export declare class HttpClient {
     #private;

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

@@ -30,6 +30,12 @@ export interface ProviderProps {
     reconnect?: boolean;
     /** Active-locale dictionary injected by the server (SSR only) to seed the client Translator. */
     dictionary?: Record<string, Record<string, unknown>>;
+    /**
+     * Full lang-keyed dictionary snapshot (SSR server-only). The provider seeds every locale into
+     * the RSC-worker Translator (free on the server, never shipped to the browser) and serializes only
+     * the request's active locale to the client, so translations resolve regardless of locale routing.
+     */
+    allDictionary?: Record<string, Record<string, Record<string, unknown>>>;
     /** Root route component used by CSR page loading. */
     of: (props: unknown) => ReactNode | null;
 }

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

@@ -3,13 +3,13 @@ import { type ReactNode } from "react";
 import { type ProviderProps } from "./Common.d.ts";
 export declare const SSR: {
     (): import("react/jsx-runtime").JSX.Element;
-    Provider: ({ className, appName, params, head, manifest, env, gaTrackingId, children, theme, prefix, fonts, layoutStyle, reconnect, dictionary, of, }: SSRProviderProps) => import("react/jsx-runtime").JSX.Element;
+    Provider: ({ className, appName, params, head, manifest, env, gaTrackingId, children, theme, prefix, fonts, layoutStyle, reconnect, dictionary, allDictionary, of, }: SSRProviderProps) => import("react/jsx-runtime").JSX.Element;
     Wrapper: ({ children, head, manifest, fonts, className, prefix, layoutStyle, }: SSRWrapperProps) => import("react/jsx-runtime").JSX.Element;
 };
 export type SSRProviderProps = ProviderProps & {
     fonts?: ReactFont[];
 };
-declare const SSRProvider: ({ className, appName, params, head, manifest, env, gaTrackingId, children, theme, prefix, fonts, layoutStyle, reconnect, dictionary, of, }: SSRProviderProps) => import("react/jsx-runtime").JSX.Element;
+declare const SSRProvider: ({ className, appName, params, head, manifest, env, gaTrackingId, children, theme, prefix, fonts, layoutStyle, reconnect, dictionary, allDictionary, of, }: SSRProviderProps) => import("react/jsx-runtime").JSX.Element;
 interface SSRWrapperProps {
     className?: string;
     appName: string;

package/ui/System/Common.tsx

@@ -32,6 +32,12 @@ export interface ProviderProps {
   reconnect?: boolean;
   /** Active-locale dictionary injected by the server (SSR only) to seed the client Translator. */
   dictionary?: Record<string, Record<string, unknown>>;
+  /**
+   * Full lang-keyed dictionary snapshot (SSR server-only). The provider seeds every locale into
+   * the RSC-worker Translator (free on the server, never shipped to the browser) and serializes only
+   * the request's active locale to the client, so translations resolve regardless of locale routing.
+   */
+  allDictionary?: Record<string, Record<string, Record<string, unknown>>>;
   /** Root route component used by CSR page loading. */
   of: (props: unknown) => ReactNode | null;
 }

package/ui/System/SSR.tsx

@@ -1,5 +1,5 @@
 import { getEnv } from "akanjs/base";
-import { clsx, type ReactFont, router, Translator, type WebAppManifest } from "akanjs/client";
+import { clsx, type ReactFont, router, Translator, usePage, type WebAppManifest } from "akanjs/client";
 import { setRequestTheme } from "akanjs/fetch";
 import { Children, Fragment, type ReactNode, Suspense } from "react";
 import { FontCss } from "../fontCss";
@@ -30,17 +30,24 @@ const SSRProvider = ({
   layoutStyle = "web",
   reconnect = getEnv().operationMode === "local",
   dictionary,
+  allDictionary,
   of,
 }: SSRProviderProps) => {
   setRequestTheme(theme);
-  if (dictionary && params.lang) Translator.seed(params.lang, dictionary);
+
+  const { lang: activeLocale } = usePage();
+
+  if (allDictionary) for (const [lng, dict] of Object.entries(allDictionary)) Translator.seed(lng, dict);
+
+  const activeDictionary = allDictionary?.[activeLocale] ?? dictionary;
+
   return (
     <Load.Page
       of={of}
       loader={async () => {
-        const { lang } = params;
-        if (!router.isInitialized) router.init({ type: "ssr", side: "server", lang, prefix });
-        return { lang } as const;
+        if (!router.isInitialized)
+          router.init({ type: "ssr", side: "server", lang: activeLocale, prefix });
+        return { lang: activeLocale } as const;
       }}
       render={({ lang }) => (
         <SSRWrapper
@@ -53,7 +60,7 @@ const SSRProvider = ({
           prefix={prefix}
           layoutStyle={layoutStyle}
         >
-          <ClientWrapper theme={theme} lang={lang} reconnect={reconnect} dictionary={dictionary}>
+          <ClientWrapper theme={theme} lang={lang} reconnect={reconnect} dictionary={activeDictionary}>
             <Fragment key="children">{Children.toArray(children)}</Fragment>
             <Suspense key="client-inner" fallback={null}>
               <ClientInner />