react-intl 3.10.0 → 3.11.0

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.11.0](https://github.com/formatjs/react-intl/compare/v3.10.0...v3.11.0) (2020-01-09)
+
+
+### Features
+
+* Allow MessageDescriptor ID to be `number` ([#1553](https://github.com/formatjs/react-intl/issues/1553)) ([95298b2](https://github.com/formatjs/react-intl/commit/95298b2b5f09173258fe9648d49fc9fa1ad673fc))
+
+
+### Bug Fixes
+
+* add a parser for chunks emitted from formatHTMLMessage ([#1550](https://github.com/formatjs/react-intl/issues/1550)) ([8c3c5c7](https://github.com/formatjs/react-intl/commit/8c3c5c78afa16d605933c82571f3b92b15363c27))
+* update formatjs deps ([1745c21](https://github.com/formatjs/react-intl/commit/1745c21b9ae5e6443f1ad5209f77cc9cb6ad66eb))
+
 ## [3.10.0](https://github.com/formatjs/react-intl/compare/v3.9.2...v3.10.0) (2019-12-26)
 
 

package/dist/components/relative.js

@@ -32,12 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var injectIntl_1 = require("./injectIntl");
 var utils_1 = require("../utils");
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-var invariant_ = require("invariant");
-var invariant = invariant_.default || invariant_;
+var intl_utils_1 = require("@formatjs/intl-utils");
 var MINUTE = 60;
 var HOUR = 60 * 60;
 var DAY = 60 * 60 * 24;
@@ -84,9 +79,6 @@ function canIncrement(unit) {
     if (unit === void 0) { unit = 'second'; }
     return INCREMENTABLE_UNITS.includes(unit);
 }
-function verifyProps(updateIntervalInSeconds, unit) {
-    invariant(!updateIntervalInSeconds || (updateIntervalInSeconds && canIncrement(unit)), 'Cannot schedule update with unit longer than hour');
-}
 var FormattedRelativeTime = /** @class */ (function (_super) {
     __extends(FormattedRelativeTime, _super);
     function FormattedRelativeTime(props) {
@@ -100,7 +92,8 @@ var FormattedRelativeTime = /** @class */ (function (_super) {
                 ? valueToSeconds(_this.props.value, _this.props.unit)
                 : 0,
         };
-        verifyProps(props.updateIntervalInSeconds, props.unit);
+        intl_utils_1.invariant(!props.updateIntervalInSeconds ||
+            !!(props.updateIntervalInSeconds && canIncrement(props.unit)), 'Cannot schedule update with unit longer than hour');
         return _this;
     }
     FormattedRelativeTime.prototype.scheduleNextUpdate = function (_a, _b) {

package/dist/formatters/message.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Formatters, IntlConfig, MessageDescriptor } from '../types';
 import { PrimitiveType } from 'intl-messageformat';
+export declare const prepareIntlMessageFormatHtmlOutput: (chunks: (string | object)[]) => React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)>;
 export declare function formatMessage({ locale, formats, messages, defaultLocale, defaultFormats, onError, }: Pick<IntlConfig, 'locale' | 'formats' | 'messages' | 'defaultLocale' | 'defaultFormats' | 'onError'>, state: Formatters, messageDescriptor?: MessageDescriptor, values?: Record<string, PrimitiveType>): string;
 export declare function formatHTMLMessage(config: Pick<IntlConfig, 'locale' | 'formats' | 'messages' | 'defaultLocale' | 'defaultFormats' | 'onError'>, state: Formatters, messageDescriptor?: MessageDescriptor, rawValues?: Record<string, PrimitiveType>): React.ReactNode;

package/dist/formatters/message.js

@@ -15,13 +15,16 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-var invariant_ = require("invariant");
-var invariant = invariant_.default || invariant_;
+var React = require("react");
+var intl_utils_1 = require("@formatjs/intl-utils");
 var utils_1 = require("../utils");
 var intl_messageformat_1 = require("intl-messageformat");
 function setTimeZoneInOptions(opts, timeZone) {
@@ -44,17 +47,15 @@ function deepMergeFormatsAndSetTimeZone(f1, timeZone) {
     var mfFormats = intl_messageformat_1.default.formats;
     return __assign(__assign(__assign({}, mfFormats), f1), { date: deepMergeOptions(setTimeZoneInOptions(mfFormats.date, timeZone), setTimeZoneInOptions(f1.date || {}, timeZone)), time: deepMergeOptions(setTimeZoneInOptions(mfFormats.time, timeZone), setTimeZoneInOptions(f1.time || {}, timeZone)) });
 }
+exports.prepareIntlMessageFormatHtmlOutput = function (chunks) { return React.createElement.apply(React, __spreadArrays([React.Fragment, null], chunks)); };
 function formatMessage(_a, state, messageDescriptor, values) {
     var locale = _a.locale, formats = _a.formats, messages = _a.messages, defaultLocale = _a.defaultLocale, defaultFormats = _a.defaultFormats, onError = _a.onError, timeZone = _a.timeZone;
     if (messageDescriptor === void 0) { messageDescriptor = { id: '' }; }
     if (values === void 0) { values = {}; }
     var id = messageDescriptor.id, defaultMessage = messageDescriptor.defaultMessage;
     // `id` is a required field of a Message Descriptor.
-    invariant(id, '[React Intl] An `id` must be provided to format a message.');
-    if (!id) {
-        throw new Error('[React Intl] An `id` must be provided to format a message.');
-    }
-    var message = messages && messages[id];
+    intl_utils_1.invariant(!!id, '[React Intl] An `id` must be provided to format a message.');
+    var message = messages && messages[String(id)];
     formats = deepMergeFormatsAndSetTimeZone(formats, timeZone);
     defaultFormats = deepMergeFormatsAndSetTimeZone(defaultFormats, timeZone);
     var formattedMessageParts = [];
@@ -93,15 +94,15 @@ function formatMessage(_a, state, messageDescriptor, values) {
         onError(utils_1.createError("Cannot format message: \"" + id + "\", " +
             ("using message " + (message || defaultMessage ? 'source' : 'id') + " as fallback.")));
         if (typeof message === 'string') {
-            return message || defaultMessage || id;
+            return message || defaultMessage || String(id);
         }
-        return defaultMessage || id;
+        return defaultMessage || String(id);
     }
     if (formattedMessageParts.length === 1 &&
         typeof formattedMessageParts[0] === 'string') {
-        return formattedMessageParts[0] || defaultMessage || id;
+        return formattedMessageParts[0] || defaultMessage || String(id);
     }
-    return formattedMessageParts;
+    return exports.prepareIntlMessageFormatHtmlOutput(formattedMessageParts);
 }
 exports.formatMessage = formatMessage;
 function formatHTMLMessage(config, state, messageDescriptor, rawValues) {

package/dist/react-intl.api.md

@@ -295,7 +295,7 @@ export interface MessageDescriptor {
     // (undocumented)
     description?: string | object;
     // (undocumented)
-    id?: string;
+    id?: string | number;
 }
 
 // @public (undocumented)

package/dist/react-intl.d.ts

@@ -441,12 +441,12 @@ declare interface LocationDetails {
 }
 
 export declare interface MessageDescriptor {
-    id?: string;
+    id?: string | number;
     description?: string | object;
     defaultMessage?: string;
 }
 
-declare type MessageFormatElement = LiteralElement | ArgumentElement | NumberElement | DateElement | TimeElement | SelectElement | PluralElement;
+declare type MessageFormatElement = LiteralElement | ArgumentElement | NumberElement | DateElement | TimeElement | SelectElement | PluralElement | PoundElement;
 
 declare type MessageFormatPart = LiteralPart_2 | ArgumentPart;
 
@@ -523,6 +523,11 @@ declare interface PluralOrSelectOption {
     location?: Location;
 }
 
+declare interface PoundElement {
+    type: TYPE.pound;
+    location?: Location;
+}
+
 declare type PrimitiveType = string | number | boolean | null | undefined | Date;
 
 declare interface Props extends FormatRelativeTimeOptions {
@@ -691,10 +696,16 @@ declare enum TYPE {
     /**
      * Variable w/ plural format
      */
-    plural = 6
+    plural = 6,
+    /**
+     * Only possible within plural argument.
+     * This is the `#` symbol that will be substituted with the count.
+     */
+    pound = 7
 }
 
 declare type UnifiedNumberFormatOptions = Intl.NumberFormatOptions & NumberFormatDigitOptions & {
+    localeMatcher?: 'lookup' | 'best fit';
     style?: 'decimal' | 'percent' | 'currency' | 'unit';
     compactDisplay?: 'short' | 'long';
     currencyDisplay?: 'symbol' | 'code' | 'name' | 'narrowSymbol';