@gmb/bitmark-parser-generator 1.2.0 → 1.2.2

package/dist/cjs/config/config.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // Bit configs
 require("./bits/_errorBitConfig");
+require("./bits/appFlashcardsBitConfig");
 require("./bits/appLinkBitConfig");
 require("./bits/articleBitConfig");
 require("./bits/articleEmbedBitConfig");
@@ -26,7 +27,6 @@ require("./bits/documentEmbedBitConfig");
 require("./bits/documentLinkBitConfig");
 require("./bits/essayBitConfig");
 require("./bits/exampleBitConfig");
-require("./bits/flashcard1BitConfig");
 require("./bits/flashcardBitConfig");
 require("./bits/focusImageBitConfig");
 require("./bits/highlightTextBitConfig");
@@ -71,6 +71,7 @@ require("./properties/bookPropertyConfig");
 require("./properties/botPropertyConfig");
 require("./properties/caseSensitivePropertyConfig");
 require("./properties/colorPropertyConfig");
+require("./properties/colorTagPropertyConfig");
 require("./properties/computerLanguagePropertyConfig");
 require("./properties/coverImagePropertyConfig");
 require("./properties/datePropertyConfig");
@@ -80,8 +81,11 @@ require("./properties/examplePropertyConfig");
 require("./properties/externalIdPropertyConfig");
 require("./properties/externalLinkPropertyConfig");
 require("./properties/externalLinkTextPropertyConfig");
+require("./properties/flashcardSetPropertyConfig");
 require("./properties/focusXPropertyConfig");
 require("./properties/focusYPropertyConfig");
+require("./properties/iconPropertyConfig");
+require("./properties/iconTagPropertyConfig");
 require("./properties/idPropertyConfig");
 require("./properties/indicationPropertyConfig");
 require("./properties/isInfoOnlyPropertyConfig");
@@ -111,6 +115,8 @@ require("./properties/shortAnswerPropertyConfig");
 require("./properties/spaceIdPropertyConfig");
 require("./properties/subjectPropertyConfig");
 require("./properties/subtypePropertyConfig");
+require("./properties/tagPropertyConfig");
+require("./properties/targetPropertyConfig");
 require("./properties/textReferencePropertyConfig");
 require("./properties/themePropertyConfig");
 require("./properties/thumbImagePropertyConfig");

