@gmb/bitmark-parser-generator 3.23.0 → 3.25.0

package/dist/cjs/breakscaping/Breakscape.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Breakscape = void 0;
 const TextFormat_1 = require("../model/enum/TextFormat");
+const TextLocation_1 = require("../model/enum/TextLocation");
 const StringUtils_1 = require("../utils/StringUtils");
 /**
  * Utility class for breakscaping strings.
  *
+ * ============
+ * Breakscaping
+ * ============
+ *
  * Breakscaping is the process of escaping certain character sequences in a string so that they are not interpreted as
  * special sequences by the parser.
  *
@@ -15,108 +20,137 @@ const StringUtils_1 = require("../utils/StringUtils");
  * The special character is ^
  * To include the special character in a text which is breakscaped, use ^^ (once), ^^^ (twice), etc.
  *
- * Any sequence can be breakscaped by breaking it with a ^ character.
+ * Any sequence can be breakscaped by breaking it with a single ^ character.
  *
- * The following unbreakscaping rules are applied when unbreakscaping text:
- *  - hat:                                   ^                  ==>
- *  - hat:                                   ^^                 ==>   ^
- *  - hat:                                   ^..N               ==>   ^..N-1
+ * When breakscaping text programmatically, the following rules apply to keep the breakscaping to a minimum:
  *
  * The following breakscaping rules are applied when breakscaping text:
- *  - hat:                                   ^                  ==>   ^^                         [bitmark-- / bitmark++]
- *  - hat:                                   ^^                 ==>   ^^^                        [bitmark-- / bitmark++]
- *  - hat:                                   ^..N               ==>   ^..N+1                     [bitmark-- / bitmark++]
- *  - inline:                                ==                 ==>   =^=                        [bitmark-- / bitmark++]
- *  - title block:                   (SOL)[##]#(space)          ==>   (SOL)[##]#^(space)         [bitmark++]
- *  - new block:                     (SOL)|(WS EOL)             ==>   (SOL)|^(WS EOL)            [bitmark++]
- *  - code block:                    (SOL)|code(:type)          ==>   (SOL)|^code(:type)         [bitmark++]
- *  - image block:                   (SOL)|image:(url)          ==>   (SOL)|^image:(url)         [bitmark++]
- *  - bullet list:                   (SOL)•(space)              ==>   (SOL)•^(space)             [bitmark++]
- *  - simple list:                   (SOL)•_(space)             ==>   (SOL)•^_(space)            [bitmark++]
- *  - ordered list (numeric):        (SOL)•<numbers>(space)     ==>   (SOL)•^<numbers>(space)    [bitmark++]
- *  - ordered list: (roman,lower)    (SOL)•<numbers>i(space)    ==>   (SOL)•^<numbers>i(space)   [bitmark++]
- *  - ordered list: (roman,upper)    (SOL)•<numbers>I(space)    ==>   (SOL)•^<numbers>I(space)   [bitmark++]
- *  - ordered list:                  (SOL)•<letters>(space)     ==>   (SOL)•^<letters>(space)    [bitmark++]
- *  - tag list +:                    (SOL)•+(space)             ==>   (SOL)•^+(space)            [bitmark++]
- *  - tag list -:                    (SOL)•-(space)             ==>   (SOL)•^-(space)            [bitmark++]
- *  - bold:                                  **                 ==>   *^*                        [bitmark-- / bitmark++]
- *  - light:                                 ``                 ==>   `^`                        [bitmark-- / bitmark++]
- *  - italic:                                __                 ==>   _^_                        [bitmark-- / bitmark++]
- *  - highlight:                             !!                 ==>   !^!                        [bitmark-- / bitmark++]
- *  - start of bit (at end):                 [<end>             ==>   [^<end>                    [bitmark-- / bitmark++]
- *  - start of bit:                          [.                 ==>   [^.                        [bitmark-- / bitmark++]
- *  - start of property:                     [@                 ==>   [^@                        [bitmark-- / bitmark++]
- *  - start of title:                        [#                 ==>   [^#                        [bitmark-- / bitmark++]
- *  - start of anchor:                       [▼                 ==>   [^▼                        [bitmark-- / bitmark++]
- *  - start of reference:                    [►                 ==>   [^►                        [bitmark-- / bitmark++]
- *  - start of item/lead:                    [%                 ==>   [^%                        [bitmark-- / bitmark++]
- *  - start of instruction:                  [!                 ==>   [^!                        [bitmark-- / bitmark++]
- *  - start of hint:                         [?                 ==>   [^?                        [bitmark-- / bitmark++]
- *  - start of true statement:               [+                 ==>   [^+                        [bitmark-- / bitmark++]
- *  - start of false statement:              [-                 ==>   [^-                        [bitmark-- / bitmark++]
- *  - start of sample solution:              [$                 ==>   [^$                        [bitmark-- / bitmark++]
- *  - start of gap:                          [_                 ==>   [^_                        [bitmark-- / bitmark++]
- *  - start of mark:                         [=                 ==>   [^=                        [bitmark-- / bitmark++]
- *  - start of resource:                     [&                 ==>   [^&                        [bitmark-- / bitmark++]
- *  - end of tag:                            ]                  ==>   ^]                         [bitmark-- / bitmark++]
+ *    <item>                                 <from>                   <to>                       <textFormat>
+ *  - hat:                                   ^                  ==>   ^^                         [--/++/+]
+ *  - hat:                                   ^^                 ==>   ^^^                        [--/++/+]
+ *  - hat:                                   ^..N               ==>   ^..N+1                     [--/++/+]
+ *  - inline:                                ==                 ==>   =^=                        [--/++/+]
+ *  - bold:                                  **                 ==>   *^*                        [--/++/+]
+ *  - light:                                 ``                 ==>   `^`                        [--/++/+]
+ *  - italic:                                __                 ==>   _^_                        [--/++/+]
+ *  - highlight:                             !!                 ==>   !^!                        [--/++/+]
+ *  - title block:                   (SOL)[##]#(space)          ==>   (SOL)[##]#^(space)         [++] <== not in tag
+ *  - new block:                     (SOL)|(WS EOL)             ==>   (SOL)|^(WS EOL)            [++] <== not in tag
+ *  - code block:                    (SOL)|code(:type)          ==>   (SOL)|^code(:type)         [++] <== not in tag
+ *  - image block:                   (SOL)|image:(url)          ==>   (SOL)|^image:(url)         [++] <== not in tag
+ *  - bullet list:                   (SOL)•(space)              ==>   (SOL)•^(space)             [++] <== not in tag
+ *  - simple list:                   (SOL)•_(space)             ==>   (SOL)•^_(space)            [++] <== not in tag
+ *  - ordered list (numeric):        (SOL)•<numbers>(space)     ==>   (SOL)•^<numbers>(space)    [++] <== not in tag
+ *  - ordered list: (roman,lower)    (SOL)•<numbers>i(space)    ==>   (SOL)•^<numbers>i(space)   [++] <== not in tag
+ *  - ordered list: (roman,upper)    (SOL)•<numbers>I(space)    ==>   (SOL)•^<numbers>I(space)   [++] <== not in tag
+ *  - ordered list:                  (SOL)•<letters>(space)     ==>   (SOL)•^<letters>(space)    [++] <== not in tag
+ *  - tag list +:                    (SOL)•+(space)             ==>   (SOL)•^+(space)            [++] <== not in tag
+ *  - tag list -:                    (SOL)•-(space)             ==>   (SOL)•^-(space)            [++] <== not in tag
+ *
+ *  - start of bit:                          [.                 ==>   [^.                        [--/++ && body]
+ *  - start of property:                     [@                 ==>   [^@                        [--/++ && body]
+ *  - start of title:                        [#                 ==>   [^#                        [--/++ && body]
+ *  - start of anchor:                       [▼                 ==>   [^▼                        [--/++ && body]
+ *  - start of reference:                    [►                 ==>   [^►                        [--/++ && body]
+ *  - start of item/lead:                    [%                 ==>   [^%                        [--/++ && body]
+ *  - start of instruction:                  [!                 ==>   [^!                        [--/++ && body]
+ *  - start of hint:                         [?                 ==>   [^?                        [--/++ && body]
+ *  - start of true statement:               [+                 ==>   [^+                        [--/++ && body]
+ *  - start of false statement:              [-                 ==>   [^-                        [--/++ && body]
+ *  - start of sample solution:              [$                 ==>   [^$                        [--/++ && body]
+ *  - start of gap:                          [_                 ==>   [^_                        [--/++ && body]
+ *  - start of mark:                         [=                 ==>   [^=                        [--/++ && body]
+ *  - start of resource:                     [&                 ==>   [^&                        [--/++ && body]
+ *  - old plain text divider:                $$$$               ==>   $^$$$                      [--/++ && body]
+ *  - old footer divider:                    ~~~~               ==>   ~^~~~                      [--/++ && body]
+ *
+ *  - start of bit:                  (SOL)[.                    ==>   (SOL)[^.                   [plain && body]
+ *  - start of bit:                  (SOL)[^.                   ==>   (SOL)[^^.                  [plain && body]
+ *  - start of bit:                  (SOL)[^..N.                ==>   (SOL)[^..N+1.              [plain && body]
+ *
+ *  - end of tag:                            ]                  ==>   ^]                         [--/++/+/plain && tag]
+ *
+ *
+ * ==============
+ * Unbreakscaping
+ * ==============
  *
- * In non- bitmark++ / bitmark-- text, breakscaping is only applied to bit tags.
- * This is true for both breakscaping and unbreakscaping.
+ * Unbreakscaping is the process of removing the breakscaping characters from a string.
+ * It is the opposite of breakscaping.
  *
- * The following unbreakscaping rules are applied when unbreakscaping plain text:
- *  - start of bit:              <line start>[^.                ==>   <line start>[.
- *  - start of bit:              <line start>[^^.               ==>   <line start>[^.
- *  - start of bit:              <line start>[^..N.             ==>   <line start>[^..N-1.
+ * In all text but plain text:
+ * ^ is always removed/reduced wherever it is found.
+ * ^^ is always needed to represent a ^.
+ *
+ * In plain text:
+ * ^ is only removed/reduced when it would break the start of a bit.
+ *
+ * The following unbreakscaping rules apply when unbreakscaping text:
+ *   <item>                                 <from>                         <to>                 <textFormat>
+ * - hat:                                   ^                   ==>                             [--/++/+]
+ * - hat:                                   ^^                  ==>        ^                    [--/++/+]
+ * - hat:                                   ^..N                ==>        ^..N-1               [--/++/+]
+ *
+ * - start of bit:                     (SOL)[^.                 ==>   (SOL)[.                   [plain && body]
+ * - start of bit:                     (SOL)[^^.                ==>   (SOL)[^.                  [plain && body]
+ * - start of bit:                     (SOL)[^..N.              ==>   (SOL)[^..N-1.             [plain && body]
  *
- * The following breakscaping rules are applied when breakscaping plain text:
- *  - start of bit:              <line start>[.                 ==>   <line start>[^.
- *  - start of bit:              <line start>[^.                ==>   <line start>[^^.
- *  - start of bit:              <line start>[^..N.             ==>   <line start>[^..N+1.
  */
 //
 // Breakscaping
 //
