intor 2.2.4 → 2.2.6

package/dist/next/index.js

@@ -1,100 +1,18 @@
-import * as React6 from 'react';
-import { logry } from 'logry';
-import Keyv from 'keyv';
-import merge from 'lodash.merge';
-import { Translator } from 'intor-translator';
 import { formatUrl } from 'next/dist/shared/lib/router/utils/format-url';
 import NextLink from 'next/link';
+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';
+import { logry } from 'logry';
+import Keyv from 'keyv';
 import { cookies, headers } from 'next/headers';
+import { Translator } from 'intor-translator';
 
-// src/adapters/next/contexts/intor-provider/intor-provider.tsx
-var ConfigContext = React6.createContext(void 0);
-
-// src/adapters/next/contexts/config/provider.tsx
-function ConfigProvider({
-  value: { config, pathname },
-  children
-}) {
-  const value = React6.useMemo(() => ({ config, pathname }), [config, pathname]);
-  return /* @__PURE__ */ React6.createElement(ConfigContext.Provider, { value }, children);
-}
-function useConfig() {
-  const context = React6.useContext(ConfigContext);
-  if (!context) throw new Error("useConfig must be used within ConfigProvider");
-  return context;
-}
-
-// src/modules/config/constants/cache.constants.ts
-var DEFAULT_CACHE_OPTIONS = {
-  enabled: process.env.NODE_ENV === "production",
-  ttl: 60 * 60 * 1e3
-  // 1 hour
-};
-
-// src/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/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({
-      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/adapters/next/navigation/link.tsx
 
