intor 1.0.10 → 1.0.11

package/dist/index.cjs

@@ -43,6 +43,7 @@ var initializeLogger = ({
     level: loggerOptions == null ? void 0 : loggerOptions.level,
     scope
   }, loggerOptions));
+  console.log(loggerOptions);
   return logger;
 };
 
@@ -350,6 +351,57 @@ var nextClientRuntime = async ({
     pathname: pathname || ""
   };
 };
+var nextServerRuntime = async ({
+  config,
+  request
+}) => {
+  var _a;
+  const logger = logry.logry({
+    id: config.id,
+    scope: "nextServerRuntime"
+  });
+  const { defaultLocale, supportedLocales = [], cookie, routing } = config;
+  let locale = void 0;
+  if (!cookie.disabled) {
+    const localeFromCookie = (_a = (await headers.cookies()).get(cookie.name)) == null ? void 0 : _a.value;
+    locale = normalizeLocale(localeFromCookie, supportedLocales);
+    if (locale) {
+      void logger.debug("Get locale from cookie:", { locale });
+    }
+  }
+  if (!locale && routing.firstVisit.localeSource === "browser") {
+    const aLHeader = (await headers.headers()).get("accept-language") || void 0;
+    const preferredLocale = resolvePreferredLocale(aLHeader, supportedLocales);
+    locale = normalizeLocale(preferredLocale, supportedLocales);
+    void logger.debug("Get locale from browser:", { locale });
+  }
+  let pathname = "";
+  if (request && typeof request === "object" && "nextUrl" in request) {
+    pathname = request.nextUrl.pathname;
+    if (pathname) {
+      void logger.debug("Get pathname from next request:", { pathname });
+    }
+  }
+  if (!cookie.disabled && cookie.autoSetCookie) {
+    (await headers.cookies()).set(__spreadProps(__spreadValues({
+      name: cookie.name,
+      value: locale || defaultLocale
+    }, cookie.domain ? { domain: cookie.domain } : {}), {
+      path: cookie.path,
+      maxAge: cookie.maxAge,
+      httpOnly: cookie.httpOnly,
+      secure: cookie.secure,
+      sameSite: cookie.sameSite
+    }));
+    void logger.debug("Set locale to cookie:", {
+      cookie: { name: cookie.name, value: locale || defaultLocale }
+    });
+  }
+  return {
+    locale: locale || defaultLocale,
+    pathname: pathname || ""
+  };
+};
 
 // src/modules/intor-adapter/resolve-adapter-runtime-loader.ts
 var resolceAdapterRuntimeLoader = async ({
@@ -360,7 +412,7 @@ var resolceAdapterRuntimeLoader = async ({
   if (adapter === "next-client") {
     loadedRuntime = nextClientRuntime;
   } else if (adapter === "next-server") {
-    loadedRuntime = nextClientRuntime;
+    loadedRuntime = nextServerRuntime;
   }
   return loadedRuntime;
 };

package/dist/index.d.cts

@@ -117,7 +117,7 @@ type IntorOptions = {
     translateHandlers?: TranslateHandlers;
 };
 type IntorNextClientClientResult = IntorRuntimeResult;
-type IntorNextServerServerResult = Translator<LocaleNamespaceMessages>;
+type IntorNextServerServerResult = Translator<unknown>;
 type IntorResult = IntorNextClientClientResult & IntorNextServerServerResult;
 
 /**

package/dist/index.d.ts

@@ -117,7 +117,7 @@ type IntorOptions = {
     translateHandlers?: TranslateHandlers;
 };
 type IntorNextClientClientResult = IntorRuntimeResult;
-type IntorNextServerServerResult = Translator<LocaleNamespaceMessages>;
+type IntorNextServerServerResult = Translator<unknown>;
 type IntorResult = IntorNextClientClientResult & IntorNextServerServerResult;
 
 /**

package/dist/index.js

@@ -35,6 +35,7 @@ var initializeLogger = ({
     level: loggerOptions == null ? void 0 : loggerOptions.level,
     scope
   }, loggerOptions));
+  console.log(loggerOptions);
   return logger;
 };
 
@@ -342,6 +343,57 @@ var nextClientRuntime = async ({
     pathname: pathname || ""
   };
 };
+var nextServerRuntime = async ({
+  config,
+  request
+}) => {
+  var _a;
+  const logger = logry({
+    id: config.id,
+    scope: "nextServerRuntime"
+  });
+  const { defaultLocale, supportedLocales = [], cookie, routing } = config;
+  let locale = void 0;
+  if (!cookie.disabled) {
+    const localeFromCookie = (_a = (await cookies()).get(cookie.name)) == null ? void 0 : _a.value;
+    locale = normalizeLocale(localeFromCookie, supportedLocales);
+    if (locale) {
+      void logger.debug("Get locale from cookie:", { locale });
+    }
+  }
+  if (!locale && routing.firstVisit.localeSource === "browser") {
+    const aLHeader = (await headers()).get("accept-language") || void 0;
+    const preferredLocale = resolvePreferredLocale(aLHeader, supportedLocales);
+    locale = normalizeLocale(preferredLocale, supportedLocales);
+    void logger.debug("Get locale from browser:", { locale });
+  }
+  let pathname = "";
+  if (request && typeof request === "object" && "nextUrl" in request) {
+    pathname = request.nextUrl.pathname;
+    if (pathname) {
+      void logger.debug("Get pathname from next request:", { pathname });
+    }
+  }
+  if (!cookie.disabled && cookie.autoSetCookie) {
+    (await cookies()).set(__spreadProps(__spreadValues({
+      name: cookie.name,
+      value: locale || defaultLocale
+    }, cookie.domain ? { domain: cookie.domain } : {}), {
+      path: cookie.path,
+      maxAge: cookie.maxAge,
+      httpOnly: cookie.httpOnly,
+      secure: cookie.secure,
+      sameSite: cookie.sameSite
+    }));
+    void logger.debug("Set locale to cookie:", {
+      cookie: { name: cookie.name, value: locale || defaultLocale }
+    });
+  }
+  return {
+    locale: locale || defaultLocale,
+    pathname: pathname || ""
+  };
+};
 
 // src/modules/intor-adapter/resolve-adapter-runtime-loader.ts
 var resolceAdapterRuntimeLoader = async ({
@@ -352,7 +404,7 @@ var resolceAdapterRuntimeLoader = async ({
   if (adapter === "next-client") {
     loadedRuntime = nextClientRuntime;
   } else if (adapter === "next-server") {
-    loadedRuntime = nextClientRuntime;
+    loadedRuntime = nextServerRuntime;
   }
   return loadedRuntime;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "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",