@gmb/bitmark-parser-generator 1.2.0 → 1.2.2

package/dist/esm/config/config.js

@@ -1,5 +1,6 @@
 // Bit configs
 import './bits/_errorBitConfig';
+import './bits/appFlashcardsBitConfig';
 import './bits/appLinkBitConfig';
 import './bits/articleBitConfig';
 import './bits/articleEmbedBitConfig';
@@ -24,7 +25,6 @@ import './bits/documentEmbedBitConfig';
 import './bits/documentLinkBitConfig';
 import './bits/essayBitConfig';
 import './bits/exampleBitConfig';
-import './bits/flashcard1BitConfig';
 import './bits/flashcardBitConfig';
 import './bits/focusImageBitConfig';
 import './bits/highlightTextBitConfig';
@@ -69,6 +69,7 @@ import './properties/bookPropertyConfig';
 import './properties/botPropertyConfig';
 import './properties/caseSensitivePropertyConfig';
 import './properties/colorPropertyConfig';
+import './properties/colorTagPropertyConfig';
 import './properties/computerLanguagePropertyConfig';
 import './properties/coverImagePropertyConfig';
 import './properties/datePropertyConfig';
@@ -78,8 +79,11 @@ import './properties/examplePropertyConfig';
 import './properties/externalIdPropertyConfig';
 import './properties/externalLinkPropertyConfig';
 import './properties/externalLinkTextPropertyConfig';
+import './properties/flashcardSetPropertyConfig';
 import './properties/focusXPropertyConfig';
 import './properties/focusYPropertyConfig';
+import './properties/iconPropertyConfig';
+import './properties/iconTagPropertyConfig';
 import './properties/idPropertyConfig';
 import './properties/indicationPropertyConfig';
 import './properties/isInfoOnlyPropertyConfig';
@@ -109,6 +113,8 @@ import './properties/shortAnswerPropertyConfig';
 import './properties/spaceIdPropertyConfig';
 import './properties/subjectPropertyConfig';
 import './properties/subtypePropertyConfig';
+import './properties/tagPropertyConfig';
+import './properties/targetPropertyConfig';
 import './properties/textReferencePropertyConfig';
 import './properties/themePropertyConfig';
 import './properties/thumbImagePropertyConfig';

package/dist/esm/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,6 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.colorTag, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=colorTagPropertyConfig.js.map

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

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

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

@@ -0,0 +1,6 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.flashcardSet, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=flashcardSetPropertyConfig.js.map

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

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

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

@@ -0,0 +1,7 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.icon, {
+    isSingle: true,
+    isTrimmedString: true,
+});
+//# sourceMappingURL=iconPropertyConfig.js.map

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

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

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

@@ -0,0 +1,7 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.iconTag, {
+    isSingle: true,
+    isTrimmedString: true,
+});
+//# sourceMappingURL=iconTagPropertyConfig.js.map

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

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

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

@@ -0,0 +1,6 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.tag, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=tagPropertyConfig.js.map

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

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

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

@@ -0,0 +1,6 @@
+import { PropertyKey } from '../../model/enum/PropertyKey';
+// Set metadata on the property keys to describe specific behaviour
+PropertyKey.setMetadata(PropertyKey.target, {
+    isTrimmedString: true,
+});
+//# sourceMappingURL=targetPropertyConfig.js.map

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

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

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

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

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

@@ -162,10 +162,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";
@@ -203,10 +203,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);
@@ -980,135 +980,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;
@@ -1119,127 +1033,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;
@@ -1267,6 +1135,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;
@@ -1294,6 +1165,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;
@@ -1320,31 +1194,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() {