-// src/modules/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();
-  }
-  return globalThis.__INTOR_MESSAGES_POOL__;
-}
+// src/shared/constants/prefix-placeholder.ts
+var PREFIX_PLACEHOLDER = "{locale}";
 var mergeMessages = (staticMessages = {}, loadedMessages = {}) => {
   if (!loadedMessages) return { ...staticMessages };
   return merge({}, staticMessages, loadedMessages);
@@ -119,9 +37,6 @@ var normalizeCacheKey = (key, delimiter = CACHE_KEY_DELIMITER) => {
   return String(key);
 };
 
-// src/shared/constants/prefix-placeholder.ts
-var PREFIX_PLACEHOLDER = "{locale}";
-
 // src/shared/utils/resolve-namespaces.ts
 var resolveNamespaces = ({
   config,
@@ -286,7 +201,145 @@ var standardizePathname = ({
   return normalizePathname(standardizedPathname);
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
+// src/adapters/next/shared/utils/locale-prefix-pathname.ts
+var localePrefixPathname = ({
+  config,
+  pathname: standardizedPathname,
+  locale
+}) => {
+  const { routing } = config;
+  const { prefix } = routing;
+  if (prefix !== "none" && !locale) {
+    throw new Error('No locale when using prefix "all", "except-default"');
+  }
+  if (prefix === "all") {
+    return normalizePathname(
+      standardizedPathname.replaceAll(PREFIX_PLACEHOLDER, locale)
+    );
+  }
+  if (prefix === "except-default") {
+    return locale === config.defaultLocale ? normalizePathname(
+      standardizedPathname.replaceAll(`/${PREFIX_PLACEHOLDER}`, "")
+    ) : normalizePathname(
+      standardizedPathname.replaceAll(PREFIX_PLACEHOLDER, locale)
+    );
+  }
+  return normalizePathname(
+    standardizedPathname.replaceAll(`/${PREFIX_PLACEHOLDER}`, "")
+  );
+};
+
+// src/adapters/next/shared/utils/localize-pathname.ts
+var localizePathname = ({
+  config,
+  pathname: rawPathname,
+  locale
+}) => {
+  const { unprefixedPathname } = extractPathname({
+    config,
+    pathname: rawPathname
+  });
+  const standardizedPathname = standardizePathname({
+    config,
+    pathname: unprefixedPathname
+  });
+  const localePrefixedPathname = localePrefixPathname({
+    config,
+    pathname: standardizedPathname,
+    locale
+  });
+  return {
+    unprefixedPathname,
+    standardizedPathname,
+    localePrefixedPathname
+  };
+};
+var ConfigContext = React6.createContext(void 0);
+function ConfigProvider({
+  value: { config, pathname },
+  children
+}) {
+  const value = React6.useMemo(() => ({ config, pathname }), [config, pathname]);
+  return /* @__PURE__ */ jsx(ConfigContext.Provider, { value, children });
+}
+function useConfig() {
+  const context = React6.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({
+      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();
+  }
+  return globalThis.__INTOR_MESSAGES_POOL__;
+}
+
+// src/server/messages/load-remote-messages/fetch-locale-messages/fetch-locale-messages.ts
 var fetchLocaleMessages = async ({
   remoteUrl,
   remoteHeaders,
@@ -328,7 +381,7 @@ var fetchLocaleMessages = async ({
   }
 };
 
-// src/modules/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
+// src/server/messages/load-remote-messages/fetch-locale-messages/utils/build-search-params.ts
 var buildSearchParams = (params) => {
   const searchParams = new URLSearchParams();
   const appendParam = (key, value) => {
@@ -346,7 +399,7 @@ var buildSearchParams = (params) => {
   return searchParams;
 };
 
-// src/modules/messages/load-remote-messages/load-remote-messages.ts
+// src/server/messages/load-remote-messages/load-remote-messages.ts
 var loadRemoteMessages = async ({
   pool = getGlobalMessagesPool(),
   rootDir,
@@ -415,7 +468,7 @@ var loadRemoteMessages = async ({
   return messages;
 };
 
-// src/adapters/next/contexts/messages/utils/use-refetch-messages.ts
+// src/client/react/contexts/messages/utils/use-refetch-messages.ts
 var useRefetchMessages = ({
   config,
   pathname,
@@ -461,10 +514,8 @@ var useRefetchMessages = ({
   return { refetchMessages };
 };
 var MessagesContext = React6.createContext(void 0);
-
-// src/adapters/next/contexts/messages/provider.tsx
 function MessagesProvider({
-  value: { messages },
+  value: { messages = {} },
   children
 }) {
   const { config, pathname } = useConfig();
@@ -486,7 +537,7 @@ function MessagesProvider({
     }),
     [loadedMessages, messages, isLoadingMessages, refetchMessages]
   );
-  return /* @__PURE__ */ React6.createElement(MessagesContext.Provider, { value }, children);
+  return /* @__PURE__ */ jsx(MessagesContext.Provider, { value, children });
 }
 function useMessages() {
   const context = React6.useContext(MessagesContext);
@@ -495,7 +546,7 @@ function useMessages() {
   return context;
 }
 
-// src/adapters/next/contexts/locale/utils/use-init-lazy-load.ts
+// src/client/react/contexts/locale/utils/use-init-lazy-load.ts
 var useInitLazyLoad = ({
   loaderOptions,
   currentLocale
@@ -511,7 +562,7 @@ var useInitLazyLoad = ({
   }, [lazyLoad, currentLocale, refetchMessages, isFirstLoadedRef]);
 };
 
-// src/adapters/next/shared/utils/build-cookie-string.ts
+// src/shared/utils/client/build-cookie-string.ts
 var buildCookieString = (cookie, locale) => {
   const parts = [`${cookie.name}=${encodeURIComponent(locale)}`];
   if (cookie.maxAge) {
@@ -533,7 +584,7 @@ var buildCookieString = (cookie, locale) => {
   return parts.join("; ");
 };
 
-// src/adapters/next/shared/utils/set-locale-cookie-browser.ts
+// src/shared/utils/client/set-locale-cookie-browser.ts
 var setLocaleCookieBrowser = ({
   cookie,
   locale
@@ -544,7 +595,7 @@ var setLocaleCookieBrowser = ({
   document.cookie = cookieString;
 };
 
-// src/adapters/next/contexts/locale/utils/use-init-locale-cookie.ts
+// src/client/react/contexts/locale/utils/use-init-locale-cookie.ts
 var useInitLocaleCookie = ({
   config,
   locale
@@ -563,7 +614,7 @@ var useInitLocaleCookie = ({
 };
 var LocaleContext = React6.createContext(void 0);
 
-// src/adapters/next/contexts/locale/utils/change-locale.ts
+// src/client/react/contexts/locale/utils/change-locale.ts
 var changeLocale = ({
   currentLocale,
   newLocale,
@@ -587,8 +638,6 @@ var changeLocale = ({
     void refetchMessages(newLocale);
   }
 };
-
-// src/adapters/next/contexts/locale/provider.tsx
 function LocaleProvider({
   value: { initialLocale },
   children
@@ -619,7 +668,7 @@ function LocaleProvider({
     }),
     [currentLocale, setLocale]
   );
-  return /* @__PURE__ */ React6.createElement(LocaleContext.Provider, { value }, children);
+  return /* @__PURE__ */ jsx(LocaleContext.Provider, { value, children });
 }
 function useLocale() {
   const context = React6.useContext(LocaleContext);
@@ -627,163 +676,22 @@ function useLocale() {
     throw new Error("useLocale must be used within a LocaleProvider");
   return context;
 }
-var TranslateHandlersContext = React6.createContext(void 0);
-
-// src/adapters/next/contexts/translate-handlers/provider.tsx
-var TranslateHandlersProvider = ({
-  children,
-  handlers
-}) => {
-  const value = handlers;
-  return /* @__PURE__ */ React6.createElement(TranslateHandlersContext.Provider, { value }, children);
-};
-function useTranslateHandlers() {
-  const context = React6.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);
-
-// src/adapters/next/contexts/translator/provider.tsx
-var EMPTY_OBJECT = Object.freeze({});
-function TranslatorProvider({ children }) {
-  const { config } = useConfig();
-  const { messages, isLoading } = useMessages();
-  const { locale } = useLocale();
-  const translatorHandlers = useTranslateHandlers();
-  const { fallbackLocales, translator: translatorOptions } = config;
-  const isBeforeCSRLoading = useInitLoadingState(config);
-  const value = React6.useMemo(() => {
-    const translator = new Translator({
-      messages: messages || EMPTY_OBJECT,
-      locale,
-      fallbackLocales,
-      loadingMessage: translatorOptions?.loadingMessage,
-      placeholder: translatorOptions?.placeholder,
-      handlers: translatorHandlers
-    });
-    translator.setLoading(isBeforeCSRLoading || isLoading);
-    return { translator };
-  }, [
-    fallbackLocales,
-    isBeforeCSRLoading,
-    isLoading,
-    locale,
-    messages,
-    translatorHandlers,
-    translatorOptions?.loadingMessage,
-    translatorOptions?.placeholder
-  ]);
-  return /* @__PURE__ */ React6.createElement(TranslatorContext.Provider, { value }, children);
-}
-function useTranslator() {
-  const context = React6.useContext(TranslatorContext);
-  if (!context)
-    throw new Error(
-      "useTranslator must be used within IntorTranslatorProvider"
-    );
-  return context;
-}
-
-// src/adapters/next/contexts/intor-provider/intor-provider.tsx
-var IntorProvider = ({
-  value: { config, pathname, initialLocale, messages },
-  children
-}) => {
-  return /* @__PURE__ */ React6.createElement(ConfigProvider, { value: { config, pathname } }, /* @__PURE__ */ React6.createElement(MessagesProvider, { value: { messages } }, /* @__PURE__ */ React6.createElement(LocaleProvider, { value: { initialLocale } }, /* @__PURE__ */ React6.createElement(TranslatorProvider, null, children))));
-};
-
-// src/adapters/next/hooks/use-translator/use-translator.ts
-function useTranslator2(preKey) {
-  const { translator } = useTranslator();
-  const { setLocale } = useLocale();
-  const props = {
-    messages: translator.messages,
-    locale: translator.locale,
-    isLoading: translator.isLoading,
-    setLocale
-  };
-  const scoped = translator.scoped(preKey);
-  return {
-    ...props,
-    hasKey: preKey ? scoped.hasKey : translator.hasKey,
-    t: preKey ? scoped.t : translator.t
-  };
-}
-
-// src/adapters/next/shared/utils/locale-prefix-pathname.ts
-var localePrefixPathname = ({
-  config,
-  pathname: standardizedPathname,
-  locale
-}) => {
-  const { routing } = config;
-  const { prefix } = routing;
-  if (prefix !== "none" && !locale) {
-    throw new Error('No locale when using prefix "all", "except-default"');
-  }
-  if (prefix === "all") {
-    return normalizePathname(
-      standardizedPathname.replaceAll(PREFIX_PLACEHOLDER, locale)
-    );
-  }
-  if (prefix === "except-default") {
-    return locale === config.defaultLocale ? normalizePathname(
-      standardizedPathname.replaceAll(`/${PREFIX_PLACEHOLDER}`, "")
-    ) : normalizePathname(
-      standardizedPathname.replaceAll(PREFIX_PLACEHOLDER, locale)
-    );
-  }
-  return normalizePathname(
-    standardizedPathname.replaceAll(`/${PREFIX_PLACEHOLDER}`, "")
-  );
-};
-
-// src/adapters/next/shared/utils/localize-pathname.ts
-var localizePathname = ({
-  config,
-  pathname: rawPathname,
-  locale
-}) => {
-  const { unprefixedPathname } = extractPathname({
-    config,
-    pathname: rawPathname
-  });
-  const standardizedPathname = standardizePathname({
-    config,
-    pathname: unprefixedPathname
-  });
-  const localePrefixedPathname = localePrefixPathname({
-    config,
-    pathname: standardizedPathname,
-    locale
-  });
-  return {
-    unprefixedPathname,
-    standardizedPathname,
-    localePrefixedPathname
-  };
-};
 
 // src/adapters/next/navigation/use-pathname.ts
 var usePathname = () => {
   const { config } = useConfig();
   const { locale } = useLocale();
   const rawPathname = usePathname$1();
-  const { localePrefixedPathname } = localizePathname({
+  const { localePrefixedPathname, standardizedPathname, unprefixedPathname } = localizePathname({
     config,
     pathname: rawPathname,
     locale
   });
-  return localePrefixedPathname;
+  return {
+    localizedPathname: localePrefixedPathname,
+    standardizedPathname,
+    unprefixedPathname
+  };
 };
 
 // src/adapters/next/navigation/utils/should-full-reload.ts
@@ -808,14 +716,14 @@ var shouldFullReload = ({
 var useLocaleSwitch = () => {
   const { config } = useConfig();
   const { locale: currentLocale, setLocale } = useLocale();
-  const pathname = usePathname();
+  const { localizedPathname } = usePathname();
   const resolveHref = ({
     href,
     locale
   }) => {
     const isLocaleValid = locale && config.supportedLocales?.includes(locale);
     const targetLocale = isLocaleValid ? locale : currentLocale;
-    const targetPathname = href ?? pathname;
+    const targetPathname = href ?? localizedPathname;
     const isExternal = targetPathname.startsWith("http");
     const resolvedHref = !isExternal ? localizePathname({
       config,
@@ -841,8 +749,6 @@ var useLocaleSwitch = () => {
   };
   return { resolveHref, switchLocale };
 };
-
-// src/adapters/next/navigation/link.tsx
 var Link = ({
   href,
   locale,
@@ -857,7 +763,7 @@ var Link = ({
     onClick?.(e);
     switchLocale({ href: formatted, locale });
   };
-  return /* @__PURE__ */ React6.createElement(NextLink, { href: resolvedHref, onClick: handleClick, ...props }, children);
+  return /* @__PURE__ */ jsx(NextLink, { href: resolvedHref, onClick: handleClick, ...props, children });
 };
 var useRouter = () => {
   const { push, replace, ...rest } = useRouter$1();
@@ -930,5 +836,90 @@ var redirect = async ({
   });
   redirect$1(localePrefixedPathname, type);
 };
+var TranslateHandlersContext = React6.createContext(void 0);
+var TranslateHandlersProvider = ({
+  children,
+  handlers
+}) => {
+  const value = handlers;
+  return /* @__PURE__ */ jsx(TranslateHandlersContext.Provider, { value, children });
+};
+function useTranslateHandlers() {
+  const context = React6.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 }) {
+  const { config } = useConfig();
+  const { messages, isLoading } = useMessages();
+  const { locale } = useLocale();
+  const translatorHandlers = useTranslateHandlers();
+  const { fallbackLocales, translator: translatorOptions } = config;
+  const isBeforeCSRLoading = useInitLoadingState(config);
+  const value = React6.useMemo(() => {
+    const translator = new Translator({
+      messages: messages || EMPTY_OBJECT,
+      locale,
+      fallbackLocales,
+      loadingMessage: translatorOptions?.loadingMessage,
+      placeholder: translatorOptions?.placeholder,
+      handlers: translatorHandlers
+    });
+    translator.setLoading(isBeforeCSRLoading || isLoading);
+    return { translator };
+  }, [
+    fallbackLocales,
+    isBeforeCSRLoading,
+    isLoading,
+    locale,
+    messages,
+    translatorHandlers,
+    translatorOptions?.loadingMessage,
+    translatorOptions?.placeholder
+  ]);
+  return /* @__PURE__ */ jsx(TranslatorContext.Provider, { value, children });
+}
+function useTranslator() {
+  const context = React6.useContext(TranslatorContext);
+  if (!context)
+    throw new Error(
+      "useTranslator must be used within IntorTranslatorProvider"
+    );
+  return context;
+}
+var IntorProvider = ({
+  value: { config, pathname = "", initialLocale, messages = config.messages },
+  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 }) }) }) });
+};
+
+// src/client/react/hooks/use-translator.ts
+function useTranslator2(preKey) {
+  const { translator } = useTranslator();
+  const { setLocale } = useLocale();
+  const props = {
+    messages: translator.messages,
+    locale: translator.locale,
+    isLoading: translator.isLoading,
+    setLocale
+  };
+  const scoped = translator.scoped(preKey);
+  return {
+    ...props,
+    hasKey: preKey ? scoped.hasKey : translator.hasKey,
+    t: preKey ? scoped.t : translator.t
+  };
+}
 
-export { IntorProvider, Link, PATHNAME_HEADER_NAME, TranslateHandlersProvider, redirect, usePathname, useRouter, useTranslator2 as useTranslator };
+export { IntorProvider, Link, TranslateHandlersProvider, redirect, usePathname, useRouter, useTranslator2 as useTranslator };