intor 2.3.5 → 2.3.6

package/dist/core/export/index.js

@@ -1,4 +1,5 @@
 export { PREFIX_PLACEHOLDER } from '../src/shared/constants/prefix-placeholder.js';
+export { deepMerge } from '../src/shared/utils/deep-merge.js';
 export { localizePathname } from '../src/shared/utils/pathname/localize-pathname.js';
 export { IntorError, IntorErrorCode } from '../src/shared/error/intor-error.js';
 import 'intor-translator';

package/dist/core/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js

@@ -73,13 +73,10 @@ async function parseFileEntries({ fileEntries, limit, extraOptions: { messagesRe
     for (const { namespace, messages } of parsedFileEntries) {
         // Handle root-level namespace (i.e., [rootDir]/index.json)
         if (namespace === "index") {
-            const merged = deepMerge(result, messages);
-            if (merged)
-                Object.assign(result, merged);
+            Object.assign(result, deepMerge(result, messages));
         }
         else {
-            result[namespace] =
-                deepMerge(result[namespace] ?? {}, messages) || {};
+            result[namespace] = deepMerge(result[namespace], messages);
         }
     }
     return result;

package/dist/core/src/shared/utils/deep-merge.js

@@ -1,15 +1,12 @@
 /**
  * Deeply merges two objects.
+ *
  * - Nested objects → merged recursively
  * - Array / primitive → b overwrites a
+ *
+ * This function always returns a plain object.
  */
-const deepMerge = (a, b) => {
-    if (!a && !b)
-        return undefined;
-    if (!a)
-        return b;
-    if (!b)
-        return a;
+const deepMerge = (a = {}, b = {}) => {
     const result = { ...a };
     for (const key in b) {
         if (Object.prototype.hasOwnProperty.call(b, key)) {
@@ -21,11 +18,9 @@ const deepMerge = (a, b) => {
                 typeof bv === "object" &&
                 !Array.isArray(av) &&
                 !Array.isArray(bv)) {
-                // recursive merge
                 result[key] = deepMerge(av, bv);
             }
             else {
-                // overwrite with primitive or array
                 result[key] = bv;
             }
         }

package/dist/next/src/server/messages/load-local-messages/read-locale-messages/parse-file-entries/parse-file-entries.js

@@ -73,13 +73,10 @@ async function parseFileEntries({ fileEntries, limit, extraOptions: { messagesRe
     for (const { namespace, messages } of parsedFileEntries) {
         // Handle root-level namespace (i.e., [rootDir]/index.json)
         if (namespace === "index") {
-            const merged = deepMerge(result, messages);
-            if (merged)
-                Object.assign(result, merged);
+            Object.assign(result, deepMerge(result, messages));
         }
         else {
-            result[namespace] =
-                deepMerge(result[namespace] ?? {}, messages) || {};
+            result[namespace] = deepMerge(result[namespace], messages);
         }
     }
     return result;

package/dist/next/src/shared/utils/deep-merge.js

@@ -1,15 +1,12 @@
 /**
  * Deeply merges two objects.
+ *
  * - Nested objects → merged recursively
  * - Array / primitive → b overwrites a
+ *
+ * This function always returns a plain object.
  */
-const deepMerge = (a, b) => {
-    if (!a && !b)
-        return undefined;
-    if (!a)
-        return b;
-    if (!b)
-        return a;
+const deepMerge = (a = {}, b = {}) => {
     const result = { ...a };
     for (const key in b) {
         if (Object.prototype.hasOwnProperty.call(b, key)) {
@@ -21,11 +18,9 @@ const deepMerge = (a, b) => {
                 typeof bv === "object" &&
                 !Array.isArray(av) &&
                 !Array.isArray(bv)) {
-                // recursive merge
                 result[key] = deepMerge(av, bv);
             }
             else {
-                // overwrite with primitive or array
                 result[key] = bv;
             }
         }

package/dist/react/src/client/react/contexts/messages/utils/use-refetch-messages.js

@@ -39,7 +39,7 @@ const useRefetchMessages = ({ config, setRuntimeMessages, setIsLoadingMessages,
             });
             // Update state only if this request was not aborted
             if (!controller.signal.aborted) {
-                setRuntimeMessages(deepMerge(config.messages, loadedMessages) || {});
+                setRuntimeMessages(deepMerge(config.messages, loadedMessages));
             }
         }
         finally {

package/dist/react/src/client/react/contexts/translator/provider.js

@@ -20,7 +20,15 @@ function TranslatorProvider({ value: { isLoading: externalIsLoading } = {}, chil
     const { messages, isLoading: internalIsLoading } = useMessages();
     const { locale } = useLocale();
     const runtime = useTranslatorRuntime();
-    const isLoading = Boolean(externalIsLoading ?? internalIsLoading);
+    // Treat locale changes as a loading boundary to avoid transient missing states.
+    // isLoading defaults to false, but is eagerly set to true on locale switches.
+    const prevLocaleRef = React.useRef(locale);
+    // eslint-disable-next-line react-hooks/refs -- intentional render-time read to detect locale switches
+    const localeChanged = prevLocaleRef.current !== locale;
+    React.useEffect(() => {
+        prevLocaleRef.current = locale;
+    }, [locale]);
+    const isLoading = !!externalIsLoading || internalIsLoading || localeChanged;
     // context value
     const value = React.useMemo(() => {
         const translator = new Translator({

package/dist/react/src/shared/utils/deep-merge.js

@@ -1,15 +1,12 @@
 /**
  * Deeply merges two objects.
+ *
  * - Nested objects → merged recursively
  * - Array / primitive → b overwrites a
+ *
+ * This function always returns a plain object.
  */
-const deepMerge = (a, b) => {
-    if (!a && !b)
-        return undefined;
-    if (!a)
-        return b;
-    if (!b)
-        return a;
+const deepMerge = (a = {}, b = {}) => {
     const result = { ...a };
     for (const key in b) {
         if (Object.prototype.hasOwnProperty.call(b, key)) {
@@ -21,11 +18,9 @@ const deepMerge = (a, b) => {
                 typeof bv === "object" &&
                 !Array.isArray(av) &&
                 !Array.isArray(bv)) {
-                // recursive merge
                 result[key] = deepMerge(av, bv);
             }
             else {
-                // overwrite with primitive or array
                 result[key] = bv;
             }
         }

package/dist/types/export/index.d.ts

@@ -1,4 +1,4 @@
 export { PREFIX_PLACEHOLDER } from "../src/shared/constants";
-export { localizePathname, } from "../src/shared/utils";
+export { deepMerge, localizePathname, } from "../src/shared/utils";
 export { IntorError, IntorErrorCode } from "../src/shared/error";
 export { type TranslatorPlugin, type TranslateHandlers, type FormatHandler, type LoadingHandler, type MissingHandler, type HandlerContext, type TranslateContext, type TranslateHook, type LocaleMessages, } from "intor-translator";

package/dist/types/src/shared/utils/deep-merge.d.ts

@@ -1,8 +1,11 @@
 type PlainObject = Record<string, unknown>;
 /**
  * Deeply merges two objects.
+ *
  * - Nested objects → merged recursively
  * - Array / primitive → b overwrites a
+ *
+ * This function always returns a plain object.
  */
-export declare const deepMerge: <T extends PlainObject, U extends PlainObject>(a?: T, b?: U) => (T & U) | T | U | undefined;
+export declare const deepMerge: <T extends PlainObject, U extends PlainObject>(a?: T, b?: U) => T & U;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "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",
   "homepage": "https://github.com/yiming-liao/intor#readme",