fix(parser): support multiple vCard TYPE parameter

Fixes #343.
kewisch · Jan 13, 2020 · a191c50 · a191c50
1 parent f220e29
commit a191c50
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/lib/ical/parse.js b/lib/ical/parse.js
@@ -412,9 +412,22 @@ ICAL.parse = (function() {
       value = parser._rfc6868Escape(value);
       if (multiValue) {
         var delimiter = mvdelim || multiValue;
-        result[lcname] = parser._parseMultiValue(value, delimiter, type, [], null, designSet);
+        value = parser._parseMultiValue(value, delimiter, type, [], null, designSet);
       } else {
-        result[lcname] = parser._parseValue(value, type, designSet);
+        value = parser._parseValue(value, type, designSet);
+      }
+
+      if (multiValue && (lcname in result)) {
+        if (Array.isArray(result[lcname])) {
+          result[lcname].push(value);
+        } else {
+          result[lcname] = [
+            result[lcname],
+            value
+          ];
+        }
+      } else {
+        result[lcname] = value;
       }
     }
     return [result, value, valuePos];

diff --git a/test/parse_test.js b/test/parse_test.js
@@ -186,6 +186,30 @@ suite('parserv2', function() {
         expected
       );
     });
+
+    test('with multiple vCard TYPE parameters', function() {
+      var input = ';TYPE=work;TYPE=voice';
+      var expected = {
+        'type': ['work', 'voice']
+      };
+
+      assert.deepEqual(
+        subject._parseParameters(input, 0, ICAL.design.components.vcard)[0],
+        expected
+      );
+    });
+
+    test('with multiple iCalendar MEMBER parameters', function() {
+      var input = ';MEMBER="urn:one","urn:two";MEMBER="urn:three"';
+      var expected = {
+        'member': ['urn:one', 'urn:two', 'urn:three']
+      };
+
+      assert.deepEqual(
+        subject._parseParameters(input, 0, ICAL.design.components.vevent)[0],
+        expected
+      );
+    });
   });
 
   test('#_parseMultiValue', function() {