@0xchain/i18n 1.1.0-beta.72 → 1.1.0-beta.73

package/dist/index.d.ts

@@ -2,5 +2,5 @@ export * from './navigation';
 export * from './routing';
 export * from './request';
 export * from './middleware';
-export * from './localeCookie';
+export { resolveIntlHref } from './lib/resolveIntlHref';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/index.js

@@ -1,19 +1,13 @@
-import { Link, getPathname, redirect, usePathname, useRouter } from "./navigation.js";
+import { Link, getPathname, redirect, resolveIntlHref, usePathname, useRouter } from "./navigation.js";
 import { routing } from "./routing.js";
 import "./request.js";
-import { createI18nMiddleware, middleware } from "./middleware.js";
-import { LOCALE_COOKIE_MAX_AGE, LOCALE_COOKIE_NAME, localeCookieOptions, requestHostname, resolveLocaleCookieDomain } from "./localeCookie.js";
+import { middleware } from "./middleware.js";
 export {
-  LOCALE_COOKIE_MAX_AGE,
-  LOCALE_COOKIE_NAME,
   Link,
-  createI18nMiddleware,
   getPathname,
-  localeCookieOptions,
   middleware,
   redirect,
-  requestHostname,
-  resolveLocaleCookieDomain,
+  resolveIntlHref,
   routing,
   usePathname,
   useRouter

package/dist/lib/resolveIntlHref.d.ts

@@ -0,0 +1,11 @@
+export type ResolvedIntlHref<THref> = {
+    href: THref;
+    locale?: string;
+};
+/**
+ * 兼容 next-intl `useRouter` 与 `next/navigation` 两种 href：
+ * - `/conversation` → 原样交给 next-intl（补当前语言）
+ * - `/ko/conversation` 或 `https://host/en/query` → 拆出语言，用 `{ locale }` 导航，避免 `/ko/ko`
+ */
+export declare function resolveIntlHref<THref>(href: THref, locales: readonly string[]): ResolvedIntlHref<THref>;
+//# sourceMappingURL=resolveIntlHref.d.ts.map

package/dist/lib/resolveIntlHref.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveIntlHref.d.ts","sourceRoot":"","sources":["../../src/lib/resolveIntlHref.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,CAAC,KAAK,IAAI;IACpC,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAmCF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,SAAS,MAAM,EAAE,GACzB,gBAAgB,CAAC,KAAK,CAAC,CA0BzB"}

package/dist/middleware.d.ts

@@ -1,4 +1,2 @@
-import { NextRequest } from 'next/server';
-export declare function createI18nMiddleware(request: NextRequest): import('next/server').NextResponse<unknown>;
-export declare function middleware(request: NextRequest): import('next/server').NextResponse<unknown>;
+export declare function middleware(request: unknown): unknown;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS/C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,+CAmBxD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,+CAE9C"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAKA,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEpD"}

package/dist/middleware.js

@@ -1,27 +1,9 @@
 import createMiddleware from "next-intl/middleware";
-import { requestHostname, LOCALE_COOKIE_NAME, localeCookieOptions, resolveLocaleCookieDomain } from "./localeCookie.js";
 import { routing } from "./routing.js";
-function createI18nMiddleware(request) {
-  const hostname = requestHostname(request);
-  const handle = createMiddleware({
-    ...routing,
-    localeCookie: {
-      name: LOCALE_COOKIE_NAME,
-      ...localeCookieOptions(hostname)
-    }
-  });
-  const response = handle(request);
-  const locale = request.nextUrl.pathname.split("/")[1];
-  if (resolveLocaleCookieDomain(hostname) && routing.locales.includes(locale)) {
-    response.cookies.set(LOCALE_COOKIE_NAME, "", { path: "/", maxAge: 0 });
-    response.cookies.set(LOCALE_COOKIE_NAME, locale, localeCookieOptions(hostname));
-  }
-  return response;
-}
+const i18n = createMiddleware(routing);
 function middleware(request) {
-  return createI18nMiddleware(request);
+  return i18n(request);
 }
 export {
-  createI18nMiddleware,
   middleware
 };

package/dist/navigation.d.ts

@@ -7,3 +7,7 @@ export declare const usePathname: IntlNavigation['usePathname'];
 export declare const getPathname: IntlNavigation['getPathname'];
 export declare const redirect: IntlNavigation['redirect'];
 export declare const useRouter: IntlNavigation['useRouter'];
+export declare function resolveIntlHref<THref>(
+  href: THref,
+  locales: readonly string[],
+): { href: THref; locale?: string };

package/dist/navigation.js

@@ -1,15 +1,85 @@
+import { useMemo } from "react";
 import { createNavigation } from "next-intl/navigation";
 import { routing } from "./routing.js";