package/dist/cjs/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":";;AAAA,cAAc;AACd,kCAAgC;AAChC,mCAAiC;AACjC,mCAAiC;AACjC,wCAAsC;AACtC,uCAAqC;AACrC,iCAA+B;AAC/B,sCAAoC;AACpC,qCAAmC;AACnC,oCAAkC;AAClC,gCAA8B;AAC9B,6CAA2C;AAC3C,yCAAuC;AACvC,wCAAsC;AACtC,iCAA+B;AAC/B,mCAAiC;AACjC,sDAAoD;AACpD,iCAA+B;AAC/B,gCAA8B;AAC9B,wCAAsC;AACtC,oCAAkC;AAClC,4CAA0C;AAC1C,yCAAuC;AACvC,wCAAsC;AACtC,iCAA+B;AAC/B,mCAAiC;AACjC,sCAAoC;AACpC,qCAAmC;AACnC,sCAAoC;AACpC,yCAAuC;AACvC,iCAA+B;AAC/B,qCAAmC;AACnC,wCAAsC;AACtC,qCAAmC;AACnC,wCAAsC;AACtC,gCAA8B;AAC9B,iCAA+B;AAC/B,2CAAyC;AACzC,0CAAwC;AACxC,8CAA4C;AAC5C,6CAA2C;AAC3C,4CAA0C;AAC1C,iCAA+B;AAC/B,iCAA+B;AAC/B,kCAAgC;AAChC,uCAAqC;AACrC,0CAAwC;AACxC,sCAAoC;AACpC,oCAAkC;AAClC,0CAAwC;AACxC,+CAA6C;AAC7C,8CAA4C;AAC5C,2CAAyC;AACzC,kCAAgC;AAChC,+BAA6B;AAC7B,sCAAoC;AACpC,qCAAmC;AACnC,6CAA2C;AAC3C,iCAA+B;AAC/B,sCAAoC;AACpC,qCAAmC;AACnC,uCAAqC;AACrC,mBAAmB;AACnB,6CAA2C;AAC3C,+CAA6C;AAC7C,kDAAgD;AAChD,6CAA2C;AAC3C,2CAAyC;AACzC,0CAAwC;AACxC,oDAAkD;AAClD,4CAA0C;AAC1C,uDAAqD;AACrD,iDAA+C;AAC/C,2CAAyC;AACzC,+CAA6C;AAC7C,+CAA6C;AAC7C,8CAA4C;AAC5C,iDAA+C;AAC/C,mDAAiD;AACjD,uDAAqD;AACrD,6CAA2C;AAC3C,6CAA2C;AAC3C,yCAAuC;AACvC,iDAA+C;AAC/C,iDAA+C;AAC/C,gDAA8C;AAC9C,2CAAyC;AACzC,iDAA+C;AAC/C,gDAA8C;AAC9C,+CAA6C;AAC7C,4CAA0C;AAC1C,2CAAyC;AACzC,+CAA6C;AAC7C,iDAA+C;AAC/C,2CAAyC;AACzC,+CAA6C;AAC7C,oDAAkD;AAClD,8CAA4C;AAC5C,+CAA6C;AAC7C,mDAAiD;AACjD,gDAA8C;AAC9C,mDAAiD;AACjD,+CAA6C;AAC7C,gDAA8C;AAC9C,qDAAmD;AACnD,+CAA6C;AAC7C,qDAAmD;AACnD,kDAAgD;AAChD,8CAA4C;AAC5C,8CAA4C;AAC5C,8CAA4C;AAC5C,oDAAkD;AAClD,4CAA0C;AAC1C,iDAA+C;AAC/C,0CAAwC;AACxC,2CAAyC;AACzC,oDAAkD"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":";;AAAA,cAAc;AACd,kCAAgC;AAChC,yCAAuC;AACvC,mCAAiC;AACjC,mCAAiC;AACjC,wCAAsC;AACtC,uCAAqC;AACrC,iCAA+B;AAC/B,sCAAoC;AACpC,qCAAmC;AACnC,oCAAkC;AAClC,gCAA8B;AAC9B,6CAA2C;AAC3C,yCAAuC;AACvC,wCAAsC;AACtC,iCAA+B;AAC/B,mCAAiC;AACjC,sDAAoD;AACpD,iCAA+B;AAC/B,gCAA8B;AAC9B,wCAAsC;AACtC,oCAAkC;AAClC,4CAA0C;AAC1C,yCAAuC;AACvC,wCAAsC;AACtC,iCAA+B;AAC/B,mCAAiC;AACjC,qCAAmC;AACnC,sCAAoC;AACpC,yCAAuC;AACvC,iCAA+B;AAC/B,qCAAmC;AACnC,wCAAsC;AACtC,qCAAmC;AACnC,wCAAsC;AACtC,gCAA8B;AAC9B,iCAA+B;AAC/B,2CAAyC;AACzC,0CAAwC;AACxC,8CAA4C;AAC5C,6CAA2C;AAC3C,4CAA0C;AAC1C,iCAA+B;AAC/B,iCAA+B;AAC/B,kCAAgC;AAChC,uCAAqC;AACrC,0CAAwC;AACxC,sCAAoC;AACpC,oCAAkC;AAClC,0CAAwC;AACxC,+CAA6C;AAC7C,8CAA4C;AAC5C,2CAAyC;AACzC,kCAAgC;AAChC,+BAA6B;AAC7B,sCAAoC;AACpC,qCAAmC;AACnC,6CAA2C;AAC3C,iCAA+B;AAC/B,sCAAoC;AACpC,qCAAmC;AACnC,uCAAqC;AACrC,mBAAmB;AACnB,6CAA2C;AAC3C,+CAA6C;AAC7C,kDAAgD;AAChD,6CAA2C;AAC3C,2CAAyC;AACzC,0CAAwC;AACxC,oDAAkD;AAClD,4CAA0C;AAC1C,+CAA6C;AAC7C,uDAAqD;AACrD,iDAA+C;AAC/C,2CAAyC;AACzC,+CAA6C;AAC7C,+CAA6C;AAC7C,8CAA4C;AAC5C,iDAA+C;AAC/C,mDAAiD;AACjD,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2C;AAC3C,6CAA2C;AAC3C,2CAAyC;AACzC,8CAA4C;AAC5C,yCAAuC;AACvC,iDAA+C;AAC/C,iDAA+C;AAC/C,gDAA8C;AAC9C,2CAAyC;AACzC,iDAA+C;AAC/C,gDAA8C;AAC9C,+CAA6C;AAC7C,4CAA0C;AAC1C,2CAAyC;AACzC,+CAA6C;AAC7C,iDAA+C;AAC/C,2CAAyC;AACzC,+CAA6C;AAC7C,oDAAkD;AAClD,8CAA4C;AAC5C,+CAA6C;AAC7C,mDAAiD;AACjD,gDAA8C;AAC9C,mDAAiD;AACjD,+CAA6C;AAC7C,gDAA8C;AAC9C,qDAAmD;AACnD,+CAA6C;AAC7C,qDAAmD;AACnD,kDAAgD;AAChD,8CAA4C;AAC5C,8CAA4C;AAC5C,8CAA4C;AAC5C,0CAAwC;AACxC,6CAA2C;AAC3C,oDAAkD;AAClD,4CAA0C;AAC1C,iDAA+C;AAC/C,0CAAwC;AACxC,2CAAyC;AACzC,oDAAkD"}

