ical-generator 1.15.0 → 1.15.4

package/CHANGELOG.md

@@ -4,6 +4,20 @@ _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
+- Types: Specify possible values for status and busystatus
+- Types: Specify possible values for transparency
+
+## [1.15.1](https://github.com/sebbo2002/ical-generator/releases/tag/1.15.1) - 2020-10-03
+### Bugfix
+- Typings: OPT_PARTICIPANT should be OPT-PARTICIPANT (#192)
+
 ## [1.15.0](https://github.com/sebbo2002/ical-generator/releases/tag/1.15.0) - 2020-08-24
 ### Feature
 - Events: Add WKST support

package/README.md

@@ -6,6 +6,14 @@
 ical-generator is a small piece of code which generates ical calendar files. I use this to generate subscriptionable
 calendar feeds.
 
+<table><tr><td>
+<b>⚠️ Version 2.0.0</b><br /><br />
+<p>I started working on version 2.0.0, a complete rewrite using typescript. You can find the
+<a href="https://github.com/sebbo2002/ical-generator/blob/master/README.md">old Readme here</a>. You can also have a look at the
+<a href="https://github.com/sebbo2002/ical-generator/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22v2.0.0+%F0%9F%8E%89%22">
+Issues assigned to the 2.0.0 Milestone</a>.</p>
+</td></tr></table>
+
 
 ## Installation
 

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/index.d.ts

@@ -16,8 +16,9 @@ declare module 'ical-generator' {
     type repeatingFreq = 'SECONDLY' | 'MINUTELY' | 'DAILY' | 'WEEKLY' | 'MONTHLY' | 'YEARLY';
     type status = 'CONFIRMED' | 'TENTATIVE' | 'CANCELLED';
     type busystatus = 'FREE' | 'TENTATIVE' | 'BUSY' | 'OOF';
+    type transparency = 'OPAQUE' | 'TRANSPARENT';
     type day = 'SU' | 'MO' | 'TU' | 'WE' | 'TH' | 'FR' | 'SA';
-    type attendeeRole = 'CHAIR' | 'REQ-PARTICIPANT' | 'OPT_PARTICIPANT' | 'NON-PARTICIPANT';
+    type attendeeRole = 'CHAIR' | 'REQ-PARTICIPANT' | 'OPT-PARTICIPANT' | 'NON-PARTICIPANT';
     type attendeeStatus = 'ACCEPTED' | 'TENTATIVE' | 'DECLINED' | 'DELEGATED' | 'NEEDS-ACTION';
     type attendeeRsvp = 'true' | 'false' | true | false;
     type attendeeType = 'INDIVIDUAL' | 'GROUP' | 'RESOURCE' | 'ROOM' | 'UNKNOWN';
@@ -76,11 +77,11 @@ declare module 'ical-generator' {
       organizer?: string | PersonData;
       attendees?: AttendeeData[];
       alarms?: AlarmData[];
-      status?: string;
-      busystatus?: string;
+      status?: status;
+      busystatus?: busystatus;
       timezone?: string;
       recurrenceId?: moment.Moment | Date | string;
-      transparency?: string;
+      transparency?: transparency;
       x?: { key: string, value: string }[];
     }
 
@@ -110,6 +111,7 @@ declare module 'ical-generator' {
       role?: attendeeRole;
       status?: attendeeStatus;
       type?: attendeeType;
+      rsvp?: attendeeRsvp,
       delegatedTo?: ICalAttendee;
       delegatedFrom?: ICalAttendee;
       delegatesTo?: ICalAttendee;
@@ -244,8 +246,8 @@ declare module 'ical-generator' {
       lastModified(): moment.Moment;
       lastModified(lastModified: string | moment.Moment | Date): ICalEvent;
       toJSON(): EventData;
-      transparency(): string;
-      transparency(transparency: string): string;
+      transparency(): transparency;
+      transparency(transparency: transparency): string;
     }
 
     class ICalAttendee {

package/package.json

@@ -11,25 +11,25 @@
     "node": ">=6.0.0"
   },
   "dependencies": {
-    "moment-timezone": "^0.5.31"
+    "moment-timezone": "^0.5.32"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.11.1",
-    "@babel/preset-env": "^7.11.0",
-    "babel-loader": "^8.1.0",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "eslint": "^7.7.0",
+    "@babel/cli": "^7.12.10",
+    "@babel/core": "^7.12.10",
+    "@babel/preset-env": "^7.12.10",
+    "babel-loader": "^8.2.2",
+    "babel-plugin-add-module-exports": "^1.0.4",
+    "eslint": "^7.15.0",
     "jquery": "^3.5.1",
     "jshint": "^2.12.0",
-    "mocha": "^8.1.1",
-    "mochawesome": "^6.1.1",
-    "moment": "^2.27.0",
+    "mocha": "^8.2.1",
+    "mochawesome": "^6.2.1",
+    "moment": "^2.29.1",
     "npm-check": "^5.9.2",
     "nyc": "^15.1.0",
     "portfinder": "^1.0.28",
-    "webpack": "^4.44.1",
-    "webpack-cli": "^3.3.12"
+    "webpack": "^5.10.1",
+    "webpack-cli": "^4.2.0"
   },
   "peerDependencies": {
     "@types/node": ">= 8.0.0"
@@ -55,5 +55,5 @@
   },
   "typings": "index.d.ts",
   "runkitExampleFilename": "examples/example-runkit.js",
-  "version": "1.15.0"
+  "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'
+            );
+        });
     });
 });