intor 2.2.10 → 2.2.12

package/dist/react/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var React10 = require('react');
+var React6 = require('react');
 var jsxRuntime = require('react/jsx-runtime');
-var merge = require('lodash.merge');
 var logry = require('logry');
 var Keyv = require('keyv');
+var merge = require('lodash.merge');
 var intorTranslator = require('intor-translator');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -27,24 +27,95 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var React10__namespace = /*#__PURE__*/_interopNamespace(React10);
-var merge__default = /*#__PURE__*/_interopDefault(merge);
+var React6__namespace = /*#__PURE__*/_interopNamespace(React6);
 var Keyv__default = /*#__PURE__*/_interopDefault(Keyv);
+var merge__default = /*#__PURE__*/_interopDefault(merge);
 
 // src/client/react/contexts/intor-provider/intor-provider.tsx
-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/config/constants/cache.constants.ts
+var DEFAULT_CACHE_OPTIONS = {
+  enabled: process.env.NODE_ENV === "production",
+  ttl: 60 * 60 * 1e3
+  // 1 hour
+};
+
+// src/server/shared/logger/global-logger-pool.ts
+function getGlobalLoggerPool() {
+  if (!globalThis.__INTOR_LOGGER_POOL__) {
+    globalThis.__INTOR_LOGGER_POOL__ = /* @__PURE__ */ new Map();
+  }
+  return globalThis.__INTOR_LOGGER_POOL__;
+}
+
+// src/server/shared/logger/get-logger.ts
+var DEFAULT_FORMATTER_CONFIG = {
+  node: { meta: { compact: true }, lineBreaksAfter: 1 }
+};
+function getLogger({
+  id = "default",
+  formatterConfig,
+  preset,
+  ...options
+}) {
+  const pool = getGlobalLoggerPool();
+  let logger = pool.get(id);
+  const useDefault = !formatterConfig && !preset;
+  if (!logger) {
+    logger = logry.logry({
+      id,
+      formatterConfig: useDefault ? DEFAULT_FORMATTER_CONFIG : formatterConfig,
+      preset,
+      ...options
+    });
+    pool.set(id, logger);
+    if (pool.size > 1e3) {
+      const keys = [...pool.keys()];
+      for (const key of keys.slice(0, 200)) pool.delete(key);
+    }
+  }
+  return logger;
+}
+
+// src/server/messages/shared/utils/is-valid-messages.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isValidMessages(value) {
+  if (!isPlainObject(value)) return false;
+  const stack = [value];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    for (const v of Object.values(current)) {
+      if (typeof v === "string") continue;
+      if (isPlainObject(v)) {
+        stack.push(v);
+      } else {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+function getGlobalMessagesPool() {
+  if (!globalThis.__INTOR_MESSAGES_POOL__) {
+    globalThis.__INTOR_MESSAGES_POOL__ = new Keyv__default.default();
+  }
+  return globalThis.__INTOR_MESSAGES_POOL__;
+}
 var mergeMessages = (staticMessages = {}, loadedMessages = {}) => {
   if (!loadedMessages) return { ...staticMessages };
   return merge__default.default({}, staticMessages, loadedMessages);
@@ -151,97 +222,6 @@ var standardizePathname = ({
   return normalizePathname(standardizedPathname);
 };
 
-// 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",
-  ttl: 60 * 60 * 1e3
-  // 1 hour
-};
-
-// src/server/shared/logger/global-logger-pool.ts
-function getGlobalLoggerPool() {
-  if (!globalThis.__INTOR_LOGGER_POOL__) {
-    globalThis.__INTOR_LOGGER_POOL__ = /* @__PURE__ */ new Map();
-  }
-  return globalThis.__INTOR_LOGGER_POOL__;
-}
-
-// src/server/shared/logger/get-logger.ts
-var DEFAULT_FORMATTER_CONFIG = {
-  node: { meta: { compact: true }, lineBreaksAfter: 1 }
-};
-function getLogger({
-  id = "default",
-  formatterConfig,
-  preset,
-  ...options
-}) {
-  const pool = getGlobalLoggerPool();
-  let logger = pool.get(id);
-  const useDefault = !formatterConfig && !preset;
-  if (!logger) {
-    logger = logry.logry({
-      id,
-      formatterConfig: useDefault ? DEFAULT_FORMATTER_CONFIG : formatterConfig,
-      preset,
-      ...options
-    });
-    pool.set(id, logger);
-    if (pool.size > 1e3) {
-      const keys = [...pool.keys()];
-      for (const key of keys.slice(0, 200)) pool.delete(key);
-    }
-  }
-  return logger;
-}
-
-// src/server/messages/shared/utils/is-valid-messages.ts
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isValidMessages(value) {
-  if (!isPlainObject(value)) return false;
-  const stack = [value];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    for (const v of Object.values(current)) {
-      if (typeof v === "string") continue;
-      if (isPlainObject(v)) {
-        stack.push(v);
-      } else {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-function getGlobalMessagesPool() {
-  if (!globalThis.__INTOR_MESSAGES_POOL__) {
-    globalThis.__INTOR_MESSAGES_POOL__ = new Keyv__default.default();
-  }
-  return globalThis.__INTOR_MESSAGES_POOL__;
-}
-
 // src/server/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
 var fetchLocaleMessages = async ({
   remoteUrl,
@@ -379,11 +359,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);
@@ -416,21 +396,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,
@@ -443,7 +423,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;
@@ -456,15 +436,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) => {
@@ -499,6 +478,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 cookies = document.cookie.split(";").map((c) => c.trim());
+    const isCookieExists = cookies.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,
@@ -524,15 +522,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,
@@ -542,28 +541,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
@@ -573,12 +555,12 @@ 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;
 }
-var TranslateHandlersContext = React10__namespace.createContext(void 0);
+var TranslateHandlersContext = React6__namespace.createContext(void 0);
 var TranslateHandlersProvider = ({
   children,
   handlers
@@ -587,19 +569,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();
@@ -608,7 +590,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,
@@ -632,7 +614,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"
@@ -645,11 +627,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/react/index.d.cts

@@ -125,12 +125,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/react/index.d.ts

@@ -125,12 +125,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;