use-intl 2.19.3 → 2.20.0

package/dist/src/core/createBaseTranslator.d.ts

@@ -1,9 +1,9 @@
-import IntlMessageFormat from 'intl-messageformat';
 import { ReactElement, ReactNodeArray } from 'react';
 import AbstractIntlMessages from './AbstractIntlMessages';
 import Formats from './Formats';
 import { InitializedIntlConfig } from './IntlConfig';
 import IntlError from './IntlError';
+import MessageFormatCache from './MessageFormatCache';
 import TranslationValues, { RichTranslationValues } from './TranslationValues';
 import MessageKeys from './utils/MessageKeys';
 import NestedKeyOf from './utils/NestedKeyOf';
@@ -14,12 +14,12 @@ export declare function getMessagesOrError<Messages extends AbstractIntlMessages
     onError?(error: IntlError): void;
 }): AbstractIntlMessages | IntlError;
 export type CreateBaseTranslatorProps<Messages> = InitializedIntlConfig & {
-    cachedFormatsByLocale?: Record<string, Record<string, IntlMessageFormat>>;
+    messageFormatCache?: MessageFormatCache;
     defaultTranslationValues?: RichTranslationValues;
     namespace?: string;
     messagesOrError: Messages | IntlError;
 };
-export default function createBaseTranslator<Messages extends AbstractIntlMessages, NestedKey extends NestedKeyOf<Messages>>({ cachedFormatsByLocale, defaultTranslationValues, formats: globalFormats, getMessageFallback, locale, messagesOrError, namespace, onError, timeZone }: CreateBaseTranslatorProps<Messages>): {
+export default function createBaseTranslator<Messages extends AbstractIntlMessages, NestedKey extends NestedKeyOf<Messages>>({ defaultTranslationValues, formats: globalFormats, getMessageFallback, locale, messageFormatCache, messagesOrError, namespace, onError, timeZone }: CreateBaseTranslatorProps<Messages>): {
     <TargetKey extends MessageKeys<NestedValueOf<Messages, NestedKey>, NestedKeyOf<NestedValueOf<Messages, NestedKey>>>>(key: TargetKey, values?: TranslationValues, formats?: Partial<Formats>): string;
     rich: (key: string, values?: RichTranslationValues, formats?: Partial<Formats>) => string | ReactElement | ReactNodeArray;
     raw(key: string): any;

package/dist/src/core/createBaseTranslator.js

@@ -69,7 +69,20 @@ export function getMessagesOrError({ messages, namespace, onError = defaultOnErr
         return intlError;
     }
 }
-export default function createBaseTranslator({ cachedFormatsByLocale, defaultTranslationValues, formats: globalFormats, getMessageFallback = defaultGetMessageFallback, locale, messagesOrError, namespace, onError, timeZone }) {
+function getPlainMessage(candidate, values) {
+    if (values)
+        return undefined;
+    const unescapedMessage = candidate.replace(/'([{}])/gi, '$1');
+    // Placeholders can be in the message if there are default values,
+    // or if the user has forgotten to provide values. In the latter
+    // case we need to compile the message to receive an error.
+    const hasPlaceholders = /<|{/.test(unescapedMessage);
+    if (!hasPlaceholders) {
+        return unescapedMessage;
+    }
+    return undefined;
+}
+export default function createBaseTranslator({ defaultTranslationValues, formats: globalFormats, getMessageFallback = defaultGetMessageFallback, locale, messageFormatCache, messagesOrError, namespace, onError, timeZone }) {
     function getFallbackFromErrorAndNotify(key, code, message) {
         const error = new IntlError(code, message);
         onError(error);
@@ -101,10 +114,10 @@ export default function createBaseTranslator({ cachedFormatsByLocale, defaultTra
         function joinPath(parts) {
             return parts.filter((part) => part != null).join('.');
         }
-        const cacheKey = joinPath([namespace, key, String(message)]);
+        const cacheKey = joinPath([locale, namespace, key, String(message)]);
         let messageFormat;
-        if (cachedFormatsByLocale?.[locale]?.[cacheKey]) {
-            messageFormat = cachedFormatsByLocale?.[locale][cacheKey];
+        if (messageFormatCache?.has(cacheKey)) {
+            messageFormat = messageFormatCache.get(cacheKey);
         }
         else {
             if (typeof message === 'object') {
@@ -129,18 +142,17 @@ export default function createBaseTranslator({ cachedFormatsByLocale, defaultTra
                 }
                 return getFallbackFromErrorAndNotify(key, code, errorMessage);
             }
+            // Hot path that avoids creating an `IntlMessageFormat` instance
+            const plainMessage = getPlainMessage(message, values);
+            if (plainMessage)
+                return plainMessage;
             try {
                 messageFormat = new IntlMessageFormat(message, locale, convertFormatsToIntlMessageFormat({ ...globalFormats, ...formats }, timeZone));
             }
             catch (error) {
                 return getFallbackFromErrorAndNotify(key, IntlErrorCode.INVALID_MESSAGE, error.message);
             }
-            if (cachedFormatsByLocale) {
-                if (!cachedFormatsByLocale[locale]) {
-                    cachedFormatsByLocale[locale] = {};
-                }
-                cachedFormatsByLocale[locale][cacheKey] = messageFormat;
-            }
+            messageFormatCache?.set(cacheKey, messageFormat);
         }
         try {
             const formattedMessage = messageFormat.format(

package/dist/src/core/createBaseTranslator.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBaseTranslator.js","sourceRoot":"","sources":["../../../src/core/createBaseTranslator.tsx"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,OAAO,iBAAiB,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,cAAc,EAIf,MAAM,OAAO,CAAC;AAIf,OAAO,SAAS,EAAE,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAErD,OAAO,iCAAiC,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAAC,yBAAyB,EAAE,cAAc,EAAC,MAAM,YAAY,CAAC;AAKrE,SAAS,WAAW,CAClB,QAA0C,EAC1C,GAAW,EACX,SAAkB;IAElB,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;YACnC,CAAC,CAAC,8BAA8B,SAAS,KAAK;YAC9C,CAAC,CAAC,SAAS,CACd,CAAC;KACH;IAED,IAAI,OAAO,GAAG,QAAQ,CAAC;IAEvB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAI,OAAe,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE;YAChC,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,uBAAuB,GAAG,SACxB,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,UACnC,GAAG;gBACL,CAAC,CAAC,SAAS,CACd,CAAC;SACH;QAED,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,wBAAwB,CAAC,MAA6B;IAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAEvD,kEAAkE;IAClE,MAAM,iBAAiB,GAA0B,EAAE,CAAC;IACpD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,WAAW,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAC/B,WAAW,GAAG,CAAC,MAAiB,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;gBAE7B,OAAO,cAAc,CAAC,MAAM,CAAC;oBAC3B,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,GAAG,GAAG,KAAK,EAAE,EAAC,CAAC;oBAC5C,CAAC,CAAC,MAAM,CAAC;YACb,CAAC,CAAC;SACH;aAAM;YACL,WAAW,GAAG,KAAK,CAAC;SACrB;QAED,iBAAiB,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAwC,EACxE,QAAQ,EACR,SAAS,EACT,OAAO,GAAG,cAAc,EAKzB;IACC,IAAI;QACF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,8CAA8C;gBAChD,CAAC,CAAC,SAAS,CACd,CAAC;SACH;QAED,MAAM,iBAAiB,GAAG,SAAS;YACjC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC;YAClC,CAAC,CAAC,QAAQ,CAAC;QAEb,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,+BAA+B,SAAS,WAAW;gBACrD,CAAC,CAAC,SAAS,CACd,CAAC;SACH;QAED,OAAO,iBAAiB,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,IAAI,SAAS,CAC7B,aAAa,CAAC,eAAe,EAC5B,KAAe,CAAC,OAAO,CACzB,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,CAAC;QACnB,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AASD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAG1C,EACA,qBAAqB,EACrB,wBAAwB,EACxB,OAAO,EAAE,aAAa,EACtB,kBAAkB,GAAG,yBAAyB,EAC9C,MAAM,EACN,eAAe,EACf,SAAS,EACT,OAAO,EACP,QAAQ,EAC4B;IACpC,SAAS,6BAA6B,CACpC,GAAW,EACX,IAAmB,EACnB,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,OAAO,kBAAkB,CAAC,EAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAC,CAAC,CAAC;IACrD,CAAC;IAED,SAAS,eAAe;IACtB,+EAA+E;IAC/E,GAAW;IACX,kEAAkE;IAClE,MAA8B;IAC9B,2DAA2D;IAC3D,OAA0B;QAE1B,IAAI,eAAe,YAAY,SAAS,EAAE;YACxC,kDAAkD;YAClD,OAAO,kBAAkB,CAAC;gBACxB,KAAK,EAAE,eAAe;gBACtB,GAAG;gBACH,SAAS;aACV,CAAC,CAAC;SACJ;QACD,MAAM,QAAQ,GAAG,eAAe,CAAC;QAEjC,IAAI,OAAO,CAAC;QACZ,IAAI;YACF,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;SACjD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,6BAA6B,CAClC,GAAG,EACH,aAAa,CAAC,eAAe,EAC5B,KAAe,CAAC,OAAO,CACzB,CAAC;SACH;QAED,SAAS,QAAQ,CAAC,KAAgC;YAChD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAE7D,IAAI,aAAa,CAAC;QAClB,IAAI,qBAAqB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;YAC/C,aAAa,GAAG,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC3D;aAAM;YACL,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,IAAI,IAAI,EAAE,YAAY,CAAC;gBACvB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC1B,IAAI,GAAG,aAAa,CAAC,eAAe,CAAC;oBACrC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;wBACzC,YAAY,GAAG,gBAAgB,QAAQ,CAAC;4BACtC,SAAS;4BACT,GAAG;yBACJ,CAAC,uIAAuI,CAAC;qBAC3I;iBACF;qBAAM;oBACL,IAAI,GAAG,aAAa,CAAC,iBAAiB,CAAC;oBACvC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;wBACzC,YAAY,GAAG,gBAAgB,QAAQ,CAAC;4BACtC,SAAS;4BACT,GAAG;yBACJ,CAAC,mLAAmL,CAAC;qBACvL;iBACF;gBAED,OAAO,6BAA6B,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;aAC/D;YAED,IAAI;gBACF,aAAa,GAAG,IAAI,iBAAiB,CACnC,OAAO,EACP,MAAM,EACN,iCAAiC,CAC/B,EAAC,GAAG,aAAa,EAAE,GAAG,OAAO,EAAC,EAC9B,QAAQ,CACT,CACF,CAAC;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,6BAA6B,CAClC,GAAG,EACH,aAAa,CAAC,eAAe,EAC5B,KAAe,CAAC,OAAO,CACzB,CAAC;aACH;YAED,IAAI,qBAAqB,EAAE;gBACzB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;oBAClC,qBAAqB,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;iBACpC;gBACD,qBAAqB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC;aACzD;SACF;QAED,IAAI;YACF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM;YAC3C,6DAA6D;YAC7D,2DAA2D;YAC3D,4DAA4D;YAC5D,iCAAiC;YACjC,wBAAwB,CAAC,EAAC,GAAG,wBAAwB,EAAE,GAAG,MAAM,EAAC,CAAC,CACnE,CAAC;YAEF,IAAI,gBAAgB,IAAI,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;oBACnC,CAAC,CAAC,sBAAsB,GAAG,SACvB,SAAS,CAAC,CAAC,CAAC,eAAe,SAAS,IAAI,CAAC,CAAC,CAAC,UAC7C,EAAE;oBACJ,CAAC,CAAC,SAAS,CACd,CAAC;aACH;YAED,mEAAmE;YACnE,OAAO,cAAc,CAAC,gBAAgB,CAAC;gBACrC,2BAA2B;gBAC3B,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/B,OAAO,gBAAgB,KAAK,QAAQ;gBACpC,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;SAC9B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,6BAA6B,CAClC,GAAG,EACH,aAAa,CAAC,gBAAgB,EAC7B,KAAe,CAAC,OAAO,CACzB,CAAC;SACH;IACH,CAAC;IAED,SAAS,WAAW;IAMlB,+EAA+E;IAC/E,GAAc;IACd,kEAAkE;IAClE,MAA0B;IAC1B,2DAA2D;IAC3D,OAA0B;QAE1B,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAErD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,OAAO,6BAA6B,CAClC,GAAG,EACH,aAAa,CAAC,eAAe,EAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACnC,CAAC,CAAC,iBAAiB,GAAG,SAClB,SAAS,CAAC,CAAC,CAAC,eAAe,SAAS,IAAI,CAAC,CAAC,CAAC,UAC7C,uFAAuF;gBACzF,CAAC,CAAC,SAAS,CACd,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,IAAI,GAAG,eAAe,CAAC;IAEnC,WAAW,CAAC,GAAG,GAAG;IAChB,+EAA+E;IAC/E,GAAW,EACN,EAAE;QACP,IAAI,eAAe,YAAY,SAAS,EAAE;YACxC,kDAAkD;YAClD,OAAO,kBAAkB,CAAC;gBACxB,KAAK,EAAE,eAAe;gBACtB,GAAG;gBACH,SAAS;aACV,CAAC,CAAC;SACJ;QACD,MAAM,QAAQ,GAAG,eAAe,CAAC;QAEjC,IAAI;YACF,OAAO,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,6BAA6B,CAClC,GAAG,EACH,aAAa,CAAC,eAAe,EAC5B,KAAe,CAAC,OAAO,CACzB,CAAC;SACH;IACH,CAAC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"createBaseTranslator.js","sourceRoot":"","sources":["../../../src/core/createBaseTranslator.tsx"],"names":[],"mappings":"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"}

package/dist/src/react/IntlContext.d.ts

@@ -1,4 +1,13 @@
 /// <reference types="react" />
-import { InitializedIntlConfig } from '../core/IntlConfig';
-declare const IntlContext: import("react").Context<InitializedIntlConfig | undefined>;
+import MessageFormatCache from '../core/MessageFormatCache';
+declare const IntlContext: import("react").Context<(import("../core/IntlConfig").default<import("../core/AbstractIntlMessages").default> & {
+    onError: (error: import("..").IntlError) => void;
+    getMessageFallback: (info: {
+        error: import("..").IntlError;
+        key: string;
+        namespace?: string | undefined;
+    }) => string;
+} & {
+    messageFormatCache?: MessageFormatCache | undefined;
+}) | undefined>;
 export default IntlContext;

package/dist/src/react/IntlContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntlContext.js","sourceRoot":"","sources":["../../../src/react/IntlContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAGpC,MAAM,WAAW,GAAG,aAAa,CAAoC,SAAS,CAAC,CAAC;AAEhF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"IntlContext.js","sourceRoot":"","sources":["../../../src/react/IntlContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAIpC,MAAM,WAAW,GAAG,aAAa,CAK/B,SAAS,CAAC,CAAC;AAEb,eAAe,WAAW,CAAC"}

package/dist/src/react/IntlProvider.js

@@ -1,7 +1,11 @@
-import React from 'react';
+import React, { useState } from 'react';
 import IntlContext from './IntlContext';
 import getInitializedConfig from './getInitializedConfig';
 export default function IntlProvider({ children, ...props }) {
-    return (React.createElement(IntlContext.Provider, { value: getInitializedConfig(props) }, children));
+    const [messageFormatCache] = useState(() => new Map());
+    return (React.createElement(IntlContext.Provider, { value: {
+            ...getInitializedConfig(props),
+            messageFormatCache
+        } }, children));
 }
 //# sourceMappingURL=IntlProvider.js.map

package/dist/src/react/IntlProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntlProvider.js","sourceRoot":"","sources":["../../../src/react/IntlProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAM1D,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAC,QAAQ,EAAE,GAAG,KAAK,EAAQ;IAC9D,OAAO,CACL,oBAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,IACrD,QAAQ,CACY,CACxB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"IntlProvider.js","sourceRoot":"","sources":["../../../src/react/IntlProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAY,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEjD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAM1D,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAC,QAAQ,EAAE,GAAG,KAAK,EAAQ;IAC9D,MAAM,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAEvD,OAAO,CACL,oBAAC,WAAW,CAAC,QAAQ,IACnB,KAAK,EAAE;YACL,GAAG,oBAAoB,CAAC,KAAK,CAAC;YAC9B,kBAAkB;SACnB,IAEA,QAAQ,CACY,CACxB,CAAC;AACJ,CAAC"}

package/dist/src/react/useIntlContext.d.ts

@@ -1 +1,10 @@
-export default function useIntlContext(): import("../core/IntlConfig").InitializedIntlConfig;
+export default function useIntlContext(): import("../core/IntlConfig").default<import("../core/AbstractIntlMessages").default> & {
+    onError: (error: import("..").IntlError) => void;
+    getMessageFallback: (info: {
+        error: import("..").IntlError;
+        key: string;
+        namespace?: string | undefined;
+    }) => string;
+} & {
+    messageFormatCache?: import("../core/MessageFormatCache").default | undefined;
+};

package/dist/src/react/useTranslationsImpl.js

@@ -1,17 +1,16 @@
-import { useMemo, useRef } from 'react';
+import { useMemo } from 'react';
 import createBaseTranslator, { getMessagesOrError } from '../core/createBaseTranslator';
 import resolveNamespace from '../core/resolveNamespace';
 import useIntlContext from './useIntlContext';
 export default function useTranslationsImpl(allMessages, namespace, namespacePrefix) {
-    const { defaultTranslationValues, formats: globalFormats, getMessageFallback, locale, onError, timeZone } = useIntlContext();
+    const { defaultTranslationValues, formats: globalFormats, getMessageFallback, locale, messageFormatCache, onError, timeZone } = useIntlContext();
     // The `namespacePrefix` is part of the type system.
     // See the comment in the hook invocation.
     allMessages = allMessages[namespacePrefix];
     namespace = resolveNamespace(namespace, namespacePrefix);
-    const cachedFormatsByLocaleRef = useRef({});
     const messagesOrError = useMemo(() => getMessagesOrError({ messages: allMessages, namespace, onError }), [allMessages, namespace, onError]);
     const translate = useMemo(() => createBaseTranslator({
-        cachedFormatsByLocale: cachedFormatsByLocaleRef.current,
+        messageFormatCache,
         getMessageFallback,
         messagesOrError,
         defaultTranslationValues,
@@ -21,6 +20,7 @@ export default function useTranslationsImpl(allMessages, namespace, namespacePre
         locale,
         timeZone
     }), [
+        messageFormatCache,
         getMessageFallback,
         messagesOrError,
         defaultTranslationValues,

package/dist/src/react/useTranslationsImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTranslationsImpl.js","sourceRoot":"","sources":["../../../src/react/useTranslationsImpl.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAEtC,OAAO,oBAAoB,EAAE,EAC3B,kBAAkB,EACnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,gBAAgB,MAAM,0BAA0B,CAAC;AAExD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAGzC,WAAqB,EAAE,SAAoB,EAAE,eAAuB;IACpE,MAAM,EACJ,wBAAwB,EACxB,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAClB,MAAM,EACN,OAAO,EACP,QAAQ,EACT,GAAG,cAAc,EAAE,CAAC;IAErB,oDAAoD;IACpD,0CAA0C;IAC1C,WAAW,GAAG,WAAW,CAAC,eAAe,CAAa,CAAC;IACvD,SAAS,GAAG,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAc,CAAC;IAEtE,MAAM,wBAAwB,GAAG,MAAM,CAErC,EAAE,CAAC,CAAC;IAEN,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,EACrE,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAClC,CAAC;IAEF,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CACH,oBAAoB,CAAC;QACnB,qBAAqB,EAAE,wBAAwB,CAAC,OAAO;QACvD,kBAAkB;QAClB,eAAe;QACf,wBAAwB;QACxB,SAAS;QACT,OAAO;QACP,OAAO,EAAE,aAAa;QACtB,MAAM;QACN,QAAQ;KACT,CAAC,EACJ;QACE,kBAAkB;QAClB,eAAe;QACf,wBAAwB;QACxB,SAAS;QACT,OAAO;QACP,aAAa;QACb,MAAM;QACN,QAAQ;KACT,CACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"useTranslationsImpl.js","sourceRoot":"","sources":["../../../src/react/useTranslationsImpl.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAE9B,OAAO,oBAAoB,EAAE,EAC3B,kBAAkB,EACnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,gBAAgB,MAAM,0BAA0B,CAAC;AAExD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAGzC,WAAqB,EAAE,SAAoB,EAAE,eAAuB;IACpE,MAAM,EACJ,wBAAwB,EACxB,OAAO,EAAE,aAAa,EACtB,kBAAkB,EAClB,MAAM,EACN,kBAAkB,EAClB,OAAO,EACP,QAAQ,EACT,GAAG,cAAc,EAAE,CAAC;IAErB,oDAAoD;IACpD,0CAA0C;IAC1C,WAAW,GAAG,WAAW,CAAC,eAAe,CAAa,CAAC;IACvD,SAAS,GAAG,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAc,CAAC;IAEtE,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,kBAAkB,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,EACrE,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAClC,CAAC;IAEF,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CACH,oBAAoB,CAAC;QACnB,kBAAkB;QAClB,kBAAkB;QAClB,eAAe;QACf,wBAAwB;QACxB,SAAS;QACT,OAAO;QACP,OAAO,EAAE,aAAa;QACtB,MAAM;QACN,QAAQ;KACT,CAAC,EACJ;QACE,kBAAkB;QAClB,kBAAkB;QAClB,eAAe;QACf,wBAAwB;QACxB,SAAS;QACT,OAAO;QACP,aAAa;QACb,MAAM;QACN,QAAQ;KACT,CACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/use-intl.cjs.development.js

@@ -240,13 +240,25 @@ function getMessagesOrError(_ref) {
     return intlError;
   }
 }
+function getPlainMessage(candidate, values) {
+  if (values) return undefined;
+  var unescapedMessage = candidate.replace(/'([{}])/gi, '$1');
+  // Placeholders can be in the message if there are default values,
+  // or if the user has forgotten to provide values. In the latter
+  // case we need to compile the message to receive an error.
+  var hasPlaceholders = /<|{/.test(unescapedMessage);
+  if (!hasPlaceholders) {
+    return unescapedMessage;
+  }
+  return undefined;
+}
 function createBaseTranslator(_ref2) {
-  var cachedFormatsByLocale = _ref2.cachedFormatsByLocale,
-    defaultTranslationValues = _ref2.defaultTranslationValues,
+  var defaultTranslationValues = _ref2.defaultTranslationValues,
     globalFormats = _ref2.formats,
     _ref2$getMessageFallb = _ref2.getMessageFallback,
     getMessageFallback = _ref2$getMessageFallb === void 0 ? defaultGetMessageFallback : _ref2$getMessageFallb,
     locale = _ref2.locale,
+    messageFormatCache = _ref2.messageFormatCache,
     messagesOrError = _ref2.messagesOrError,
     namespace = _ref2.namespace,
     onError = _ref2.onError,
@@ -264,7 +276,6 @@ function createBaseTranslator(_ref2) {
   key, /** Key value pairs for values to interpolate into the message. */
   values, /** Provide custom formats for numbers, dates and times. */
   formats) {
-    var _cachedFormatsByLocal;
     if (messagesOrError instanceof IntlError) {
       // We have already warned about this during render
       return getMessageFallback({
@@ -285,10 +296,10 @@ function createBaseTranslator(_ref2) {
         return part != null;
       }).join('.');
     }
-    var cacheKey = joinPath([namespace, key, String(message)]);
+    var cacheKey = joinPath([locale, namespace, key, String(message)]);
     var messageFormat;
-    if (cachedFormatsByLocale != null && (_cachedFormatsByLocal = cachedFormatsByLocale[locale]) != null && _cachedFormatsByLocal[cacheKey]) {
-      messageFormat = cachedFormatsByLocale == null ? void 0 : cachedFormatsByLocale[locale][cacheKey];
+    if (messageFormatCache != null && messageFormatCache.has(cacheKey)) {
+      messageFormat = messageFormatCache.get(cacheKey);
     } else {
       if (typeof message === 'object') {
         var code, errorMessage;
@@ -305,17 +316,15 @@ function createBaseTranslator(_ref2) {
         }
         return getFallbackFromErrorAndNotify(key, code, errorMessage);
       }
+      // Hot path that avoids creating an `IntlMessageFormat` instance
+      var plainMessage = getPlainMessage(message, values);
+      if (plainMessage) return plainMessage;
       try {
         messageFormat = new IntlMessageFormat__default["default"](message, locale, convertFormatsToIntlMessageFormat(_extends({}, globalFormats, formats), timeZone));
       } catch (error) {
         return getFallbackFromErrorAndNotify(key, exports.IntlErrorCode.INVALID_MESSAGE, error.message);
       }
-      if (cachedFormatsByLocale) {
-        if (!cachedFormatsByLocale[locale]) {
-          cachedFormatsByLocale[locale] = {};
-        }
-        cachedFormatsByLocale[locale][cacheKey] = messageFormat;
-      }
+      messageFormatCache == null ? void 0 : messageFormatCache.set(cacheKey, messageFormat);
     }
     try {
       var formattedMessage = messageFormat.format(
@@ -646,8 +655,14 @@ var _excluded = ["children"];
 function IntlProvider(_ref) {
   var children = _ref.children,
     props = _objectWithoutPropertiesLoose(_ref, _excluded);
+  var _useState = React.useState(function () {
+      return new Map();
+    }),
+    messageFormatCache = _useState[0];
   return React__default["default"].createElement(IntlContext.Provider, {
-    value: getInitializedConfig(props)
+    value: _extends({}, getInitializedConfig(props), {
+      messageFormatCache: messageFormatCache
+    })
   }, children);
 }
 
@@ -665,13 +680,13 @@ function useTranslationsImpl(allMessages, namespace, namespacePrefix) {
     globalFormats = _useIntlContext.formats,
     getMessageFallback = _useIntlContext.getMessageFallback,
     locale = _useIntlContext.locale,
+    messageFormatCache = _useIntlContext.messageFormatCache,
     onError = _useIntlContext.onError,
     timeZone = _useIntlContext.timeZone;
   // The `namespacePrefix` is part of the type system.
   // See the comment in the hook invocation.
   allMessages = allMessages[namespacePrefix];
   namespace = resolveNamespace(namespace, namespacePrefix);
-  var cachedFormatsByLocaleRef = React.useRef({});
   var messagesOrError = React.useMemo(function () {
     return getMessagesOrError({
       messages: allMessages,
@@ -681,7 +696,7 @@ function useTranslationsImpl(allMessages, namespace, namespacePrefix) {
   }, [allMessages, namespace, onError]);
   var translate = React.useMemo(function () {
     return createBaseTranslator({
-      cachedFormatsByLocale: cachedFormatsByLocaleRef.current,
+      messageFormatCache: messageFormatCache,
       getMessageFallback: getMessageFallback,
       messagesOrError: messagesOrError,
       defaultTranslationValues: defaultTranslationValues,
@@ -691,7 +706,7 @@ function useTranslationsImpl(allMessages, namespace, namespacePrefix) {
       locale: locale,
       timeZone: timeZone
     });
-  }, [getMessageFallback, messagesOrError, defaultTranslationValues, namespace, onError, globalFormats, locale, timeZone]);
+  }, [messageFormatCache, getMessageFallback, messagesOrError, defaultTranslationValues, namespace, onError, globalFormats, locale, timeZone]);
   return translate;
 }