use-intl 2.4.1-alpha.2 → 2.4.1-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "use-intl",
-  "version": "2.4.1-alpha.2",
+  "version": "2.4.1-alpha.3",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.me>",
   "description": "Minimal, but complete solution for managing internationalization in React apps.",
@@ -19,6 +19,9 @@
   "main": "dist/index.js",
   "module": "dist/use-intl.esm.js",
   "typings": "dist/index.d.ts",
+  "jest": {
+    "testEnvironment": "jsdom"
+  },
   "files": [
     "dist",
     "src"
@@ -56,5 +59,5 @@
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "83d4b8601cea9390c61995a75c3ad7210530e728"
+  "gitHead": "20f7811f70b0a1ae8b0d338b1a01269b8307a3cc"
 }

package/src/GlobalMessages.tsx

@@ -1,6 +1,4 @@
 // This module is intended to be overridden
 // by the consumer for optional type safety
 
-// declare interface GlobalMessages extends Record<any, any> {}
-
-declare interface GlobalMessages {}
+declare interface GlobalMessages extends Record<any, any> {}

package/src/useTranslations.tsx

@@ -1,4 +1,4 @@
-// import GlobalMessages from './GlobalMessages';
+import IntlError, { IntlErrorCode } from './IntlError';
 import useIntlContext from './useIntlContext';
 import useTranslationsImpl from './useTranslationsImpl';
 import NamespaceKeys from './utils/NamespaceKeys';
@@ -15,21 +15,32 @@ import NestedKeyOf from './utils/NestedKeyOf';
 export default function useTranslations<
   NestedKey extends NamespaceKeys<GlobalMessages, NestedKeyOf<GlobalMessages>>
 >(namespace?: NestedKey) {
+  const context = useIntlContext()
+
   // @ts-ignore
-  const messages = useIntlContext().messages as GlobalMessages;
-  if (!messages) throw new Error('TODO')
+  const messages = context.messages as GlobalMessages;
+  if (!messages) {
+    const intlError = new IntlError(
+      IntlErrorCode.MISSING_MESSAGE,
+      __DEV__ ? `No messages were configured on the provider.` : undefined
+    );
+    context.onError(intlError);
+    throw intlError;
+  }
 
   // We have to wrap the actual hook so the type inference for the optional
   // namespace works correctly. See https://stackoverflow.com/a/71529575/343045
+  // The prefix ("!"") is arbitrary, but we have to use some.
   return useTranslationsImpl<
     // @ts-ignore
-    {__private: GlobalMessages},
+    {'!': GlobalMessages},
     NamespaceKeys<GlobalMessages, NestedKeyOf<GlobalMessages>> extends NestedKey
-      ? '__private'
-      : `__private.${NestedKey}`
+      ? '!'
+      : `!.${NestedKey}`
   >(
-    {__private: messages},
+    {'!': messages},
     // @ts-ignore
-    namespace ? `__private.${namespace}` : '__private'
+    namespace ? `!.${namespace}` : '!',
+    '!'
   );
 }

package/src/useTranslationsImpl.tsx

@@ -81,7 +81,7 @@ function prepareTranslationValues(values: RichTranslationValues) {
 export default function useTranslationsImpl<
   Messages extends IntlMessages,
   NestedKey extends NestedKeyOf<Messages>
->(allMessages: Messages, namespace: NestedKey) {
+>(allMessages: Messages, namespace: NestedKey, namespacePrefix: string) {
   const {
     defaultTranslationValues,
     formats: globalFormats,
@@ -91,6 +91,13 @@ export default function useTranslationsImpl<
     timeZone
   } = useIntlContext();
 
+  // The `namespacePrefix` is part of the type system.
+  // See the comment in the hook invocation.
+  allMessages = allMessages[namespacePrefix] as Messages;
+  namespace = (namespace === namespacePrefix
+    ? undefined
+    : namespace.slice((namespacePrefix + '.').length)) as NestedKey;
+
   const cachedFormatsByLocaleRef = useRef<
     Record<string, Record<string, IntlMessageFormat>>
   >({});