intor 2.2.11 → 2.2.13

package/dist/next/index.js

@@ -1,6 +1,6 @@
 import { formatUrl } from 'next/dist/shared/lib/router/utils/format-url';
 import NextLink from 'next/link';
-import * as React6 from 'react';
+import * as React7 from 'react';
 import { usePathname as usePathname$1, useRouter as useRouter$1, redirect as redirect$1 } from 'next/navigation';
 import merge from 'lodash.merge';
 import { jsx } from 'react/jsx-runtime';
@@ -254,20 +254,71 @@ var localizePathname = ({
     localePrefixedPathname
   };
 };
-var ConfigContext = React6.createContext(void 0);
+var ConfigContext = React7.createContext(void 0);
 function ConfigProvider({
   value: { config, pathname },
   children
 }) {
-  const value = React6.useMemo(() => ({ config, pathname }), [config, pathname]);
+  const value = React7.useMemo(() => ({ config, pathname }), [config, pathname]);
   return /* @__PURE__ */ jsx(ConfigContext.Provider, { value, children });
 }
 function useConfig() {
-  const context = React6.useContext(ConfigContext);
+  const context = React7.useContext(ConfigContext);
   if (!context) throw new Error("useConfig must be used within ConfigProvider");
   return context;
 }
 
+// src/shared/utils/client/build-cookie-string.ts
+var buildCookieString = (cookie, locale) => {
+  const parts = [`${cookie.name}=${encodeURIComponent(locale)}`];
+  if (cookie.maxAge) {
+    const expires = new Date(Date.now() + cookie.maxAge * 1e3).toUTCString();
+    parts.push(`expires=${expires}`, `max-age=${cookie.maxAge}`);
+  }
+  parts.push(`path=${cookie.path ?? "/"}`);
+  if (cookie.domain) {
+    parts.push(`domain=${cookie.domain}`);
+  }
+  if (cookie.sameSite) {
+    parts.push(
+      `SameSite=${cookie.sameSite[0].toUpperCase()}${cookie.sameSite.slice(1).toLowerCase()}`
+    );
+  }
+  if (cookie.secure !== false) {
+    parts.push(`Secure`);
+  }
+  return parts.join("; ");
+};
+
+// src/shared/utils/client/set-locale-cookie-browser.ts
+var setLocaleCookieBrowser = ({
+  cookie,
+  locale
+}) => {
+  if (typeof document === "undefined") return;
+  if (!cookie.enabled || !cookie.autoSetCookie) return;
+  const cookieString = buildCookieString(cookie, locale);
+  document.cookie = cookieString;
+};
+
+// src/client/react/contexts/locale/utils/use-init-locale-cookie.ts
+var useInitLocaleCookie = ({
+  config,
+  locale
+}) => {
+  React7.useEffect(() => {
+    if (typeof document === "undefined") return;
+    const { cookie, routing } = config;
+    const { firstVisit } = routing;
+    const cookies2 = document.cookie.split(";").map((c) => c.trim());
+    const isCookieExists = cookies2.some((c) => c.startsWith(`${cookie.name}=`));
+    if (isCookieExists) return;
+    if (!firstVisit.redirect) return;
+    if (!cookie.enabled || !cookie.autoSetCookie) return;
+    setLocaleCookieBrowser({ cookie, locale });
+  }, []);
+};
+
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
@@ -475,19 +526,19 @@ var useRefetchMessages = ({
   setLoadedMessages,
   setIsLoadingMessages
 }) => {
-  const { messages: staticMessages } = config;
-  const namespaces = React6.useMemo(() => {
-    if (!config.loader) return [];
+  const { messages: staticMessages, loader } = config;
+  const namespaces = React7.useMemo(() => {
+    if (!loader) return [];
     return resolveNamespaces({ config, pathname });
   }, [config, pathname]);
-  const refetchMessages = React6.useCallback(
+  const refetchMessages = React7.useCallback(
     async (newLocale) => {
-      if (config.loader?.type === "remote") {
+      if (loader?.type === "remote") {
         setIsLoadingMessages(true);
         const loadedMessages = await loadRemoteMessages({
-          rootDir: config.loader.rootDir,
-          remoteUrl: config.loader.remoteUrl,
-          remoteHeaders: config.loader.remoteHeaders,
+          rootDir: loader.rootDir,
+          remoteUrl: loader.remoteUrl,
+          remoteHeaders: loader.remoteHeaders,
           locale: newLocale,
           fallbackLocales: config.fallbackLocales[newLocale] || [],
           namespaces,
@@ -502,8 +553,9 @@ var useRefetchMessages = ({
       }
     },
     [
-      config.loader,
+      loader,
       config.fallbackLocales,
+      config.cache,
       config.id,
       setIsLoadingMessages,
       namespaces,
@@ -513,21 +565,21 @@ var useRefetchMessages = ({
   );
   return { refetchMessages };
 };
-var MessagesContext = React6.createContext(void 0);
+var MessagesContext = React7.createContext(void 0);
 function MessagesProvider({
   value: { messages = {} },
   children
 }) {
   const { config, pathname } = useConfig();
-  const [loadedMessages, setLoadedMessages] = React6.useState(null);
-  const [isLoadingMessages, setIsLoadingMessages] = React6.useState(false);
+  const [loadedMessages, setLoadedMessages] = React7.useState(null);
+  const [isLoadingMessages, setIsLoadingMessages] = React7.useState(false);
   const { refetchMessages } = useRefetchMessages({
     config,
     pathname,
     setLoadedMessages,
     setIsLoadingMessages
   });
-  const value = React6.useMemo(
+  const value = React7.useMemo(
     () => ({
       messages: loadedMessages || messages,
       isLoading: isLoadingMessages,
@@ -540,128 +592,61 @@ function MessagesProvider({
   return /* @__PURE__ */ jsx(MessagesContext.Provider, { value, children });
 }
 function useMessages() {
-  const context = React6.useContext(MessagesContext);
+  const context = React7.useContext(MessagesContext);
   if (!context)
     throw new Error("useMessages must be used within a MessagesProvider");
   return context;
 }
-
-// src/client/react/contexts/locale/utils/use-init-lazy-load.ts
-var useInitLazyLoad = ({
-  loaderOptions,
-  currentLocale
-}) => {
-  const { refetchMessages } = useMessages();
-  const lazyLoad = !!loaderOptions?.lazyLoad;
-  const isFirstLoadedRef = React6.useRef(false);
-  React6.useEffect(() => {
-    if (lazyLoad && !isFirstLoadedRef.current) {
-      void refetchMessages(currentLocale);
-      isFirstLoadedRef.current = true;
-    }
-  }, [lazyLoad, currentLocale, refetchMessages, isFirstLoadedRef]);
-};
-
-// src/shared/utils/client/build-cookie-string.ts
-var buildCookieString = (cookie, locale) => {
-  const parts = [`${cookie.name}=${encodeURIComponent(locale)}`];
-  if (cookie.maxAge) {
-    const expires = new Date(Date.now() + cookie.maxAge * 1e3).toUTCString();
-    parts.push(`expires=${expires}`, `max-age=${cookie.maxAge}`);
-  }
-  parts.push(`path=${cookie.path ?? "/"}`);
-  if (cookie.domain) {
-    parts.push(`domain=${cookie.domain}`);
-  }
-  if (cookie.sameSite) {
-    parts.push(
-      `SameSite=${cookie.sameSite[0].toUpperCase()}${cookie.sameSite.slice(1).toLowerCase()}`
-    );
-  }
-  if (cookie.secure !== false) {
-    parts.push(`Secure`);
-  }
-  return parts.join("; ");
-};
-
-// src/shared/utils/client/set-locale-cookie-browser.ts
-var setLocaleCookieBrowser = ({
-  cookie,
-  locale
-}) => {
-  if (globalThis.window === void 0) return;
-  if (cookie.disabled || !cookie.autoSetCookie) return;
-  const cookieString = buildCookieString(cookie, locale);
-  document.cookie = cookieString;
-};
-
-// src/client/react/contexts/locale/utils/use-init-locale-cookie.ts
-var useInitLocaleCookie = ({
-  config,
-  locale
-}) => {
-  React6.useEffect(() => {
-    if (typeof document === "undefined") return;
-    const { cookie, routing } = config;
-    const { firstVisit } = routing;
-    const cookies2 = document.cookie.split(";").map((c) => c.trim());
-    const isCookieExists = cookies2.some((c) => c.startsWith(`${cookie.name}=`));
-    if (isCookieExists) return;
-    if (!firstVisit.redirect) return;
-    if (cookie.disabled || !cookie.autoSetCookie) return;
-    setLocaleCookieBrowser({ cookie, locale });
-  }, []);
-};
-var LocaleContext = React6.createContext(void 0);
+var LocaleContext = React7.createContext(void 0);
 
 // src/client/react/contexts/locale/utils/change-locale.ts
 var changeLocale = ({
   currentLocale,
   newLocale,
-  loaderOptions,
+  loader,
   cookie,
   setLocale,
   refetchMessages
 }) => {
   if (typeof document === "undefined") return;
-  const loaderType = loaderOptions?.type;
+  const { type } = loader || {};
   if (newLocale === currentLocale) return;
-  if (loaderType === "local") {
+  if (type === "local") {
     console.warn(
-      `[Intor] You are using dynamic local to switch languages. Please make sure to use the wrapped <Link> component to trigger a page reload, ensuring that the translation data is dynamically updated.`
+      `[Intor] You are using "loader type: local" to switch languages. Please make sure to use the wrapped <Link> component to trigger a page reload, ensuring that the translation data is dynamically updated.`
     );
   }
   setLocale(newLocale);
   setLocaleCookieBrowser({ cookie, locale: newLocale });
   document.documentElement.lang = newLocale;
-  if (loaderType === "remote" && refetchMessages) {
+  if (type === "remote" && refetchMessages) {
     void refetchMessages(newLocale);
   }
 };
 function LocaleProvider({
-  value: { initialLocale },
+  value: { initialLocale, onLocaleChange },
   children
 }) {
   const { config } = useConfig();
   const { refetchMessages } = useMessages();
-  const { loader: loaderOptions, cookie } = config;
-  const [currentLocale, setCurrentLocale] = React6.useState(initialLocale);
-  useInitLazyLoad({ loaderOptions, currentLocale });
+  const { loader, cookie } = config;
+  const [currentLocale, setCurrentLocale] = React7.useState(initialLocale);
   useInitLocaleCookie({ config, locale: initialLocale });
-  const setLocale = React6.useCallback(
-    (newLocale) => {
+  const setLocale = React7.useCallback(
+    async (newLocale) => {
       changeLocale({
         currentLocale,
         newLocale,
-        loaderOptions,
+        loader,
         cookie,
         setLocale: setCurrentLocale,
         refetchMessages
       });
+      onLocaleChange?.(newLocale);
     },
-    [currentLocale, loaderOptions, cookie, refetchMessages]
+    [currentLocale, loader, cookie, refetchMessages, onLocaleChange]
   );
-  const value = React6.useMemo(
+  const value = React7.useMemo(
     () => ({
       locale: currentLocale,
       setLocale
@@ -671,7 +656,7 @@ function LocaleProvider({
   return /* @__PURE__ */ jsx(LocaleContext.Provider, { value, children });
 }
 function useLocale() {
-  const context = React6.useContext(LocaleContext);
+  const context = React7.useContext(LocaleContext);
   if (!context)
     throw new Error("useLocale must be used within a LocaleProvider");
   return context;
@@ -794,7 +779,7 @@ var getI18nContext = async (config) => {
   const headersStore = await headers();
   const { defaultLocale, supportedLocales = [], cookie, routing } = config;
   let locale;
-  if (!cookie.disabled) {
+  if (cookie.enabled) {
     const localeFromCookie = cookiesStore.get(cookie.name)?.value;
     locale = normalizeLocale(localeFromCookie, supportedLocales);
     if (locale) {
@@ -836,61 +821,51 @@ var redirect = async ({
   });
   redirect$1(localePrefixedPathname, type);
 };
-var TranslateHandlersContext = React6.createContext(void 0);
+var TranslateHandlersContext = React7.createContext(void 0);
 var TranslateHandlersProvider = ({
-  children,
-  handlers
+  handlers,
+  children
 }) => {
-  const value = handlers;
-  return /* @__PURE__ */ jsx(TranslateHandlersContext.Provider, { value, children });
+  return /* @__PURE__ */ jsx(TranslateHandlersContext.Provider, { value: { handlers }, children });
 };
 function useTranslateHandlers() {
-  const context = React6.useContext(TranslateHandlersContext);
+  const context = React7.useContext(TranslateHandlersContext);
   return context;
 }
-var useInitLoadingState = (config) => {
-  const lazyLoad = !!config.loader?.lazyLoad;
-  const [isCsr, setIsCsr] = React6.useState(false);
-  React6.useEffect(() => {
-    setIsCsr(true);
-  }, []);
-  const isBeforeCSRLoading = lazyLoad && !isCsr;
-  return isBeforeCSRLoading;
-};
-var TranslatorContext = React6.createContext(void 0);
-var EMPTY_OBJECT = Object.freeze({});
-function TranslatorProvider({ children }) {
+var TranslatorContext = React7.createContext(void 0);
+function TranslatorProvider({
+  value: { isLoading: externalIsLoading },
+  children
+}) {
   const { config } = useConfig();
-  const { messages, isLoading } = useMessages();
+  const { messages, isLoading: internalIsLoading } = useMessages();
   const { locale } = useLocale();
-  const translatorHandlers = useTranslateHandlers();
+  const { handlers } = useTranslateHandlers();
   const { fallbackLocales, translator: translatorOptions } = config;
-  const isBeforeCSRLoading = useInitLoadingState(config);
-  const value = React6.useMemo(() => {
-    const translator = new Translator({
-      messages: messages || EMPTY_OBJECT,
+  const isLoading = Boolean(externalIsLoading ?? internalIsLoading);
+  const translator = React7.useMemo(() => {
+    return new Translator({
+      messages,
       locale,
+      isLoading,
       fallbackLocales,
       loadingMessage: translatorOptions?.loadingMessage,
       placeholder: translatorOptions?.placeholder,
-      handlers: translatorHandlers
+      handlers
     });
-    translator.setLoading(isBeforeCSRLoading || isLoading);
-    return { translator };
   }, [
-    fallbackLocales,
-    isBeforeCSRLoading,
-    isLoading,
-    locale,
     messages,
-    translatorHandlers,
+    locale,
+    isLoading,
+    fallbackLocales,
+    handlers,
     translatorOptions?.loadingMessage,
     translatorOptions?.placeholder
   ]);
-  return /* @__PURE__ */ jsx(TranslatorContext.Provider, { value, children });
+  return /* @__PURE__ */ jsx(TranslatorContext.Provider, { value: { translator }, children });
 }
 function useTranslator() {
-  const context = React6.useContext(TranslatorContext);
+  const context = React7.useContext(TranslatorContext);
   if (!context)
     throw new Error(
       "useTranslator must be used within IntorTranslatorProvider"
@@ -898,10 +873,17 @@ function useTranslator() {
   return context;
 }
 var IntorProvider = ({
-  value: { config, pathname = "", initialLocale, messages = config.messages },
+  value: {
+    config,
+    pathname = "",
+    initialLocale,
+    messages = config.messages,
+    onLocaleChange,
+    isLoading
+  },
   children
 }) => {
-  return /* @__PURE__ */ jsx(ConfigProvider, { value: { config, pathname }, children: /* @__PURE__ */ jsx(MessagesProvider, { value: { messages }, children: /* @__PURE__ */ jsx(LocaleProvider, { value: { initialLocale }, children: /* @__PURE__ */ jsx(TranslatorProvider, { children }) }) }) });
+  return /* @__PURE__ */ jsx(ConfigProvider, { value: { config, pathname }, children: /* @__PURE__ */ jsx(MessagesProvider, { value: { messages }, children: /* @__PURE__ */ jsx(LocaleProvider, { value: { initialLocale, onLocaleChange }, children: /* @__PURE__ */ jsx(TranslatorProvider, { value: { isLoading }, children }) }) }) });
 };
 
 // src/client/react/hooks/use-translator.ts

package/dist/next/middleware/index.cjs

@@ -14,7 +14,7 @@ function setLocaleCookieEdge({
   override = false
   // Default to not override existed cookie
 }) {
-  if (cookie.disabled || !cookie.autoSetCookie) return;
+  if (!cookie.enabled || !cookie.autoSetCookie) return;
   const isCookieExists = request.cookies.has(cookie.name);
   if (isCookieExists && !override) return;
   response.cookies.set(cookie.name, locale, {

package/dist/next/middleware/index.d.cts

@@ -3,8 +3,8 @@ import { Locale, LocaleMessages, FallbackLocalesMap } from 'intor-translator';
 import { NextRequest } from 'next/server';
 
 type CookieRawOptions = {
-    /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
-    disabled?: boolean;
+    /** Enable cookie usage (read/write) - default: true */
+    enabled?: boolean;
     /** Allow the system to automatically set cookies - default: true */
     autoSetCookie?: boolean;
     /** default: "intor.i18n.locale" */
@@ -52,7 +52,6 @@ type BaseLoaderOptions = {
     namespaces?: string[];
     routeNamespaces?: RouteNamespaces;
     concurrency?: number;
-    lazyLoad?: boolean;
 };
 type LocalLoader = BaseLoaderOptions & {
     type: "local";
@@ -89,6 +88,7 @@ type RoutingRawOptions = {
 type RoutingResolvedOptions = Required<RoutingRawOptions>;
 
 type CacheRawOptions = {
+    /** default: process.env.NODE_ENV === "production" */
     enabled?: boolean;
     /** default: 60\*60\*1000 (1 hour) */
     ttl?: number;

package/dist/next/middleware/index.d.ts

@@ -3,8 +3,8 @@ import { Locale, LocaleMessages, FallbackLocalesMap } from 'intor-translator';
 import { NextRequest } from 'next/server';
 
 type CookieRawOptions = {
-    /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
-    disabled?: boolean;
+    /** Enable cookie usage (read/write) - default: true */
+    enabled?: boolean;
     /** Allow the system to automatically set cookies - default: true */
     autoSetCookie?: boolean;
     /** default: "intor.i18n.locale" */
@@ -52,7 +52,6 @@ type BaseLoaderOptions = {
     namespaces?: string[];
     routeNamespaces?: RouteNamespaces;
     concurrency?: number;
-    lazyLoad?: boolean;
 };
 type LocalLoader = BaseLoaderOptions & {
     type: "local";
@@ -89,6 +88,7 @@ type RoutingRawOptions = {
 type RoutingResolvedOptions = Required<RoutingRawOptions>;
 
 type CacheRawOptions = {
+    /** default: process.env.NODE_ENV === "production" */
     enabled?: boolean;
     /** default: 60\*60\*1000 (1 hour) */
     ttl?: number;

package/dist/next/middleware/index.js

@@ -12,7 +12,7 @@ function setLocaleCookieEdge({
   override = false
   // Default to not override existed cookie
 }) {
-  if (cookie.disabled || !cookie.autoSetCookie) return;
+  if (!cookie.enabled || !cookie.autoSetCookie) return;
   const isCookieExists = request.cookies.has(cookie.name);
   if (isCookieExists && !override) return;
   response.cookies.set(cookie.name, locale, {

package/dist/next/server/index.cjs

@@ -218,7 +218,7 @@ var getI18nContext = async (config) => {
   const headersStore = await headers.headers();
   const { defaultLocale, supportedLocales = [], cookie, routing } = config;
   let locale;
-  if (!cookie.disabled) {
+  if (cookie.enabled) {
     const localeFromCookie = cookiesStore.get(cookie.name)?.value;
     locale = normalizeLocale(localeFromCookie, supportedLocales);
     if (locale) {

package/dist/next/server/index.d.cts

@@ -4,8 +4,8 @@ import Keyv from 'keyv';
 import { Logger } from 'logry';
 
 type CookieRawOptions = {
-    /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
-    disabled?: boolean;
+    /** Enable cookie usage (read/write) - default: true */
+    enabled?: boolean;
     /** Allow the system to automatically set cookies - default: true */
     autoSetCookie?: boolean;
     /** default: "intor.i18n.locale" */
@@ -53,7 +53,6 @@ type BaseLoaderOptions = {
     namespaces?: string[];
     routeNamespaces?: RouteNamespaces;
     concurrency?: number;
-    lazyLoad?: boolean;
 };
 type LocalLoader = BaseLoaderOptions & {
     type: "local";
@@ -90,6 +89,7 @@ type RoutingRawOptions = {
 type RoutingResolvedOptions = Required<RoutingRawOptions>;
 
 type CacheRawOptions = {
+    /** default: process.env.NODE_ENV === "production" */
     enabled?: boolean;
     /** default: 60\*60\*1000 (1 hour) */
     ttl?: number;

package/dist/next/server/index.d.ts

@@ -4,8 +4,8 @@ import Keyv from 'keyv';
 import { Logger } from 'logry';
 
 type CookieRawOptions = {
-    /** Completely disable cookie usage (no read, no write, no lookup by name) - default: false */
-    disabled?: boolean;
+    /** Enable cookie usage (read/write) - default: true */
+    enabled?: boolean;
     /** Allow the system to automatically set cookies - default: true */
     autoSetCookie?: boolean;
     /** default: "intor.i18n.locale" */
@@ -53,7 +53,6 @@ type BaseLoaderOptions = {
     namespaces?: string[];
     routeNamespaces?: RouteNamespaces;
     concurrency?: number;
-    lazyLoad?: boolean;
 };
 type LocalLoader = BaseLoaderOptions & {
     type: "local";
@@ -90,6 +89,7 @@ type RoutingRawOptions = {
 type RoutingResolvedOptions = Required<RoutingRawOptions>;
 
 type CacheRawOptions = {
+    /** default: process.env.NODE_ENV === "production" */
     enabled?: boolean;
     /** default: 60\*60\*1000 (1 hour) */
     ttl?: number;

package/dist/next/server/index.js

@@ -208,7 +208,7 @@ var getI18nContext = async (config) => {
   const headersStore = await headers();
   const { defaultLocale, supportedLocales = [], cookie, routing } = config;
   let locale;
-  if (!cookie.disabled) {
+  if (cookie.enabled) {
     const localeFromCookie = cookiesStore.get(cookie.name)?.value;
     locale = normalizeLocale(localeFromCookie, supportedLocales);
     if (locale) {