@phis/ui 0.1.0 → 0.2.1

package/server-helpers/public-login-route.js

@@ -1,6 +1,6 @@
 import "server-only";
 import { cache } from "react";
-import { cookies } from "next/headers";
+import { cookies, headers } from "next/headers";
 import { PHI_CANONICAL_SOURCE_LOCALE, localizeAreaPath } from "../helpers/locale";
 import { getPhiExactSiteArea } from "./cms";
 import { getPhiCapabilitySnapshot } from "../gateway/server-capabilities";
@@ -8,6 +8,7 @@ import { resolvePhiRequestLocale } from "./request-locale";
 import { readPhiAreaLandingSelection, readPhiAreaPublicRoutePaths, } from "../helpers/cms-area-config";
 import { compilePhiCmsActiveRouteTable, resolvePhiCmsAreaShellPresetBinding, resolvePhiCmsDescriptorCatalog, resolvePhiCmsRoutePreset, } from "../plugins/runtime-modules/descriptor-compiler";
 import { resolveActivePresetModuleKeys } from "./cms-request";
+import { PHIS_REQUEST_PATH_HEADER, PHIS_REQUEST_SEARCH_HEADER } from "../constants/http-headers";
 const PHI_PUBLIC_LOGIN_PATH = "/login";
 /**
  * Resolves the canonical Public login href, or `null` when no active Auth Module owns that route.
@@ -19,7 +20,7 @@ const PHI_PUBLIC_LOGIN_PATH = "/login";
  *
  * Only the redirect path pays for this: an unauthenticated visitor reaching a staff Area.
  */
