intor 2.2.12 → 2.2.13

package/dist/react/index.js

@@ -1,4 +1,4 @@
-import * as React6 from 'react';
+import * as React7 from 'react';
 import { jsx } from 'react/jsx-runtime';
 import { logry } from 'logry';
 import Keyv from 'keyv';
@@ -6,20 +6,71 @@ import merge from 'lodash.merge';
 import { Translator } from 'intor-translator';
 
 // src/client/react/contexts/intor-provider/intor-provider.tsx
-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 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.enabled || !cookie.autoSetCookie) return;
+    setLocaleCookieBrowser({ cookie, locale });
+  }, []);
+};
+
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
   enabled: process.env.NODE_ENV === "production",
@@ -332,19 +383,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,
@@ -359,8 +410,9 @@ var useRefetchMessages = ({
       }
     },
     [
-      config.loader,
+      loader,
       config.fallbackLocales,
+      config.cache,
       config.id,
       setIsLoadingMessages,
       namespaces,
@@ -370,21 +422,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,
@@ -397,101 +449,34 @@ 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 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.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);
   }
 };
@@ -501,25 +486,24 @@ function LocaleProvider({
 }) {
   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(
+  const setLocale = React7.useCallback(
     async (newLocale) => {
       changeLocale({
         currentLocale,
         newLocale,
-        loaderOptions,
+        loader,
         cookie,
         setLocale: setCurrentLocale,
         refetchMessages
       });
       onLocaleChange?.(newLocale);
     },
-    [currentLocale, loaderOptions, cookie, refetchMessages, onLocaleChange]
+    [currentLocale, loader, cookie, refetchMessages, onLocaleChange]
   );
-  const value = React6.useMemo(
+  const value = React7.useMemo(
     () => ({
       locale: currentLocale,
       setLocale
@@ -529,66 +513,56 @@ 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;
 }
-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"
@@ -601,11 +575,12 @@ var IntorProvider = ({
     pathname = "",
     initialLocale,
     messages = config.messages,
-    onLocaleChange
+    onLocaleChange,
+    isLoading
   },
   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 }) }) }) });
+  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/server/index.cjs

@@ -17,14 +17,7 @@ var fs__default = /*#__PURE__*/_interopDefault(fs);
 var merge__default = /*#__PURE__*/_interopDefault(merge);
 var Keyv__default = /*#__PURE__*/_interopDefault(Keyv);
 
-// src/server/intor/utils/should-load-messages.ts
-var shouldLoadMessages = (loader) => {
-  if (!loader) return false;
-  const { type, lazyLoad } = loader;
-  if (type === "local") return true;
-  if (lazyLoad) return false;
-  return true;
-};
+// src/server/messages/load-local-messages/load-local-messages.ts
 
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
@@ -641,7 +634,7 @@ var intor = async (config, i18nContext, loadMessagesOptions = {}) => {
   const source = isI18nContextFunction ? i18nContext.name : "static fallback";
   logger.debug(`I18n context resolved via ${source}.`, context);
   let loadedMessages;
-  if (shouldLoadMessages(loader)) {
+  if (loader) {
     loadedMessages = await loadMessages({
       config,
       locale,
@@ -658,7 +651,7 @@ var intor = async (config, i18nContext, loadMessagesOptions = {}) => {
     static: { enabled: !!messages },
     loaded: {
       enabled: !!loadedMessages,
-      ...loader ? { loaderType: loader.type, lazyLoad: !!loader.lazyLoad } : null
+      ...loader ? { loaderType: loader.type } : null
     },
     merged: mergedMessages
   });

package/dist/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/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/server/index.js

@@ -7,14 +7,7 @@ import merge from 'lodash.merge';
 import Keyv from 'keyv';
 import { Translator } from 'intor-translator';
 
-// src/server/intor/utils/should-load-messages.ts
-var shouldLoadMessages = (loader) => {
-  if (!loader) return false;
-  const { type, lazyLoad } = loader;
-  if (type === "local") return true;
-  if (lazyLoad) return false;
-  return true;
-};
+// src/server/messages/load-local-messages/load-local-messages.ts
 
 // src/config/constants/cache.constants.ts
 var DEFAULT_CACHE_OPTIONS = {
@@ -631,7 +624,7 @@ var intor = async (config, i18nContext, loadMessagesOptions = {}) => {
   const source = isI18nContextFunction ? i18nContext.name : "static fallback";
   logger.debug(`I18n context resolved via ${source}.`, context);
   let loadedMessages;
-  if (shouldLoadMessages(loader)) {
+  if (loader) {
     loadedMessages = await loadMessages({
       config,
       locale,
@@ -648,7 +641,7 @@ var intor = async (config, i18nContext, loadMessagesOptions = {}) => {
     static: { enabled: !!messages },
     loaded: {
       enabled: !!loadedMessages,
-      ...loader ? { loaderType: loader.type, lazyLoad: !!loader.lazyLoad } : null
+      ...loader ? { loaderType: loader.type } : null
     },
     merged: mergedMessages
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.2.12",
+  "version": "2.2.13",
   "description": "A modular and extensible i18n core designed for TypeScript and JavaScript projects. Intor enables custom translation logic with support for both frontend and backend environments, featuring runtime configuration, caching, adapters, and message loaders.",
   "author": "Yiming Liao",
   "license": "MIT",
@@ -80,7 +80,7 @@
     "knip": "knip --config .config/knip.config.ts"
   },
   "dependencies": {
-    "intor-translator": "^1.1.2",
+    "intor-translator": "^1.1.5",
     "keyv": "^5.5.3",
     "lodash.merge": "^4.6.2",
     "logry": "^2.0.1",