fimo-vite 2.4.0-staging.2 → 2.4.0-staging.4

package/dist/plugins/translations.d.ts

@@ -5,7 +5,19 @@ interface LabelBundle {
     locales: string[];
     updatedAt: string | null;
 }
+interface LabelBundleRead {
+    bundle: LabelBundle;
+    ok: boolean;
+}
 export default function translationsPlugin(): Plugin;
-export declare function loadLabelBundle(rootDir: string): Promise<LabelBundle>;
+/**
+ * Reads every configured locale dictionary from the tenant API.
+ *
+ * `ok` is true only when every locale request returned an authoritative
+ * dictionary — an empty dictionary from a 200 response counts, a rejected or
+ * non-ok read does not. Failed locales keep the dictionary from `previous`,
+ * so a transient outage never replaces valid labels with empty data.
+ */
+export declare function loadLabelBundle(rootDir: string, previous?: LabelBundle): Promise<LabelBundleRead>;
 export {};
 //# sourceMappingURL=translations.d.ts.map

package/dist/plugins/translations.js

@@ -25,17 +25,50 @@ export default function translationsPlugin() {
     let refreshTimer;
     let pollTimer;
     let eventConnectionAttempt = 0;
+    let subscribedAttempt = null;
     let closed = false;
-    const refreshLabels = async () => {
-        bundle = await loadLabelBundle(rootDir);
-        return bundle;
+    let refreshQueue = Promise.resolve();
+    // `closeBundle` also fires between build-watch rebuilds, which must keep
+    // reading labels; only a torn-down dev server retires the queue.
+    const retired = () => closed && command === 'serve';
+    // Reads run one at a time: a read started before an event still resolves
+    // first, so it can never overwrite the fresher bundle the event asked for.
+    const refreshLabels = (invalidateIfChanged = false) => {
+        const refresh = refreshQueue.then(async () => {
+            if (retired()) {
+                return { bundle, ok: false };
+            }
+            const before = serializeBundle(bundle);
+            const next = await loadLabelBundle(rootDir, bundle);
+            if (retired()) {
+                return { bundle, ok: false };
+            }
+            bundle = next.bundle;
+            if (invalidateIfChanged && serializeBundle(bundle) !== before) {
+                invalidateLabels();
+            }
+            return next;
+        });
+        refreshQueue = refresh.then(() => undefined, () => undefined);
+        return refresh;
     };
-    const refreshLabelsAndInvalidateIfChanged = async () => {
-        const before = serializeBundle(bundle);
-        const next = await refreshLabels();
-        if (serializeBundle(next) !== before) {
-            invalidateLabels();
-        }
+    // A failed read must not retire the poll: it can hide a label change
+    // committed while the subscription was still connecting. Only a snapshot
+    // every locale reported as authoritative, applied while the attempt that
+    // asked for it is still the subscribed one, proves events now cover
+    // further changes.
+    const reconcileLabels = (attempt) => {
+        void refreshLabels(true)
+            .then((next) => {
+            if (next.ok &&
+                !closed &&
+                attempt !== null &&
+                attempt === eventConnectionAttempt &&
+                attempt === subscribedAttempt) {
+                stopFallbackPolling();
+            }
+        })
+            .catch(() => undefined);
     };
     const invalidateLabels = () => {
         if (!devServer) {
@@ -72,7 +105,7 @@ export default function translationsPlugin() {
             if (closed) {
                 return;
             }
-            void refreshLabelsAndInvalidateIfChanged().catch(() => undefined);
+            void refreshLabels(true).catch(() => undefined);
         }, 150);
     };
     const startFallbackPolling = () => {
@@ -80,7 +113,7 @@ export default function translationsPlugin() {
             return;
         }
         pollTimer = setInterval(() => {
-            void refreshLabelsAndInvalidateIfChanged().catch(() => undefined);
+            reconcileLabels(subscribedAttempt);
         }, FALLBACK_POLL_INTERVAL_MS);
     };
     const stopFallbackPolling = () => {
@@ -115,19 +148,21 @@ export default function translationsPlugin() {
             await connectLabelEvents(rootDir, scheduleRefresh, sockets, {
                 isActive: () => !closed && attempt === eventConnectionAttempt,
                 onConnected: () => {
-                    if (closed || attempt !== eventConnectionAttempt) {
+                    if (closed || attempt !== eventConnectionAttempt || subscribedAttempt === attempt) {
                         return;
                     }
+                    subscribedAttempt = attempt;
                     if (reconnectTimer) {
                         clearTimeout(reconnectTimer);
                         reconnectTimer = undefined;
                     }
-                    stopFallbackPolling();
+                    reconcileLabels(attempt);
                 },
                 onDisconnected: () => {
                     if (closed || attempt !== eventConnectionAttempt) {
                         return;
                     }
+                    subscribedAttempt = null;
                     scheduleReconnect();
                 },
             });
@@ -166,7 +201,7 @@ export default function translationsPlugin() {
             devServer = server;
             closed = false;
             server.watcher.add([resolveFimoConfigPath(rootDir), join(rootDir, '.env'), join(rootDir, '.env.local')]);
-            void refreshLabelsAndInvalidateIfChanged().catch(() => undefined);
+            void refreshLabels(true).catch(() => undefined);
             startFallbackPolling();
             void connectEvents();
         },
@@ -180,7 +215,7 @@ export default function translationsPlugin() {
             if (id !== RESOLVED_ID) {
                 return null;
             }
-            const current = command === 'serve' ? bundle : await refreshLabels();
+            const current = command === 'serve' ? bundle : (await refreshLabels()).bundle;
             const dictionaries = JSON.stringify(current.dictionaries);
             const defaultLabels = JSON.stringify(current.dictionaries[current.defaultLocale] ?? {});
             return [
@@ -384,7 +419,15 @@ function labelUpdatePayload(bundle) {
         signature: labelSignature(bundle),
     };
 }
-export async function loadLabelBundle(rootDir) {
+/**
+ * Reads every configured locale dictionary from the tenant API.
+ *
+ * `ok` is true only when every locale request returned an authoritative
+ * dictionary — an empty dictionary from a 200 response counts, a rejected or
+ * non-ok read does not. Failed locales keep the dictionary from `previous`,
+ * so a transient outage never replaces valid labels with empty data.
+ */
+export async function loadLabelBundle(rootDir, previous) {
     const config = getConfigServer(rootDir);
     const defaultLocale = getFimoDefaultLocale(config);
     const locales = getFimoLocales(config);
@@ -392,52 +435,54 @@ export async function loadLabelBundle(rootDir) {
     const apiUrl = env.VITE_API_URL;
     if (!apiUrl) {
         return {
-            dictionaries: Object.fromEntries(locales.map((locale) => [locale, {}])),
-            defaultLocale,
-            locales,
-            updatedAt: null,
+            bundle: {
+                dictionaries: Object.fromEntries(locales.map((locale) => [locale, {}])),
+                defaultLocale,
+                locales,
+                updatedAt: null,
+            },
+            ok: true,
         };
     }
-    try {
-        const loaded = await Promise.all(locales.map((locale) => fetchLabelDictionary(apiUrl, locale).catch(() => ({ locale, labels: {}, updatedAt: null }))));
-        const updatedAtValues = loaded
-            .map((entry) => entry.updatedAt)
-            .filter((value) => typeof value === 'string')
-            .sort();
-        const updatedAt = updatedAtValues[updatedAtValues.length - 1];
-        return {
-            dictionaries: Object.fromEntries(loaded.map((entry) => [entry.locale, entry.labels])),
-            defaultLocale,
-            locales,
-            updatedAt: updatedAt ?? null,
-        };
+    const loaded = await Promise.all(locales.map(async (locale) => {
+        try {
+            return { locale, ok: true, ...(await fetchLabelDictionary(apiUrl, locale)) };
+        }
+        catch {
+            return { locale, ok: false };
+        }
+    }));
+    const ok = loaded.every((entry) => entry.ok);
+    const updatedAtValues = loaded.flatMap((entry) => entry.ok && typeof entry.updatedAt === 'string' ? [entry.updatedAt] : []);
+    if (!ok && typeof previous?.updatedAt === 'string') {
+        updatedAtValues.push(previous.updatedAt);
     }
-    catch {
-        return {
-            dictionaries: Object.fromEntries(locales.map((locale) => [locale, {}])),
+    updatedAtValues.sort();
+    return {
+        bundle: {
+            dictionaries: Object.fromEntries(loaded.map((entry) => [entry.locale, entry.ok ? entry.labels : (previous?.dictionaries[entry.locale] ?? {})])),
             defaultLocale,
             locales,
-            updatedAt: null,
-        };
-    }
+            updatedAt: updatedAtValues[updatedAtValues.length - 1] ?? null,
+        },
+        ok,
+    };
 }
 async function fetchLabelDictionary(apiUrl, locale) {
     const url = new URL('/labels', apiUrl);
     url.searchParams.set('locale', locale);
     const response = await fetchWithTimeout(url, LABEL_FETCH_TIMEOUT_MS);
     if (!response.ok) {
-        return { locale, labels: {}, updatedAt: null };
+        throw new Error(`Failed to load labels for locale "${locale}": ${response.status}`);
     }
     const body = (await response.json());
     if (Array.isArray(body.data)) {
         return {
-            locale,
             labels: Object.fromEntries(body.data.map((row) => [row.key, row.value ?? row.defaultValue ?? ''])),
             updatedAt: null,
         };
     }
     return {
-        locale,
         labels: body.data?.labels ?? {},
         updatedAt: body.data?.updatedAt ?? null,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo-vite",
-  "version": "2.4.0-staging.2",
+  "version": "2.4.0-staging.4",
   "description": "Framework-neutral Fimo Vite plugin. Pairs with the fimo package at the same version.",
   "files": [
     "dist/",
@@ -31,15 +31,15 @@
     "oxc-parser": "^0.118.0"
   },
   "devDependencies": {
-    "@fimo/tsconfig": "2.4.0-staging.2",
+    "@fimo/tsconfig": "2.4.0-staging.4",
     "@types/node": "22.18.6",
-    "fimo": "2.4.0-staging.2",
+    "fimo": "2.4.0-staging.4",
     "typescript": "7.0.2",
     "vite": "8.2.2",
     "vitest": "5.0.0"
   },
   "peerDependencies": {
-    "fimo": "2.4.0-staging.2",
+    "fimo": "2.4.0-staging.4",
     "vite": "^7.0.0 || ^8.0.0"
   },
   "engines": {