@inlang/paraglide-js 2.3.0 → 2.3.1

package/dist/compiler/runtime/set-locale.d.ts

@@ -6,16 +6,19 @@
  * reloading is disabled, you need to ensure that the UI is updated
  * to reflect the new locale.
  *
+ * If any custom strategy's \`setLocale\` function is async, then this
+ * function will become async as well.
+ *
  * @example
  *   setLocale('en');
  *
  * @example
  *   setLocale('en', { reload: false });
  *
- * @type {(newLocale: Locale, options?: { reload?: boolean }) => void}
+ * @type {(newLocale: Locale, options?: { reload?: boolean }) => Promise<void> | void}
  */
 export let setLocale: (newLocale: Locale, options?: {
     reload?: boolean;
-}) => void;
+}) => Promise<void> | void;
 export function overwriteSetLocale(fn: (newLocale: Locale) => void): void;
 //# sourceMappingURL=set-locale.d.ts.map

package/dist/compiler/runtime/set-locale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-locale.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/set-locale.js"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;GAeG;AACH,sBAFU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CA8FnE;AAgBK,uCAFI,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,QAIrC"}
+{"version":3,"file":"set-locale.d.ts","sourceRoot":"","sources":["../../../src/compiler/runtime/set-locale.js"],"names":[],"mappings":"AAgCA;;;;;;;;;;;;;;;;;;GAkBG;AACH,sBAFU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAmGnF;AAgBK,uCAFI,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,QAIrC"}

package/dist/compiler/runtime/set-locale.js

@@ -2,6 +2,22 @@ import { getLocale } from "./get-locale.js";
 import { localizeUrl } from "./localize-url.js";
 import { customClientStrategies, isCustomStrategy } from "./strategy.js";
 import { cookieDomain, cookieMaxAge, cookieName, isServer, localStorageKey, strategy, TREE_SHAKE_COOKIE_STRATEGY_USED, TREE_SHAKE_GLOBAL_VARIABLE_STRATEGY_USED, TREE_SHAKE_LOCAL_STORAGE_STRATEGY_USED, TREE_SHAKE_URL_STRATEGY_USED, } from "./variables.js";