-export const resolvePhiPublicLoginHref = cache(async function resolvePhiPublicLoginHref(cmsBridge, locale, viewer, serverCapabilities) {
+export const resolvePhiPublicLoginHref = cache(async function resolvePhiPublicLoginHref(cmsBridge, locale, serverCapabilities) {
     const catalog = resolvePhiCmsDescriptorCatalog(cmsBridge.runtimeModuleCatalog);
     const shellBinding = resolvePhiCmsAreaShellPresetBinding(catalog, "public");
     if (!shellBinding) {
@@ -45,12 +46,11 @@ export const resolvePhiPublicLoginHref = cache(async function resolvePhiPublicLo
             presetKey: shellBinding.descriptor.presetKey,
         },
     }).catch(() => null);
-    const activeModuleIds = resolveActivePresetModuleKeys(cmsBridge.runtimeModuleCatalog, "public", areaPreset ? { preset: areaPreset.preset } : null, serverCapabilities ?? null, viewer);
+    const activeModuleIds = resolveActivePresetModuleKeys(cmsBridge.runtimeModuleCatalog, "public", areaPreset ? { preset: areaPreset.preset } : null, serverCapabilities ?? null);
     const routeTable = compilePhiCmsActiveRouteTable({
         catalog,
         area: "public",
         activeModuleIds,
-        viewer,
         publicRoutePaths: readPhiAreaPublicRoutePaths(areaPreset?.preset.preset.config),
         landingSelection: readPhiAreaLandingSelection(areaPreset?.preset.preset.config),
     });
@@ -83,10 +83,22 @@ export async function resolvePhiUnauthenticatedLoginHref(cmsBridge, root) {
         internalToken: cmsBridge.runtime?.internalToken ?? "",
         siteKey: cmsBridge.runtime?.siteKey ?? "",
     }).catch(() => null);
-    const login = await resolvePhiPublicLoginHref(cmsBridge, locale, undefined, serverCapabilities);
+    const login = await resolvePhiPublicLoginHref(cmsBridge, locale, serverCapabilities);
     if (!login) {
         return null;
     }
-    const next = root.startsWith("/") ? root : `/${root}`;
+    /*
+     * Back to what was asked for, query included, as the Area guard sends a visitor back to the path they
+     * requested: signing in only to land on the Area's root drops the page that was being opened. The
+     * proxy states the request path on every request it passes; a static render has none to state and
+     * no query, so it names the Area root, as the guard does where no path is known.
+     */
+    const requestHeaders = await headers();
+    const requestPath = requestHeaders.get(PHIS_REQUEST_PATH_HEADER)?.trim();
+    const requestSearch = requestHeaders.get(PHIS_REQUEST_SEARCH_HEADER)?.trim().replace(/^\?/, "");
+    const requestedPath = requestPath && (requestPath.startsWith("/") ? requestPath : `/${requestPath}`);
+    const next = requestedPath
+        ? `${requestedPath}${requestSearch ? `?${requestSearch}` : ""}`
+        : root.startsWith("/") ? root : `/${root}`;
     return `${login}?${new URLSearchParams({ login: "1", next }).toString()}`;
 }

package/server-helpers/request-runtime.d.ts

@@ -2,7 +2,26 @@ import "server-only";
 import type { PhiBlockRuntime } from "../types";
 import type { PhiCmsCompiledDescriptorCatalog, PhiRuntimeModuleId } from "../types/cms-module-descriptors";
 import type { PhiCmsAreaKey } from "../constants/cms-areas";
+type PhiRequestRuntimeStore = {
+    runtime: PhiBlockRuntime | null;
+    navigationByArea: Map<PhiCmsAreaKey, {
+        catalog: PhiCmsCompiledDescriptorCatalog;
+        activeModuleIds: ReadonlySet<PhiRuntimeModuleId>;
+    }>;
+};
 export declare function runWithPhiRequestRuntime<T>(runtime: PhiBlockRuntime, work: () => T): T;
+/**
+ * A request scope for a Server Action, which renders nothing until it has returned.
+ *
+ * An Action's body runs outside the React render, so the RSC-scoped store gives it a fresh object on
+ * every read; this scope holds one store for the body instead. What the body then returns is rendered by
+ * Next afterwards, outside the scope -- `capturePhiRequestRuntimeStore` and `restorePhiRequestRuntimeStore`
+ * carry what the body learned into that render.
+ */
+export declare function runInPhiRequestScope<T>(work: () => T): T;
+export type PhiCapturedRequestRuntime = Readonly<PhiRequestRuntimeStore>;
+export declare function capturePhiRequestRuntimeStore(): PhiCapturedRequestRuntime;
+export declare function restorePhiRequestRuntimeStore(captured: PhiCapturedRequestRuntime): void;
 export declare function setPhiRequestRuntime(runtime: PhiBlockRuntime): PhiBlockRuntime;
 export declare function setPhiRequestNavigationContext(area: PhiCmsAreaKey, catalog: PhiCmsCompiledDescriptorCatalog, activeModuleIds: ReadonlySet<PhiRuntimeModuleId>): {
     catalog: PhiCmsCompiledDescriptorCatalog;
@@ -12,5 +31,18 @@ export declare function getPhiRequestNavigationContext(area: PhiCmsAreaKey): {
     catalog: PhiCmsCompiledDescriptorCatalog;
     activeModuleIds: ReadonlySet<PhiRuntimeModuleId>;
 };
+/**
+ * The same, for an Area this request may not have set up.
+ *
+ * One Area is prepared per request -- the one being served -- so asking about another is a legitimate
+ * question with no answer here rather than a mistake. A link that points into another Area is the case:
+ * the compiled catalogue is the same object for every Area, but which Modules answer in one is that
+ * Area's own fact, and this request never read it.
+ */
+export declare function maybeGetPhiRequestNavigationContext(area: PhiCmsAreaKey): {
+    catalog: PhiCmsCompiledDescriptorCatalog;
+    activeModuleIds: ReadonlySet<PhiRuntimeModuleId>;
+} | null;
 export declare function maybeGetPhiRequestRuntime(): PhiBlockRuntime | null;
 export declare function getPhiRequestRuntime(): PhiBlockRuntime;
+export {};

package/server-helpers/request-runtime.js

@@ -23,6 +23,28 @@ export function runWithPhiRequestRuntime(runtime, work) {
     store.runtime = runtime;
     return phiRequestRuntimeScope.run(store, work);
 }
+/**
+ * A request scope for a Server Action, which renders nothing until it has returned.
+ *
+ * An Action's body runs outside the React render, so the RSC-scoped store gives it a fresh object on
+ * every read; this scope holds one store for the body instead. What the body then returns is rendered by
+ * Next afterwards, outside the scope -- `capturePhiRequestRuntimeStore` and `restorePhiRequestRuntimeStore`
+ * carry what the body learned into that render.
+ */
+export function runInPhiRequestScope(work) {
+    return phiRequestRuntimeScope.run(createPhiRequestRuntimeStore(), work);
+}
+export function capturePhiRequestRuntimeStore() {
+    const store = getPhiRequestRuntimeStore();
+    return { runtime: store.runtime, navigationByArea: new Map(store.navigationByArea) };
+}
+export function restorePhiRequestRuntimeStore(captured) {
+    const store = getPhiRequestRuntimeStore();
+    store.runtime = captured.runtime;
+    for (const [area, context] of captured.navigationByArea) {
+        store.navigationByArea.set(area, context);
+    }
+}
 export function setPhiRequestRuntime(runtime) {
     const store = getPhiRequestRuntimeStore();
     store.runtime = runtime;
@@ -35,12 +57,23 @@ export function setPhiRequestNavigationContext(area, catalog, activeModuleIds) {
     return context;
 }
 export function getPhiRequestNavigationContext(area) {
-    const context = getPhiRequestRuntimeStore().navigationByArea.get(area);
+    const context = maybeGetPhiRequestNavigationContext(area);
     if (!context) {
         throw new Error(`Missing Phi request navigation context for Area "${area}".`);
     }
     return context;
 }
+/**
+ * The same, for an Area this request may not have set up.
+ *
+ * One Area is prepared per request -- the one being served -- so asking about another is a legitimate
+ * question with no answer here rather than a mistake. A link that points into another Area is the case:
+ * the compiled catalogue is the same object for every Area, but which Modules answer in one is that
+ * Area's own fact, and this request never read it.
+ */
+export function maybeGetPhiRequestNavigationContext(area) {
+    return getPhiRequestRuntimeStore().navigationByArea.get(area) ?? null;
+}
 export function maybeGetPhiRequestRuntime() {
     return getPhiRequestRuntimeStore().runtime;
 }

package/server-helpers/runtime.d.ts

@@ -1,7 +1,7 @@
 import "server-only";
 import type { PhiWidgetAreaKey, PhiBlockRuntime, PhiBlockRuntimeSite, PhiWidgetThemeMode } from "../types/widget-runtime";
 import type { PhiSiteFontSlots, PhiSiteRemSettings } from "../types/site-theme";
-import type { PhiCapabilitySnapshot } from "../types/server-capabilities";
+import type { PhiSiteRequestContext } from "../types/site-request-context";
 type PhiWidgetSiteTheme = NonNullable<PhiBlockRuntime["site"]["theme"]>;
 type PhiResolvedWidgetRuntimeSite = PhiBlockRuntimeSite & {
     name: string;
@@ -38,170 +38,6 @@ export type PhiCmsRuntimeInfo = {
     site: PhiResolvedWidgetRuntimeSite;
     viewer: PhiViewerState;
 };
-export type PhiSiteRequestContext = {
-    serverCapabilities: PhiCapabilitySnapshot | null;
-    site: {
-        id: number;
-        key: string;
-        publicUrl?: string;
-        name: string;
-        hostname: string;
-        availableLocales: Array<{
-            code: string;
-            label: string;
-        }>;
-        defaultLocale: string;
-        themeRevision: {
-            publishedRevisionId: number | null;
-            workingDraftRevisionId: number | null;
-        };
-        theme: {
-            mode: PhiWidgetThemeMode;
-            fonts?: PhiSiteFontSlots | null;
-            rem?: PhiSiteRemSettings | null;
-            brand?: {
-                slogan?: {
-                    label?: string | null;
-                    icon?: string | null;
-                } | null;
-                location?: {
-                    label?: string | null;
-                    icon?: string | null;
-                } | null;
-                wordmark?: {
-                    parts?: Array<{
-                        text: string;
-                        color?: string | null;
-                        fontWeight?: number | string | null;
-                    }> | null;
-                } | null;
-            };
-            contact?: {
-                label?: string | null;
-                href?: string | null;
-                icon?: string | null;
-            };
-            shell?: {
-                light?: {
-                    background?: string | null;
-                    color?: string | null;
-                } | null;
-                dark?: {
-                    background?: string | null;
-                    color?: string | null;
-                } | null;
-                header?: {
-                    light?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    dark?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    top?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                    } | null;
-                    main?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                    } | null;
-                    bottom?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                    } | null;
-                } | null;
-                sider?: {
-                    light?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    dark?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    left?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        sticky?: boolean | null;
-                        width?: number | null;
-                    } | null;
-                    right?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        sticky?: boolean | null;
-                        width?: number | null;
-                    } | null;
-                } | null;
-                footer?: {
-                    light?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    dark?: {
-                        background?: string | null;
-                        color?: string | null;
-                    } | null;
-                    main?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                    } | null;
-                    bottom?: {
-                        light?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                        dark?: {
-                            background?: string | null;
-                            color?: string | null;
-                        } | null;
-                    } | null;
-                } | null;
-            };
-        };
-    };
-    locale: {
-        current: string;
-    };
-    viewer: PhiViewerState;
-};
 export declare function resolvePhiWidgetAreaKey(areaMask: number): PhiWidgetAreaKey;
 export declare function buildPhiBlockRuntime({ requestContext, areaMask, page, request, }: {
     requestContext: PhiSiteRequestContext;

package/server-helpers/runtime.js

@@ -5,8 +5,14 @@ import { resolvePhiRuntimeConfig } from "../helpers/phis-runtime";
 import { buildApiHeaders, buildApiUrl } from "../helpers/site-api";
 import { getResolvedSiteConfig } from "../gateway/site-config";
 import { getPhiCapabilitySnapshot } from "../gateway/server-capabilities";
-import { PHI_DEFAULT_THEME_MODE_PREFERENCE, readPhiColorSchemeHintFromCookieHeader, resolvePhiThemeMode, } from "../theme/phi-theme-mode";
+import { normalizePhiThemeModePreference, readPhiColorSchemeHintFromCookieHeader, readPhiThemeModePreferenceFromCookieHeader, resolvePhiThemeMode, } from "../theme/phi-theme-mode";
 import { readPhiServerApiCredentials } from "../helpers/phis-server-credentials";
+function requirePhiViewerArea(area) {
+    if (!area) {
+        throw new Error("The auth viewer answered a signed-in session without its Area.");
+    }
+    return area;
+}
 export function resolvePhiWidgetAreaKey(areaMask) {
     return resolvePhiCmsAreaKey(areaMask);
 }
@@ -57,18 +63,24 @@ export async function getPhiCmsRuntimeInfo({ apiBaseUrl, internalToken, siteKey,
     /*
      * The mode this viewer is shown until something overrides it live. It sits beside the viewer's
      * other preferences rather than in `site.theme`, which stays the Theme record the Theme workspace
-     * builds its draft from. A stored user setting will take the default's place here.
+     * builds its draft from.
+     *
+     * It still reads the cookie, and for a signed-in viewer that cookie is no longer the choice itself
+     * but a mirror of the account: the server writes it on login and whenever the choice changes, so it
+     * follows the person between browsers. Reading it here rather than the account keeps this agreeing
+     * with the two readers that cannot see an account at all -- the static proxy and the script that
+     * runs before the first paint. The account's own answer travels separately as `preferredThemeMode`,
+     * because a panel has to show what was chosen, not what it resolved to.
      */
-    const viewerThemeMode = resolvePhiThemeMode(PHI_DEFAULT_THEME_MODE_PREFERENCE, readPhiColorSchemeHintFromCookieHeader(cookieHeader));
-    const response = await fetch(buildApiUrl(resolvedRuntime.apiBaseUrl, "/api/auth/me"), {
+    const viewerThemeMode = resolvePhiThemeMode(readPhiThemeModePreferenceFromCookieHeader(cookieHeader), readPhiColorSchemeHintFromCookieHeader(cookieHeader));
+    const response = await fetch(buildApiUrl(resolvedRuntime.apiBaseUrl, "/api/v1/auth/me"), {
         headers: buildApiHeaders({
+            token: resolvedRuntime.internalToken,
+            includeToken: true,
             siteKey: resolvedRuntime.siteKey,
             includeSiteKey: true,
-            extra: {
-                Accept: "application/json",
-                "User-Agent": "phis-ui/1.0",
-                ...(cookieHeader?.trim() ? { Cookie: cookieHeader.trim() } : {}),
-            },
+            gateway: true,
+            cookie: cookieHeader,
         }),
         cache: "no-store",
     });
@@ -110,7 +122,12 @@ export async function getPhiCmsRuntimeInfo({ apiBaseUrl, internalToken, siteKey,
         site: resolvedSite,
         viewer: {
             access: "authenticated",
-            resolvedArea: payload.area ?? "app",
+            /*
+             * phis-server answers a signed-in viewer's Area every time (`resolvePhiUserArea`). A missing
+             * one used to become `app`, which the access guard then forwarded to -- onto an Area this
+             * viewer may not enter, and round again.
+             */
+            resolvedArea: requirePhiViewerArea(payload.area),
             roleClaims: (payload.user?.roleClaims ?? [])
                 .filter((claim) => typeof claim.providerId === "string" &&
                 /^@[^/]+\/[^/]+/.test(claim.providerId) &&
@@ -139,12 +156,19 @@ export async function getPhiCmsRuntimeInfo({ apiBaseUrl, internalToken, siteKey,
                 (payload.user?.authorizationRevision ?? 0) >= 0
                 ? payload.user?.authorizationRevision
                 : 0,
-            siteFlags: Number.isInteger(payload.user?.siteFlags) ? payload.user?.siteFlags : 0,
             newsletterOptIn: payload.user?.newsletterOptIn ?? null,
             themeMode: viewerThemeMode,
             userName: payload.user?.name ?? null,
             userEmail: payload.user?.email ?? null,
             preferredLocale: payload.user?.preferredLocale ?? null,
+            /*
+             * The stored choice, kept beside the resolution above rather than folded into it. The server
+             * answers `system` for an account that has chosen nothing, and that has to survive the trip:
+             * a Settings panel showing "Light" because the browser is light would be telling the person
+             * they decided something they never did.
+             */
+            preferredThemeMode: normalizePhiThemeModePreference(payload.user?.themeMode),
+            mustChangePassword: payload.user?.mustChangePassword === true,
             profile: payload.user?.profile ?? null,
         },
     };
@@ -156,17 +180,13 @@ export const loadPhiSiteRequestContext = cache(async function loadPhiSiteRequest
         siteKey,
         cookieHeader,
     });
-    let serverCapabilities = null;
-    try {
-        serverCapabilities = await getPhiCapabilitySnapshot({
-            apiBaseUrl: readPhiServerApiCredentials().apiBaseUrl,
-            internalToken: readPhiServerApiCredentials().internalToken,
-            siteKey: runtimeInfo.site.key,
-        });
-    }
-    catch (error) {
-        console.error("Failed to load phi-server capability snapshot.", error);
-    }
+    // Without it no Module can tell what the server provides; rendering on would show Modules as active
+    // that the server refuses, so a failed read fails the request.
+    const serverCapabilities = await getPhiCapabilitySnapshot({
+        apiBaseUrl: readPhiServerApiCredentials().apiBaseUrl,
+        internalToken: readPhiServerApiCredentials().internalToken,
+        siteKey: runtimeInfo.site.key,
+    });
     return {
         serverCapabilities,
         site: runtimeInfo.site,

package/server-helpers/site-locale.d.ts

@@ -10,5 +10,13 @@ export type FetchResolvedSiteLocaleOptions = FetchSiteLocaleConfigOptions & {
     acceptLanguage?: string | null;
     cookieHeader?: string | null;
 };
+/**
+ * The Site's languages, read from the Site config rather than cached beside it.
+ *
+ * They arrive in the same `/api/v1/site` answer, and a cache of their own kept them for an hour while
+ * the config around them refreshed every few seconds: a language added in Admin was a page path for the
+ * router until then, and `/fr/...` was forwarded to `/de/fr/...`. The config's cache is also the one a
+ * write through the Site proxy and a moved read marker clear.
+ */
 export declare function fetchSiteLocaleConfig(options?: FetchSiteLocaleConfigOptions): Promise<SiteLocaleConfig>;
 export declare function fetchResolvedSiteLocale(options?: FetchResolvedSiteLocaleOptions): Promise<PhiResolvedLocale>;

package/server-helpers/site-locale.js

@@ -1,16 +1,8 @@
 import "server-only";
-import { PHI_CANONICAL_SOURCE_LOCALE, normalizeLocale } from "../helpers/locale";
+import { PHI_CANONICAL_SOURCE_LOCALE, canonicalizePhiLocaleTag } from "../helpers/locale";
 import { resolvePhiRuntimeConfig } from "../helpers/phis-runtime";
 import { PHIS_SITE_KEY_HEADER } from "../constants/http-headers";
-const CACHE_TTL_MS = 3_600_000;
-const configCache = new Map();
-function buildCacheKey(options) {
-    const runtime = resolvePhiRuntimeConfig(options, {
-        context: "fetchSiteLocaleConfig cache",
-        requireSiteKey: true,
-    });
-    return [runtime.apiBaseUrl, runtime.internalToken, runtime.siteKey ?? ""].join("::");
-}
+import { getResolvedSiteConfig } from "../gateway/site-config";
 function capitalizeLocaleLabel(value) {
     if (!value)
         return value;
@@ -35,7 +27,7 @@ function normalizeLocaleOptions(input, defaultLocale) {
     const normalized = [];
     for (const value of input) {
         if (typeof value === "string") {
-            const code = normalizeLocale(value, { defaultLocale });
+            const code = canonicalizePhiLocaleTag(value);
             if (code)
                 normalized.push({ code, label: buildLocaleLabel(code) });
             continue;
@@ -43,7 +35,7 @@ function normalizeLocaleOptions(input, defaultLocale) {
         if (value && typeof value === "object") {
             const record = value;
             const code = typeof record.code === "string"
-                ? normalizeLocale(record.code, { defaultLocale })
+                ? canonicalizePhiLocaleTag(record.code)
                 : "";
             if (!code)
                 continue;
@@ -72,7 +64,7 @@ function sanitizeSiteLocaleConfig(payload) {
         ? site
         : {};
     const fallbackDefaultLocale = typeof record.defaultLocale === "string"
-        ? normalizeLocale(record.defaultLocale, { defaultLocale: PHI_CANONICAL_SOURCE_LOCALE })
+        ? canonicalizePhiLocaleTag(record.defaultLocale) || PHI_CANONICAL_SOURCE_LOCALE
         : PHI_CANONICAL_SOURCE_LOCALE;
     const availableLocales = normalizeLocaleOptions(record.availableLocales, fallbackDefaultLocale);
     return {
@@ -82,31 +74,25 @@ function sanitizeSiteLocaleConfig(payload) {
         availableLocales,
     };
 }
+/**
+ * The Site's languages, read from the Site config rather than cached beside it.
+ *
+ * They arrive in the same `/api/v1/site` answer, and a cache of their own kept them for an hour while
+ * the config around them refreshed every few seconds: a language added in Admin was a page path for the
+ * router until then, and `/fr/...` was forwarded to `/de/fr/...`. The config's cache is also the one a
+ * write through the Site proxy and a moved read marker clear.
+ */
 export async function fetchSiteLocaleConfig(options = {}) {
-    const now = Date.now();
-    const cacheKey = buildCacheKey(options);
-    const cached = configCache.get(cacheKey);
-    if (cached && now - cached.cachedAt < CACHE_TTL_MS)
-        return cached.config;
     const resolvedRuntime = resolvePhiRuntimeConfig(options, {
         context: "fetchSiteLocaleConfig",
         requireSiteKey: true,
     });
-    const response = await fetch(`${resolvedRuntime.apiBaseUrl}/api/v1/site`, {
-        method: "GET",
-        headers: {
-            Accept: "application/json",
-            Authorization: `Bearer ${resolvedRuntime.internalToken}`,
-            [PHIS_SITE_KEY_HEADER]: resolvedRuntime.siteKey,
-            "user-agent": "phis-ui-locale-config/1.0",
-        },
-        cache: "no-store",
+    const site = await getResolvedSiteConfig({
+        apiBaseUrl: resolvedRuntime.apiBaseUrl,
+        internalToken: resolvedRuntime.internalToken,
+        siteKey: resolvedRuntime.siteKey,
     });
-    if (!response.ok)
-        throw new Error(`Site locale config fetch failed (${response.status}).`);
-    const config = sanitizeSiteLocaleConfig(await response.json());
-    configCache.set(cacheKey, { config, cachedAt: now });
-    return config;
+    return sanitizeSiteLocaleConfig({ site });
 }
 export async function fetchResolvedSiteLocale(options = {}) {
     const resolvedRuntime = resolvePhiRuntimeConfig(options, {

package/server-helpers/translate.js

@@ -1,5 +1,5 @@
 import "server-only";
-import { PHI_CANONICAL_SOURCE_LOCALE, normalizeLocale } from "../helpers/locale";
+import { PHI_CANONICAL_SOURCE_LOCALE, isPhiLocaleReadableAsSource, resolvePhiTranslationLocale, } from "../helpers/locale";
 import { resolvePhiRuntimeConfig } from "../helpers/phis-runtime";
 import { formatPhiTranslation, } from "../helpers/translation-format";
 import { PHI_TR_CTX_WEB_UI_LABEL, trBulk as requestInternalTranslationBulk, tr as requestInternalTranslation, } from "../gateway/tr";
@@ -54,33 +54,23 @@ export async function trForLocale(localeInput, msg, params = 0, ctx = 0, format
     if (!normalizedMessage) {
         return "";
     }
-    const locale = normalizeLocale(localeInput);
+    const locale = resolvePhiTranslationLocale(localeInput);
     const options = buildTranslatorOptions(locale);
-    try {
-        const translated = await requestInternalTranslation(options, normalizedMessage, undefined, ctx ? String(ctx) : undefined, format);
-        return formatPhiTranslation(translated, params);
-    }
-    catch {
-        return formatPhiTranslation(normalizedMessage, params);
-    }
+    const translated = await requestInternalTranslation(options, normalizedMessage, undefined, ctx ? String(ctx) : undefined, format);
+    return formatPhiTranslation(translated, params);
 }
 export async function trGlobalForLocale(localeInput, msg, params = 0, ctx = 0, format = "text") {
     const normalizedMessage = msg.trim();
     if (!normalizedMessage) {
         return "";
     }
-    const locale = normalizeLocale(localeInput);
+    const locale = resolvePhiTranslationLocale(localeInput);
     const options = buildGlobalTranslatorOptions(locale);
-    if (locale === normalizeLocale(PHI_CANONICAL_SOURCE_LOCALE)) {
-        return formatPhiTranslation(normalizedMessage, params);
-    }
-    try {
-        const translated = await requestInternalTranslation(options, normalizedMessage, undefined, ctx ? String(ctx) : undefined, format);
-        return formatPhiTranslation(translated, params);
-    }
-    catch {
+    if (isPhiLocaleReadableAsSource(locale, PHI_CANONICAL_SOURCE_LOCALE)) {
         return formatPhiTranslation(normalizedMessage, params);
     }
+    const translated = await requestInternalTranslation(options, normalizedMessage, undefined, ctx ? String(ctx) : undefined, format);
+    return formatPhiTranslation(translated, params);
 }
 export async function trBulk(msgs, ctx = 0, format = "text", sourceLocale) {
     const locale = await resolvePhiRequestLocale();
@@ -91,14 +81,9 @@ export async function trBulkForLocale(localeInput, msgs, ctx = 0, format = "text
     if (normalizedMessages.length === 0) {
         return [];
     }
-    const locale = normalizeLocale(localeInput);
+    const locale = resolvePhiTranslationLocale(localeInput);
     const options = buildTranslatorOptions(locale, sourceLocale);
-    try {
-        return await requestInternalTranslationBulk(options, normalizedMessages, ctx ? String(ctx) : undefined, format);
-    }
-    catch {
-        return normalizedMessages;
-    }
+    return requestInternalTranslationBulk(options, normalizedMessages, ctx ? String(ctx) : undefined, format);
 }
 export async function trGlobalBulk(msgs, ctx = 0, format = "text") {
     const locale = await resolvePhiRequestLocale();
@@ -109,15 +94,10 @@ export async function trGlobalBulkForLocale(localeInput, msgs, ctx = 0, format =
     if (normalizedMessages.length === 0) {
         return [];
     }
-    const locale = normalizeLocale(localeInput);
+    const locale = resolvePhiTranslationLocale(localeInput);
     const options = buildGlobalTranslatorOptions(locale);
-    if (locale === normalizeLocale(PHI_CANONICAL_SOURCE_LOCALE)) {
-        return normalizedMessages;
-    }
-    try {
-        return await requestInternalTranslationBulk(options, normalizedMessages, ctx ? String(ctx) : undefined, format);
-    }
-    catch {
+    if (isPhiLocaleReadableAsSource(locale, PHI_CANONICAL_SOURCE_LOCALE)) {
         return normalizedMessages;
     }
+    return requestInternalTranslationBulk(options, normalizedMessages, ctx ? String(ctx) : undefined, format);
 }

package/server-helpers.d.ts

@@ -1,5 +1,10 @@
 export { tr, trGlobal, trForLocale, trGlobalForLocale, trBulk, trBulkForLocale, trGlobalBulk, trGlobalBulkForLocale, PHI_TR_CTX_WEB_UI_LABEL, } from "./server-helpers/translate";
 export { phiRuntime } from "./server-helpers/phi-runtime";
+export { definePhiLabelSet, definePhiMessageLabel, definePhiRuntimeModuleLabelSet, getPhiLabelSet, type PhiLabelSetDefinition, type PhiLabelSetEntry, type PhiLabelSetLabels, type PhiLabelSetTexts, } from "./gateway/label-set";
+export type { PhiGlobalTranslatorOptions } from "./gateway/tr";
+export { readPhiServerApiCredentials } from "./helpers/phis-server-credentials";
+export type { PhiServerApiCredentials } from "./helpers/phis-server-credentials";
+export { getPhiUserState, type GetPhiUserStateOptions, type PhiUserState } from "./gateway/user-state";
 export { resolvePhiRequestLocale } from "./server-helpers/request-locale";
 export { loadPhiResolvedCmsRequest } from "./server-helpers/cms-request";
 export { loadPhiCmsRootRequest } from "./server-helpers/cms-root";