@formatjs/intl 1.10.6 → 1.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/create-intl.d.ts.map +1 -1
- package/lib/src/create-intl.js +2 -2
- package/lib/src/list.d.ts +6 -1
- package/lib/src/list.d.ts.map +1 -1
- package/lib/src/list.js +26 -18
- package/lib/src/types.d.ts +2 -1
- package/lib/src/types.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/create-intl.d.ts.map +1 -1
- package/src/create-intl.js +1 -1
- package/src/list.d.ts +6 -1
- package/src/list.d.ts.map +1 -1
- package/src/list.js +29 -20
- package/src/types.d.ts +2 -1
- package/src/types.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-intl.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/create-intl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAkBxD,MAAM,WAAW,YAAY,CAC3B,CAAC,GAAG,MAAM,EACV,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EACvC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErC,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,CAAC,CAAA;CAClC;AAqBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,MAAM,EACnC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,CAAC,EAAE,SAAS,GAChB,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"create-intl.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/create-intl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAkBxD,MAAM,WAAW,YAAY,CAC3B,CAAC,GAAG,MAAM,EACV,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EACvC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErC,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,CAAC,CAAA;CAClC;AAqBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,MAAM,EACnC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,CAAC,EAAE,SAAS,GAChB,SAAS,CAAC,CAAC,CAAC,CAqGd"}
|
package/lib/src/create-intl.js
CHANGED
|
@@ -6,7 +6,7 @@ import { formatRelativeTime } from './relativeTime';
|
|
|
6
6
|
import { formatDate, formatDateToParts, formatTime, formatTimeToParts, formatDateTimeRange, } from './dateTime';
|
|
7
7
|
import { formatPlural } from './plural';
|
|
8
8
|
import { formatMessage } from './message';
|
|
9
|
-
import { formatList } from './list';
|
|
9
|
+
import { formatList, formatListToParts } from './list';
|
|
10
10
|
import { formatDisplayName } from './displayName';
|
|
11
11
|
function messagesContainString(messages) {
|
|
12
12
|
var firstMessage = messages ? messages[Object.keys(messages)[0]] : undefined;
|
|
@@ -46,5 +46,5 @@ export function createIntl(config, cache) {
|
|
|
46
46
|
onError(new MissingDataError("Missing locale data for locale: \"" + locale + "\" in Intl.DateTimeFormat. Using default locale: \"" + defaultLocale + "\" as fallback. See https://formatjs.io/docs/react-intl#runtime-requirements for more details"));
|
|
47
47
|
}
|
|
48
48
|
verifyConfigMessages(resolvedConfig);
|
|
49
|
-
return __assign(__assign({}, resolvedConfig), { formatters: formatters, formatNumber: formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateTimeRange: formatDateTimeRange.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: formatMessage.bind(null, resolvedConfig, formatters), formatList: formatList.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
|
|
49
|
+
return __assign(__assign({}, resolvedConfig), { formatters: formatters, formatNumber: formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateTimeRange: formatDateTimeRange.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: formatMessage.bind(null, resolvedConfig, formatters), formatList: formatList.bind(null, resolvedConfig, formatters.getListFormat), formatListToParts: formatListToParts.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
|
|
50
50
|
}
|
package/lib/src/list.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Formatters, IntlFormatters, OnErrorFn } from './types';
|
|
2
|
-
|
|
2
|
+
import type { Part } from '@formatjs/intl-listformat';
|
|
3
|
+
export declare function formatList(opts: {
|
|
3
4
|
locale: string;
|
|
4
5
|
onError: OnErrorFn;
|
|
5
6
|
}, getListFormat: Formatters['getListFormat'], values: Array<string>, options: Parameters<IntlFormatters['formatList']>[1]): string;
|
|
7
|
+
export declare function formatListToParts<T>(opts: {
|
|
8
|
+
locale: string;
|
|
9
|
+
onError: OnErrorFn;
|
|
10
|
+
}, getListFormat: Formatters['getListFormat'], values: Array<string>, options: Parameters<IntlFormatters['formatList']>[1]): Part[];
|
|
6
11
|
//# sourceMappingURL=list.d.ts.map
|
package/lib/src/list.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,SAAS,CAAA;AAG7D,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAA;AAiBnD,wBAAgB,UAAU,CACxB,IAAI,EAAE;IACJ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,SAAS,CAAA;CACnB,EACD,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,EAC1C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,MAAM,CAAA;AA6BT,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,IAAI,EAAE;IACJ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,SAAS,CAAA;CACnB,EACD,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,EAC1C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,IAAI,EAAE,CAAA"}
|
package/lib/src/list.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { __assign } from "tslib";
|
|
1
2
|
import { filterProps } from './utils';
|
|
2
3
|
import { FormatError, ErrorCode } from 'intl-messageformat';
|
|
3
4
|
import { IntlError, IntlErrorCode } from './error';
|
|
@@ -10,7 +11,24 @@ var now = Date.now();
|
|
|
10
11
|
function generateToken(i) {
|
|
11
12
|
return now + "_" + i + "_" + now;
|
|
12
13
|
}
|
|
13
|
-
export function formatList(
|
|
14
|
+
export function formatList(opts, getListFormat, values, options) {
|
|
15
|
+
if (options === void 0) { options = {}; }
|
|
16
|
+
var results = formatListToParts(opts, getListFormat, values, options).reduce(function (all, el) {
|
|
17
|
+
var val = el.value;
|
|
18
|
+
if (typeof val !== 'string') {
|
|
19
|
+
all.push(val);
|
|
20
|
+
}
|
|
21
|
+
else if (typeof all[all.length - 1] === 'string') {
|
|
22
|
+
all[all.length - 1] += val;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
all.push(val);
|
|
26
|
+
}
|
|
27
|
+
return all;
|
|
28
|
+
}, []);
|
|
29
|
+
return results.length === 1 ? results[0] : results;
|
|
30
|
+
}
|
|
31
|
+
export function formatListToParts(_a, getListFormat, values, options) {
|
|
14
32
|
var locale = _a.locale, onError = _a.onError;
|
|
15
33
|
if (options === void 0) { options = {}; }
|
|
16
34
|
var ListFormat = Intl.ListFormat;
|
|
@@ -28,23 +46,13 @@ export function formatList(_a, getListFormat, values, options) {
|
|
|
28
46
|
}
|
|
29
47
|
return String(v);
|
|
30
48
|
});
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
all.push(richValues_1[val]);
|
|
39
|
-
}
|
|
40
|
-
else if (typeof all[all.length - 1] === 'string') {
|
|
41
|
-
all[all.length - 1] += val;
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
all.push(val);
|
|
45
|
-
}
|
|
46
|
-
return all;
|
|
47
|
-
}, []);
|
|
49
|
+
return getListFormat(locale, filteredOptions)
|
|
50
|
+
.formatToParts(serializedValues)
|
|
51
|
+
.map(function (part) {
|
|
52
|
+
return part.type === 'literal'
|
|
53
|
+
? part
|
|
54
|
+
: __assign(__assign({}, part), { value: richValues_1[part.value] || part.value });
|
|
55
|
+
});
|
|
48
56
|
}
|
|
49
57
|
catch (e) {
|
|
50
58
|
onError(new IntlError(IntlErrorCode.FORMAT_ERROR, 'Error formatting list.', e));
|
package/lib/src/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IntlMessageFormat, Formats, PrimitiveType, FormatXMLElementFn, FormatError, Options as IntlMessageFormatOptions } from 'intl-messageformat';
|
|
2
2
|
import { DateTimeFormat } from '@formatjs/ecma402-abstract';
|
|
3
3
|
import { MessageFormatElement } from '@formatjs/icu-messageformat-parser';
|
|
4
|
-
import IntlListFormat, { IntlListFormatOptions } from '@formatjs/intl-listformat';
|
|
4
|
+
import IntlListFormat, { IntlListFormatOptions, Part } from '@formatjs/intl-listformat';
|
|
5
5
|
import { DisplayNames, DisplayNamesOptions } from '@formatjs/intl-displaynames';
|
|
6
6
|
import { MissingTranslationError, MessageFormatError, MissingDataError, InvalidConfigError, UnsupportedFormatterError } from './error';
|
|
7
7
|
import { DEFAULT_INTL_CONFIG } from './utils';
|
|
@@ -48,6 +48,7 @@ export interface IntlFormatters<T = any, R = T> {
|
|
|
48
48
|
formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | T | FormatXMLElementFn<T, R>>, opts?: IntlMessageFormatOptions): R;
|
|
49
49
|
formatList(values: Array<string>, opts?: FormatListOptions): string;
|
|
50
50
|
formatList(values: Array<string | T>, opts?: FormatListOptions): T | string | Array<string | T>;
|
|
51
|
+
formatListToParts(values: Array<string | T>, opts?: FormatListOptions): Part[];
|
|
51
52
|
formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts: FormatDisplayNameOptions): string | undefined;
|
|
52
53
|
}
|
|
53
54
|
export interface Formatters {
|
package/lib/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,OAAO,IAAI,wBAAwB,EACpC,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAA;AACvE,OAAO,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/intl/src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@formatjs/intl",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.1",
|
|
4
4
|
"description": "Internationalize JS apps. This library provides an API to format dates, numbers, and strings, including pluralization and handling translations.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"intl",
|
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
"module": "lib/index.js",
|
|
30
30
|
"sideEffects": false,
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@formatjs/ecma402-abstract": "1.
|
|
32
|
+
"@formatjs/ecma402-abstract": "1.9.1",
|
|
33
33
|
"@formatjs/fast-memoize": "1.1.1",
|
|
34
|
-
"@formatjs/icu-messageformat-parser": "2.0.
|
|
35
|
-
"@formatjs/intl-displaynames": "
|
|
36
|
-
"@formatjs/intl-listformat": "
|
|
37
|
-
"intl-messageformat": "9.6.
|
|
34
|
+
"@formatjs/icu-messageformat-parser": "2.0.4",
|
|
35
|
+
"@formatjs/intl-displaynames": "5.1.2",
|
|
36
|
+
"@formatjs/intl-listformat": "6.2.1",
|
|
37
|
+
"intl-messageformat": "9.6.16",
|
|
38
38
|
"tslib": "^2.1.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
package/src/create-intl.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-intl.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/create-intl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAkBxD,MAAM,WAAW,YAAY,CAC3B,CAAC,GAAG,MAAM,EACV,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EACvC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErC,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,CAAC,CAAA;CAClC;AAqBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,MAAM,EACnC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,CAAC,EAAE,SAAS,GAChB,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"create-intl.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/create-intl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAkBxD,MAAM,WAAW,YAAY,CAC3B,CAAC,GAAG,MAAM,EACV,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EACvC,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErC,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,CAAC,CAAA;CAClC;AAqBD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,MAAM,EACnC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,CAAC,EAAE,SAAS,GAChB,SAAS,CAAC,CAAC,CAAC,CAqGd"}
|
package/src/create-intl.js
CHANGED
|
@@ -49,6 +49,6 @@ function createIntl(config, cache) {
|
|
|
49
49
|
onError(new error_1.MissingDataError("Missing locale data for locale: \"" + locale + "\" in Intl.DateTimeFormat. Using default locale: \"" + defaultLocale + "\" as fallback. See https://formatjs.io/docs/react-intl#runtime-requirements for more details"));
|
|
50
50
|
}
|
|
51
51
|
verifyConfigMessages(resolvedConfig);
|
|
52
|
-
return tslib_1.__assign(tslib_1.__assign({}, resolvedConfig), { formatters: formatters, formatNumber: number_1.formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: number_1.formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: relativeTime_1.formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: dateTime_1.formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: dateTime_1.formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: dateTime_1.formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateTimeRange: dateTime_1.formatDateTimeRange.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: dateTime_1.formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: plural_1.formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: message_1.formatMessage.bind(null, resolvedConfig, formatters), formatList: list_1.formatList.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: displayName_1.formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
|
|
52
|
+
return tslib_1.__assign(tslib_1.__assign({}, resolvedConfig), { formatters: formatters, formatNumber: number_1.formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: number_1.formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: relativeTime_1.formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: dateTime_1.formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: dateTime_1.formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: dateTime_1.formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateTimeRange: dateTime_1.formatDateTimeRange.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: dateTime_1.formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: plural_1.formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: message_1.formatMessage.bind(null, resolvedConfig, formatters), formatList: list_1.formatList.bind(null, resolvedConfig, formatters.getListFormat), formatListToParts: list_1.formatListToParts.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: displayName_1.formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
|
|
53
53
|
}
|
|
54
54
|
exports.createIntl = createIntl;
|
package/src/list.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Formatters, IntlFormatters, OnErrorFn } from './types';
|
|
2
|
-
|
|
2
|
+
import type { Part } from '@formatjs/intl-listformat';
|
|
3
|
+
export declare function formatList(opts: {
|
|
3
4
|
locale: string;
|
|
4
5
|
onError: OnErrorFn;
|
|
5
6
|
}, getListFormat: Formatters['getListFormat'], values: Array<string>, options: Parameters<IntlFormatters['formatList']>[1]): string;
|
|
7
|
+
export declare function formatListToParts<T>(opts: {
|
|
8
|
+
locale: string;
|
|
9
|
+
onError: OnErrorFn;
|
|
10
|
+
}, getListFormat: Formatters['getListFormat'], values: Array<string>, options: Parameters<IntlFormatters['formatList']>[1]): Part[];
|
|
6
11
|
//# sourceMappingURL=list.d.ts.map
|
package/src/list.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,SAAS,CAAA;AAG7D,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAA;AAiBnD,wBAAgB,UAAU,CACxB,IAAI,EAAE;IACJ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,SAAS,CAAA;CACnB,EACD,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,EAC1C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,MAAM,CAAA;AA6BT,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,IAAI,EAAE;IACJ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,SAAS,CAAA;CACnB,EACD,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,EAC1C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EACrB,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,IAAI,EAAE,CAAA"}
|
package/src/list.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.formatList = void 0;
|
|
3
|
+
exports.formatListToParts = exports.formatList = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
4
5
|
var utils_1 = require("./utils");
|
|
5
6
|
var intl_messageformat_1 = require("intl-messageformat");
|
|
6
7
|
var error_1 = require("./error");
|
|
@@ -13,7 +14,25 @@ var now = Date.now();
|
|
|
13
14
|
function generateToken(i) {
|
|
14
15
|
return now + "_" + i + "_" + now;
|
|
15
16
|
}
|
|
16
|
-
function formatList(
|
|
17
|
+
function formatList(opts, getListFormat, values, options) {
|
|
18
|
+
if (options === void 0) { options = {}; }
|
|
19
|
+
var results = formatListToParts(opts, getListFormat, values, options).reduce(function (all, el) {
|
|
20
|
+
var val = el.value;
|
|
21
|
+
if (typeof val !== 'string') {
|
|
22
|
+
all.push(val);
|
|
23
|
+
}
|
|
24
|
+
else if (typeof all[all.length - 1] === 'string') {
|
|
25
|
+
all[all.length - 1] += val;
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
all.push(val);
|
|
29
|
+
}
|
|
30
|
+
return all;
|
|
31
|
+
}, []);
|
|
32
|
+
return results.length === 1 ? results[0] : results;
|
|
33
|
+
}
|
|
34
|
+
exports.formatList = formatList;
|
|
35
|
+
function formatListToParts(_a, getListFormat, values, options) {
|
|
17
36
|
var locale = _a.locale, onError = _a.onError;
|
|
18
37
|
if (options === void 0) { options = {}; }
|
|
19
38
|
var ListFormat = Intl.ListFormat;
|
|
@@ -31,23 +50,13 @@ function formatList(_a, getListFormat, values, options) {
|
|
|
31
50
|
}
|
|
32
51
|
return String(v);
|
|
33
52
|
});
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
all.push(richValues_1[val]);
|
|
42
|
-
}
|
|
43
|
-
else if (typeof all[all.length - 1] === 'string') {
|
|
44
|
-
all[all.length - 1] += val;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
all.push(val);
|
|
48
|
-
}
|
|
49
|
-
return all;
|
|
50
|
-
}, []);
|
|
53
|
+
return getListFormat(locale, filteredOptions)
|
|
54
|
+
.formatToParts(serializedValues)
|
|
55
|
+
.map(function (part) {
|
|
56
|
+
return part.type === 'literal'
|
|
57
|
+
? part
|
|
58
|
+
: tslib_1.__assign(tslib_1.__assign({}, part), { value: richValues_1[part.value] || part.value });
|
|
59
|
+
});
|
|
51
60
|
}
|
|
52
61
|
catch (e) {
|
|
53
62
|
onError(new error_1.IntlError(error_1.IntlErrorCode.FORMAT_ERROR, 'Error formatting list.', e));
|
|
@@ -55,4 +64,4 @@ function formatList(_a, getListFormat, values, options) {
|
|
|
55
64
|
// @ts-ignore
|
|
56
65
|
return values;
|
|
57
66
|
}
|
|
58
|
-
exports.
|
|
67
|
+
exports.formatListToParts = formatListToParts;
|
package/src/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IntlMessageFormat, Formats, PrimitiveType, FormatXMLElementFn, FormatError, Options as IntlMessageFormatOptions } from 'intl-messageformat';
|
|
2
2
|
import { DateTimeFormat } from '@formatjs/ecma402-abstract';
|
|
3
3
|
import { MessageFormatElement } from '@formatjs/icu-messageformat-parser';
|
|
4
|
-
import IntlListFormat, { IntlListFormatOptions } from '@formatjs/intl-listformat';
|
|
4
|
+
import IntlListFormat, { IntlListFormatOptions, Part } from '@formatjs/intl-listformat';
|
|
5
5
|
import { DisplayNames, DisplayNamesOptions } from '@formatjs/intl-displaynames';
|
|
6
6
|
import { MissingTranslationError, MessageFormatError, MissingDataError, InvalidConfigError, UnsupportedFormatterError } from './error';
|
|
7
7
|
import { DEFAULT_INTL_CONFIG } from './utils';
|
|
@@ -48,6 +48,7 @@ export interface IntlFormatters<T = any, R = T> {
|
|
|
48
48
|
formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | T | FormatXMLElementFn<T, R>>, opts?: IntlMessageFormatOptions): R;
|
|
49
49
|
formatList(values: Array<string>, opts?: FormatListOptions): string;
|
|
50
50
|
formatList(values: Array<string | T>, opts?: FormatListOptions): T | string | Array<string | T>;
|
|
51
|
+
formatListToParts(values: Array<string | T>, opts?: FormatListOptions): Part[];
|
|
51
52
|
formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts: FormatDisplayNameOptions): string | undefined;
|
|
52
53
|
}
|
|
53
54
|
export interface Formatters {
|
package/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,OAAO,IAAI,wBAAwB,EACpC,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAA;AACvE,OAAO,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../packages/intl/src/types.ts"],"names":[],"mappings":"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"}
|