+function pathnameAndSearch(href) {
+  try {
+    if (/^https?:\/\//i.test(href) || href.startsWith("//")) {
+      const url = new URL(href, "http://local.invalid");
+      return `${url.pathname}${url.search}`;
+    }
+  } catch {
+  }
+  return href.startsWith("/") || href.startsWith("?") ? href : `/${href}`;
+}
+function matchLocalePrefix(path, locales) {
+  const normalized = path.startsWith("/") ? path : `/${path}`;
+  const sorted = [...locales].sort((a, b) => b.length - a.length);
+  for (const locale of sorted) {
+    const prefix = `/${locale}`;
+    if (normalized === prefix || normalized === `${prefix}/`) {
+      return { locale, rest: "/" };
+    }
+    if (normalized.startsWith(`${prefix}/`)) {
+      return { locale, rest: normalized.slice(prefix.length) || "/" };
+    }
+    if (normalized.startsWith(`${prefix}?`)) {
+      return { locale, rest: `/${normalized.slice(prefix.length)}` };
+    }
+  }
+  return null;
+}
+function resolveIntlHref(href, locales) {
+  if (typeof href === "string") {
+    const path = pathnameAndSearch(href);
+    const matched = matchLocalePrefix(path, locales);
+    if (!matched) {
+      return { href: path };
+    }
+    return { href: matched.rest, locale: matched.locale };
+  }
+  if (href && typeof href === "object" && "pathname" in href) {
+    const record = href;
+    if (typeof record.pathname !== "string") {
+      return { href };
+    }
+    const matched = matchLocalePrefix(record.pathname, locales);
+    if (!matched) {
+      return { href };
+    }
+    return {
+      href: { ...record, pathname: matched.rest },
+      locale: matched.locale
+    };
+  }
+  return { href };
+}
 const navigation = createNavigation(routing);
 const Link = navigation.Link;
 const usePathname = navigation.usePathname;
 const getPathname = navigation.getPathname;
 const redirect = navigation.redirect;
-const useRouter = navigation.useRouter;
+function withCompatibleHref(navigate, href, options) {
+  const resolved = resolveIntlHref(href, routing.locales);
+  const locale = options?.locale ?? resolved.locale;
+  navigate(resolved.href, locale ? { ...options, locale } : options);
+}
+function useRouter() {
+  const router = navigation.useRouter();
+  return useMemo(
+    () => ({
+      ...router,
+      push: (href, options) => withCompatibleHref(router.push, href, options),
+      replace: (href, options) => withCompatibleHref(router.replace, href, options),
+      prefetch: (href, options) => withCompatibleHref(router.prefetch, href, options)
+    }),
+    [router]
+  );
+}
 export {
   Link,
   getPathname,
   redirect,
+  resolveIntlHref,
   usePathname,
   useRouter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/i18n",
-  "version": "1.1.0-beta.72",
+  "version": "1.1.0-beta.73",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -32,11 +32,6 @@
       "import": "./dist/middleware.js",
       "default": "./dist/middleware.js"
     },
-    "./localeCookie": {
-      "types": "./dist/localeCookie.d.ts",
-      "import": "./dist/localeCookie.js",
-      "default": "./dist/localeCookie.js"
-    },
     "./redirectWithLanguage": {
       "types": "./dist/redirectWithLanguage.d.ts",
       "import": "./dist/redirectWithLanguage.js",

package/dist/localeCookie.d.ts

@@ -1,18 +0,0 @@
-export declare const LOCALE_COOKIE_NAME = "NEXT_LOCALE";
-export declare const LOCALE_COOKIE_MAX_AGE: number;
-export declare function resolveLocaleCookieDomain(hostname: string): string | undefined;
-export declare function localeCookieOptions(hostname: string): {
-    domain?: string | undefined;
-    path: string;
-    sameSite: "lax";
-    maxAge: number;
-};
-export declare function requestHostname(request: {
-    headers: {
-        get(name: string): string | null;
-    };
-    nextUrl: {
-        hostname: string;
-    };
-}): string;
-//# sourceMappingURL=localeCookie.d.ts.map

package/dist/localeCookie.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"localeCookie.d.ts","sourceRoot":"","sources":["../src/localeCookie.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,eAAO,MAAM,qBAAqB,QAAqB,CAAC;AAExD,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM;;;;;EAQnD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,OAAO,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAC9C,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,UAMA"}

package/dist/localeCookie.js

@@ -1,27 +0,0 @@
-const LOCALE_COOKIE_NAME = "NEXT_LOCALE";
-const LOCALE_COOKIE_MAX_AGE = 60 * 60 * 24 * 365;
-function resolveLocaleCookieDomain(hostname) {
-  const host = hostname.split(":")[0];
-  if (/(^|\.)ichatgo\.ai$/i.test(host)) return ".ichatgo.ai";
-  if (/(^|\.)chaindigg\.com$/i.test(host)) return ".chaindigg.com";
-  return void 0;
-}
-function localeCookieOptions(hostname) {
-  const domain = resolveLocaleCookieDomain(hostname);
-  return {
-    path: "/",
-    sameSite: "lax",
-    maxAge: LOCALE_COOKIE_MAX_AGE,
-    ...domain ? { domain } : {}
-  };
-}
-function requestHostname(request) {
-  return (request.headers.get("x-forwarded-host") || request.headers.get("host") || request.nextUrl.hostname).split(":")[0];
-}
-export {
-  LOCALE_COOKIE_MAX_AGE,
-  LOCALE_COOKIE_NAME,
-  localeCookieOptions,
-  requestHostname,
-  resolveLocaleCookieDomain
-};