-const REGEX_MARKS = /([*`_!=])(?=\1)/; // $1^
-const REGEX_BLOCKS = /^(\|)(code[\s]*|code:|image:|[\s]*$)/; // $2^$3
-const REGEX_TITLE_BLOCKS = /^([#]{1,3})([^\S\r\n]+)/; // $4^$5
-const REGEX_LIST_BLOCKS = /^(•)([0-9]+[iI]*|[a-zA-Z]{1}|_|\+|-|)([^\S\r\n]+)/; // $6^$7$8
-const REGEX_START_OF_TAG = /(\[)([.@#▼►%!?+\-$_=&])/; // $9^$10   /   $2^$3
-const REGEX_FOOTER_DIVIDER = /^(~)(~~~)[ \t]*$/; // $11^$12   /   $4^$5
-const REGEX_PLAIN_TEXT_DIVIDER = /^(\$)(\$\$\$)[ \t]*$/; // $13^$14   /   $6^$7
-const REGEX_END_OF_TAG = /(\^*])/; // ^$15   /   ^$8
-const REGEX_HATS = /(\^+)/; // $16^   /   ^$9  // Must be last
-const BREAKSCAPE_PLUSPLUS_REGEX_SOURCE = `${REGEX_MARKS.source}|${REGEX_BLOCKS.source}|${REGEX_TITLE_BLOCKS.source}|${REGEX_LIST_BLOCKS.source}|${REGEX_START_OF_TAG.source}|${REGEX_FOOTER_DIVIDER.source}|${REGEX_PLAIN_TEXT_DIVIDER.source}|${REGEX_END_OF_TAG.source}|${REGEX_HATS.source}`;
-const BREAKSCAPE_MINUSMINUS_REGEX_SOURCE = `${REGEX_MARKS.source}|${REGEX_START_OF_TAG.source}|${REGEX_FOOTER_DIVIDER.source}|${REGEX_PLAIN_TEXT_DIVIDER.source}|${REGEX_END_OF_TAG.source}|${REGEX_HATS.source}`;
-const REGEX_END = /([\\[])$/; // $1^
-const BREAKSCAPE_ENDS_REGEX_SOURCE = `${REGEX_END.source}`;
-const BREAKSCAPE_PLUSPLUS_REGEX = new RegExp(BREAKSCAPE_PLUSPLUS_REGEX_SOURCE, 'gm');
-const BREAKSCAPE_PLUSPLUS_REGEX_REPLACER = '$1$2$4$6$9$11$13$16^$3$5$7$8$10$12$14$15';
-const BREAKSCAPE_MINUSMINUS_REGEX = new RegExp(BREAKSCAPE_MINUSMINUS_REGEX_SOURCE, 'gm');
-const BREAKSCAPE_MINUSMINUS_REGEX_REPLACER = '$1$2$4$6^$3$5$7$8$9';
-const BREAKSCAPE_PLAIN_IN_BODY_REGEX = new RegExp('^(\\[)(\\^*)(\\.)', 'gm');
-const BREAKSCAPE_PLAIN_IN_BODY_REGEX_REPLACER = '$1^$2$3';
-const BREAKSCAPE_TAG_REGEX = new RegExp('(\\^*)(\\])', 'gm');
-const BREAKSCAPE_TAG_REPLACER = '$1^$2';
-const BREAKSCAPE_V2_REGEX = new RegExp('^(?:(\\[)(\\^*)(\\.))|(?:(\\^+))', 'gm');
-const BREAKSCAPE_V2_REGEX_REPLACER = '$1$4^$2$3';
-const BREAKSCAPE_ENDS_REGEX = new RegExp(BREAKSCAPE_ENDS_REGEX_SOURCE, 'g');
-const BREAKSCAPE_ENDS_REGEX_REPLACER = '$1^';
-// const UNBREAKSCAPE_REGEX = new RegExp(UNBREAKSCAPE_REGEX_SOURCE, 'gm');
-// const UNBREAKSCAPE_REGEX_REPLACER = BREAKSCAPE_REGEX_REPLACER.replace(/\^/g, ''); // Remove ^ from the regex replacer
+const REGEX_MARKS = /([*`_!=])(?=\1)/; // BM_TAG: $1^  --BODY: $1^  ++BODY: $1^
+const REGEX_BLOCKS = /^(\|)(code[\s]*|code:|image:|[\s]*$)/; // ++BODY: $2^$3
+const REGEX_TITLE_BLOCKS = /^([#]{1,3})([^\S\r\n]+)/; // ++BODY: $4^$5
+const REGEX_LIST_BLOCKS = /^(•)([0-9]+[iI]*|[a-zA-Z]{1}|_|\+|-|)([^\S\r\n]+)/; // ++BODY: $6^$7$8
+const REGEX_START_OF_TAG = /(\[)([.@#▼►%!?+\-$_=&])/; // --BODY: $2^$3  ++BODY: $9^$10
+const REGEX_FOOTER_DIVIDER = /^(~)(~~~[ \t]*)$/; // --BODY: $4^$5  ++BODY: $11^$12
+const REGEX_PLAIN_TEXT_DIVIDER = /^(\$)(\$\$\$[ \t]*)$/; // --BODY: $6^$7  ++BODY: $13^$14
+const REGEX_END_OF_TAG = /(\^*])/; // BM_TAG: ^$2  PLAIN_TAG: ^$1
+const REGEX_BIT_START = /^(\[)(\^*)(\.)/; // PLAIN_BODY: $1^$2$3
+const REGEX_HATS = /(\^+)/; // BM_TAG: $3^  PLAIN_TAG: $2^  --BODY: ^$8  ++BODY: $15^  // Must be last
+const BREAKSCAPE_BITMARK_TAG_REGEX_SOURCE = `${REGEX_MARKS.source}|${REGEX_END_OF_TAG.source}|${REGEX_HATS.source}`;
+const BREAKSCAPE_PLAIN_TAG_REGEX_SOURCE = `${REGEX_END_OF_TAG.source}|${REGEX_HATS.source}`;
+const BREAKSCAPE_MINUSMINUS_BODY_REGEX_SOURCE = `${REGEX_MARKS.source}|${REGEX_START_OF_TAG.source}|${REGEX_FOOTER_DIVIDER.source}|${REGEX_PLAIN_TEXT_DIVIDER.source}|${REGEX_HATS.source}`;
+const BREAKSCAPE_PLUSPLUS_BODY_REGEX_SOURCE = `${REGEX_MARKS.source}|${REGEX_BLOCKS.source}|${REGEX_TITLE_BLOCKS.source}|${REGEX_LIST_BLOCKS.source}|${REGEX_START_OF_TAG.source}|${REGEX_FOOTER_DIVIDER.source}|${REGEX_PLAIN_TEXT_DIVIDER.source}|${REGEX_HATS.source}`;
+const BREAKSCAPE_PLAIN_BODY_REGEX_SOURCE = `${REGEX_BIT_START.source}`;
+// Breakscape regex for --/++/+ in tags
+const BREAKSCAPE_BITMARK_TAG_REGEX = new RegExp(BREAKSCAPE_BITMARK_TAG_REGEX_SOURCE, 'gm');
+const BREAKSCAPE_BITMARK_TAG_REGEX_REPLACER = '$1$3^$2';
+// Breakscape regex for plain text in tags
+const BREAKSCAPE_PLAIN_TAG_REGEX = new RegExp(BREAKSCAPE_PLAIN_TAG_REGEX_SOURCE, 'gm');
+const BREAKSCAPE_PLAIN_TAG_REGEX_REPLACER = '$2^$1';
+// Breakscape regex for --/+ in body
+const BREAKSCAPE_MINUSMINUS_BODY_REGEX = new RegExp(BREAKSCAPE_MINUSMINUS_BODY_REGEX_SOURCE, 'gm');
+const BREAKSCAPE_MINUSMINUS_BODY_REGEX_REPLACER = '$1$2$4$6^$3$5$7$8';
+// Breakscape regex for ++ in body
+const BREAKSCAPE_PLUSPLUS_BODY_REGEX = new RegExp(BREAKSCAPE_PLUSPLUS_BODY_REGEX_SOURCE, 'gm');
+const BREAKSCAPE_PLUSPLUS_BODY_REGEX_REPLACER = '$1$2$4$6$9$11$13$15^$3$5$7$8$10$12$14';
+// Breakscape regex for plain text in body
+const BREAKSCAPE_PLAIN_BODY_REGEX = new RegExp(BREAKSCAPE_PLAIN_BODY_REGEX_SOURCE, 'gm');
+const BREAKSCAPE_PLAIN_BODY_REGEX_REPLACER = '$1^$2$3';
+// Breakscape regex for v2 tag. Not required, same as BREAKSCAPE_PLAIN_TAG_REGEX
+// const BREAKSCAPE_V2_TAG_REGEX = new RegExp('^(\\^*])|(\\^+)', 'gm');
+// const BREAKSCAPE_V2_TAG_REGEX_REPLACER = '$2^$1';
+// Breakscape regex for v2 body
+const BREAKSCAPE_V2_BODY_REGEX = new RegExp('^(?:(\\[)(\\^*)(\\.))|(\\^+)', 'gm');
+const BREAKSCAPE_V2_BODY_REGEX_REPLACER = '$1$4^$2$3';
+// Unbreakscape regex for everything but plain text in the body
 const UNBREAKSCAPE_REGEX = new RegExp('\\^([\\^]*)', 'gm');
 const UNBREAKSCAPE_REGEX_REPLACER = '$1';
-const UNBREAKSCAPE_TAG_REGEX = new RegExp('\\^(\\^*)(\\])', 'gm');
-const UNBREAKSCAPE_TAG_REPLACER = '$1$2';
+// Unbreakscape regex for plain text in the body
 const UNBREAKSCAPE_PLAIN_IN_BODY_REGEX = new RegExp('^(\\[)\\^(\\^*)(\\.)', 'gm');
 const UNBREAKSCAPE_PLAIN_IN_BODY_REGEX_REPLACER = '$1$2$3';
 // Regex explanation:
 // - match a single | or • or # character at the start of a line and capture in group 1
 // This will capture all new block characters within the code text.
 // Replace with group 1, ^
+// TODO: Not sure this is used any longer. #code blocks are not separate bits as far as I am aware?
 const BREAKSCAPE_CODE_REGEX = new RegExp('^(\\||•|#)', 'gm');
 const BREAKSCAPE_CODE_REGEX_REPLACER = '$1^';
 const DEFAULT_BREAKSCAPE_OPTIONS = {
     textFormat: TextFormat_1.TextFormat.bitmarkMinusMinus,
+    textLocation: TextLocation_1.TextLocation.body,
 };
 class Breakscape {
     constructor() {
@@ -135,50 +169,16 @@ class Breakscape {
         if (val == null)
             return val;
         const opts = Object.assign({}, DEFAULT_BREAKSCAPE_OPTIONS, options);
+        // Select the correct regex and replacer for the text format and location
+        const { regex, replacer } = this.selectBreakscapeRegexAndReplacer(opts.textFormat, opts.textLocation, opts.v2);
         const breakscapeStr = (str) => {
             if (!str)
                 return str;
-            let regex = BREAKSCAPE_PLAIN_IN_BODY_REGEX;
-            let replacer = BREAKSCAPE_PLAIN_IN_BODY_REGEX_REPLACER;
-            if (opts.textFormat === TextFormat_1.TextFormat.tag) {
-                regex = BREAKSCAPE_TAG_REGEX;
-                replacer = BREAKSCAPE_TAG_REPLACER;
-            }
-            else if (opts.textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus) {
-                if (opts.v2) {
-                    // Hack for v2 breakscaping
-                    regex = BREAKSCAPE_V2_REGEX;
-                    replacer = BREAKSCAPE_V2_REGEX_REPLACER;
-                }
-                else {
-                    regex = BREAKSCAPE_MINUSMINUS_REGEX;
-                    replacer = BREAKSCAPE_MINUSMINUS_REGEX_REPLACER;
-                }
-            }
-            else if (opts.textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus) {
-                if (opts.v2) {
-                    // Hack for v2 breakscaping
-                    regex = BREAKSCAPE_V2_REGEX;
-                    replacer = BREAKSCAPE_V2_REGEX_REPLACER;
-                }
-                else {
-                    regex = BREAKSCAPE_PLUSPLUS_REGEX;
-                    replacer = BREAKSCAPE_PLUSPLUS_REGEX_REPLACER;
-                }
-            }
             str = str.replace(regex, replacer);
-            // Ends - ensures that the start and end of the string are breakscaped in cases where the ends could otherwise
-            // come together to form a recognized sequence
-            // TODO: this should not be needed in the future
-            if (!opts.v2) {
-                if (opts.textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || opts.textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus) {
-                    str = str.replace(BREAKSCAPE_ENDS_REGEX, BREAKSCAPE_ENDS_REGEX_REPLACER);
-                }
-            }
             return str;
         };
         if (Array.isArray(val)) {
-            const newVal = opts.modifyArray ? val : [val.length];
+            const newVal = opts.modifyArray ? val : new Array(val.length);
             for (let i = 0, len = val.length; i < len; i++) {
                 const v = val[i];
                 if (StringUtils_1.StringUtils.isString(v)) {
@@ -204,24 +204,16 @@ class Breakscape {
         if (val == null)
             return val;
         const opts = Object.assign({}, DEFAULT_BREAKSCAPE_OPTIONS, options);
+        // Select the correct regex and replacer for the text format and location
+        const { regex, replacer } = this.selectUnbreakscapeRegexAndReplacer(opts.textFormat, opts.textLocation);
         const unbreakscapeStr = (str) => {
             if (!str)
                 return str;
-            let regex = UNBREAKSCAPE_PLAIN_IN_BODY_REGEX;
-            let replacer = UNBREAKSCAPE_PLAIN_IN_BODY_REGEX_REPLACER;
-            if (opts.textFormat === TextFormat_1.TextFormat.tag) {
-                regex = UNBREAKSCAPE_TAG_REGEX;
-                replacer = UNBREAKSCAPE_TAG_REPLACER;
-            }
-            else if (opts.textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || opts.textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus) {
-                regex = UNBREAKSCAPE_REGEX;
-                replacer = UNBREAKSCAPE_REGEX_REPLACER;
-            }
             str = str.replace(regex, replacer);
             return str;
         };
         if (Array.isArray(val)) {
-            const newVal = opts.modifyArray ? val : [];
+            const newVal = opts.modifyArray ? val : new Array(val.length);
             for (let i = 0, len = val.length; i < len; i++) {
                 const v = val[i];
                 if (StringUtils_1.StringUtils.isString(v)) {
@@ -270,6 +262,71 @@ class Breakscape {
         }
         return val;
     }
+    /**
+     * For breakscaping, select the correct regex and replacer for the text format and location.
+     *
+     * @param textFormat the format of the text
+     * @param textLocation the location of the text
+     * @param v2 if true, use v2 breakscaping
+     * @returns the regex and replacer
+     */
+    selectBreakscapeRegexAndReplacer(textFormat, textLocation, v2) {
+        let regex;
+        let replacer;
+        if (textLocation === TextLocation_1.TextLocation.tag) {
+            regex = BREAKSCAPE_PLAIN_TAG_REGEX;
+            replacer = BREAKSCAPE_PLAIN_TAG_REGEX_REPLACER;
+            if (!v2 && (textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus)) {
+                regex = BREAKSCAPE_BITMARK_TAG_REGEX;
+                replacer = BREAKSCAPE_BITMARK_TAG_REGEX_REPLACER;
+            }
+        }
+        else {
+            // if (textLocation === TextLocation.body) {
+            regex = BREAKSCAPE_PLAIN_BODY_REGEX;
+            replacer = BREAKSCAPE_PLAIN_BODY_REGEX_REPLACER;
+            if (textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus) {
+                if (v2) {
+                    // Hack for v2 breakscaping (still needed??)
+                    regex = BREAKSCAPE_V2_BODY_REGEX;
+                    replacer = BREAKSCAPE_V2_BODY_REGEX_REPLACER;
+                }
+                else {
+                    regex = BREAKSCAPE_MINUSMINUS_BODY_REGEX;
+                    replacer = BREAKSCAPE_MINUSMINUS_BODY_REGEX_REPLACER;
+                }
+            }
+            else if (textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus) {
+                if (v2) {
+                    // Hack for v2 breakscaping (still needed??)
+                    regex = BREAKSCAPE_V2_BODY_REGEX;
+                    replacer = BREAKSCAPE_V2_BODY_REGEX_REPLACER;
+                }
+                else {
+                    regex = BREAKSCAPE_PLUSPLUS_BODY_REGEX;
+                    replacer = BREAKSCAPE_PLUSPLUS_BODY_REGEX_REPLACER;
+                }
+            }
+        }
+        return { regex, replacer };
+    }
+    /**
+     * For unbreakscaping, select the correct regex and replacer for the text format and location.
+     *
+     * @param textFormat the format of the text
+     * @param textLocation the location of the text
+     * @returns the regex and replacer
+     */
+    selectUnbreakscapeRegexAndReplacer(textFormat, textLocation) {
+        const isPlain = !(textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus);
+        let regex = UNBREAKSCAPE_REGEX;
+        let replacer = UNBREAKSCAPE_REGEX_REPLACER;
+        if (textLocation === TextLocation_1.TextLocation.body && isPlain) {
+            regex = UNBREAKSCAPE_PLAIN_IN_BODY_REGEX;
+            replacer = UNBREAKSCAPE_PLAIN_IN_BODY_REGEX_REPLACER;
+        }
+        return { regex, replacer };
+    }
     /**
      * Concatenate two breakscaped strings.
      *

package/dist/cjs/breakscaping/Breakscape.js.map

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

package/dist/cjs/config/raw/bits.js

@@ -1154,6 +1154,7 @@ const BITS = {
         cardSet: CardSetConfigKey_1.CardSetConfigKey._flashcard,
     },
     [BitType_1.BitType.flashcard1]: { since: '1.3.0', baseBitType: BitType_1.BitType.flashcard },
+    [BitType_1.BitType.qAndACard]: { since: '3.25.0', baseBitType: BitType_1.BitType.flashcard1 },
     [BitType_1.BitType.focusImage]: {
         since: '1.3.0',
         baseBitType: BitType_1.BitType.image,
@@ -2229,6 +2230,16 @@ const BITS = {
             },
         ],
     },
+    [BitType_1.BitType.tocInline]: {
+        since: '3.24.0',
+        baseBitType: BitType_1.BitType.toc,
+        tags: [
+            {
+                type: BitTagType_1.BitTagType.property,
+                configKey: PropertyConfigKey_1.PropertyConfigKey.maxTocChapterLevel,
+            },
+        ],
+    },
     [BitType_1.BitType.anchor]: { since: '1.3.0', baseBitType: BitType_1.BitType._standard },
     [BitType_1.BitType.bitBookEnding]: { since: '1.3.0', baseBitType: BitType_1.BitType._standard },
     [BitType_1.BitType.bitBookSummary]: { since: '1.3.0', baseBitType: BitType_1.BitType._standard },