@mpgd/i18n 0.6.0 → 0.6.1

package/dist/paraglide/server.d.ts

@@ -87,7 +87,7 @@
 * }
 * ```
 */
-export function paraglideMiddleware<T>(request: Request, resolve: (args: {
+export declare function paraglideMiddleware<T>(request: Request, resolve: (args: {
   request: Request;
   locale: import("./runtime.js").Locale;
 }) => T | Promise<T>, options?: {

package/dist/paraglide/server.js

@@ -92,11 +92,19 @@ import * as runtime from "./runtime.js";
  * ```
  */
 export async function paraglideMiddleware(request, resolve, options) {
-    if (!runtime.disableAsyncLocalStorage && !runtime.serverAsyncLocalStorage) {
+    let requestAsyncLocalStorage = runtime.serverAsyncLocalStorage;
+    requestAsyncLocalStorage = runtime.getServerAsyncLocalStorage();
+    if (!runtime.disableAsyncLocalStorage && !requestAsyncLocalStorage) {
       const { AsyncLocalStorage } = await import("async_hooks");
-      runtime.overwriteServerAsyncLocalStorage(new AsyncLocalStorage());
-    } else if (!runtime.serverAsyncLocalStorage) {
-      runtime.overwriteServerAsyncLocalStorage(createMockAsyncLocalStorage());
+      requestAsyncLocalStorage = runtime.getServerAsyncLocalStorage();
+      if (!requestAsyncLocalStorage) {
+        requestAsyncLocalStorage = new AsyncLocalStorage();
+        runtime.overwriteServerAsyncLocalStorage(requestAsyncLocalStorage);
+      }
+    }
+    if (!requestAsyncLocalStorage) {
+      requestAsyncLocalStorage = createMockAsyncLocalStorage();
+      runtime.overwriteServerAsyncLocalStorage(requestAsyncLocalStorage);
     }
     const url = resolveMiddlewareUrl(request, options?.effectiveRequestUrl);
     const origin = url.origin;
@@ -105,10 +113,13 @@ export async function paraglideMiddleware(request, resolve, options) {
         const newRequest = cloneRequestWithFallback(request, url);
         /** @type {Set<string>} */
         const messageCalls = new Set();
-        return /** @type {Response} */ (await runtime.serverAsyncLocalStorage?.run({ locale, origin, messageCalls }, () => resolve({ locale, request: newRequest })));
+        return /** @type {Response} */ (await requestAsyncLocalStorage?.run({ locale, origin, messageCalls }, () => resolve({ locale, request: newRequest })));
     }
     const strategy = runtime.getStrategyForUrl(url.href);
-    const decision = await runtime.shouldRedirect({ request, effectiveRequestUrl: url });
+    const decision = await runtime.shouldRedirect({
+        request,
+        effectiveRequestUrl: url,
+    });
     const locale = decision.locale;
     // if the client makes a request to a URL that doesn't match
     // the localizedUrl, redirect the client to the localized URL
@@ -147,7 +158,7 @@ export async function paraglideMiddleware(request, resolve, options) {
     // the message functions that have been called in this request
     /** @type {Set<string>} */
     const messageCalls = new Set();
-    const response = await runtime.serverAsyncLocalStorage?.run({ locale, origin, messageCalls }, () => resolve({ locale, request: newRequest }));
+    const response = await requestAsyncLocalStorage?.run({ locale, origin, messageCalls }, () => resolve({ locale, request: newRequest }));
     // Only modify HTML responses
     if (runtime.experimentalMiddlewareLocaleSplitting &&
         response.headers.get("Content-Type")?.includes("html")) {
@@ -193,7 +204,8 @@ function resolveMiddlewareUrl(request, effectiveRequestUrl) {
     if (typeof effectiveRequestUrl === "function") {
         return new URL(effectiveRequestUrl(request), request.url);
     }
-    if (typeof effectiveRequestUrl === "string" || effectiveRequestUrl instanceof URL) {
+    if (typeof effectiveRequestUrl === "string" ||
+        effectiveRequestUrl instanceof URL) {
         return new URL(effectiveRequestUrl, request.url);
     }
     return new URL(request.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/i18n",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Paraglide-backed message catalog for mpgd demos and target-aware UI.",
   "license": "MIT",
   "repository": {
@@ -47,11 +47,11 @@
     "@mpgd/platform": "0.12.0"
   },
   "devDependencies": {
-    "@inlang/paraglide-js": "2.20.2",
+    "@inlang/paraglide-js": "2.25.1",
     "@inlang/plugin-message-format": "4.4.0",
     "@types/node": "^24.0.0",
     "ttsc": "0.18.4",
-    "typescript": "5.9.3"
+    "typescript": "7.0.2"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",