package/dist/cjs/config/properties/colorTagPropertyConfig.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.colorTag, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=colorTagPropertyConfig.js.map

package/dist/cjs/config/properties/colorTagPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"colorTagPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/colorTagPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,QAAQ,EAAE;IACjE,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/config/properties/flashcardSetPropertyConfig.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.flashcardSet, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=flashcardSetPropertyConfig.js.map

package/dist/cjs/config/properties/flashcardSetPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flashcardSetPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/flashcardSetPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,YAAY,EAAE;IACrE,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/config/properties/iconPropertyConfig.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.icon, {
+    isSingle: true,
+    isTrimmedString: true,
+});
+//# sourceMappingURL=iconPropertyConfig.js.map

package/dist/cjs/config/properties/iconPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iconPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/iconPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,IAAI,EAAE;IAC7D,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/config/properties/iconTagPropertyConfig.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.iconTag, {
+    isSingle: true,
+    isTrimmedString: true,
+});
+//# sourceMappingURL=iconTagPropertyConfig.js.map

package/dist/cjs/config/properties/iconTagPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iconTagPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/iconTagPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,OAAO,EAAE;IAChE,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/config/properties/tagPropertyConfig.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.tag, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=tagPropertyConfig.js.map

package/dist/cjs/config/properties/tagPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/tagPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,GAAG,EAAE;IAC5D,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/config/properties/targetPropertyConfig.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PropertyKey_1 = require("../../model/enum/PropertyKey");
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey_1.PropertyKey.setMetadata(PropertyKey_1.PropertyKey.target, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=targetPropertyConfig.js.map

package/dist/cjs/config/properties/targetPropertyConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"targetPropertyConfig.js","sourceRoot":"","sources":["../../../../src/config/properties/targetPropertyConfig.ts"],"names":[],"mappings":";;AAAA,8DAAgF;AAEhF,mEAAmE;AAEnE,yBAAW,CAAC,WAAW,CAAsB,yBAAW,CAAC,MAAM,EAAE;IAC/D,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC"}

package/dist/cjs/generated/build-info.js

@@ -5,6 +5,6 @@ exports.buildInfo = void 0;
 /* eslint-disable */
 exports.buildInfo = {
     "name": "@gmb/bitmark-parser-generator",
-    "version": "1.2.0"
+    "version": "1.2.2"
 };
 //# sourceMappingURL=build-info.js.map

package/dist/cjs/generated/parser/bitmark/bitmark-peggy-parser.js

