fix(intl-messageformat): fix formatHTMLMessage @ regex

fix formatjs#217
Li0liQ · Oct 23, 2019 · d1b7c8c · d1b7c8c
1 parent 22121b2
commit d1b7c8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/intl-messageformat/src/formatters.ts b/packages/intl-messageformat/src/formatters.ts
@@ -268,7 +268,7 @@ export type FormatXMLElementFn = (...args: any[]) => string | object;
 // Singleton
 let domParser: DOMParser;
 const TOKEN_DELIMITER = '@@';
-const TOKEN_REGEX = /@@(.*?)@@/g;
+const TOKEN_REGEX = /@@(\d+_\d+)@@/g;
 let counter = 0;
 function generateId() {
  return `${Date.now()}_${++counter}`;

diff --git a/packages/intl-messageformat/tests/index.ts b/packages/intl-messageformat/tests/index.ts
@@ -552,6 +552,15 @@ describe('IntlMessageFormat', function() {
  });
 
  describe('xml', function() {
+ it('should handle @ correctly', function() {
+ const mf = new IntlMessageFormat('hi @{there}', 'en');
+ expect(
+ mf.formatHTMLMessage({
+ there: '2008',
+ })
+ ).to.deep.equal(['hi @2008']);
+ });
+
  it('simple message', function() {
  var mf = new IntlMessageFormat('hello <b>world</b>', 'en');
  expect(mf.formatHTMLMessage({b: str => ({str})})).to.deep.equal([