ti2-tourplan 1.0.119 → 1.0.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.119",
+  "version": "1.0.121",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -55,13 +55,14 @@ const escapeInvalidXmlChars = str => {
       ['æ', 'ae'],
       ['ß', 'ss'],
     ];
-    const preprocessed = accentedChars.reduce((acc, [k, v]) => acc.replace(k, v), s);
+    const preprocessed = accentedChars.reduce((acc, [k, v]) => acc.split(k).join(v), s);
     return preprocessed.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
   };
   // NOTE: There is no need to sanitize the string for 5 characters (&, <, >, " and ')
   // because js2xmlparser does that for us. Plus if we use sanitize before calling js2xmlparser
   // js2xmlparser will escape & to '&amp;' making it invalid XML
   return convertAccentedChars(asString)
+    .replace(/\u00A0/g, ' ')
     .replace(/’/g, "'")
     .replace(/‘/g, "'")
     .replace(/“/g, '"')

package/utils.test.js

@@ -0,0 +1,36 @@
+const { escapeInvalidXmlChars } = require('./utils');
+
+describe('escapeInvalidXmlChars', () => {
+  it('returns empty string for falsy input', () => {
+    expect(escapeInvalidXmlChars('')).toBe('');
+    expect(escapeInvalidXmlChars(null)).toBe('');
+    expect(escapeInvalidXmlChars(undefined)).toBe('');
+  });
+
+  it('maps accented letters before NFD stripping', () => {
+    expect(escapeInvalidXmlChars('Müller')).toBe('Mueller');
+    expect(escapeInvalidXmlChars('Straße')).toBe('Strasse');
+    expect(escapeInvalidXmlChars('Søren')).toBe('Soeren');
+  });
+
+  it('maps repeated accented letters for every occurrence', () => {
+    expect(escapeInvalidXmlChars('öffnen und rösten')).toBe('oeffnen und roesten');
+    expect(escapeInvalidXmlChars('für süße Grüße')).toBe('fuer suesse Gruesse');
+  });
+
+  it('replaces smart quotes and en dash', () => {
+    expect(escapeInvalidXmlChars('Say ‘hi’ and “bye” – ok')).toBe('Say \'hi\' and "bye" - ok');
+  });
+
+  it('replaces non-breaking spaces with regular spaces', () => {
+    expect(escapeInvalidXmlChars('Borwieck\u00A0Mrs R')).toBe('Borwieck Mrs R');
+  });
+
+  it('strips disallowed control characters', () => {
+    expect(escapeInvalidXmlChars('A\u0000B\u0008C')).toBe('ABC');
+  });
+
+  it('strips lone UTF-16 surrogate code units', () => {
+    expect(escapeInvalidXmlChars('X\uD800Y')).toBe('XY');
+  });
+});