intor 2.2.10 → 2.2.12

package/dist/next/index.cjs

@@ -2,7 +2,7 @@
 
 var formatUrl = require('next/dist/shared/lib/router/utils/format-url');
 var NextLink = require('next/link');
-var React10 = require('react');
+var React6 = require('react');
 var navigation = require('next/navigation');
 var merge = require('lodash.merge');
 var jsxRuntime = require('react/jsx-runtime');
@@ -32,7 +32,7 @@ function _interopNamespace(e) {
 }
 
 var NextLink__default = /*#__PURE__*/_interopDefault(NextLink);
-var React10__namespace = /*#__PURE__*/_interopNamespace(React10);
+var React6__namespace = /*#__PURE__*/_interopNamespace(React6);
 var merge__default = /*#__PURE__*/_interopDefault(merge);
 var Keyv__default = /*#__PURE__*/_interopDefault(Keyv);
 
@@ -281,40 +281,20 @@ var localizePathname = ({
     localePrefixedPathname
   };
 };
-var ConfigContext = React10__namespace.createContext(void 0);
+var ConfigContext = React6__namespace.createContext(void 0);
 function ConfigProvider({
   value: { config, pathname },
   children
 }) {
-  const value = React10__namespace.useMemo(() => ({ config, pathname }), [config, pathname]);
+  const value = React6__namespace.useMemo(() => ({ config, pathname }), [config, pathname]);
   return /* @__PURE__ */ jsxRuntime.jsx(ConfigContext.Provider, { value, children });
 }
 function useConfig() {
-  const context = React10__namespace.useContext(ConfigContext);
+  const context = React6__namespace.useContext(ConfigContext);
   if (!context) throw new Error("useConfig must be used within ConfigProvider");
   return context;
 }
 