+/**
+ * Navigates to the localized URL, or reloads the current page
+ *
+ * @param {string} [newLocation] The new location
+ * @return {undefined}
+ */
+const navigateOrReload = (newLocation) => {
+    if (newLocation) {
+        // reload the page by navigating to the new url
+        window.location.href = newLocation;
+    }
+    else {
+        // reload the page to reflect the new locale
+        window.location.reload();
+    }
+};
 /**
  * Set the locale.
  *
@@ -10,13 +26,16 @@ import { cookieDomain, cookieMaxAge, cookieName, isServer, localStorageKey, stra
  * reloading is disabled, you need to ensure that the UI is updated
  * to reflect the new locale.
  *
+ * If any custom strategy's \`setLocale\` function is async, then this
+ * function will become async as well.
+ *
  * @example
  *   setLocale('en');
  *
  * @example
  *   setLocale('en', { reload: false });
  *
- * @type {(newLocale: Locale, options?: { reload?: boolean }) => void}
+ * @type {(newLocale: Locale, options?: { reload?: boolean }) => Promise<void> | void}
  */
 export let setLocale = (newLocale, options) => {
     const optionsWithDefaults = {
@@ -32,6 +51,8 @@ export let setLocale = (newLocale, options) => {
     catch {
         // do nothing, no locale has been set yet.
     }
+    /** @type {Array<Promise<any>>} */
+    const customSetLocalePromises = [];
     /** @type {string | undefined} */
     let newLocation = undefined;
     for (const strat of strategy) {
@@ -85,8 +106,9 @@ export let setLocale = (newLocale, options) => {
                 // Handle async setLocale - fire and forget
                 if (result instanceof Promise) {
                     result.catch((error) => {
-                        console.warn(`Custom strategy "${strat}" setLocale failed:`, error);
+                        error.message = `Custom strategy "${strat}" setLocale failed: ${error.message}`;
                     });
+                    customSetLocalePromises.push(result);
                 }
             }
         }
@@ -95,13 +117,14 @@ export let setLocale = (newLocale, options) => {
         optionsWithDefaults.reload &&
         window.location &&
         newLocale !== currentLocale) {
-        if (newLocation) {
-            // reload the page by navigating to the new url
-            window.location.href = newLocation;
+        if (customSetLocalePromises.length) {
+            // Wait for any async custom setLocale functions
+            return Promise.all(customSetLocalePromises).then(() => {
+                navigateOrReload(newLocation);
+            });
         }
         else {
-            // reload the page to reflect the new locale
-            window.location.reload();
+            navigateOrReload(newLocation);
         }
     }
     return;

package/dist/compiler/runtime/set-locale.test.js

@@ -317,6 +317,102 @@ test("calls setLocale on multiple custom strategies", async () => {
     expect(customLocale1).toBe("de");
     expect(customLocale2).toBe("de");
 });
+test("awaits async setLocale functions to resolve in custom strategy", async () => {
+    let customLocale1 = "en";
+    globalThis.window = {
+        location: {
+            reload: vi.fn(),
+        },
+    };
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr", "de"],
+            },
+        }),
+        strategy: ["custom-async", "baseLocale"],
+        isServer: "false",
+    });
+    runtime.defineCustomClientStrategy("custom-async", {
+        getLocale: () => customLocale1,
+        setLocale: async (locale) => {
+            customLocale1 = locale;
+        },
+    });
+    const setLocalePromise = runtime.setLocale("de");
+    expect(window.location.reload).not.toHaveBeenCalled();
+    await setLocalePromise;
+    // Verify that setLocale resolved before reload was called
+    expect(window.location.reload).toHaveBeenCalledTimes(1);
+    expect(customLocale1).toBe("de");
+});
+test("awaits async setLocale functions to resolve in multiple custom strategies", async () => {
+    let customLocale1 = "en";
+    let customLocale2 = "en";
+    globalThis.window = {
+        location: {
+            reload: vi.fn(),
+        },
+    };
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr", "de"],
+            },
+        }),
+        strategy: ["custom-async1", "custom-async2", "baseLocale"],
+        isServer: "false",
+    });
+    runtime.defineCustomClientStrategy("custom-async1", {
+        getLocale: () => customLocale1,
+        setLocale: async (locale) => {
+            customLocale1 = locale;
+        },
+    });
+    runtime.defineCustomClientStrategy("custom-async2", {
+        getLocale: () => customLocale2,
+        setLocale: async (locale) => {
+            customLocale2 = locale;
+        },
+    });
+    const setLocalePromise = runtime.setLocale("de");
+    expect(window.location.reload).not.toHaveBeenCalled();
+    await setLocalePromise;
+    // Verify that setLocale resolved before reload was called
+    expect(window.location.reload).toHaveBeenCalledTimes(1);
+    expect(customLocale1).toBe("de");
+    expect(customLocale2).toBe("de");
+});
+test("reload should not run if async setLocale function rejects in custom strategy", async () => {
+    const customLocale1 = "en";
+    globalThis.window = {
+        location: {
+            reload: vi.fn(),
+        },
+    };
+    const runtime = await createParaglide({
+        blob: await newProject({
+            settings: {
+                baseLocale: "en",
+                locales: ["en", "fr", "de"],
+            },
+        }),
+        strategy: ["custom-async", "baseLocale"],
+        isServer: "false",
+    });
+    runtime.defineCustomClientStrategy("custom-async", {
+        getLocale: () => customLocale1,
+        setLocale: async () => {
+            throw new Error("fetch error");
+        },
+    });
+    await expect(() => runtime.setLocale("de")).rejects.toThrowError(`Custom strategy "custom-async" setLocale failed: fetch error`);
+    // Verify that reload was never called
+    expect(window.location.reload).toHaveBeenCalledTimes(0);
+    expect(customLocale1).toBe("en");
+});
 test("custom strategy setLocale works with cookie and localStorage", async () => {
     let customData = "en";
     globalThis.document = { cookie: "" };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/paraglide-js",
   "type": "module",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public",