cloudflare-next-intl 0.9.5 → 0.9.7

package/dist/src/client/components/client_provider.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { createContext, useMemo } from "react";
-import dynamic from "next/dynamic";
+import dynamic from "next/dynamic.js";
 import config from "@intl-config";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import installGlobalErrorOverride from "../../error_handling/install_global_error_override.js";

package/dist/src/client/components/client_provider_static.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { createContext, useMemo } from "react";
-import dynamic from "next/dynamic";
+import dynamic from "next/dynamic.js";
 import config from "@intl-config";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import installGlobalErrorOverride from "../../error_handling/install_global_error_override.js";

package/dist/src/client/components/locale_link.d.ts

@@ -1,4 +1,4 @@
-import { type LinkProps } from 'next/link';
+import { type LinkProps } from 'next/link.js';
 import { type ComponentProps } from 'react';
 type NextLinkProps = Omit<ComponentProps<'a'>, keyof LinkProps> & Omit<LinkProps, 'locale' | 'href' | 'prefetch' | 'onNavigate' | 'hrefLang' | 'replace' | 'scroll'>;
 export type LocaleLinkProps = NextLinkProps & {

package/dist/src/client/components/locale_link_client.js

@@ -5,7 +5,7 @@ import config from '../../config/intl_config.js';
 import usePathname from '../hooks/use_path_name.js';
 import { localeCookieName } from '../../config/cookie_key.js';
 import setCookie from '../functions/set_cookie.js';
-import { useSearchParams } from 'next/navigation';
+import { useSearchParams } from 'next/navigation.js';
 function ClientLocaleLinkComponent({ locale, className, ...rest }, ref) {
     const pathname = usePathname();
     const searchParams = useSearchParams();

package/dist/src/client/hooks/use_path_name.js

@@ -1,5 +1,5 @@
 "use client";
-import { usePathname as nextUsePathname } from "next/navigation";
+import { usePathname as nextUsePathname } from "next/navigation.js";
 import { useLocale } from "./client_hooks.js";
 export default function usePathname() {
     const pathname = nextUsePathname();

package/dist/src/config/middleware.d.ts

@@ -1,5 +1,5 @@
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
+import type { NextRequest } from 'next/server.js';
+import { NextResponse } from 'next/server.js';
 import type { MiddlewareCustomHandler } from '../types/types.js';
 export declare const localesSet: Set<string>;
 export default function intlMiddleware(request: NextRequest, options?: {

package/dist/src/config/middleware.js

@@ -1,4 +1,4 @@
-import { NextResponse } from 'next/server';
+import { NextResponse } from 'next/server.js';
 import { languageDetecotr } from '../server/functions/get_user_locale.js';
 import config from './intl_config.js';
 import { isBotCookieKey, localeCookieName } from './cookie_key.js';

package/dist/src/cookie_consent/client/components/auto_analytics_events.js

@@ -1,5 +1,5 @@
 'use client';
-import { usePathname } from 'next/navigation';
+import { usePathname } from 'next/navigation.js';
 import { useReportWebVitals } from 'next/web-vitals';
 import { useEffect } from 'react';
 import useCookieConsent from '../use_cookie_consent.js';

package/dist/src/cookie_consent/client/components/cookie_consent_analytics.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
-import dynamic from 'next/dynamic';
+import dynamic from 'next/dynamic.js';
 import useCookieConsent from '../use_cookie_consent.js';
 const ClarityScript = dynamic(() => import('./clarity_script.js'));
 export default function CookieConsentAnalytics({ config }) {

package/dist/src/cookie_consent/client/components/default_privacy_policy_link.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import NextLink from 'next/link';
+import NextLink from 'next/link.js';
 import config from '../../../config/intl_config.js';
 import { getLocaleCache } from '../../../general/cache_variables.js';
 export default function DefaultPrivacyPolicyLink({ privacyPolicyPath, text, className, style }) {

package/dist/src/cookie_consent/client/cookie_consent_provider.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useEffect, useMemo, useState } from 'react';
-import { usePathname } from 'next/navigation';
+import { usePathname } from 'next/navigation.js';
 import config from '../../config/intl_config.js';
 import requireCookieConsentConfig from '../require_config.js';
 import getCookie from '../../client/functions/get_cookie.js';

package/dist/src/db/connection.js

@@ -21,6 +21,14 @@ async function resolveConnectionString(db, generate) {
         'to a connection string, or to a function returning one (e.g. reading a ' +
         'Hyperdrive binding off `env` or `getCloudflareContext().env`).');
 }
+async function resetSessionState(client) {
+    try {
+        await client.query('discard all');
+    }
+    catch {
+        await client.query('reset role').catch(() => undefined);
+    }
+}
 export async function withDbClient(config, queryFn) {
     const db = config.db;
     requireDbConfig(db);
@@ -33,6 +41,7 @@ export async function withDbClient(config, queryFn) {
         try {
             await client.connect();
             connected = true;
+            await resetSessionState(client);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error ?? '');
@@ -83,6 +92,7 @@ export async function connectToPostgres(config) {
         void reportError({ errorHandling: config.errorHandling, generate: config.generate }, { error, classOrMethodName: 'db.connectToPostgres.clientError' });
     });
     await client.connect();
+    await resetSessionState(client);
     return client;
 }
 export async function disconnectPostgres(client) {

package/dist/src/db/context.js

@@ -126,10 +126,6 @@ function injectUidComment(sql, userId) {
     }
     return sql;
 }
-function isSelectOnly(sql) {
-    const text = typeof sql === 'string' ? sql : sql?.text;
-    return typeof text === 'string' && /^(select|with)\b/i.test(text.trimStart());
-}
 export async function withUserDb(fn, uid, dbOverride) {
     const config = await resolveDbConfig(dbOverride);
     const db = config.db;
@@ -144,17 +140,29 @@ export async function withUserDb(fn, uid, dbOverride) {
     return await withDbClient(config, async (client) => {
         const rawClient = client;
         const setSessionState = async () => {
-            await rawClient.query(`select set_config('request.jwt.claims', $1, false)`, [JSON.stringify({ sub: userId })]);
-            await rawClient.query(`set role "${role.replace(/"/g, '""')}"`);
+            await rawClient.query(`select set_config('request.jwt.claims', $1, true)`, [JSON.stringify({ sub: userId })]);
+            await rawClient.query(`set local role "${role.replace(/"/g, '""')}"`);
         };
         let inTransaction = false;
-        let sessionStateSet = false;
         let gate = Promise.resolve();
         const serialize = (op) => {
             const run = gate.then(op, op);
             gate = run.catch(() => undefined);
             return run;
         };
+        const beginWithIdentity = async () => {
+            if (inTransaction)
+                return;
+            await rawClient.query('begin');
+            try {
+                await setSessionState();
+            }
+            catch (error) {
+                await rawClient.query('rollback').catch(() => undefined);
+                throw error;
+            }
+            inTransaction = true;
+        };
         const interceptingClient = new Proxy(client, {
             get(target, prop) {
                 if (prop === 'query') {
@@ -164,16 +172,7 @@ export async function withUserDb(fn, uid, dbOverride) {
                         const isCommitOrRollback = /^(commit|rollback)\b/i.test(text.trimStart());
                         if (isBegin) {
                             return await serialize(async () => {
-                                if (!sessionStateSet) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                    sessionStateSet = true;
-                                }
-                                else if (!inTransaction) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                }
+                                await beginWithIdentity();
                                 return { rows: [], rowCount: 0 };
                             });
                         }
@@ -187,27 +186,7 @@ export async function withUserDb(fn, uid, dbOverride) {
                                 return { rows: [], rowCount: 0 };
                             });
                         }
-                        await serialize(async () => {
-                            if (!sessionStateSet) {
-                                if (isSelectOnly(sql)) {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                    await rawClient.query('commit');
-                                    inTransaction = false;
-                                }
-                                else {
-                                    await rawClient.query('begin');
-                                    inTransaction = true;
-                                    await setSessionState();
-                                }
-                                sessionStateSet = true;
-                            }
-                            else if (!inTransaction && !isSelectOnly(sql)) {
-                                await rawClient.query('begin');
-                                inTransaction = true;
-                            }
-                        });
+                        await serialize(beginWithIdentity);
                         const targetClient = target;
                         return targetClient.query(injectUidComment(sql, userId), ...args);
                     };
@@ -218,15 +197,18 @@ export async function withUserDb(fn, uid, dbOverride) {
         });
         const { drizzle } = await import('drizzle-orm/node-postgres');
         const drizzleHandle = drizzle(interceptingClient);
+        const resetRole = () => rawClient.query('reset role').catch(() => undefined);
         try {
             const result = await fn(await postgresDb(drizzleHandle, interceptingClient));
             if (inTransaction)
                 await rawClient.query('commit');
+            await resetRole();
             return result;
         }
         catch (err) {
             if (inTransaction)
                 await rawClient.query('rollback').catch(() => undefined);
+            await resetRole();
             throw err;
         }
     });

package/dist/src/error_handling/create_server_error_action.js

@@ -2,7 +2,7 @@ import reportError from './report_error.js';
 import stringifyUnknown from './stringify_unknown.js';
 async function resolveRequestContext() {
     try {
-        const { headers } = await import('next/headers');
+        const { headers } = await import('next/headers.js');
         const headerList = await headers();
         return {
             path: headerList.get('x-pathname') ?? undefined,

package/dist/src/firebase_auth/client/auth_user_provider.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useEffect, useRef, useState } from 'react';
-import { useRouter } from 'next/navigation';
+import { useRouter } from 'next/navigation.js';
 import usePathname from '../../client/hooks/use_path_name.js';
 import config from '@intl-config';
 import requireFirebaseAuthConfig from '../require_config.js';

package/dist/src/firebase_auth/middleware/update_session.d.ts

@@ -1,4 +1,4 @@
-import { NextResponse, type NextRequest } from 'next/server';
+import { NextResponse, type NextRequest } from 'next/server.js';
 import config from '@intl-config';
 export declare const defaultSessionCookieName = "__fa_session__";
 export declare const defaultRefreshTokenCookieName = "__fa_refresh_token__";

package/dist/src/firebase_auth/middleware/update_session.js

@@ -1,4 +1,4 @@
-import { NextResponse } from 'next/server';
+import { NextResponse } from 'next/server.js';
 import config from '@intl-config';
 import decodeJwtPayload from '../decode_jwt_payload.js';
 import isWhitelisted from '../is_whitelisted.js';

package/dist/src/firebase_auth/server/auth_user_server_provider.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import dynamic from 'next/dynamic';
-import { headers } from 'next/headers';
-import { redirect } from 'next/navigation';
+import dynamic from 'next/dynamic.js';
+import { headers } from 'next/headers.js';
+import { redirect } from 'next/navigation.js';
 import config from '@intl-config';
 import requireFirebaseAuthConfig from '../require_config.js';
 import { getAuthenticatedAppForUser } from './firebase_server.js';

package/dist/src/firebase_auth/server/clear_session_action.js

@@ -1,5 +1,5 @@
 "use server";
-import { cookies } from "next/headers";
+import { cookies } from "next/headers.js";
 import config from "@intl-config";
 import { defaultRefreshTokenCookieName, defaultSessionCookieName } from "../middleware/update_session.js";
 export default async function clearSessionAction() {

package/dist/src/firebase_auth/server/firebase_server.js

@@ -1,4 +1,4 @@
-import { cookies } from 'next/headers';
+import { cookies } from 'next/headers.js';
 import { cache } from 'react';
 import config from '@intl-config';
 import requireFirebaseAuthConfig from '../require_config.js';

package/dist/src/image_optimizer/next_image_shim.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
-import { getImageProps as nextGetImageProps } from "next/image";
-import type { ImageProps } from "next/image";
+import { getImageProps as nextGetImageProps } from "next/image.js";
+import type { ImageProps } from "next/image.js";
 import { getImageBlurSvg } from "./blur_svg.js";
 import type { OptimizedImage } from "./types.js";
 export type ManifestEntry = OptimizedImage;

package/dist/src/image_optimizer/next_image_shim.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import NextImage, { getImageProps as nextGetImageProps } from "next/image";
+import NextImage, { getImageProps as nextGetImageProps } from "next/image.js";
 import { getImageBlurSvg } from "./blur_svg.js";
 import { ImgWithFallback } from "./img_with_fallback.js";
 function pickVariant(entry, requestedWidth) {

package/dist/src/server/components/link.d.ts

@@ -1,4 +1,4 @@
-import { type LinkProps } from 'next/link';
+import { type LinkProps } from 'next/link.js';
 import { type ComponentProps } from 'react';
 type NextLinkProps = Omit<ComponentProps<'a'>, keyof LinkProps> & Omit<LinkProps, 'locale'>;
 declare const Link: import("react").ForwardRefExoticComponent<Omit<NextLinkProps, "ref"> & import("react").RefAttributes<HTMLAnchorElement>>;

package/dist/src/server/components/link.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import LinkComponent from 'next/link';
+import LinkComponent from 'next/link.js';
 import { forwardRef, } from 'react';
 import config from '../../config/intl_config.js';
 import { getLocaleCache } from '../../general/cache_variables.js';

package/dist/src/server/components/server_provider.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { getMessage } from "../functions/server.js";
-import dynamic from "next/dynamic";
+import dynamic from "next/dynamic.js";
 import { localesSet } from "../../config/middleware.js";
 import config from "../../config/intl_config.js";
 import resolveRequiresConsent from "../../cookie_consent/gdpr_countries.js";
@@ -11,7 +11,7 @@ const LocationzationClientProvider = dynamic(() => import("../../client/componen
 let authUserServerProviderModule;
 export default async function LocationzationProvider({ language, messages, staticSafe = true, children }) {
     if (!localesSet.has(language)) {
-        const { notFound } = await import("next/navigation");
+        const { notFound } = await import("next/navigation.js");
         notFound();
     }
     if (language) {

package/dist/src/server/components/server_provider_static.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { getMessage } from "../functions/server.js";
-import dynamic from "next/dynamic";
+import dynamic from "next/dynamic.js";
 import { localesSet } from "../../config/middleware.js";
 import config from "../../config/intl_config.js";
 import resolveRequiresConsent from "../../cookie_consent/gdpr_countries.js";
@@ -10,7 +10,7 @@ import reportError from "../../error_handling/report_error.js";
 const LocationzationClientProvider = dynamic(() => import("../../client/components/client_provider_static.js"));
 export default async function LocationzationProvider({ language, messages, children }) {
     if (!localesSet.has(language)) {
-        const { notFound } = await import("next/navigation");
+        const { notFound } = await import("next/navigation.js");
         notFound();
     }
     if (config.firebaseAuth) {

package/dist/src/server/functions/geo.js

@@ -48,7 +48,7 @@ export async function getCountry(input, generate, headerNames) {
         }
     }
     try {
-        const { headers } = await import('next/headers');
+        const { headers } = await import('next/headers.js');
         const h = await headers();
         const country = extractFromHeaderNames(h, names);
         if (country)
@@ -101,7 +101,7 @@ export async function getTimezone(input, fallback, generate, headerNames) {
         }
     }
     try {
-        const { headers } = await import('next/headers');
+        const { headers } = await import('next/headers.js');
         const h = await headers();
         const tz = extractFromHeaderNames(h, names);
         if (tz)

package/dist/src/server/functions/server.js

@@ -19,7 +19,7 @@ async function iGetMessage(locale) {
         }
         catch {
             if (!localesSet.has(locale)) {
-                const { notFound } = await import("next/navigation");
+                const { notFound } = await import("next/navigation.js");
                 notFound();
                 return {};
             }
@@ -47,7 +47,7 @@ async function iGetLocale() {
     }
     try {
         if (!nextHeadersModule) {
-            nextHeadersModule = await import("next/headers");
+            nextHeadersModule = await import("next/headers.js");
         }
         const cookieStore = await nextHeadersModule.cookies();
         const localeCookie = cookieStore.get(localeCookieName);

package/dist/src/types/types.d.ts

@@ -1,4 +1,4 @@
-import type { NextResponse } from 'next/server';
+import type { NextResponse } from 'next/server.js';
 import type { Languages } from 'next/dist/lib/metadata/types/alternative-urls-types';
 import type { Videos } from 'next/dist/lib/metadata/types/metadata-types';
 import type { CookieConsentDialogProps } from '../cookie_consent/client/components/cookie_consent_dialog.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",