-// src/client/react/contexts/load-import-messages.ts
-async function loadImportMessages({
-  config,
-  locale,
-  importLoader,
-  setLoadedMessages,
-  setIsLoadingMessages
-}) {
-  if (!importLoader) return;
-  try {
-    setIsLoadingMessages(true);
-    const importMessages = await importLoader(locale);
-    setLoadedMessages(mergeMessages(config.messages, importMessages));
-  } catch (error) {
-    console.error(`Failed to load messages for ${locale}`, error);
-  } finally {
-    setIsLoadingMessages(false);
-  }
-}
-
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
@@ -523,11 +503,11 @@ var useRefetchMessages = ({
   setIsLoadingMessages
 }) => {
   const { messages: staticMessages } = config;
-  const namespaces = React10__namespace.useMemo(() => {
+  const namespaces = React6__namespace.useMemo(() => {
     if (!config.loader) return [];
     return resolveNamespaces({ config, pathname });
   }, [config, pathname]);
-  const refetchMessages = React10__namespace.useCallback(
+  const refetchMessages = React6__namespace.useCallback(
     async (newLocale) => {
       if (config.loader?.type === "remote") {
         setIsLoadingMessages(true);
@@ -560,21 +540,21 @@ var useRefetchMessages = ({
   );
   return { refetchMessages };
 };
-var MessagesContext = React10__namespace.createContext(void 0);
+var MessagesContext = React6__namespace.createContext(void 0);
 function MessagesProvider({
   value: { messages = {} },
   children
 }) {
   const { config, pathname } = useConfig();
-  const [loadedMessages, setLoadedMessages] = React10__namespace.useState(null);
-  const [isLoadingMessages, setIsLoadingMessages] = React10__namespace.useState(false);
+  const [loadedMessages, setLoadedMessages] = React6__namespace.useState(null);
+  const [isLoadingMessages, setIsLoadingMessages] = React6__namespace.useState(false);
   const { refetchMessages } = useRefetchMessages({
     config,
     pathname,
     setLoadedMessages,
     setIsLoadingMessages
   });
-  const value = React10__namespace.useMemo(
+  const value = React6__namespace.useMemo(
     () => ({
       messages: loadedMessages || messages,
       isLoading: isLoadingMessages,
@@ -587,7 +567,7 @@ function MessagesProvider({
   return /* @__PURE__ */ jsxRuntime.jsx(MessagesContext.Provider, { value, children });
 }
 function useMessages() {
-  const context = React10__namespace.useContext(MessagesContext);
+  const context = React6__namespace.useContext(MessagesContext);
   if (!context)
     throw new Error("useMessages must be used within a MessagesProvider");
   return context;
@@ -600,15 +580,14 @@ var useInitLazyLoad = ({
 }) => {
   const { refetchMessages } = useMessages();
   const lazyLoad = !!loaderOptions?.lazyLoad;
-  const isFirstLoadedRef = React10__namespace.useRef(false);
-  React10__namespace.useEffect(() => {
+  const isFirstLoadedRef = React6__namespace.useRef(false);
+  React6__namespace.useEffect(() => {
     if (lazyLoad && !isFirstLoadedRef.current) {
       void refetchMessages(currentLocale);
       isFirstLoadedRef.current = true;
     }
   }, [lazyLoad, currentLocale, refetchMessages, isFirstLoadedRef]);
 };
-var LocaleContext = React10__namespace.createContext(void 0);
 
 // src/shared/utils/client/build-cookie-string.ts
 var buildCookieString = (cookie, locale) => {
@@ -643,6 +622,25 @@ var setLocaleCookieBrowser = ({
   document.cookie = cookieString;
 };
 
+// src/client/react/contexts/locale/utils/use-init-locale-cookie.ts
+var useInitLocaleCookie = ({
+  config,
+  locale
+}) => {
+  React6__namespace.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__namespace.createContext(void 0);
+
 // src/client/react/contexts/locale/utils/change-locale.ts
 var changeLocale = ({
   currentLocale,
@@ -668,15 +666,16 @@ var changeLocale = ({
   }
 };
 function LocaleProvider({
-  value: { initialLocale, importLoader },
+  value: { initialLocale, onLocaleChange },
   children
 }) {
   const { config } = useConfig();
-  const { refetchMessages, setLoadedMessages, setIsLoadingMessages } = useMessages();
+  const { refetchMessages } = useMessages();
   const { loader: loaderOptions, cookie } = config;
-  const [currentLocale, setCurrentLocale] = React10__namespace.useState(initialLocale);
+  const [currentLocale, setCurrentLocale] = React6__namespace.useState(initialLocale);
   useInitLazyLoad({ loaderOptions, currentLocale });
-  const setLocale = React10__namespace.useCallback(
+  useInitLocaleCookie({ config, locale: initialLocale });
+  const setLocale = React6__namespace.useCallback(
     async (newLocale) => {
       changeLocale({
         currentLocale,
@@ -686,28 +685,11 @@ function LocaleProvider({
         setLocale: setCurrentLocale,
         refetchMessages
       });
-      await loadImportMessages({
-        config,
-        locale: newLocale,
-        importLoader,
-        setLoadedMessages,
-        setIsLoadingMessages
-      });
+      onLocaleChange?.(newLocale);
     },
-    [
-      currentLocale,
-      loaderOptions,
-      cookie,
-      refetchMessages,
-      importLoader,
-      setLoadedMessages,
-      setIsLoadingMessages
-    ]
+    [currentLocale, loaderOptions, cookie, refetchMessages, onLocaleChange]
   );
-  React10__namespace.useEffect(() => {
-    void setLocale(initialLocale);
-  }, []);
-  const value = React10__namespace.useMemo(
+  const value = React6__namespace.useMemo(
     () => ({
       locale: currentLocale,
       setLocale
@@ -717,7 +699,7 @@ function LocaleProvider({
   return /* @__PURE__ */ jsxRuntime.jsx(LocaleContext.Provider, { value, children });
 }
 function useLocale() {
-  const context = React10__namespace.useContext(LocaleContext);
+  const context = React6__namespace.useContext(LocaleContext);
   if (!context)
     throw new Error("useLocale must be used within a LocaleProvider");
   return context;
@@ -882,7 +864,7 @@ var redirect = async ({
   });
   navigation.redirect(localePrefixedPathname, type);
 };
-var TranslateHandlersContext = React10__namespace.createContext(void 0);
+var TranslateHandlersContext = React6__namespace.createContext(void 0);
 var TranslateHandlersProvider = ({
   children,
   handlers
@@ -891,19 +873,19 @@ var TranslateHandlersProvider = ({
   return /* @__PURE__ */ jsxRuntime.jsx(TranslateHandlersContext.Provider, { value, children });
 };
 function useTranslateHandlers() {
-  const context = React10__namespace.useContext(TranslateHandlersContext);
+  const context = React6__namespace.useContext(TranslateHandlersContext);
   return context;
 }
 var useInitLoadingState = (config) => {
   const lazyLoad = !!config.loader?.lazyLoad;
-  const [isCsr, setIsCsr] = React10__namespace.useState(false);
-  React10__namespace.useEffect(() => {
+  const [isCsr, setIsCsr] = React6__namespace.useState(false);
+  React6__namespace.useEffect(() => {
     setIsCsr(true);
   }, []);
   const isBeforeCSRLoading = lazyLoad && !isCsr;
   return isBeforeCSRLoading;
 };
-var TranslatorContext = React10__namespace.createContext(void 0);
+var TranslatorContext = React6__namespace.createContext(void 0);
 var EMPTY_OBJECT = Object.freeze({});
 function TranslatorProvider({ children }) {
   const { config } = useConfig();
@@ -912,7 +894,7 @@ function TranslatorProvider({ children }) {
   const translatorHandlers = useTranslateHandlers();
   const { fallbackLocales, translator: translatorOptions } = config;
   const isBeforeCSRLoading = useInitLoadingState(config);
-  const value = React10__namespace.useMemo(() => {
+  const value = React6__namespace.useMemo(() => {
     const translator = new intorTranslator.Translator({
       messages: messages || EMPTY_OBJECT,
       locale,
@@ -936,7 +918,7 @@ function TranslatorProvider({ children }) {
   return /* @__PURE__ */ jsxRuntime.jsx(TranslatorContext.Provider, { value, children });
 }
 function useTranslator() {
-  const context = React10__namespace.useContext(TranslatorContext);
+  const context = React6__namespace.useContext(TranslatorContext);
   if (!context)
     throw new Error(
       "useTranslator must be used within IntorTranslatorProvider"
@@ -949,11 +931,11 @@ var IntorProvider = ({
     pathname = "",
     initialLocale,
     messages = config.messages,
-    importLoader
+    onLocaleChange
   },
   children
 }) => {
-  return /* @__PURE__ */ jsxRuntime.jsx(ConfigProvider, { value: { config, pathname }, children: /* @__PURE__ */ jsxRuntime.jsx(MessagesProvider, { value: { messages }, children: /* @__PURE__ */ jsxRuntime.jsx(LocaleProvider, { value: { initialLocale, importLoader }, children: /* @__PURE__ */ jsxRuntime.jsx(TranslatorProvider, { children }) }) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(ConfigProvider, { value: { config, pathname }, children: /* @__PURE__ */ jsxRuntime.jsx(MessagesProvider, { value: { messages }, children: /* @__PURE__ */ jsxRuntime.jsx(LocaleProvider, { value: { initialLocale, onLocaleChange }, children: /* @__PURE__ */ jsxRuntime.jsx(TranslatorProvider, { children }) }) }) });
 };
 
 // src/client/react/hooks/use-translator.ts

package/dist/next/index.d.cts

@@ -223,12 +223,12 @@ interface IntorProviderProps {
         initialLocale: Locale;
         pathname?: string;
         messages?: Readonly<LocaleMessages>;
-        importLoader?: (locale: string) => Promise<LocaleMessages>;
+        onLocaleChange?: (newLocale: string) => Promise<void> | void;
     };
     children: React.ReactNode;
 }
 
-declare const IntorProvider: ({ value: { config, pathname, initialLocale, messages, importLoader, }, children, }: IntorProviderProps) => react_jsx_runtime.JSX.Element;
+declare const IntorProvider: ({ value: { config, pathname, initialLocale, messages, onLocaleChange, }, children, }: IntorProviderProps) => react_jsx_runtime.JSX.Element;
 
 type TranslateHandlersProviderProps = {
     children: React.ReactNode;

package/dist/next/index.d.ts

@@ -223,12 +223,12 @@ interface IntorProviderProps {
         initialLocale: Locale;
         pathname?: string;
         messages?: Readonly<LocaleMessages>;
-        importLoader?: (locale: string) => Promise<LocaleMessages>;
+        onLocaleChange?: (newLocale: string) => Promise<void> | void;
     };
     children: React.ReactNode;
 }
 
-declare const IntorProvider: ({ value: { config, pathname, initialLocale, messages, importLoader, }, children, }: IntorProviderProps) => react_jsx_runtime.JSX.Element;
+declare const IntorProvider: ({ value: { config, pathname, initialLocale, messages, onLocaleChange, }, children, }: IntorProviderProps) => react_jsx_runtime.JSX.Element;
 
 type TranslateHandlersProviderProps = {
     children: React.ReactNode;

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 React10 from 'react';
+import * as React6 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,40 +254,20 @@ var localizePathname = ({
     localePrefixedPathname
   };
 };
-var ConfigContext = React10.createContext(void 0);
+var ConfigContext = React6.createContext(void 0);
 function ConfigProvider({
   value: { config, pathname },
   children
 }) {
-  const value = React10.useMemo(() => ({ config, pathname }), [config, pathname]);
+  const value = React6.useMemo(() => ({ config, pathname }), [config, pathname]);
   return /* @__PURE__ */ jsx(ConfigContext.Provider, { value, children });
 }
 function useConfig() {
-  const context = React10.useContext(ConfigContext);
+  const context = React6.useContext(ConfigContext);
   if (!context) throw new Error("useConfig must be used within ConfigProvider");
   return context;
 }
 
-// src/client/react/contexts/load-import-messages.ts
-async function loadImportMessages({
-  config,
-  locale,
-  importLoader,
-  setLoadedMessages,
-  setIsLoadingMessages
-}) {
-  if (!importLoader) return;
-  try {
-    setIsLoadingMessages(true);
-    const importMessages = await importLoader(locale);
-    setLoadedMessages(mergeMessages(config.messages, importMessages));
-  } catch (error) {
-    console.error(`Failed to load messages for ${locale}`, error);
-  } finally {
-    setIsLoadingMessages(false);
-  }
-}
-
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
@@ -496,11 +476,11 @@ var useRefetchMessages = ({
   setIsLoadingMessages
 }) => {
   const { messages: staticMessages } = config;
-  const namespaces = React10.useMemo(() => {
+  const namespaces = React6.useMemo(() => {
     if (!config.loader) return [];
     return resolveNamespaces({ config, pathname });
   }, [config, pathname]);
-  const refetchMessages = React10.useCallback(
+  const refetchMessages = React6.useCallback(
     async (newLocale) => {
       if (config.loader?.type === "remote") {
         setIsLoadingMessages(true);
@@ -533,21 +513,21 @@ var useRefetchMessages = ({
   );
   return { refetchMessages };
 };
-var MessagesContext = React10.createContext(void 0);
+var MessagesContext = React6.createContext(void 0);
 function MessagesProvider({
   value: { messages = {} },
   children
 }) {
   const { config, pathname } = useConfig();
-  const [loadedMessages, setLoadedMessages] = React10.useState(null);
-  const [isLoadingMessages, setIsLoadingMessages] = React10.useState(false);
+  const [loadedMessages, setLoadedMessages] = React6.useState(null);
+  const [isLoadingMessages, setIsLoadingMessages] = React6.useState(false);
   const { refetchMessages } = useRefetchMessages({
     config,
     pathname,
     setLoadedMessages,
     setIsLoadingMessages
   });
-  const value = React10.useMemo(
+  const value = React6.useMemo(
     () => ({
       messages: loadedMessages || messages,
       isLoading: isLoadingMessages,
@@ -560,7 +540,7 @@ function MessagesProvider({
   return /* @__PURE__ */ jsx(MessagesContext.Provider, { value, children });
 }
 function useMessages() {
-  const context = React10.useContext(MessagesContext);
+  const context = React6.useContext(MessagesContext);
   if (!context)
     throw new Error("useMessages must be used within a MessagesProvider");
   return context;
@@ -573,15 +553,14 @@ var useInitLazyLoad = ({
 }) => {
   const { refetchMessages } = useMessages();
   const lazyLoad = !!loaderOptions?.lazyLoad;
-  const isFirstLoadedRef = React10.useRef(false);
-  React10.useEffect(() => {
+  const isFirstLoadedRef = React6.useRef(false);
+  React6.useEffect(() => {
     if (lazyLoad && !isFirstLoadedRef.current) {
       void refetchMessages(currentLocale);
       isFirstLoadedRef.current = true;
     }
   }, [lazyLoad, currentLocale, refetchMessages, isFirstLoadedRef]);
 };
-var LocaleContext = React10.createContext(void 0);
 
 // src/shared/utils/client/build-cookie-string.ts
 var buildCookieString = (cookie, locale) => {
@@ -616,6 +595,25 @@ var setLocaleCookieBrowser = ({
   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);
+
 // src/client/react/contexts/locale/utils/change-locale.ts
 var changeLocale = ({
   currentLocale,
@@ -641,15 +639,16 @@ var changeLocale = ({
   }
 };
 function LocaleProvider({
-  value: { initialLocale, importLoader },
+  value: { initialLocale, onLocaleChange },
   children
 }) {
   const { config } = useConfig();
-  const { refetchMessages, setLoadedMessages, setIsLoadingMessages } = useMessages();
+  const { refetchMessages } = useMessages();
   const { loader: loaderOptions, cookie } = config;
-  const [currentLocale, setCurrentLocale] = React10.useState(initialLocale);
+  const [currentLocale, setCurrentLocale] = React6.useState(initialLocale);
   useInitLazyLoad({ loaderOptions, currentLocale });
-  const setLocale = React10.useCallback(
+  useInitLocaleCookie({ config, locale: initialLocale });
+  const setLocale = React6.useCallback(
     async (newLocale) => {
       changeLocale({
         currentLocale,
@@ -659,28 +658,11 @@ function LocaleProvider({
         setLocale: setCurrentLocale,
         refetchMessages
       });
-      await loadImportMessages({
-        config,
-        locale: newLocale,
-        importLoader,
-        setLoadedMessages,
-        setIsLoadingMessages
-      });
+      onLocaleChange?.(newLocale);
     },
-    [
-      currentLocale,
-      loaderOptions,
-      cookie,
-      refetchMessages,
-      importLoader,
-      setLoadedMessages,
-      setIsLoadingMessages
-    ]
+    [currentLocale, loaderOptions, cookie, refetchMessages, onLocaleChange]
   );
-  React10.useEffect(() => {
-    void setLocale(initialLocale);
-  }, []);
-  const value = React10.useMemo(
+  const value = React6.useMemo(
     () => ({
       locale: currentLocale,
       setLocale
@@ -690,7 +672,7 @@ function LocaleProvider({
   return /* @__PURE__ */ jsx(LocaleContext.Provider, { value, children });
 }
 function useLocale() {
-  const context = React10.useContext(LocaleContext);
+  const context = React6.useContext(LocaleContext);
   if (!context)
     throw new Error("useLocale must be used within a LocaleProvider");
   return context;
@@ -855,7 +837,7 @@ var redirect = async ({
   });
   redirect$1(localePrefixedPathname, type);
 };
-var TranslateHandlersContext = React10.createContext(void 0);
+var TranslateHandlersContext = React6.createContext(void 0);
 var TranslateHandlersProvider = ({
   children,
   handlers
@@ -864,19 +846,19 @@ var TranslateHandlersProvider = ({
   return /* @__PURE__ */ jsx(TranslateHandlersContext.Provider, { value, children });
 };
 function useTranslateHandlers() {
-  const context = React10.useContext(TranslateHandlersContext);
+  const context = React6.useContext(TranslateHandlersContext);
   return context;
 }
 var useInitLoadingState = (config) => {
   const lazyLoad = !!config.loader?.lazyLoad;
-  const [isCsr, setIsCsr] = React10.useState(false);
-  React10.useEffect(() => {
+  const [isCsr, setIsCsr] = React6.useState(false);
+  React6.useEffect(() => {
     setIsCsr(true);
   }, []);
   const isBeforeCSRLoading = lazyLoad && !isCsr;
   return isBeforeCSRLoading;
 };
-var TranslatorContext = React10.createContext(void 0);
+var TranslatorContext = React6.createContext(void 0);
 var EMPTY_OBJECT = Object.freeze({});
 function TranslatorProvider({ children }) {
   const { config } = useConfig();
@@ -885,7 +867,7 @@ function TranslatorProvider({ children }) {
   const translatorHandlers = useTranslateHandlers();
   const { fallbackLocales, translator: translatorOptions } = config;
   const isBeforeCSRLoading = useInitLoadingState(config);
-  const value = React10.useMemo(() => {
+  const value = React6.useMemo(() => {
     const translator = new Translator({
       messages: messages || EMPTY_OBJECT,
       locale,
@@ -909,7 +891,7 @@ function TranslatorProvider({ children }) {
   return /* @__PURE__ */ jsx(TranslatorContext.Provider, { value, children });
 }
 function useTranslator() {
-  const context = React10.useContext(TranslatorContext);
+  const context = React6.useContext(TranslatorContext);
   if (!context)
     throw new Error(
       "useTranslator must be used within IntorTranslatorProvider"
@@ -922,11 +904,11 @@ var IntorProvider = ({
     pathname = "",
     initialLocale,
     messages = config.messages,
-    importLoader
+    onLocaleChange
   },
   children
 }) => {
-  return /* @__PURE__ */ jsx(ConfigProvider, { value: { config, pathname }, children: /* @__PURE__ */ jsx(MessagesProvider, { value: { messages }, children: /* @__PURE__ */ jsx(LocaleProvider, { value: { initialLocale, importLoader }, 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, { children }) }) }) });
 };
 
 // src/client/react/hooks/use-translator.ts