akanjs 2.2.3-rc.0 → 2.2.3

package/common/types.ts

@@ -1,7 +1,7 @@
 export interface FetchPolicy<Returns = unknown> {
   cache?: boolean | number;
   crystalize?: boolean;
-  url?: string;
+  origin?: string;
   onError?: (error: string) => void;
   token?: string;
   partial?: string[];

package/fetch/client/fetchClient.ts

@@ -142,7 +142,7 @@ 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 baseUrl = option?.url;
+          const baseUrl = option?.origin;
 
           const requestQuery = () => this.http.get(url, { headers, baseUrl });
           const response = baseUrl
@@ -162,7 +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,
+            baseUrl: option?.origin,
           });
           const parsedReturn = parseReturn(response, { crystalize: option?.crystalize ?? true });
           return parsedReturn;

package/package.json

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

package/types/common/types.d.ts

@@ -1,7 +1,7 @@
 export interface FetchPolicy<Returns = unknown> {
     cache?: boolean | number;
     crystalize?: boolean;
-    url?: string;
+    origin?: string;
     onError?: (error: string) => void;
     token?: string;
     partial?: string[];

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;
 }
@@ -57,10 +63,7 @@ export function toManifestJson(value: unknown): unknown {
   return Object.fromEntries(
     Object.entries(value)
       .filter(([, entryValue]) => entryValue !== undefined)
-      .map(([key, entryValue]) => [
-        camelToSnake(key),
-        toManifestJson(entryValue),
-      ]),
+      .map(([key, entryValue]) => [camelToSnake(key), toManifestJson(entryValue)]),
   );
 }
 

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,23 @@ 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 +59,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 />