intor 1.0.35 → 1.0.36

package/dist/config/index.cjs

@@ -1,36 +1,19 @@
 'use strict';
 
-var logry = require('logry');
+var edge = require('logry/edge');
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+// src/modules/intor-config/initialize-logger.ts
 var initializeLogger = ({
   id,
   scope,
   loggerOptions
 }) => {
-  const logger = logry.logry(__spreadValues({
+  const logger = edge.logry({
     id,
-    level: loggerOptions == null ? void 0 : loggerOptions.level,
-    scope
-  }, loggerOptions));
+    level: loggerOptions?.level,
+    scope,
+    ...loggerOptions
+  });
   return logger;
 };
 
@@ -50,7 +33,10 @@ var DEFAULT_COOKIE_OPTIONS = {
 
 // src/modules/intor-config/resolvers/resolve-cookie-options.ts
 var resolveCookieOptions = (cookie = {}) => {
-  return __spreadValues(__spreadValues({}, DEFAULT_COOKIE_OPTIONS), cookie);
+  return {
+    ...DEFAULT_COOKIE_OPTIONS,
+    ...cookie
+  };
 };
 
 // src/modules/intor-config/resolvers/resolve-fallback-locales.ts
@@ -96,7 +82,7 @@ var DEFAULT_PREFIX_PLACEHOLDER = "{{locale}}";
 
 // src/modules/intor-config/resolvers/resolve-prefix-placeholder.ts
 var resolvePrefixPlaceholder = (input) => {
-  return (input == null ? void 0 : input.replace(/\//g, "")) || DEFAULT_PREFIX_PLACEHOLDER;
+  return input?.replace(/\//g, "") || DEFAULT_PREFIX_PLACEHOLDER;
 };
 
 // src/modules/intor-config/constants/routing-options-constants.ts
@@ -145,10 +131,15 @@ var normalizePathname = (rawPathname, options = {}) => {
 
 // src/modules/intor-config/resolvers/resolve-routing-options.ts
 var resolveRoutingOptions = (routing = {}) => {
-  return __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_ROUTING_OPTIONS), routing), {
-    firstVisit: __spreadValues(__spreadValues({}, DEFAULT_ROUTING_OPTIONS.firstVisit), routing.firstVisit || {}),
-    basePath: normalizePathname((routing == null ? void 0 : routing.basePath) || "")
-  });
+  return {
+    ...DEFAULT_ROUTING_OPTIONS,
+    ...routing,
+    firstVisit: {
+      ...DEFAULT_ROUTING_OPTIONS.firstVisit,
+      ...routing.firstVisit || {}
+    },
+    basePath: normalizePathname(routing?.basePath || "")
+  };
 };
 
 // src/modules/intor-error/intor-error.ts
@@ -176,7 +167,7 @@ var validateDefaultLocale = ({
       message: `The defaultLocale is undefined`
     });
   }
-  if (!(supportedLocales == null ? void 0 : supportedLocales.includes(defaultLocale))) {
+  if (!supportedLocales?.includes(defaultLocale)) {
     throw new IntorError({
       id,
       code: "INTOR_UNSUPPORTED_DEFAULT_LOCALE" /* UNSUPPORTED_DEFAULT_LOCALE */,

package/dist/config/index.d.cts

@@ -1,4 +1,4 @@
-import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry';
+import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry/edge';
 import { Locale, LocaleNamespaceMessages, FallbackLocalesMap } from 'intor-translator';
 
 type InitCookieOptions = {

package/dist/config/index.d.ts

@@ -1,4 +1,4 @@
-import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry';
+import { Level, NormalizerConfig, FormatterConfig, LoggerPreset } from 'logry/edge';
 import { Locale, LocaleNamespaceMessages, FallbackLocalesMap } from 'intor-translator';
 
 type InitCookieOptions = {

package/dist/config/index.js

@@ -1,34 +1,17 @@
-import { logry } from 'logry';
+import { logry } from 'logry/edge';
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+// src/modules/intor-config/initialize-logger.ts
 var initializeLogger = ({
   id,
   scope,
   loggerOptions
 }) => {
-  const logger = logry(__spreadValues({
+  const logger = logry({
     id,
-    level: loggerOptions == null ? void 0 : loggerOptions.level,
-    scope
-  }, loggerOptions));
+    level: loggerOptions?.level,
+    scope,
+    ...loggerOptions
+  });
   return logger;
 };
 
@@ -48,7 +31,10 @@ var DEFAULT_COOKIE_OPTIONS = {
 
 // src/modules/intor-config/resolvers/resolve-cookie-options.ts
 var resolveCookieOptions = (cookie = {}) => {
-  return __spreadValues(__spreadValues({}, DEFAULT_COOKIE_OPTIONS), cookie);
+  return {
+    ...DEFAULT_COOKIE_OPTIONS,
+    ...cookie
+  };
 };
 
 // src/modules/intor-config/resolvers/resolve-fallback-locales.ts
@@ -94,7 +80,7 @@ var DEFAULT_PREFIX_PLACEHOLDER = "{{locale}}";
 
 // src/modules/intor-config/resolvers/resolve-prefix-placeholder.ts
 var resolvePrefixPlaceholder = (input) => {
-  return (input == null ? void 0 : input.replace(/\//g, "")) || DEFAULT_PREFIX_PLACEHOLDER;
+  return input?.replace(/\//g, "") || DEFAULT_PREFIX_PLACEHOLDER;
 };
 
 // src/modules/intor-config/constants/routing-options-constants.ts
@@ -143,10 +129,15 @@ var normalizePathname = (rawPathname, options = {}) => {
 
 // src/modules/intor-config/resolvers/resolve-routing-options.ts
 var resolveRoutingOptions = (routing = {}) => {
-  return __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_ROUTING_OPTIONS), routing), {
-    firstVisit: __spreadValues(__spreadValues({}, DEFAULT_ROUTING_OPTIONS.firstVisit), routing.firstVisit || {}),
-    basePath: normalizePathname((routing == null ? void 0 : routing.basePath) || "")
-  });
+  return {
+    ...DEFAULT_ROUTING_OPTIONS,
+    ...routing,
+    firstVisit: {
+      ...DEFAULT_ROUTING_OPTIONS.firstVisit,
+      ...routing.firstVisit || {}
+    },
+    basePath: normalizePathname(routing?.basePath || "")
+  };
 };
 
 // src/modules/intor-error/intor-error.ts
@@ -174,7 +165,7 @@ var validateDefaultLocale = ({
       message: `The defaultLocale is undefined`
     });
   }
-  if (!(supportedLocales == null ? void 0 : supportedLocales.includes(defaultLocale))) {
+  if (!supportedLocales?.includes(defaultLocale)) {
     throw new IntorError({
       id,
       code: "INTOR_UNSUPPORTED_DEFAULT_LOCALE" /* UNSUPPORTED_DEFAULT_LOCALE */,

package/dist/index.cjs

@@ -14,25 +14,7 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 var pLimit__default = /*#__PURE__*/_interopDefault(pLimit);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+// src/modules/intor/intor.ts
 
 // src/modules/intor-error/intor-error.ts
 var IntorError = class extends Error {
@@ -64,10 +46,9 @@ var DEFAULT_PATHNAME_HEADER_NAME = "x-intor-pathname";
 var normalizeLocale = (locale = "", supportedLocales = []) => {
   if (!locale || supportedLocales.length === 0) return void 0;
   const toCanonical = (input) => {
-    var _a;
     try {
-      return (_a = Intl.getCanonicalLocales(input)[0]) == null ? void 0 : _a.toLowerCase();
-    } catch (e) {
+      return Intl.getCanonicalLocales(input)[0]?.toLowerCase();
+    } catch {
       return void 0;
     }
   };
@@ -95,19 +76,18 @@ var normalizeLocale = (locale = "", supportedLocales = []) => {
 
 // src/shared/utils/locale/resolve-preferred-locale.ts
 var resolvePreferredLocale = (acceptLanguageHeader, supportedLocales) => {
-  var _a;
   if (!acceptLanguageHeader || !supportedLocales || supportedLocales.length === 0) {
     return;
   }
   const supportedLocalesSet = new Set(supportedLocales);
-  const preferred = (_a = acceptLanguageHeader.split(",").map((part) => {
+  const preferred = acceptLanguageHeader.split(",").map((part) => {
     const [lang, qValue] = part.split(";");
     const q = qValue ? parseFloat(qValue.split("=")[1]) : 1;
     if (isNaN(q)) {
       return { lang: lang.trim(), q: 0 };
     }
     return { lang: lang.trim(), q };
-  }).sort((a, b) => b.q - a.q).find(({ lang }) => supportedLocalesSet.has(lang))) == null ? void 0 : _a.lang;
+  }).sort((a, b) => b.q - a.q).find(({ lang }) => supportedLocalesSet.has(lang))?.lang;
   return preferred;
 };
 
@@ -115,14 +95,13 @@ var resolvePreferredLocale = (acceptLanguageHeader, supportedLocales) => {
 var nextClientRuntime = async ({
   config
 }) => {
-  var _a;
   const cookiesStore = await headers.cookies();
   const headersStore = await headers.headers();
   const logger = logry.logry({ id: config.id, scope: "nextClientRuntime" });
   const { defaultLocale, supportedLocales = [], cookie, routing } = config;
   let locale;
   if (!cookie.disabled) {
-    const localeFromCookie = (_a = cookiesStore.get(cookie.name)) == null ? void 0 : _a.value;
+    const localeFromCookie = cookiesStore.get(cookie.name)?.value;
     locale = normalizeLocale(localeFromCookie, supportedLocales);
     if (locale) {
       logger.debug("Get locale from cookie:", { locale });
@@ -147,14 +126,13 @@ var nextServerRuntime = async ({
   config,
   request
 }) => {
-  var _a;
   const cookiesStore = await headers.cookies();
   const headersStore = await headers.headers();
   const logger = logry.logry({ id: config.id, scope: "nextServerRuntime" });
   const { defaultLocale, supportedLocales = [], cookie, routing } = config;
   let locale;
   if (!cookie.disabled) {
-    const localeFromCookie = (_a = cookiesStore.get(cookie.name)) == null ? void 0 : _a.value;
+    const localeFromCookie = cookiesStore.get(cookie.name)?.value;
     locale = normalizeLocale(localeFromCookie, supportedLocales);
     if (locale) {
       logger.debug("Get locale from cookie:", { locale });
@@ -180,16 +158,16 @@ var nextServerRuntime = async ({
     }
   }
   if (!cookie.disabled && cookie.autoSetCookie) {
-    cookiesStore.set(__spreadProps(__spreadValues({
+    cookiesStore.set({
       name: cookie.name,
-      value: locale || defaultLocale
-    }, cookie.domain ? { domain: cookie.domain } : {}), {
+      value: locale || defaultLocale,
+      ...cookie.domain ? { domain: cookie.domain } : {},
       path: cookie.path,
       maxAge: cookie.maxAge,
       httpOnly: cookie.httpOnly,
       secure: cookie.secure,
       sameSite: cookie.sameSite
-    }));
+    });
     logger.debug("Set locale to cookie:", {
       cookie: { name: cookie.name, value: locale || defaultLocale }
     });
@@ -232,24 +210,24 @@ var parseMessageFile = async (filePath, loggerId) => {
   const logger = logry.logry({ id: loggerId, scope: "parseMessageFile" });
   const trimmedPath = filePath.trim();
   if (!trimmedPath) {
-    logger == null ? void 0 : logger.warn("Invalid file path provided.", { filePath: trimmedPath });
+    logger?.warn("Invalid file path provided.", { filePath: trimmedPath });
     return null;
   }
   if (trimmedPath.length > MAX_PATH_LENGTH) {
-    logger == null ? void 0 : logger.warn("Invalid file path provided.", { filePath: trimmedPath });
+    logger?.warn("Invalid file path provided.", { filePath: trimmedPath });
     return null;
   }
   const fileName = path__default.default.basename(trimmedPath);
   if (!fileName.toLowerCase().endsWith(".json")) {
-    logger == null ? void 0 : logger.debug(`Skipped non-JSON file.`, { filePath: trimmedPath });
+    logger?.debug(`Skipped non-JSON file.`, { filePath: trimmedPath });
     return null;
   }
   try {
     const { content } = await readMessageRecordFile(trimmedPath);
-    logger == null ? void 0 : logger.debug(`Loaded a file.`, { filePath: trimmedPath });
+    logger?.debug(`Loaded a file.`, { filePath: trimmedPath });
     return content;
   } catch (error) {
-    logger == null ? void 0 : logger.warn(`Failed to load file.`, { filePath: trimmedPath, error });
+    logger?.warn(`Failed to load file.`, { filePath: trimmedPath, error });
     return null;
   }
 };
@@ -285,12 +263,10 @@ var loadNamespaceGroup = async ({
   limit,
   loggerId
 }) => {
-  var _a;
   const logger = logry.logry({ id: loggerId, scope: "loadNamespaceGroup" });
   const { isAtRoot, filePaths } = namespaceGroupValue;
   if (filePaths.length === 0) {
-    (_a = logger == null ? void 0 : logger.debug) == null ? void 0 : _a.call(
-      logger,
+    logger?.debug?.(
       `Skipped merging [${locale}][${namespace}] because filePaths is empty`
     );
     return;
@@ -304,10 +280,10 @@ var loadNamespaceGroup = async ({
     if (!messages[locale]) {
       messages[locale] = {};
     }
-    const finalContent = isAtRoot ? base : __spreadValues(__spreadValues({}, base), sub);
+    const finalContent = isAtRoot ? base : { ...base, ...sub };
     messages[locale][namespace] = finalContent;
     if (!isAtRoot && Object.keys(finalContent).length > 0) {
-      logger == null ? void 0 : logger.debug(
+      logger?.debug(
         `Merged ${locale}/${namespace} from ${filePaths.length} file(s)`,
         { namespace }
       );
@@ -553,7 +529,7 @@ var loadLocalMessages = async ({
     path: { basePath, resolvedBasePath },
     locale,
     fallbackLocales,
-    namespaces: namespaces && namespaces.length > 0 ? { count: namespaces == null ? void 0 : namespaces.length, list: [...namespaces] } : "All",
+    namespaces: namespaces && namespaces.length > 0 ? { count: namespaces?.length, list: [...namespaces] } : "All",
     concurrency
   });
   const validNamespaces = await loadLocaleWithFallback({
@@ -567,7 +543,7 @@ var loadLocalMessages = async ({
   });
   const end = perf_hooks.performance.now();
   const duration = Math.round(end - start);
-  if (validNamespaces && (validNamespaces == null ? void 0 : validNamespaces.length) > 0) {
+  if (validNamespaces && validNamespaces?.length > 0) {
     logger.info("Finished loading local messages.", {
       locale,
       namespaces: validNamespaces,
@@ -585,7 +561,7 @@ var loadLocalMessages = async ({
 
 // src/modules/intor-messages-loader/create-local-messages-loader/create-local-messages-loader.ts
 var createLocalMessagesLoader = (basePath) => {
-  return (options) => loadLocalMessages(__spreadValues({ basePath }, options));
+  return (options) => loadLocalMessages({ basePath, ...options });
 };
 
 // src/modules/intor-messages-loader/fetch-api-messages/build-search-params.ts
@@ -634,7 +610,7 @@ var fetcher = async ({
       );
     }
     return data;
-  } catch (e) {
+  } catch {
     logger.warn(`Failed to fetch messages for locale "${locale}".`, {
       locale,
       apiUrl,
@@ -714,7 +690,6 @@ var extractPathname = ({
   config,
   pathname: rawPathname
 }) => {
-  var _a;
   const { routing, defaultLocale } = config;
   const { basePath, prefix } = routing;
   const normalizedPathname = normalizePathname(rawPathname);
@@ -726,7 +701,7 @@ var extractPathname = ({
   }
   const pathParts = prefixedPathname.split("/").filter(Boolean);
   const maybeLocale = pathParts[0] || "";
-  const isLocalePrefixed = (_a = config.supportedLocales) == null ? void 0 : _a.includes(maybeLocale);
+  const isLocalePrefixed = config.supportedLocales?.includes(maybeLocale);
   let unprefixedPathname = prefixedPathname;
   if (prefix === "all") {
     if (isLocalePrefixed) {
@@ -767,7 +742,6 @@ var resolveNamespaces = ({
   config,
   pathname
 }) => {
-  var _a, _b, _c, _d;
   const { loaderOptions, prefixPlaceHolder } = config;
   const {
     routeNamespaces = {},
@@ -782,8 +756,8 @@ var resolveNamespaces = ({
     `/${prefixPlaceHolder}`,
     ""
   );
-  const defaultNamespaces = (_a = routeNamespaces.default) != null ? _a : [];
-  const exactMatchNamespaces = (_b = routeNamespaces[standardizedPathname]) != null ? _b : routeNamespaces[placeholderRemovedPathname];
+  const defaultNamespaces = routeNamespaces.default ?? [];
+  const exactMatchNamespaces = routeNamespaces[standardizedPathname] ?? routeNamespaces[placeholderRemovedPathname];
   if (exactMatchNamespaces) {
     return [...defaultNamespaces, ...exactMatchNamespaces];
   }
@@ -801,7 +775,7 @@ var resolveNamespaces = ({
       }
     }
   }
-  const matchedNamespaces = (_d = (_c = bestNamespaces != null ? bestNamespaces : routeNamespaces["/*"]) != null ? _c : fallbackNamespaces) != null ? _d : [];
+  const matchedNamespaces = bestNamespaces ?? routeNamespaces["/*"] ?? fallbackNamespaces ?? [];
   if (matchedNamespaces.length > 0) {
     return [...defaultNamespaces, ...matchedNamespaces];
   } else {
@@ -828,19 +802,21 @@ var intorMessagesLoader = async ({
   });
   if (loaderOptions.type === "import") {
     const loadLocalMessages2 = createLocalMessagesLoader(loaderOptions.basePath);
-    dynamicMessages = await loadLocalMessages2(__spreadProps(__spreadValues({}, loaderOptions), {
+    dynamicMessages = await loadLocalMessages2({
+      ...loaderOptions,
       locale,
       fallbackLocales,
       namespaces,
       loggerId: config.id
-    }));
+    });
   } else if (loaderOptions.type === "api") {
-    dynamicMessages = await fetchApiMessages(__spreadProps(__spreadValues({}, loaderOptions), {
+    dynamicMessages = await fetchApiMessages({
+      ...loaderOptions,
       locale,
       fallbackLocales,
       namespaces,
       loggerId: config.id
-    }));
+    });
   } else {
     logger.error("Unknown loader type.", {
       type: loaderOptions.type
@@ -877,14 +853,17 @@ var shouldLoadDynamicMessages = (loaderOptions, adapter) => {
 
 // src/shared/utils/merge-static-and-dynamic-messages.ts
 var mergeStaticAndDynamicMessages = (staticMessages = {}, dynamicMessages = {}) => {
-  const result = Object.keys(staticMessages).length ? __spreadValues({}, staticMessages) : {};
+  const result = Object.keys(staticMessages).length ? { ...staticMessages } : {};
   for (const locale in dynamicMessages) {
     const dynamic = dynamicMessages[locale];
     if (!result[locale]) {
       result[locale] = dynamic;
       continue;
     }
-    result[locale] = __spreadValues(__spreadValues({}, result[locale]), dynamic);
+    result[locale] = {
+      ...result[locale],
+      ...dynamic
+    };
   }
   return result;
 };
@@ -924,12 +903,13 @@ var intorRuntime = async ({
     staticMessages: {
       fromConfig: !!staticMessages
     },
-    dynamicMessages: __spreadValues({
-      fromLoader: !!dynamicMessages
-    }, loaderOptions ? {
-      loaderType: loaderOptions.type,
-      lazyLoad: !!loaderOptions.lazyLoad
-    } : null),
+    dynamicMessages: {
+      fromLoader: !!dynamicMessages,
+      ...loaderOptions ? {
+        loaderType: loaderOptions.type,
+        lazyLoad: !!loaderOptions.lazyLoad
+      } : null
+    },
     mergedMessages: messages
   });
   return {
@@ -969,14 +949,13 @@ var intor = async ({
 };
 var createIntor = (config, translateHandlers) => {
   return async (request) => {
-    var _a, _b;
     const { initialLocale, messages } = await intor({ config, request });
     const translator = new intorTranslator.Translator({
       locale: initialLocale,
       messages,
       fallbackLocales: config.fallbackLocales,
-      loadingMessage: (_a = config.translator) == null ? void 0 : _a.loadingMessage,
-      placeholder: (_b = config.translator) == null ? void 0 : _b.placeholder,
+      loadingMessage: config.translator?.loadingMessage,
+      placeholder: config.translator?.placeholder,
       handlers: translateHandlers
     });
     return translator;