ical-generator 1.15.3 → 1.15.4

package/CHANGELOG.md

@@ -4,6 +4,10 @@ _The following document documents changes to this library. Changes to the depend
 
 <br />
 
+## [1.15.4](https://github.com/sebbo2002/ical-generator/releases/tag/1.15.4) - 2021-01-14
+### Budgfix
+- Fix: Line folding breaks surrogate pairs ([#221](https://github.com/sebbo2002/ical-generator/issues/221))
+
 ## [1.15.2](https://github.com/sebbo2002/ical-generator/releases/tag/1.15.2) - 2020-11-12
 ### Bugfix
 - Types: Add rsvp to AttendeeData

package/dist/_tools.js

@@ -122,7 +122,28 @@ var ICalTools = /*#__PURE__*/function () {
     key: "foldLines",
     value: function foldLines(input) {
       return input.split('\r\n').map(function (line) {
-        return line.match(/(.{1,74})/g).join('\r\n ');
+        var result = '';
+        var c = 0;
+
+        for (var i = 0; i < line.length; i++) {
+          var ch = line.charAt(i); // surrogate pair, see https://mathiasbynens.be/notes/javascript-encoding#surrogate-pairs
+
+          if (ch >= "\uD800" && ch <= "\uDBFF") {
+            ch += line.charAt(++i);
+          }
+
+          var charsize = Buffer.from(ch).length;
+          c += charsize;
+
+          if (c > 74) {
+            result += '\r\n ';
+            c = charsize;
+          }
+
+          result += ch;
+        }
+
+        return result;
       }).join('\r\n');
     }
   }, {

package/package.json

@@ -55,5 +55,5 @@
   },
   "typings": "index.d.ts",
   "runkitExampleFilename": "examples/example-runkit.js",
-  "version": "1.15.3"
+  "version": "1.15.4"
 }

package/src/_tools.js

@@ -90,7 +90,26 @@ class ICalTools {
 
     static foldLines (input) {
         return input.split('\r\n').map(function (line) {
-            return line.match(/(.{1,74})/g).join('\r\n ');
+            let result = '';
+            let c = 0;
+            for (let i = 0; i < line.length; i++) {
+                let ch = line.charAt(i);
+
+                // surrogate pair, see https://mathiasbynens.be/notes/javascript-encoding#surrogate-pairs
+                if (ch >= '\ud800' && ch <= '\udbff') {
+                    ch += line.charAt(++i);
+                }
+
+                const charsize = Buffer.from(ch).length;
+                c += charsize;
+                if (c > 74) {
+                    result += '\r\n ';
+                    c = charsize;
+                }
+
+                result += ch;
+            }
+            return result;
         }).join('\r\n');
     }
 

package/test/test_tools.js

@@ -202,5 +202,11 @@ describe('ICalTools', function () {
                 '12345678ikjhgztrde546rf7g8hjiomkjnhgqfcdxerdftgzuinjhgcfvtzvzvuwcbiweciujz\r\n vguhbghbbqwxowidoi21e8981'
             );
         });
+        it('should not split surrogate pairs', function () {
+            assert.strictEqual(
+                ICalTools.foldLines('👋🏼12345678ikjhgztrde546rf7g8hjiomkjnhgqfcdxerdftgzuinjhgcfvtzvzvuwcbiweciujvguhbghbbqwxowidoi21e8981'),
+                '👋🏼12345678ikjhgztrde546rf7g8hjiomkjnhgqfcdxerdftgzuinjhgcfvtzvzvuwcb\r\n iweciujvguhbghbbqwxowidoi21e8981'
+            );
+        });
     });
 });