@@ -166,10 +166,10 @@ function peg$parse(input, options) {
     var peg$c1 = "]";
     var peg$c2 = ":";
     var peg$c3 = "&";
-    var peg$c4 = "++";
-    var peg$c5 = "====";
+    var peg$c4 = "====";
+    var peg$c5 = "~~~~";
     var peg$c6 = "--";
-    var peg$c7 = "~~";
+    var peg$c7 = "++";
     var peg$c8 = "===";
     var peg$c9 = "==";
     var peg$c10 = "[@id";
@@ -207,10 +207,10 @@ function peg$parse(input, options) {
     var peg$e3 = peg$literalExpectation(":", false);
     var peg$e4 = peg$literalExpectation("&", false);
     var peg$e5 = peg$anyExpectation();
-    var peg$e6 = peg$literalExpectation("++", false);
-    var peg$e7 = peg$literalExpectation("====", false);
+    var peg$e6 = peg$literalExpectation("====", false);
+    var peg$e7 = peg$literalExpectation("~~~~", false);
     var peg$e8 = peg$literalExpectation("--", false);
-    var peg$e9 = peg$literalExpectation("~~", false);
+    var peg$e9 = peg$literalExpectation("++", false);
     var peg$e10 = peg$literalExpectation("===", false);
     var peg$e11 = peg$literalExpectation("==", false);
     var peg$e12 = peg$literalExpectation("[@id", false);
@@ -984,135 +984,49 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseCardSetStart_V2() {
-        var s0, s1, s2, s3, s4, s5, s6, s7;
+        var s0, s1, s2, s3, s4, s5;
         s0 = peg$currPos;
         s1 = peg$parseNL();
         if (s1 !== peg$FAILED) {
-            if (input.substr(peg$currPos, 2) === peg$c4) {
-                s2 = peg$c4;
-                peg$currPos += 2;
+            s2 = peg$currPos;
+            peg$silentFails++;
+            s3 = peg$currPos;
+            if (input.substr(peg$currPos, 4) === peg$c4) {
+                s4 = peg$c4;
+                peg$currPos += 4;
             }
             else {
-                s2 = peg$FAILED;
+                s4 = peg$FAILED;
                 if (peg$silentFails === 0) {
                     peg$fail(peg$e6);
                 }
             }
-            if (s2 !== peg$FAILED) {
-                s3 = peg$parseWNL();
-                if (s3 !== peg$FAILED) {
-                    s4 = peg$currPos;
-                    peg$silentFails++;
-                    s5 = peg$currPos;
-                    if (input.substr(peg$currPos, 4) === peg$c5) {
-                        s6 = peg$c5;
-                        peg$currPos += 4;
-                    }
-                    else {
-                        s6 = peg$FAILED;
-                        if (peg$silentFails === 0) {
-                            peg$fail(peg$e7);
-                        }
-                    }
-                    if (s6 !== peg$FAILED) {
-                        s7 = peg$parseWNL();
-                        if (s7 !== peg$FAILED) {
-                            s6 = [s6, s7];
-                            s5 = s6;
-                        }
-                        else {
-                            peg$currPos = s5;
-                            s5 = peg$FAILED;
-                        }
-                    }
-                    else {
-                        peg$currPos = s5;
-                        s5 = peg$FAILED;
-                    }
-                    peg$silentFails--;
-                    if (s5 !== peg$FAILED) {
-                        peg$currPos = s4;
-                        s4 = undefined;
-                    }
-                    else {
-                        s4 = peg$FAILED;
-                    }
-                    if (s4 !== peg$FAILED) {
-                        peg$savedPos = s0;
-                        s0 = peg$f18();
-                    }
-                    else {
-                        peg$currPos = s0;
-                        s0 = peg$FAILED;
-                    }
+            if (s4 !== peg$FAILED) {
+                s5 = peg$parseWNL();
+                if (s5 !== peg$FAILED) {
+                    s4 = [s4, s5];
+                    s3 = s4;
                 }
                 else {
-                    peg$currPos = s0;
-                    s0 = peg$FAILED;
+                    peg$currPos = s3;
+                    s3 = peg$FAILED;
                 }
             }
             else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
+                peg$currPos = s3;
+                s3 = peg$FAILED;
             }
-        }
-        else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-        }
-        return s0;
-    }
-    function peg$parseCardSetEnd_V2() {
-        var s0, s1, s2, s3, s4, s5;
-        s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c5) {
-            s1 = peg$c5;
-            peg$currPos += 4;
-        }
-        else {
-            s1 = peg$FAILED;
-            if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
+            peg$silentFails--;
+            if (s3 !== peg$FAILED) {
+                peg$currPos = s2;
+                s2 = undefined;
+            }
+            else {
+                s2 = peg$FAILED;
             }
-        }
-        if (s1 !== peg$FAILED) {
-            s2 = peg$parseWNL();
             if (s2 !== peg$FAILED) {
-                if (input.substr(peg$currPos, 2) === peg$c4) {
-                    s3 = peg$c4;
-                    peg$currPos += 2;
-                }
-                else {
-                    s3 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                        peg$fail(peg$e6);
-                    }
-                }
-                if (s3 !== peg$FAILED) {
-                    s4 = peg$currPos;
-                    peg$silentFails++;
-                    s5 = peg$parseWEOL();
-                    peg$silentFails--;
-                    if (s5 !== peg$FAILED) {
-                        peg$currPos = s4;
-                        s4 = undefined;
-                    }
-                    else {
-                        s4 = peg$FAILED;
-                    }
-                    if (s4 !== peg$FAILED) {
-                        s1 = [s1, s2, s3, s4];
-                        s0 = s1;
-                    }
-                    else {
-                        peg$currPos = s0;
-                        s0 = peg$FAILED;
-                    }
-                }
-                else {
-                    peg$currPos = s0;
-                    s0 = peg$FAILED;
-                }
+                peg$savedPos = s0;
+                s0 = peg$f18();
             }
             else {
                 peg$currPos = s0;
@@ -1123,127 +1037,81 @@ function peg$parse(input, options) {
             peg$currPos = s0;
             s0 = peg$FAILED;
         }
-        if (s0 === peg$FAILED) {
-            s0 = peg$currPos;
-            s1 = peg$currPos;
-            s2 = [];
-            s3 = peg$parseWS();
-            while (s3 !== peg$FAILED) {
-                s2.push(s3);
-                s3 = peg$parseWS();
-            }
-            s3 = peg$parseEOF();
-            if (s3 !== peg$FAILED) {
-                s2 = [s2, s3];
-                s1 = s2;
-            }
-            else {
-                peg$currPos = s1;
-                s1 = peg$FAILED;
-            }
-            if (s1 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s1 = peg$f19();
-            }
-            s0 = s1;
-        }
         return s0;
     }
-    function peg$parseCards_V2() {
-        var s0, s1, s2, s3, s4, s5, s6;
+    function peg$parseCardSetEnd_V2() {
+        var s0, s1, s2, s3, s4;
         s0 = peg$currPos;
         s1 = peg$currPos;
-        peg$silentFails++;
-        s2 = peg$currPos;
         if (input.substr(peg$currPos, 4) === peg$c5) {
-            s3 = peg$c5;
+            s2 = peg$c5;
             peg$currPos += 4;
         }
         else {
-            s3 = peg$FAILED;
+            s2 = peg$FAILED;
             if (peg$silentFails === 0) {
                 peg$fail(peg$e7);
             }
         }
-        if (s3 !== peg$FAILED) {
-            s4 = peg$parseWNL();
-            if (s4 !== peg$FAILED) {
-                if (input.substr(peg$currPos, 2) === peg$c4) {
-                    s5 = peg$c4;
-                    peg$currPos += 2;
-                }
-                else {
-                    s5 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                        peg$fail(peg$e6);
-                    }
-                }
-                if (s5 !== peg$FAILED) {
-                    s6 = peg$parseWEOL();
-                    if (s6 !== peg$FAILED) {
-                        s3 = [s3, s4, s5, s6];
-                        s2 = s3;
-                    }
-                    else {
-                        peg$currPos = s2;
-                        s2 = peg$FAILED;
-                    }
-                }
-                else {
-                    peg$currPos = s2;
-                    s2 = peg$FAILED;
-                }
-            }
-            else {
-                peg$currPos = s2;
-                s2 = peg$FAILED;
-            }
+        if (s2 === peg$FAILED) {
+            s2 = null;
+        }
+        s3 = peg$currPos;
+        peg$silentFails++;
+        s4 = peg$parseWEOL();
+        peg$silentFails--;
+        if (s4 !== peg$FAILED) {
+            peg$currPos = s3;
+            s3 = undefined;
         }
         else {
-            peg$currPos = s2;
-            s2 = peg$FAILED;
+            s3 = peg$FAILED;
         }
-        peg$silentFails--;
-        if (s2 === peg$FAILED) {
-            s1 = undefined;
+        if (s3 !== peg$FAILED) {
+            s2 = [s2, s3];
+            s1 = s2;
         }
         else {
             peg$currPos = s1;
             s1 = peg$FAILED;
         }
         if (s1 !== peg$FAILED) {
-            s2 = peg$parseCardLineOrDivider_V2();
-            if (s2 !== peg$FAILED) {
-                peg$savedPos = s0;
-                s0 = peg$f20(s2);
-            }
-            else {
-                peg$currPos = s0;
-                s0 = peg$FAILED;
-            }
+            peg$savedPos = s0;
+            s1 = peg$f19();
         }
-        else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseCards_V2() {
+        var s0, s1;
+        s0 = peg$currPos;
+        s1 = peg$parseCardLineOrDivider_V2();
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f20(s1);
         }
+        s0 = s1;
         return s0;
     }
     function peg$parseCardLineOrDivider_V2() {
         var s0, s1, s2, s3;
         s0 = peg$currPos;
         s1 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c5) {
-            s2 = peg$c5;
+        if (input.substr(peg$currPos, 4) === peg$c4) {
+            s2 = peg$c4;
             peg$currPos += 4;
         }
         else {
             s2 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
+                peg$fail(peg$e6);
             }
         }
         if (s2 !== peg$FAILED) {
             s3 = peg$parseWNL();
+            if (s3 === peg$FAILED) {
+                s3 = peg$parseWEOL();
+            }
             if (s3 !== peg$FAILED) {
                 s2 = [s2, s3];
                 s1 = s2;
@@ -1271,6 +1139,9 @@ function peg$parse(input, options) {
             }
             if (s2 !== peg$FAILED) {
                 s3 = peg$parseWNL();
+                if (s3 === peg$FAILED) {
+                    s3 = peg$parseWEOL();
+                }
                 if (s3 !== peg$FAILED) {
                     s2 = [s2, s3];
                     s1 = s2;
@@ -1298,6 +1169,9 @@ function peg$parse(input, options) {
                 }
                 if (s2 !== peg$FAILED) {
                     s3 = peg$parseWNL();
+                    if (s3 === peg$FAILED) {
+                        s3 = peg$parseWEOL();
+                    }
                     if (s3 !== peg$FAILED) {
                         s2 = [s2, s3];
                         s1 = s2;
@@ -1324,31 +1198,105 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseCardLine_V2() {
-        var s0, s1, s2, s3, s4;
+        var s0, s1, s2, s3, s4, s5;
         s0 = peg$currPos;
         s1 = peg$currPos;
+        peg$silentFails++;
         s2 = peg$currPos;
-        s3 = peg$parseLine();
-        s4 = peg$parseNL();
-        if (s4 !== peg$FAILED) {
-            s3 = [s3, s4];
-            s2 = s3;
+        if (input.substr(peg$currPos, 4) === peg$c5) {
+            s3 = peg$c5;
+            peg$currPos += 4;
+        }
+        else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e7);
+            }
+        }
+        if (s3 !== peg$FAILED) {
+            s4 = peg$parseWEOL();
+            if (s4 !== peg$FAILED) {
+                s3 = [s3, s4];
+                s2 = s3;
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
         }
         else {
             peg$currPos = s2;
             s2 = peg$FAILED;
         }
-        if (s2 !== peg$FAILED) {
-            s1 = input.substring(s1, peg$currPos);
+        peg$silentFails--;
+        if (s2 === peg$FAILED) {
+            s1 = undefined;
         }
         else {
-            s1 = s2;
+            peg$currPos = s1;
+            s1 = peg$FAILED;
         }
         if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$f22(s1);
+            s2 = peg$currPos;
+            s3 = peg$currPos;
+            s4 = peg$parseLine();
+            s5 = peg$parseNL();
+            if (s5 !== peg$FAILED) {
+                s4 = [s4, s5];
+                s3 = s4;
+            }
+            else {
+                peg$currPos = s3;
+                s3 = peg$FAILED;
+            }
+            if (s3 === peg$FAILED) {
+                s3 = peg$currPos;
+                s4 = [];
+                s5 = peg$parseChar();
+                if (s5 !== peg$FAILED) {
+                    while (s5 !== peg$FAILED) {
+                        s4.push(s5);
+                        s5 = peg$parseChar();
+                    }
+                }
+                else {
+                    s4 = peg$FAILED;
+                }
+                if (s4 !== peg$FAILED) {
+                    s5 = peg$parseEOL();
+                    if (s5 !== peg$FAILED) {
+                        s4 = [s4, s5];
+                        s3 = s4;
+                    }
+                    else {
+                        peg$currPos = s3;
+                        s3 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s3;
+                    s3 = peg$FAILED;
+                }
+            }
+            if (s3 !== peg$FAILED) {
+                s2 = input.substring(s2, peg$currPos);
+            }
+            else {
+                s2 = s3;
+            }
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f22(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
         }
-        s0 = s1;
         return s0;
     }
     function peg$parseCardSet_V1() {