@gmb/bitmark-parser-generator 1.34.0 → 2.0.0

package/dist/esm/generator/json/JsonGenerator.js

@@ -24,19 +24,16 @@ import { Config } from '../../config/Config';
 import { NodeType } from '../../model/ast/NodeType';
 import { BitType } from '../../model/enum/BitType';
 import { BitmarkVersion, DEFAULT_BITMARK_VERSION } from '../../model/enum/BitmarkVersion';
-import { BodyBitType } from '../../model/enum/BodyBitType';
 import { ExampleType } from '../../model/enum/ExampleType';
-import { PropertyAstKey } from '../../model/enum/PropertyAstKey';
-import { PropertyTag } from '../../model/enum/PropertyTag';
 import { ResourceTag } from '../../model/enum/ResourceTag';
 import { TextFormat } from '../../model/enum/TextFormat';
+import { TextNodeType } from '../../model/enum/TextNodeType';
 import { TextParser } from '../../parser/text/TextParser';
 import { ArrayUtils } from '../../utils/ArrayUtils';
 import { BooleanUtils } from '../../utils/BooleanUtils';
 import { NumberUtils } from '../../utils/NumberUtils';
-import { StringUtils } from '../../utils/StringUtils';
-import { UrlUtils } from '../../utils/UrlUtils';
 import { AstWalkerGenerator } from '../AstWalkerGenerator';
+import { TextGenerator } from '../text/TextGenerator';
 const DEFAULT_OPTIONS = {
 // debugGenerationInline: true,
 };
@@ -64,7 +61,13 @@ class JsonGenerator extends AstWalkerGenerator {
         this.textDefault = Breakscape.EMPTY_STRING;
         this.bodyDefault = Breakscape.EMPTY_STRING;
         this.bodyJson = this.bodyDefault;
-        this.startPlaceholderIndex = 0;
+        this.placeholderIndex = 0;
+        // Bind callbacks
+        this.enter = this.enter.bind(this);
+        this.between = this.between.bind(this);
+        this.exit = this.exit.bind(this);
+        this.leaf = this.leaf.bind(this);
+        this.bodyBitCallback = this.bodyBitCallback.bind(this);
         this.bitmarkVersion = (_a = BitmarkVersion.fromValue(options === null || options === void 0 ? void 0 : options.bitmarkVersion)) !== null && _a !== void 0 ? _a : DEFAULT_BITMARK_VERSION;
         this.textParserVersion = this.textParser.version();
         this.options = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options === null || options === void 0 ? void 0 : options.jsonOptions);
@@ -81,11 +84,13 @@ class JsonGenerator extends AstWalkerGenerator {
                 this.options.textAsPlainText = false;
             }
         }
+        // Create the text generator for generating v2 texts
+        this.textGenerator = new TextGenerator(this.bitmarkVersion, {
+            // writeCallback: this.write,
+            bodyBitCallback: this.bodyBitCallback,
+            debugGenerationInline: this.debugGenerationInline,
+        });
         this.writer = writer;
-        this.enter = this.enter.bind(this);
-        this.between = this.between.bind(this);
-        this.exit = this.exit.bind(this);
-        this.leaf = this.leaf.bind(this);
         this.generatePropertyHandlers();
     }
     /**
@@ -129,7 +134,8 @@ class JsonGenerator extends AstWalkerGenerator {
         this.textDefault = this.options.textAsPlainText ? Breakscape.EMPTY_STRING : [];
         this.bodyDefault = this.options.textAsPlainText ? Breakscape.EMPTY_STRING : [];
         this.bodyJson = this.bodyDefault;
-        this.startPlaceholderIndex = 0;
+        this.listItem = undefined;
+        this.placeholderIndex = 0;
         this.printed = false;
     }
     walkAndWrite(ast) {
@@ -147,6 +153,16 @@ class JsonGenerator extends AstWalkerGenerator {
         // Reset the JSON
         this.json = [];
     }
+    exit_bitmarkAst(_node, _route) {
+        // Convert all bitmark text to plain text if required
+        if (this.options.textAsPlainText) {
+            // Convert all bitmark text to plain text
+            this.convertAllBitmarkTextsToStringsForPlainText(this.json);
+        }
+        // Walk the entire json object and remove all' '_xxx' properties
+        // (which are used to store temporary data during the generation process)
+        this.removeTemporaryProperties(this.json);
+    }
     // bitmarkAst -> bits
     // bitmarkAst -> bits -> bitsValue
     enter_bitsValue(node, _route) {
@@ -180,7 +196,7 @@ class JsonGenerator extends AstWalkerGenerator {
             }
             else {
                 // String example
-                defaultExample = (_c = Breakscape.unbreakscape(ArrayUtils.asSingle(bit.sampleSolution))) !== null && _c !== void 0 ? _c : '';
+                defaultExample = (_c = ArrayUtils.asSingle(bit.sampleSolution)) !== null && _c !== void 0 ? _c : '';
             }
             const exampleRes = this.toExample(bit, {
                 defaultExample,
@@ -192,87 +208,34 @@ class JsonGenerator extends AstWalkerGenerator {
         else if (bit.isExample) {
             this.bitJson.isExample = true;
         }
+        // Reset the placeholder index
+        this.placeholderIndex = 0;
     }
     exit_bitsValue(_node, _route) {
         // Clean up the bit JSON, removing any unwanted values
-        this.cleanAndSetDefaultsForBitJson(this.bitJson);
+        this.cleanBitJson(this.bitJson);
     }
     // bitmarkAst -> bits -> bitsValue -> imageSource
     enter_imageSource(node, route) {
-        const imageSource = node.value;
-        // Ignore values that are not at the bit level as they might be handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        const { url, mockupId, size, format, trim } = imageSource;
-        const imageSourceJson = {};
-        this.addProperty(imageSourceJson, 'url', url !== null && url !== void 0 ? url : '', true);
-        this.addProperty(imageSourceJson, 'mockupId', mockupId !== null && mockupId !== void 0 ? mockupId : '', true);
-        this.addProperty(imageSourceJson, 'size', size !== null && size !== void 0 ? size : null, true);
-        this.addProperty(imageSourceJson, 'format', format !== null && format !== void 0 ? format : null, true);
-        this.addProperty(imageSourceJson, 'trim', BooleanUtils.isBoolean(trim) ? trim : null, true);
-        this.bitJson.imageSource = imageSourceJson;
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> person
     enter_person(node, route) {
-        const person = node.value;
         const bitType = this.getBitType(route);
-        // Ignore values that are not at the bit level as they might be handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue || !bitType)
-            return;
-        const { name, title, avatarImage } = person;
-        const personJson = {};
-        this.addProperty(personJson, 'name', name !== null && name !== void 0 ? name : '', true);
-        if (title) {
-            this.addProperty(personJson, 'title', title, true);
-        }
-        if (avatarImage) {
-            const res = this.parseResourceToJson(bitType, avatarImage);
-            if (res && res.type === ResourceTag.image) {
-                personJson.avatarImage = res.image;
-            }
-        }
+        let keyOverride = 'person';
         if (Config.isOfBitType(bitType, BitType.conversationLeft1)) {
             // Use the legacy partner property in the JSON for conversation bits, so change to person is backwards compatible
-            this.bitJson.partner = personJson;
-        }
-        else {
-            this.bitJson.person = personJson;
+            keyOverride = 'partner';
         }
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false, keyOverride });
     }
     // bitmarkAst -> bits -> bitsValue -> ratingLevelStart
     enter_ratingLevelStart(node, route) {
-        const json = this.enterRatingLevelStartEndCommon(node, route);
-        if (json)
-            this.bitJson.ratingLevelStart = json;
-        // Stop traversal of this branch
-        return false;
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> ratingLevelEnd
     enter_ratingLevelEnd(node, route) {
-        const json = this.enterRatingLevelStartEndCommon(node, route);
-        if (json)
-            this.bitJson.ratingLevelEnd = json;
-        // Stop traversal of this branch
-        return false;
-    }
-    // Common code for ratingLevelStart and ratingLevelEnd
-    enterRatingLevelStartEndCommon(node, route) {
-        const n = node.value;
-        // Ignore statements that are not at the bit level
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        const json = {};
-        this.addProperty(json, 'level', n.level, true);
-        if (n.label) {
-            json.label = this.convertBreakscapedStringToJsonText(n.label, TextFormat.bitmarkMinusMinus);
-        }
-        // Delete unwanted properties
-        if ((json === null || json === void 0 ? void 0 : json.label) == null)
-            delete json.label;
-        return json;
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> productId
     enter_productId(node, route) {
@@ -280,53 +243,76 @@ class JsonGenerator extends AstWalkerGenerator {
         // Ignore item that is not at the correct level
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
+            return true;
         const bitType = this.getBitType(route);
         if (bitType === BitType.module) {
-            this.addProperty(this.bitJson, 'productId', productIds);
+            this.addProperty(this.bitJson, 'productId', productIds, { array: true });
         }
         else if (productIds.length > 0) {
-            this.addProperty(this.bitJson, 'productId', productIds[productIds.length - 1], true);
+            this.addProperty(this.bitJson, 'productId', productIds[productIds.length - 1], { array: false });
         }
+        // Stop traversal of this branch
+        return false;
+    }
+    // bitmarkAst -> bits -> bitsValue -> markConfig
+    enter_markConfig(_node, _route) {
+        // Handler so markConfig is not processed by the default property handler
+        // Continue traversal
+        return true;
     }
     // bitmarkAst -> bits -> bitsValue -> markConfig -> markConfigValue
     enter_markConfigValue(node, route) {
-        const markConfig = node.value;
+        const markJson = node.value;
         // Ignore item that is not at the correct level
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.markConfig)
-            return;
-        const { mark, color, emphasis } = markConfig;
-        const markJson = {};
-        this.addProperty(markJson, 'mark', mark !== null && mark !== void 0 ? mark : 'unknown', true);
-        if (color)
-            this.addProperty(markJson, 'color', color !== null && color !== void 0 ? color : '', true);
-        if (emphasis)
-            this.addProperty(markJson, 'emphasis', emphasis !== null && emphasis !== void 0 ? emphasis : '', true);
+            return true;
         if (!this.bitJson.marks)
             this.bitJson.marks = [];
         this.bitJson.marks.push(markJson);
+        // Stop traversal of this branch
+        return false;
     }
-    // bitmarkAst -> bits -> bitsValue -> itemLead
-    enter_itemLead(node, route) {
-        const itemLead = node.value;
-        const { item, lead, pageNumber, marginNumber } = itemLead;
-        // Ignore item / lead that are not at the bit level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        if (item != null) {
-            this.bitJson.item = this.convertBreakscapedStringToJsonText(item, TextFormat.bitmarkMinusMinus);
-        }
-        if (lead != null) {
-            this.bitJson.lead = this.convertBreakscapedStringToJsonText(lead, TextFormat.bitmarkMinusMinus);
-        }
-        if (pageNumber != null) {
-            this.bitJson.pageNumber = this.convertBreakscapedStringToJsonText(pageNumber, TextFormat.bitmarkMinusMinus);
-        }
-        if (marginNumber != null) {
-            this.bitJson.marginNumber = this.convertBreakscapedStringToJsonText(marginNumber, TextFormat.bitmarkMinusMinus);
-        }
+    // bitmarkAst -> bits -> bitsValue -> item
+    enter_item(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> lead
+    enter_lead(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> pageNumber
+    enter_pageNumber(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> marginNumber
+    enter_marginNumber(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> hint
+    enter_hint(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> instruction
+    enter_instruction(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    // bitmarkAst -> bits -> bitsValue -> title
+    enter_title(node, route) {
+        // // Ignore title that are not at the bit or card node level as they are handled elsewhere
+        // const parent = this.getParentNode(route);
+        // if (parent?.key !== NodeType.bitsValue && parent?.key !== NodeType.cardNode) return;
+        // this.bitJson.title = node.value;
+        return this.standardHandler(node, route, [NodeType.bitsValue, NodeType.cardNode], { array: true });
+    }
+    //  bitmarkAst -> bits -> bitsValue -> subtitle
+    enter_subtitle(node, route) {
+        // this.bitJson.subtitle = node.value;
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
+    }
+    //  bitmarkAst -> bits -> bitsValue -> caption
+    enter_caption(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> width
     enter_width(node, route) {
@@ -338,8 +324,7 @@ class JsonGenerator extends AstWalkerGenerator {
             value = (_a = NumberUtils.asNumber(value, 0)) !== null && _a !== void 0 ? _a : 0;
         }
         // Add the property
-        this.addProperty(this.bitJson, 'width', value, true);
-        return false;
+        return this.standardHandler(node, route, undefined, { array: false, valueOverride: value });
     }
     // bitmarkAst -> bits -> bitsValue -> height
     enter_height(node, route) {
@@ -351,8 +336,7 @@ class JsonGenerator extends AstWalkerGenerator {
             value = (_a = NumberUtils.asNumber(value, 0)) !== null && _a !== void 0 ? _a : 0;
         }
         // Add the property
-        this.addProperty(this.bitJson, 'height', value, true);
-        return false;
+        return this.standardHandler(node, route, undefined, { array: false, valueOverride: value });
     }
     // bitmarkAst -> bits -> bitsValue -> extraProperties
     enter_extraProperties(node, _route) {
@@ -363,12 +347,14 @@ class JsonGenerator extends AstWalkerGenerator {
                 if (Object.prototype.hasOwnProperty.call(this.bitJson, key)) {
                     k = `_${key}`;
                 }
-                this.addProperty(this.bitJson, k, values);
+                this.addProperty(this.bitJson, k, values, { array: true });
             }
         }
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> cardBits -> cardBitsValue
     enter_cardBitsValue(node, route) {
+        var _a, _b, _c, _d;
+        const cardBit = node.value;
         // How cardBits are handled depends on the bit type
         const bitType = this.getBitType(route);
         if (!bitType)
@@ -386,7 +372,14 @@ class JsonGenerator extends AstWalkerGenerator {
             listItems = this.bitJson.listItems;
         }
         // Create this list item
-        this.listItem = Object.assign(Object.assign({}, this.toItemLeadHintInstruction(node.value)), { body: this.bodyDefault });
+        this.listItem = {
+            item: ((_a = cardBit.item) !== null && _a !== void 0 ? _a : []),
+            lead: ((_b = cardBit.lead) !== null && _b !== void 0 ? _b : []),
+            hint: ((_c = cardBit.hint) !== null && _c !== void 0 ? _c : []),
+            instruction: ((_d = cardBit.instruction) !== null && _d !== void 0 ? _d : []),
+            // ...this.toItemLeadHintInstruction(node.value),
+            body: this.bodyDefault,
+        };
         // Delete unwanted properties
         // const nv = node.value;
         // const li: Partial<ListItemJson> = this.listItem;
@@ -396,208 +389,58 @@ class JsonGenerator extends AstWalkerGenerator {
         this.listItem = undefined;
     }
     // bitmarkAst -> bits -> bitsValue -> body
-    enter_body(_node, _route) {
-        // Override the bodyDefault if the textFormat is json
-        const textFormat = this.getTextFormat(_route);
-        if (textFormat === TextFormat.json)
-            this.bodyDefault = null;
-        this.bodyJson = this.bodyDefault;
-    }
-    exit_body(_node, route) {
+    enter_body(node, route) {
+        const value = node.value;
         const parent = this.getParentNode(route);
         if (!parent)
-            return;
+            return false;
+        const textFormat = this.getTextFormat(route);
+        const isBitmarkText = textFormat === TextFormat.bitmarkMinusMinus || textFormat === TextFormat.bitmarkPlusPlus;
+        this.bodyJson = value.body;
+        // Set the correct body property
         if (parent.key === NodeType.bitsValue) {
             // Body is at the bit level
             this.bitJson.body = this.bodyJson;
+            // Convert the body to plain text if required
+            if (this.options.textAsPlainText && isBitmarkText && this.isBitmarkText(this.bodyJson)) {
+                const textBody = this.textGenerator.generateSync(this.bodyJson, textFormat);
+                this.bitJson.body = (Breakscape.unbreakscape(textBody, {
+                    textFormat: TextFormat.bitmarkMinusMinus,
+                }) || '').trim();
+            }
         }
         else if (parent.key === NodeType.cardBitsValue) {
             // Body is at the list item (card bit) level
             if (this.listItem)
                 this.listItem.body = this.bodyJson;
         }
-    }
-    // bitmarkAst -> bits -> bitsValue -> * -> bodyParts (body, cardBody (e.g. cloze-list, page-footer))
-    enter_bodyParts(node, route) {
-        const bodyParts = node.value;
-        const plainText = this.options.textAsPlainText;
-        const textFormat = this.getTextFormat(route);
-        let fullBodyTextStr = '';
-        let placeholderIndex = this.startPlaceholderIndex;
-        // Function for creating the placeholder keys
-        const createPlaceholderKeys = (i) => {
-            return {
-                // Old placeholder style (for backwards compatibility) = {0}
-                legacyPlaceholderKey: `{${i}}`,
-                // New placeholder style (cannot clash as bitmark parser would have removed it) = [!0]
-                placeholderKey: `[!${i}]`,
-            };
-        };
-        // Loop the text bodyParts creating full body text with the correct placeholders
-        //
-        // For text output 'fullBodyTextStr:
-        // - is created and written to the JSON
-        // - has placeholders inserted into 'fullBodyTextStr' in the format {0}
-        //
-        // For JSON output 'fullBodyTextStr:
-        // - is created and passed into the text parser to create the body text AST
-        // - has placeholders inserted into 'fullBodyTextStr' in the format [!0] to allow the text parser to identify
-        //   where the body bits should be inserted
-        //
-        for (let i = 0; i < bodyParts.length; i++) {
-            const bodyPart = bodyParts[i];
-            const isText = bodyPart.type === BodyBitType.text;
-            if (isText) {
-                const asText = bodyPart;
-                const bodyTextPart = asText.data.bodyText;
-                // Append the text part to the full text body
-                fullBodyTextStr = Breakscape.concatenate(fullBodyTextStr, bodyTextPart);
-            }
-            else {
-                const { legacyPlaceholderKey, placeholderKey } = createPlaceholderKeys(placeholderIndex);
-                // Append the placeholder to the full text body
-                fullBodyTextStr = Breakscape.concatenate(fullBodyTextStr, plainText ? legacyPlaceholderKey : placeholderKey);
-                placeholderIndex++;
-            }
-        }
-        // Add string or AST to the body
-        this.bodyJson = this.convertBreakscapedStringToJsonText(fullBodyTextStr, textFormat);
-        const bodyAst = this.bodyJson;
-        // Loop the body parts again to create the body bits:
-        // - For text output the body bits are inserted into the 'placeholders' object
-        // - For JSON output the body bits are inserted into body AST, replacing the placeholders created by the text parser
-        placeholderIndex = this.startPlaceholderIndex;
-        for (let i = 0; i < bodyParts.length; i++) {
-            const bodyPart = bodyParts[i];
-            // Skip text body parts as they are handled above
-            const isText = bodyPart.type === BodyBitType.text;
-            if (isText)
-                continue;
-            const bodyBit = bodyPart;
-            let bodyBitJson;
-            const { legacyPlaceholderKey } = createPlaceholderKeys(placeholderIndex);
-            switch (bodyPart.type) {
-                case BodyBitType.gap: {
-                    const gap = bodyBit;
-                    bodyBitJson = this.createGapJson(gap);
-                    break;
-                }
-                case BodyBitType.mark: {
-                    const mark = bodyBit;
-                    bodyBitJson = this.createMarkJson(mark);
-                    break;
-                }
-                case BodyBitType.select: {
-                    const select = bodyBit;
-                    bodyBitJson = this.createSelectJson(select);
-                    break;
-                }
-                case BodyBitType.highlight: {
-                    const highlight = bodyBit;
-                    bodyBitJson = this.createHighlightJson(highlight);
-                    break;
-                }
-            }
-            // Add the gap to the placeholders
-            if (bodyBitJson) {
-                if (plainText) {
-                    // Ensure placeholders exists
-                    if (!this.bitJson.placeholders)
-                        this.bitJson.placeholders = {};
-                    // Add the body bit to the placeholders
-                    this.bitJson.placeholders[legacyPlaceholderKey] = bodyBitJson;
-                }
-                else {
-                    // Insert the body bit into the body AST
-                    this.replacePlaceholderWithBodyBit(bodyAst, bodyBitJson, placeholderIndex);
-                }
-            }
-            placeholderIndex++;
-        }
-        // Save the current placeholder index for the next body (body, card bodies)
-        this.startPlaceholderIndex = placeholderIndex;
-        // Stop traversal of this branch for efficiency
+        // Stop traversal of this branch
         return false;
     }
-    // bitmarkAst -> bits -> bitsValue -> * -> bodyJson (body when textFormat === TextFormat.json)
-    enter_bodyJson(node, _route) {
-        const bodyJson = node.value;
-        // NOTE: type is not really JsonText, but unknown, but it is better for type checking to use JsonText for
-        // the bodyJson property in the BitJson interface
-        this.bodyJson = bodyJson;
-        // Stop traversal of this branch to avoid processing the bodyJson
-        return false;
+    bodyBitCallback(bodyBit, _index, _route) {
+        // console.log('bodyBitCallback', bodyBit, index, route);
+        var _a;
+        const placeholder = `{${this.placeholderIndex}}`;
+        this.placeholderIndex++;
+        this.bitJson.placeholders = (_a = this.bitJson.placeholders) !== null && _a !== void 0 ? _a : {};
+        this.bitJson.placeholders[placeholder] = bodyBit;
+        return placeholder;
+    }
+    // bitmarkAst -> bits -> bitsValue -> footer
+    enter_footer(node, route) {
+        return this.standardHandler(node, route, undefined, { array: true, valueOverride: node.value.footer });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> elements
-    enter_elements(node, _route) {
-        const elements = node.value;
-        // Ignore elements that are not at the bit level as they are handled elsewhere as quizzes
-        // if (parent?.key !== NodeType.bitsValue) return;
-        if (elements && elements.length > 0) {
-            this.bitJson.elements = Breakscape.unbreakscape(elements);
-        }
+    enter_elements(node, route) {
+        return this.standardHandler(node, route, undefined, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards
     enter_flashcards(node, route) {
-        var _a, _b, _c, _d;
-        const flashcards = node.value;
-        // Ignore responses that are not at the correct level as they are potentially handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const flashcardsJson = [];
-        if (flashcards) {
-            for (const c of flashcards) {
-                // Create the flashcard
-                const flashcardJson = Object.assign(Object.assign({ question: this.convertBreakscapedStringToJsonText((_a = c.question) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus), answer: this.convertBreakscapedStringToJsonText((_b = c.answer) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus), alternativeAnswers: ((_c = c.alternativeAnswers) !== null && _c !== void 0 ? _c : []).map((a) => this.convertBreakscapedStringToJsonText(a !== null && a !== void 0 ? a : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus)) }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
-                    defaultExample: c.isDefaultExample,
-                    isBoolean: true,
-                }));
-                // Delete unwanted properties
-                if (((_d = c.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
-                    delete flashcardJson.lead;
-                flashcardsJson.push(flashcardJson);
-            }
-        }
-        if (flashcardsJson.length > 0) {
-            this.bitJson.cards = flashcardsJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true, keyOverride: 'cards' });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> definitions
     enter_definitions(node, route) {
-        var _a, _b, _c, _d;
-        const definitionListItem = node.value;
-        // Ignore responses that are not at the correct level as they are potentially handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const definitionsJson = [];
-        if (definitionListItem) {
-            for (const c of definitionListItem) {
-                // Create the flashcard
-                const definitionListItemJson = Object.assign(Object.assign({ term: this.convertBreakscapedStringToJsonText((_a = c.term) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus), description: this.convertBreakscapedStringToJsonText((_b = c.description) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus), alternativeDefinitions: ((_c = c.alternativeDefinitions) !== null && _c !== void 0 ? _c : []).map((a) => this.convertBreakscapedStringToJsonText(a !== null && a !== void 0 ? a : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus)) }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
-                    defaultExample: c.isDefaultExample,
-                    isBoolean: true,
-                }));
-                // Delete unwanted properties
-                if (((_d = c.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
-                    delete definitionListItemJson.lead;
-                // description-list is an alias of definition-list. Just rename the properties
-                if (Config.isOfBitType(this.getBitType(route), BitType.descriptionList)) {
-                    definitionListItemJson.alternativeDescriptions = definitionListItemJson.alternativeDefinitions;
-                    delete definitionListItemJson.alternativeDefinitions;
-                }
-                definitionsJson.push(definitionListItemJson);
-            }
-        }
-        if (definitionsJson.length > 0) {
-            if (Config.isOfBitType(this.getBitType(route), BitType.descriptionList)) {
-                this.bitJson.descriptions = definitionsJson;
-            }
-            else {
-                this.bitJson.definitions = definitionsJson;
-            }
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> statement
     enter_statement(node, route) {
@@ -608,405 +451,74 @@ class JsonGenerator extends AstWalkerGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
             return;
         if (statement) {
-            this.bitJson.statement = (_a = Breakscape.unbreakscape(statement.text)) !== null && _a !== void 0 ? _a : '';
+            this.bitJson.statement = (_a = statement.statement) !== null && _a !== void 0 ? _a : '';
             this.bitJson.isCorrect = (_b = statement.isCorrect) !== null && _b !== void 0 ? _b : false;
+            this.bitJson.example = statement.example;
+            this.bitJson.isExample = statement.isExample;
         }
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> statements -> statementsValue
     enter_statements(node, route) {
-        var _a, _b, _c;
-        const statements = node.value;
-        // Ignore statements that are not at the card node level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const statementsJson = [];
-        if (statements) {
-            for (const s of statements) {
-                // Create the statement
-                const statementJson = Object.assign(Object.assign({ statement: (_a = Breakscape.unbreakscape(s.text)) !== null && _a !== void 0 ? _a : '', isCorrect: !!s.isCorrect }, this.toItemLeadHintInstruction(s)), this.toExample(s, {
-                    defaultExample: !!s.isCorrect,
-                    isBoolean: true,
-                }));
-                // Delete unwanted properties
-                if (((_b = s.itemLead) === null || _b === void 0 ? void 0 : _b.item) == null)
-                    delete statementJson.item;
-                if (((_c = s.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
-                    delete statementJson.lead;
-                if ((s === null || s === void 0 ? void 0 : s.hint) == null)
-                    delete statementJson.hint;
-                if ((s === null || s === void 0 ? void 0 : s.instruction) == null)
-                    delete statementJson.instruction;
-                statementsJson.push(statementJson);
-            }
-        }
-        if (statementsJson.length > 0) {
-            this.bitJson.statements = statementsJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> choices
     // X bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> choices
     enter_choices(node, route) {
-        var _a, _b, _c;
-        const choices = node.value;
-        // Ignore choices that are not at the bit level as they are handled elsewhere as quizzes
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const choicesJson = [];
-        if (choices) {
-            for (const c of choices) {
-                // Create the choice
-                const choiceJson = Object.assign(Object.assign({ choice: (_a = Breakscape.unbreakscape(c.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
-                    defaultExample: !!c.isCorrect,
-                    isBoolean: true,
-                }));
-                // Delete unwanted properties
-                if (((_c = c.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
-                    delete choiceJson.lead;
-                choicesJson.push(choiceJson);
-            }
-        }
-        if (choicesJson.length > 0) {
-            this.bitJson.choices = choicesJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> responses
     // X bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> responses
     enter_responses(node, route) {
-        var _a, _b, _c;
-        const responses = node.value;
-        // Ignore responses that are not at the correct level as they are handled elsewhere as quizzes
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const responsesJson = [];
-        if (responses) {
-            for (const r of responses) {
-                // Create the response
-                const responseJson = Object.assign(Object.assign({ response: (_a = Breakscape.unbreakscape(r.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = r.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
-                    defaultExample: !!r.isCorrect,
-                    isBoolean: true,
-                }));
-                // Delete unwanted properties
-                if (((_c = r.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
-                    delete responseJson.lead;
-                responsesJson.push(responseJson);
-            }
-        }
-        if (responsesJson.length > 0) {
-            this.bitJson.responses = responsesJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes
-    enter_quizzes(node, _route) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const quizzes = node.value;
-        const quizzesJson = [];
-        if (quizzes) {
-            for (const q of quizzes) {
-                // Choices
-                const choicesJson = [];
-                if (q.choices) {
-                    for (const c of q.choices) {
-                        // Create the choice
-                        const choiceJson = Object.assign(Object.assign({ choice: (_a = Breakscape.unbreakscape(c.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
-                            defaultExample: !!c.isCorrect,
-                            isBoolean: true,
-                        }));
-                        // Delete unwanted properties
-                        if (((_c = q.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
-                            delete choiceJson.lead;
-                        choicesJson.push(choiceJson);
-                    }
-                }
-                // Responses
-                const responsesJson = [];
-                if (q.responses) {
-                    for (const r of q.responses) {
-                        // Create the choice
-                        const responseJson = Object.assign(Object.assign({ response: (_d = Breakscape.unbreakscape(r.text)) !== null && _d !== void 0 ? _d : '', isCorrect: (_e = r.isCorrect) !== null && _e !== void 0 ? _e : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
-                            defaultExample: !!r.isCorrect,
-                            isBoolean: true,
-                        }));
-                        // Delete unwanted properties
-                        if (((_f = q.itemLead) === null || _f === void 0 ? void 0 : _f.lead) == null)
-                            delete responseJson.lead;
-                        responsesJson.push(responseJson);
-                    }
-                }
-                // Create the quiz
-                const quizJson = Object.assign(Object.assign({}, this.toItemLeadHintInstruction(q)), { isExample: (_g = q.isExample) !== null && _g !== void 0 ? _g : false, choices: q.choices ? choicesJson : undefined, responses: q.responses ? responsesJson : undefined });
-                // Delete unwanted properties
-                if (((_h = q.itemLead) === null || _h === void 0 ? void 0 : _h.lead) == null)
-                    delete quizJson.lead;
-                quizzesJson.push(quizJson);
-            }
-        }
-        if (quizzesJson.length > 0) {
-            this.bitJson.quizzes = quizzesJson;
-        }
+    enter_quizzes(node, route) {
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> heading
-    enter_heading(node, _route) {
-        var _a;
-        const heading = node.value;
-        // Check if the heading is for a match or a match matrix
-        const bitType = this.getBitType(_route);
-        const isMatrix = Config.isOfBitType(bitType, BitType.matchMatrix);
-        // Create the heading
-        const headingJson = {
-            forKeys: (_a = Breakscape.unbreakscape(heading.forKeys)) !== null && _a !== void 0 ? _a : '',
-        };
-        if (isMatrix) {
-            // Matrix match, forValues is an array
-            headingJson.forValues = [];
-            if (Array.isArray(heading.forValues)) {
-                if (heading.forValues.length >= 1) {
-                    headingJson.forValues = Breakscape.unbreakscape(heading.forValues);
-                }
-            }
-        }
-        else {
-            // Standard match, forValues is a string
-            headingJson.forValues = '';
-            if (Array.isArray(heading.forValues)) {
-                if (heading.forValues.length >= 1) {
-                    headingJson.forValues = Breakscape.unbreakscape(heading.forValues[heading.forValues.length - 1]);
-                }
-            }
-        }
-        this.bitJson.heading = headingJson;
+    enter_heading(node, route) {
+        return this.standardHandler(node, route, undefined, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs
     enter_pairs(node, route) {
-        var _a, _b, _c, _d;
-        const pairs = node.value;
-        const pairsJson = [];
-        const bitType = this.getBitType(route);
-        if (pairs && bitType) {
-            for (const p of pairs) {
-                // Get default example
-                const defaultExample = Array.isArray(p.values) && p.values.length > 0 && p.values[0];
-                // Create the question
-                const pairJson = Object.assign(Object.assign(Object.assign({ key: (_a = Breakscape.unbreakscape(p.key)) !== null && _a !== void 0 ? _a : '', keyAudio: p.keyAudio ? this.addAudioResource(bitType, p.keyAudio) : undefined, keyImage: p.keyImage ? this.addImageResource(bitType, p.keyImage) : undefined, values: (_b = Breakscape.unbreakscape(p.values)) !== null && _b !== void 0 ? _b : [] }, this.toItemLeadHintInstruction(p)), { isCaseSensitive: (_c = p.isCaseSensitive) !== null && _c !== void 0 ? _c : true }), this.toExample(p, {
-                    defaultExample,
-                    isBoolean: false,
-                }));
-                // Delete unwanted properties
-                if (((_d = p.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
-                    delete pairJson.lead;
-                if (pairJson.key) {
-                    delete pairJson.keyAudio;
-                    delete pairJson.keyImage;
-                }
-                if (pairJson.keyAudio != null) {
-                    delete pairJson.key;
-                    delete pairJson.keyImage;
-                }
-                if (pairJson.keyImage != null) {
-                    delete pairJson.key;
-                    delete pairJson.keyAudio;
-                }
-                pairsJson.push(pairJson);
-            }
-        }
-        if (pairsJson.length > 0) {
-            this.bitJson.pairs = pairsJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix
-    enter_matrix(node, _route) {
-        var _a, _b, _c, _d, _e, _f;
-        const matrix = node.value;
-        const matrixJsonArray = [];
-        if (matrix) {
-            for (const m of matrix) {
-                // Choices
-                const matrixCellsJson = [];
-                if (m.cells) {
-                    for (const c of m.cells) {
-                        // Get default example
-                        const defaultExample = Array.isArray(c.values) && c.values.length > 0 && c.values[0];
-                        // Create the choice
-                        const matrixCellJson = Object.assign(Object.assign(Object.assign({ values: (_a = Breakscape.unbreakscape(c.values)) !== null && _a !== void 0 ? _a : [] }, this.toItemLeadHintInstruction(c)), { isCaseSensitive: (_b = c.isCaseSensitive) !== null && _b !== void 0 ? _b : true }), this.toExample(c, {
-                            defaultExample,
-                            isBoolean: false,
-                        }));
-                        // Delete unwanted properties
-                        if (((_c = c.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
-                            delete matrixCellJson.lead;
-                        if (c.hint == null)
-                            delete matrixCellJson.hint;
-                        matrixCellsJson.push(matrixCellJson);
-                    }
-                }
-                // Create the matrix
-                const matrixJson = Object.assign(Object.assign({ key: (_d = Breakscape.unbreakscape(m.key)) !== null && _d !== void 0 ? _d : '', cells: matrixCellsJson !== null && matrixCellsJson !== void 0 ? matrixCellsJson : [] }, this.toItemLeadHintInstruction(m)), { 
-                    // ...this.toExample(m.example, m.isExample),
-                    isExample: (_e = m.isExample) !== null && _e !== void 0 ? _e : false });
-                // Delete unwanted properties
-                if (((_f = m.itemLead) === null || _f === void 0 ? void 0 : _f.lead) == null)
-                    delete matrixJson.lead;
-                if (m.instruction == null)
-                    delete matrixJson.instruction;
-                matrixJsonArray.push(matrixJson);
-            }
-        }
-        if (matrixJsonArray.length > 0) {
-            this.bitJson.matrix = matrixJsonArray;
-        }
+    enter_matrix(node, route) {
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> table
-    enter_table(node, _route) {
-        const table = node.value;
-        // const bitType = this.getBitType(route);
-        if (table) {
-            const tableJson = {
-                columns: Breakscape.unbreakscape(table.columns),
-                data: table.rows.map((row) => Breakscape.unbreakscape(row)),
-            };
-            // const isEmpty = !table.columns || table.columns.length === 0 || !table.rows || table.rows.length === 0;
-            this.bitJson.table = tableJson;
-        }
-        // Stop traversal of this branch to avoid unnecessary processing
-        return false;
+    enter_table(node, route) {
+        return this.standardHandler(node, route, NodeType.cardNode, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> questions
-    enter_questions(node, _route) {
-        var _a, _b, _c, _d, _e;
-        const questions = node.value;
-        const questionsJson = [];
-        if (questions) {
-            for (const q of questions) {
-                // Create the question
-                const questionJson = Object.assign(Object.assign(Object.assign({ question: (_a = Breakscape.unbreakscape(q.question)) !== null && _a !== void 0 ? _a : '', partialAnswer: (_b = Breakscape.unbreakscape(ArrayUtils.asSingle(q.partialAnswer))) !== null && _b !== void 0 ? _b : '', sampleSolution: (_c = Breakscape.unbreakscape(ArrayUtils.asSingle(q.sampleSolution))) !== null && _c !== void 0 ? _c : '', additionalSolutions: (_d = Breakscape.unbreakscape(q.additionalSolutions)) !== null && _d !== void 0 ? _d : [] }, this.toItemLeadHintInstruction(q)), { reasonableNumOfChars: q.reasonableNumOfChars }), this.toExample(q, {
-                    defaultExample: q.sampleSolution || '',
-                    isBoolean: false,
-                }));
-                // Delete unwanted properties
-                if (((_e = q.itemLead) === null || _e === void 0 ? void 0 : _e.lead) == null)
-                    delete questionJson.lead;
-                if (q.additionalSolutions == null || q.additionalSolutions.length === 0) {
-                    delete questionJson.additionalSolutions;
-                }
-                questionsJson.push(questionJson);
-            }
-        }
-        if (questionsJson.length > 0) {
-            this.bitJson.questions = questionsJson;
-        }
+    enter_questions(node, route) {
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses
     enter_botResponses(node, route) {
-        var _a, _b, _c, _d;
-        const botResponses = node.value;
-        // Ignore responses that are not at the cardNode level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const responsesJson = [];
-        if (botResponses) {
-            for (const r of botResponses) {
-                // Create the response
-                const responseJson = Object.assign({ response: (_a = Breakscape.unbreakscape(r.response)) !== null && _a !== void 0 ? _a : '', reaction: (_b = Breakscape.unbreakscape(r.reaction)) !== null && _b !== void 0 ? _b : '', feedback: (_c = Breakscape.unbreakscape(r.feedback)) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(r));
-                // Delete unwanted properties
-                if (((_d = r.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
-                    delete responseJson.lead;
-                if (r.hint == null)
-                    delete responseJson.hint;
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                delete responseJson.instruction;
-                responsesJson.push(responseJson);
-            }
-        }
-        if (responsesJson.length > 0) {
-            this.bitJson.responses = responsesJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true, keyOverride: 'responses' });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> ingredients -> ingredientsValue
     enter_ingredients(node, route) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const ingredients = node.value;
-        // Ignore statements that are not at the card node level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        const ingredientsJson = [];
-        if (ingredients) {
-            for (const i of ingredients) {
-                // Create the ingredient
-                const ingredientJson = {
-                    title: (_a = Breakscape.unbreakscape(i.title)) !== null && _a !== void 0 ? _a : '',
-                    checked: (_b = i.checked) !== null && _b !== void 0 ? _b : false,
-                    item: (_c = Breakscape.unbreakscape(i.item)) !== null && _c !== void 0 ? _c : '',
-                    quantity: (_d = i.quantity) !== null && _d !== void 0 ? _d : 0,
-                    unit: (_e = Breakscape.unbreakscape(i.unit)) !== null && _e !== void 0 ? _e : '',
-                    unitAbbr: (_f = Breakscape.unbreakscape(i.unitAbbr)) !== null && _f !== void 0 ? _f : '',
-                    decimalPlaces: (_g = i.decimalPlaces) !== null && _g !== void 0 ? _g : 1,
-                    disableCalculation: (_h = i.disableCalculation) !== null && _h !== void 0 ? _h : false,
-                };
-                // Delete unwanted properties
-                if ((i === null || i === void 0 ? void 0 : i.title) == null)
-                    delete ingredientJson.title;
-                // if (i?.unit == null) delete ingredientJson.unit;
-                if ((i === null || i === void 0 ? void 0 : i.unitAbbr) == null)
-                    delete ingredientJson.unitAbbr;
-                // if (i?.instruction == null) delete ingredientJson.instruction;
-                ingredientsJson.push(ingredientJson);
-            }
-        }
-        if (ingredientsJson.length > 0) {
-            this.bitJson.ingredients = ingredientsJson;
-        }
+        return this.standardHandler(node, route, NodeType.cardNode, { array: true });
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> captionDefinitionList
-    enter_captionDefinitionList(node, _route) {
-        var _a, _b;
-        const list = node.value;
-        // const bitType = this.getBitType(route);
-        if (list) {
-            const columns = (_a = list.columns) !== null && _a !== void 0 ? _a : [];
-            const definitions = (_b = list.definitions) !== null && _b !== void 0 ? _b : [];
-            const captionDefinitionListJson = {
-                columns: Breakscape.unbreakscape(columns),
-                definitions: definitions.map((d) => {
-                    var _a, _b;
-                    return {
-                        term: (_a = Breakscape.unbreakscape(d.term)) !== null && _a !== void 0 ? _a : '',
-                        description: (_b = Breakscape.unbreakscape(d.description)) !== null && _b !== void 0 ? _b : '',
-                    };
-                }),
-            };
-            // const isEmpty = !table.columns || table.columns.length === 0 || !table.rows || table.rows.length === 0;
-            this.bitJson.captionDefinitionList = captionDefinitionListJson;
-        }
-        // Stop traversal of this branch to avoid unnecessary processing
-        return false;
+    enter_captionDefinitionList(node, route) {
+        return this.standardHandler(node, route, NodeType.cardNode, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> imagePlaceholder
     enter_imagePlaceholder(node, route) {
-        // Ignore imagePlaceholder that is not at the bit level as it are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        const resource = node.value;
-        const bitType = this.getBitType(route);
-        if (!resource || !bitType)
-            return;
-        const res = this.parseResourceToJson(bitType, resource);
-        if (res && res.type === ResourceTag.image) {
-            this.bitJson.imagePlaceholder = res;
-        }
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> resources
     enter_resources(node, route) {
-        var _a;
+        var _a, _b;
         const resources = node.value;
         const bitType = this.getBitType(route);
         const resourceType = this.getResourceType(route);
         if (!resources || !bitType)
-            return;
+            return true;
         let resourceJson;
         const bitConfig = Config.getBitConfig(bitType);
         const bitResourcesConfig = Config.getBitResourcesConfig(bitType, resourceType);
@@ -1020,15 +532,17 @@ class JsonGenerator extends AstWalkerGenerator {
                 // Create the combo resource wrapper
                 const wrapper = {
                     type: comboTagType,
+                    __typeAlias: comboTagType,
                 };
                 // For each of the resources in this combo resource, find the actual resource and add it to the JSON
                 for (const rt of resourceTags) {
-                    const r = resources.find((r) => r.typeAlias === rt);
+                    const r = resources.find((r) => r.__typeAlias === rt);
                     // Extract everything except the type from the resource
                     if (r) {
-                        const tagConfig = Config.getTagConfigForTag(bitConfig.tags, r.typeAlias);
-                        const key = (_a = tagConfig === null || tagConfig === void 0 ? void 0 : tagConfig.jsonKey) !== null && _a !== void 0 ? _a : r.typeAlias;
-                        const json = this.parseResourceToJson(bitType, r);
+                        const tagConfig = Config.getTagConfigForTag(bitConfig.tags, r.__typeAlias);
+                        const key = (_a = tagConfig === null || tagConfig === void 0 ? void 0 : tagConfig.jsonKey) !== null && _a !== void 0 ? _a : r.__typeAlias;
+                        const tag = (_b = tagConfig === null || tagConfig === void 0 ? void 0 : tagConfig.tag) !== null && _b !== void 0 ? _b : r.__typeAlias;
+                        const json = r.__typeAlias === tag ? r : undefined;
                         if (json) {
                             for (const [k, v] of Object.entries(json)) {
                                 if (k !== 'type') {
@@ -1046,9 +560,8 @@ class JsonGenerator extends AstWalkerGenerator {
             // The resource is a logo-grave  / prototpye-images resource
             const images = [];
             for (const r of resources) {
-                const json = this.parseResourceToJson(bitType, r);
-                if (json) {
-                    images.push(json);
+                if (r.type === ResourceTag.image) {
+                    images.push(r);
                 }
             }
             if (bitType === BitType.imagesLogoGrave) {
@@ -1062,93 +575,49 @@ class JsonGenerator extends AstWalkerGenerator {
             // This is a standard resource. If there is more than one resource, use the first one.
             // There should not be more than one because of validation
             if (resources.length >= 1) {
-                resourceJson = this.parseResourceToJson(bitType, resources[0]);
+                resourceJson = resources[0]; // this.parseResourceToJson(bitType, resources[0]);
             }
         }
         this.bitJson.resource = resourceJson;
+        return false;
     }
     //
     // Terminal nodes (leaves)
     //
-    // bitmarkAst -> bits -> bitsValue -> title
-    leaf_title(node, route) {
-        // Ignore title that are not at the bit or card node level as they are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.cardNode)
-            return;
-        this.bitJson.title = this.convertBreakscapedStringToJsonText(node.value, TextFormat.bitmarkMinusMinus);
-    }
-    //  bitmarkAst -> bits -> bitsValue -> subtitle
-    leaf_subtitle(node, _route) {
-        this.bitJson.subtitle = this.convertBreakscapedStringToJsonText(node.value, TextFormat.bitmarkMinusMinus);
-    }
-    // //  bitmarkAst -> bits -> bitsValue -> level
-    leaf_level(node, _route) {
-        var _a;
-        if (node.value != null)
-            this.addProperty(this.bitJson, 'level', (_a = node.value) !== null && _a !== void 0 ? _a : 1, true);
+    //  bitmarkAst -> bits -> bitsValue -> level
+    leaf_level(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> book
-    leaf_book(node, _route) {
-        if (node.value != null)
-            this.addProperty(this.bitJson, 'book', node.value, true);
+    leaf_book(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     //  bitmarkAst -> bits -> bitsValue -> anchor
-    leaf_anchor(node, _route) {
-        if (node.value != null)
-            this.addProperty(this.bitJson, 'anchor', node.value, true);
+    leaf_anchor(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     //  bitmarkAst -> bits -> bitsValue -> reference
-    leaf_reference(node, _route) {
-        if (node.value != null)
-            this.addProperty(this.bitJson, 'reference', node.value, true);
+    leaf_reference(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     //  bitmarkAst -> bits -> bitsValue -> referenceEnd
-    leaf_referenceEnd(node, _route) {
-        if (node.value != null)
-            this.addProperty(this.bitJson, 'referenceEnd', node.value, true);
-    }
-    //  bitmarkAst -> bits -> bitsValue -> caption
-    leaf_caption(node, route) {
-        const caption = node.value;
-        // Ignore caption that is not at the bit level as it are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        this.bitJson.caption = this.convertBreakscapedStringToJsonText(caption, TextFormat.bitmarkMinusMinus);
-    }
-    //  bitmarkAst -> bits -> bitsValue ->  * -> hint
-    leaf_hint(node, route) {
-        const hint = node.value;
-        // Ignore hint that is not at the bit level as it are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        this.bitJson.hint = this.convertBreakscapedStringToJsonText(hint, TextFormat.bitmarkMinusMinus);
-    }
-    // bitmarkAst -> bits -> bitsValue ->  * -> instruction
-    leaf_instruction(node, route) {
-        const instruction = node.value;
-        // Ignore instruction that is not at the bit level as it are handled elsewhere
-        const parent = this.getParentNode(route);
-        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType.bitsValue)
-            return;
-        this.bitJson.instruction = this.convertBreakscapedStringToJsonText(instruction, TextFormat.bitmarkMinusMinus);
-    }
-    // bitmarkAst -> bits -> footer -> footerText
-    leaf_footerText(node, route) {
-        const footer = node.value;
-        const textFormat = this.getTextFormat(route);
-        this.bitJson.footer = this.convertBreakscapedStringToJsonText(footer, textFormat);
+    leaf_referenceEnd(node, route) {
+        return this.standardHandler(node, route, NodeType.bitsValue, { array: false });
     }
     // bitmarkAst -> bits -> bitsValue -> markup
     leaf_markup(node, _route) {
         const bitmark = node.value;
         if (bitmark)
             this.bitWrapperJson.bitmark = bitmark;
+        // Stop traversal of this branch
+        return false;
     }
-    // bitmarkAst -> bits -> bitsValue -> parser
     // bitmarkAst -> bits -> bitsValue -> * -> internalComment
+    enter_internalComment(_node, _route) {
+        // Stop traversal of this branch, handled in enter_parser()
+        return false;
+    }
+    // bitmarkAst -> bits -> bitsValue -> parser
     enter_parser(node, route) {
         const parser = node.value;
         const bitType = this.getBitType(route);
@@ -1162,13 +631,11 @@ class JsonGenerator extends AstWalkerGenerator {
             if (Array.isArray(parserExcessResources) && parserExcessResources.length > 0) {
                 excessResources = [];
                 for (const r of parserExcessResources) {
-                    const rJson = this.parseResourceToJson(bitType, r);
-                    if (rJson)
-                        excessResources.push(rJson);
+                    excessResources.push(r);
                 }
             }
             // Extract internal comments from the AST and add to the parser
-            const internalComments = Breakscape.unbreakscape(this.getInternalComments(route));
+            const internalComments = this.getInternalComments(route);
             if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType.bitsValue) {
                 // Bit level parser information
                 this.bitWrapperJson.parser = Object.assign(Object.assign({ version,
@@ -1214,32 +681,12 @@ class JsonGenerator extends AstWalkerGenerator {
         const propertiesConfig = Config.getRawPropertiesConfig();
         for (const propertyConfig of Object.values(propertiesConfig)) {
             const astKey = (_a = propertyConfig.astKey) !== null && _a !== void 0 ? _a : propertyConfig.tag;
-            // Special cases (handled outside of the automatically generated handlers)
-            if (astKey === PropertyTag.internalComment)
-                continue;
-            if (astKey === PropertyTag.caption)
-                continue;
-            if (astKey === PropertyTag.example)
-                continue;
-            if (astKey === PropertyTag.imageSource)
-                continue;
-            if (astKey === PropertyTag.person)
-                continue;
-            if (astKey === PropertyTag.imagePlaceholder)
-                continue;
-            if (astKey === PropertyTag.width)
-                continue;
-            if (astKey === PropertyTag.height)
-                continue;
-            if (astKey === PropertyAstKey.ast_markConfig)
-                continue;
-            if (astKey === PropertyTag.ratingLevelStart)
-                continue;
-            if (astKey === PropertyTag.ratingLevelEnd)
-                continue;
-            if (astKey === PropertyTag.productId)
-                continue;
             const funcName = `enter_${astKey}`;
+            // Skip if the function already exists, allows for custom handlers
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if (typeof this[funcName] === 'function') {
+                continue;
+            }
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             this[funcName] = (node, route) => {
                 var _a;
@@ -1254,7 +701,7 @@ class JsonGenerator extends AstWalkerGenerator {
                 // Convert key as needed
                 const jsonKey = (_a = propertyConfig.jsonKey) !== null && _a !== void 0 ? _a : propertyConfig.tag;
                 // Add the property
-                this.addProperty(this.bitJson, jsonKey, value, propertyConfig.single);
+                this.addProperty(this.bitJson, jsonKey, value, { array: !propertyConfig.single });
             };
             // Bind this
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1265,605 +712,51 @@ class JsonGenerator extends AstWalkerGenerator {
     //
     // HELPER FUNCTIONS
     //
-    createGapJson(gap) {
-        var _a;
-        const data = gap.data;
-        const defaultExample = data.solutions && data.solutions.length > 0 ? data.solutions[0] : '';
-        // Create the gap
-        const gapJson = Object.assign(Object.assign(Object.assign(Object.assign({ type: 'gap' }, this.toItemLeadHintInstruction(data)), { isCaseSensitive: (_a = data.isCaseSensitive) !== null && _a !== void 0 ? _a : true }), this.toExample(data, {
-            defaultExample,
-            isBoolean: false,
-        })), { solutions: Breakscape.unbreakscape(data.solutions) });
-        // Remove unwanted properties
-        // if (!data.itemLead?.lead) delete gapJson.lead;
-        return gapJson;
-    }
-    createMarkJson(mark) {
-        const data = mark.data;
-        // Create the mark
-        const markJson = Object.assign(Object.assign({ type: 'mark', solution: Breakscape.unbreakscape(data.solution), mark: Breakscape.unbreakscape(data.mark) }, this.toItemLeadHintInstruction(data)), this.toExample(data, {
-            defaultExample: true,
-            isBoolean: true,
-        }));
-        // Remove unwanted properties
-        // if (!data.itemLead?.lead) delete markJson.lead;
-        return markJson;
-    }
-    createSelectJson(select) {
-        var _a, _b, _c, _d;
-        const data = select.data;
-        // Create the select options
-        const options = [];
-        for (const option of data.options) {
-            const optionJson = Object.assign(Object.assign({ text: Breakscape.unbreakscape(option.text), isCorrect: (_a = option.isCorrect) !== null && _a !== void 0 ? _a : false }, this.toItemLeadHintInstruction(option)), this.toExample(option, {
-                defaultExample: !!option.isCorrect,
-                isBoolean: true,
-            }));
-            // Remove unwanted properties
-            // if (!option.itemLead?.item) delete optionJson.item;
-            // if (!option.itemLead?.lead) delete optionJson.lead;
-            // if (!option.instruction) delete optionJson.instruction;
-            options.push(optionJson);
-        }
-        // Create the select
-        const selectJson = Object.assign(Object.assign({ type: 'select', prefix: (_b = Breakscape.unbreakscape(data.prefix)) !== null && _b !== void 0 ? _b : '', postfix: (_c = Breakscape.unbreakscape(data.postfix)) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_d = data.isExample) !== null && _d !== void 0 ? _d : false, options });
-        // Remove unwanted properties
-        // if (!data.itemLead?.lead) delete selectJson.lead;
-        return selectJson;
-    }
-    createHighlightJson(highlight) {
-        var _a, _b, _c, _d, _e;
-        const data = highlight.data;
-        // Create the highlight options
-        const texts = [];
-        for (const text of data.texts) {
-            const textJson = Object.assign(Object.assign({ text: Breakscape.unbreakscape(text.text), isCorrect: (_a = text.isCorrect) !== null && _a !== void 0 ? _a : false, isHighlighted: (_b = text.isHighlighted) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(text)), this.toExample(text, {
-                defaultExample: !!text.isCorrect,
-                isBoolean: true,
-            }));
-            // Remove unwanted properties
-            // if (!text.itemLead?.item) delete textJson.item;
-            // if (!text.itemLead?.lead) delete textJson.lead;
-            // if (!text.hint) delete textJson.hint;
-            texts.push(textJson);
-        }
-        // Create the select
-        const highlightJson = Object.assign(Object.assign({ type: 'highlight', prefix: (_c = Breakscape.unbreakscape(data.prefix)) !== null && _c !== void 0 ? _c : '', postfix: (_d = Breakscape.unbreakscape(data.postfix)) !== null && _d !== void 0 ? _d : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_e = data.isExample) !== null && _e !== void 0 ? _e : false, texts });
-        // Remove unwanted properties
-        // if (!data.itemLead?.lead) delete highlightJson.lead;
-        return highlightJson;
-    }
-    parseResourceToJson(bitType, resource) {
-        if (!resource)
-            return undefined;
-        // All resources should now be valid as they are validated in the AST
-        // TODO: remove code below
-        // // Check if a resource has a value, if not, we should not write it (or any of its chained properties)
-        // let valid = false;
-        // if (resource.value) {
-        //   valid = true;
-        // }
-        // // Resource is not valid, return undefined
-        // if (!valid) return undefined;
-        // // Resource is valid, write it.
-        let resourceJson;
-        switch (resource.type) {
-            case ResourceTag.image:
-                resourceJson = {
-                    type: ResourceTag.image,
-                    image: this.addImageResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.imageLink:
-                resourceJson = {
-                    type: ResourceTag.imageLink,
-                    imageLink: this.addImageLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.audio:
-                resourceJson = {
-                    type: ResourceTag.audio,
-                    audio: this.addAudioResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.audioEmbed:
-                resourceJson = {
-                    type: ResourceTag.audioEmbed,
-                    audioEmbed: this.addAudioEmbedResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.audioLink:
-                resourceJson = {
-                    type: ResourceTag.audioLink,
-                    audioLink: this.addAudioLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.video:
-                resourceJson = {
-                    type: ResourceTag.video,
-                    video: this.addVideoResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.videoEmbed:
-                resourceJson = {
-                    type: ResourceTag.videoEmbed,
-                    videoEmbed: this.addVideoEmbedResource(bitType, resource),
-                };
-                resourceJson.videoEmbed = this.addVideoLinkResource(bitType, resource);
-                break;
-            case ResourceTag.videoLink:
-                resourceJson = {
-                    type: ResourceTag.videoLink,
-                    videoLink: this.addVideoLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.stillImageFilmEmbed:
-                resourceJson = {
-                    type: ResourceTag.stillImageFilmEmbed,
-                    stillImageFilmEmbed: this.addStillImageFilmEmbedResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.stillImageFilmLink:
-                resourceJson = {
-                    type: ResourceTag.stillImageFilmLink,
-                    stillImageFilmLink: this.addStillImageFilmLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.article:
-                resourceJson = {
-                    type: ResourceTag.article,
-                    article: this.addArticleResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.document:
-                resourceJson = {
-                    type: ResourceTag.document,
-                    document: this.addDocumentResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.documentEmbed:
-                resourceJson = {
-                    type: ResourceTag.documentEmbed,
-                    documentEmbed: this.addDocumentEmbedResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.documentLink:
-                resourceJson = {
-                    type: ResourceTag.documentLink,
-                    documentLink: this.addDocumentLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.documentDownload:
-                resourceJson = {
-                    type: ResourceTag.documentDownload,
-                    documentDownload: this.addDocumentDownloadResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.appLink:
-                resourceJson = {
-                    type: ResourceTag.appLink,
-                    appLink: this.addAppLinkResource(bitType, resource),
-                };
-                break;
-            case ResourceTag.websiteLink:
-                resourceJson = {
-                    type: ResourceTag.websiteLink,
-                    websiteLink: this.addWebsiteLinkResource(bitType, resource),
-                };
-                break;
-            default:
-        }
-        return resourceJson;
-    }
-    addImageResource(bitType, resource) {
-        var _a, _b, _c;
-        const resourceJson = {};
-        if (StringUtils.isString(resource)) {
-            const value = resource;
-            resource = {
-                type: ResourceTag.image,
-                typeAlias: ResourceTag.image,
-                value: value,
-                format: UrlUtils.fileExtensionFromUrl(value),
-                provider: UrlUtils.domainFromUrl(value),
-            };
-        }
-        resource = resource; // Keep TS compiler happy
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.src = Breakscape.unbreakscape(resource.value);
-        if (resource.src1x != null)
-            resourceJson.src1x = Breakscape.unbreakscape(resource.src1x);
-        if (resource.src2x != null)
-            resourceJson.src2x = Breakscape.unbreakscape(resource.src2x);
-        if (resource.src3x != null)
-            resourceJson.src3x = Breakscape.unbreakscape(resource.src3x);
-        if (resource.src4x != null)
-            resourceJson.src4x = Breakscape.unbreakscape(resource.src4x);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        resourceJson.alt = (_c = Breakscape.unbreakscape(resource.alt)) !== null && _c !== void 0 ? _c : '';
-        resourceJson.zoomDisabled = this.getZoomDisabled(bitType, resource.zoomDisabled);
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addImageLinkResource(bitType, resource) {
-        var _a, _b, _c;
-        const resourceJson = {};
-        if (StringUtils.isString(resource)) {
-            const value = resource;
-            resource = {
-                type: ResourceTag.imageLink,
-                typeAlias: ResourceTag.imageLink,
-                value,
-                format: UrlUtils.fileExtensionFromUrl(value),
-                provider: UrlUtils.domainFromUrl(value),
-            };
-        }
-        resource = resource; // Keep TS compiler happy
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        if (resource.src1x != null)
-            resourceJson.src1x = Breakscape.unbreakscape(resource.src1x);
-        if (resource.src2x != null)
-            resourceJson.src2x = Breakscape.unbreakscape(resource.src2x);
-        if (resource.src3x != null)
-            resourceJson.src3x = Breakscape.unbreakscape(resource.src3x);
-        if (resource.src4x != null)
-            resourceJson.src4x = Breakscape.unbreakscape(resource.src4x);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        resourceJson.alt = (_c = Breakscape.unbreakscape(resource.alt)) !== null && _c !== void 0 ? _c : '';
-        resourceJson.zoomDisabled = this.getZoomDisabled(bitType, resource.zoomDisabled);
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addAudioResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.src = Breakscape.unbreakscape(resource.value);
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addAudioEmbedResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.src = Breakscape.unbreakscape(resource.value);
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addAudioLinkResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        this.addGenericResourceProperties(bitType, resource, resourceJson, true);
-        return resourceJson;
-    }
-    addVideoResource(bitType, resource) {
-        var _a, _b;
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.src = Breakscape.unbreakscape(resource.value);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        if (resource.allowSubtitles != null)
-            resourceJson.allowSubtitles = resource.allowSubtitles;
-        if (resource.showSubtitles != null)
-            resourceJson.showSubtitles = resource.showSubtitles;
-        if (resource.alt != null)
-            resourceJson.alt = Breakscape.unbreakscape(resource.alt);
-        if (resource.posterImage != null)
-            resourceJson.posterImage = this.addImageResource(bitType, resource.posterImage);
-        if (resource.thumbnails != null && resource.thumbnails.length > 0) {
-            resourceJson.thumbnails = [];
-            for (const thumbnail of resource.thumbnails) {
-                resourceJson.thumbnails.push(this.addImageResource(bitType, thumbnail));
-            }
-        }
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addVideoEmbedResource(bitType, resource) {
-        var _a, _b;
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.src = Breakscape.unbreakscape(resource.value);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        if (resource.allowSubtitles != null)
-            resourceJson.allowSubtitles = resource.allowSubtitles;
-        if (resource.showSubtitles != null)
-            resourceJson.showSubtitles = resource.showSubtitles;
-        if (resource.alt != null)
-            resourceJson.alt = Breakscape.unbreakscape(resource.alt);
-        if (resource.posterImage != null)
-            resourceJson.posterImage = this.addImageResource(bitType, resource.posterImage);
-        if (resource.thumbnails != null && resource.thumbnails.length > 0) {
-            resourceJson.thumbnails = [];
-            for (const thumbnail of resource.thumbnails) {
-                resourceJson.thumbnails.push(this.addImageResource(bitType, thumbnail));
-            }
-        }
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addVideoLinkResource(bitType, resource) {
+    /**
+     * Default handler for properties.
+     *
+     * @param node the node
+     * @param route  the route to the node
+     * @param parentNodeTypes the parent node types for which to handle the node
+     * @returns
+     */
+    standardHandler(node, route, parentNodeTypes, options) {
         var _a, _b;
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        if (resource.allowSubtitles != null)
-            resourceJson.allowSubtitles = resource.allowSubtitles;
-        if (resource.showSubtitles != null)
-            resourceJson.showSubtitles = resource.showSubtitles;
-        if (resource.alt != null)
-            resourceJson.alt = Breakscape.unbreakscape(resource.alt);
-        if (resource.posterImage != null)
-            resourceJson.posterImage = this.addImageResource(bitType, resource.posterImage);
-        if (resource.thumbnails != null && resource.thumbnails.length > 0) {
-            resourceJson.thumbnails = [];
-            for (const thumbnail of resource.thumbnails) {
-                resourceJson.thumbnails.push(this.addImageResource(bitType, thumbnail));
-            }
+        // Ignore items not at the nodeType level
+        if (parentNodeTypes) {
+            const nodeTypeArray = Array.isArray(parentNodeTypes) ? parentNodeTypes : [parentNodeTypes];
+            const parent = this.getParentNode(route);
+            if (!(parent === null || parent === void 0 ? void 0 : parent.key) || !nodeTypeArray.includes(parent === null || parent === void 0 ? void 0 : parent.key))
+                return true;
         }
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
+        // Add the property
+        this.addProperty(this.bitJson, (_a = options.keyOverride) !== null && _a !== void 0 ? _a : node.key, (_b = options.valueOverride) !== null && _b !== void 0 ? _b : node.value, options);
+        // Stop traversal of this branch
+        return false;
     }
-    addStillImageFilmEmbedResource(bitType, resource) {
-        var _a, _b;
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        if (resource.allowSubtitles != null)
-            resourceJson.allowSubtitles = resource.allowSubtitles;
-        if (resource.showSubtitles != null)
-            resourceJson.showSubtitles = resource.showSubtitles;
-        if (resource.alt != null)
-            resourceJson.alt = Breakscape.unbreakscape(resource.alt);
-        if (resource.posterImage != null)
-            resourceJson.posterImage = this.addImageResource(bitType, resource.posterImage);
-        if (resource.thumbnails != null && resource.thumbnails.length > 0) {
-            resourceJson.thumbnails = [];
-            for (const thumbnail of resource.thumbnails) {
-                resourceJson.thumbnails.push(this.addImageResource(bitType, thumbnail));
+    addProperty(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    target, name, values, options) {
+        if (values !== undefined) {
+            let finalValue;
+            if (!Array.isArray(values))
+                values = [values];
+            const valuesArr = values;
+            // if (valuesArr.length > 0) {
+            if (!options.array && valuesArr.length >= 1) {
+                finalValue = valuesArr[valuesArr.length - 1];
             }
-        }
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addStillImageFilmLinkResource(bitType, resource) {
-        var _a, _b;
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
-        resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        if (resource.duration != null)
-            resourceJson.duration = resource.duration;
-        if (resource.mute != null)
-            resourceJson.mute = resource.mute;
-        if (resource.autoplay != null)
-            resourceJson.autoplay = resource.autoplay;
-        if (resource.allowSubtitles != null)
-            resourceJson.allowSubtitles = resource.allowSubtitles;
-        if (resource.showSubtitles != null)
-            resourceJson.showSubtitles = resource.showSubtitles;
-        if (resource.alt != null)
-            resourceJson.alt = Breakscape.unbreakscape(resource.alt);
-        if (resource.posterImage != null)
-            resourceJson.posterImage = this.addImageResource(bitType, resource.posterImage);
-        if (resource.thumbnails != null && resource.thumbnails.length > 0) {
-            resourceJson.thumbnails = [];
-            for (const thumbnail of resource.thumbnails) {
-                resourceJson.thumbnails.push(this.addImageResource(bitType, thumbnail));
+            else {
+                finalValue = valuesArr;
             }
-        }
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addArticleResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.body = Breakscape.unbreakscape(resource.value);
-        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addDocumentResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addDocumentEmbedResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addDocumentLinkResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addDocumentDownloadResource(bitType, resource) {
-        const resourceJson = {};
-        if (resource.format != null)
-            resourceJson.format = Breakscape.unbreakscape(resource.format);
-        if (resource.provider != null)
-            resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addAppLinkResource(bitType, resource) {
-        const resourceJson = {};
-        // if (resource.format != null) resourceJson.format = BreakscapeUtils.unbreakscape(resource.format);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addWebsiteLinkResource(bitType, resource) {
-        const resourceJson = {};
-        // if (resource.format != null) resourceJson.format = BreakscapeUtils.unbreakscape(resource.format);
-        if (resource.value != null)
-            resourceJson.url = Breakscape.unbreakscape(resource.value);
-        if (resource.siteName != null)
-            resourceJson.siteName = Breakscape.unbreakscape(resource.siteName);
-        this.addGenericResourceProperties(bitType, resource, resourceJson);
-        return resourceJson;
-    }
-    addGenericResourceProperties(_bitType, resource, resourceJson, noDefaults) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (noDefaults) {
-            if (resource.license != null)
-                resourceJson.license = (_a = Breakscape.unbreakscape(resource.license)) !== null && _a !== void 0 ? _a : '';
-            if (resource.copyright != null)
-                resourceJson.copyright = (_b = Breakscape.unbreakscape(resource.copyright)) !== null && _b !== void 0 ? _b : '';
-            if (resource.provider != null)
-                resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-            if (resource.showInIndex != null)
-                resourceJson.showInIndex = (_c = resource.showInIndex) !== null && _c !== void 0 ? _c : false;
-            if (resource.caption != null) {
-                resourceJson.caption = this.convertBreakscapedStringToJsonText((_d = resource.caption) !== null && _d !== void 0 ? _d : '', TextFormat.bitmarkMinusMinus);
+            // }
+            if (options.allowNull || finalValue != null) {
+                target[name] = finalValue;
             }
-            if (resource.search != null)
-                resourceJson.search = (_e = Breakscape.unbreakscape(resource.search)) !== null && _e !== void 0 ? _e : '';
         }
-        else {
-            resourceJson.license = (_f = Breakscape.unbreakscape(resource.license)) !== null && _f !== void 0 ? _f : '';
-            resourceJson.copyright = (_g = Breakscape.unbreakscape(resource.copyright)) !== null && _g !== void 0 ? _g : '';
-            if (resource.provider != null)
-                resourceJson.provider = Breakscape.unbreakscape(resource.provider);
-            resourceJson.showInIndex = (_h = resource.showInIndex) !== null && _h !== void 0 ? _h : false;
-            resourceJson.caption = this.convertBreakscapedStringToJsonText((_j = resource.caption) !== null && _j !== void 0 ? _j : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus);
-            if (resource.search != null)
-                resourceJson.search = (_k = Breakscape.unbreakscape(resource.search)) !== null && _k !== void 0 ? _k : '';
-        }
-        return resourceJson;
-    }
-    toItemLeadHintInstruction(item) {
-        var _a, _b, _c, _d, _e, _f;
-        return {
-            item: this.convertBreakscapedStringToJsonText((_b = (_a = item.itemLead) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus),
-            lead: this.convertBreakscapedStringToJsonText((_d = (_c = item.itemLead) === null || _c === void 0 ? void 0 : _c.lead) !== null && _d !== void 0 ? _d : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus),
-            hint: this.convertBreakscapedStringToJsonText((_e = item.hint) !== null && _e !== void 0 ? _e : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus),
-            instruction: this.convertBreakscapedStringToJsonText((_f = item.instruction) !== null && _f !== void 0 ? _f : Breakscape.EMPTY_STRING, TextFormat.bitmarkMinusMinus),
-        };
     }
     toExample(node, options) {
-        const { isExample, example, isDefaultExample } = node;
+        const { isExample, example, __isDefaultExample } = node;
         const { defaultExample, isBoolean } = options;
         if (!isExample) {
             return {
@@ -1872,7 +765,7 @@ class JsonGenerator extends AstWalkerGenerator {
             };
         }
         let exampleValue;
-        if (isDefaultExample) {
+        if (__isDefaultExample) {
             exampleValue = isBoolean
                 ? BooleanUtils.toBoolean(defaultExample)
                 : this.convertBreakscapedStringToJsonText(defaultExample, TextFormat.bitmarkMinusMinus);
@@ -1887,53 +780,6 @@ class JsonGenerator extends AstWalkerGenerator {
             example: exampleValue,
         };
     }
-    addProperty(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    target, name, values, singleWithoutArray) {
-        if (values !== undefined) {
-            let finalValue;
-            if (!Array.isArray(values))
-                values = [values];
-            if (Array.isArray(values) && values.length > 0) {
-                // Unbreakscape values that are strings
-                values = Breakscape.unbreakscape(values);
-                if (Array.isArray(values) && singleWithoutArray && values.length >= 1) {
-                    finalValue = values[values.length - 1];
-                }
-                else {
-                    finalValue = values;
-                }
-            }
-            // if (finalValue != null) {
-            target[name] = finalValue;
-            // }
-        }
-    }
-    //
-    // Helper functions
-    //
-    /**
-     * Get the value for the zoomDisabled property, setting the appropriate default value if no value is set.
-     *
-     * @param bitType
-     * @param zoomDisabled
-     * @returns
-     */
-    getZoomDisabled(bitType, zoomDisabled) {
-        if (zoomDisabled != null)
-            return zoomDisabled;
-        // The default value in the JSON is hardcoded, because there is currently no good way to set a different
-        // default per bit in the BitConfig.
-        if (Config.isOfBitType(bitType, [
-            BitType.imageSeparator,
-            BitType.pageBanner,
-            BitType.imagesLogoGrave,
-            BitType.prototypeImages,
-        ])) {
-            return true;
-        }
-        return false;
-    }
     /**
      * Get the bit type from any node
      *
@@ -2020,9 +866,14 @@ class JsonGenerator extends AstWalkerGenerator {
     convertBreakscapedStringToJsonText(text, format) {
         if (!text)
             undefined;
-        const asPlainText = this.options.textAsPlainText || format === TextFormat.text || format === TextFormat.json;
+        const isBitmarkText = format === TextFormat.bitmarkMinusMinus || format === TextFormat.bitmarkPlusPlus;
+        if (!isBitmarkText) {
+            // Not bitmark text, so plain text, so  unbreakscape only the start of bit tags
+            return text || '';
+        }
+        const asPlainText = this.options.textAsPlainText;
         if (asPlainText) {
-            return Breakscape.unbreakscape(text) || Breakscape.EMPTY_STRING;
+            return text || '';
         }
         // Use the text parser to parse the text
         const textAst = this.textParser.toAst(text, {
@@ -2031,40 +882,73 @@ class JsonGenerator extends AstWalkerGenerator {
         return textAst;
     }
     /**
-     * Walk the body AST to find the placeholder and replace it with the body bit.
+     * Concatenates a plain JSON text with a JsonText that may be plain (v2) or BitmarkText (v3)
+     * Returns the combined text.
      *
-     * @param bodyAst the body AST
-     * @param bodyBitJson the body bit json to insert at the placeholder position
-     * @param index the index of the placeholder to replace
+     * @param text the text to concatenate
+     * @param textPlain the plain text to concatenate
      */
-    replacePlaceholderWithBodyBit(bodyAst, bodyBitJson, index) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const walkRecursive = (node, parent, parentKey) => {
-            if (Array.isArray(node)) {
-                // Walk the array of nodes
-                for (let i = 0; i < node.length; i++) {
-                    const child = node[i];
-                    const done = walkRecursive(child, node, i);
-                    if (done)
-                        return true;
+    concatenatePlainTextWithJsonTexts(text, extraBreaks, textPlain) {
+        var _a;
+        if (Array.isArray(text)) {
+            textPlain = textPlain.trim();
+            if (textPlain) {
+                const splitText = textPlain.split('\n');
+                const content = [];
+                for (let i = 0; i < extraBreaks; i++) {
+                    content.push({
+                        type: TextNodeType.hardBreak,
+                    });
                 }
-            }
-            else {
-                if (node.type === 'bit' && node.index === index) {
-                    // Found the placeholder, replace it with the body bit
-                    parent[parentKey] = bodyBitJson;
-                    return true;
+                for (let i = 0; i < splitText.length; i++) {
+                    const t = splitText[i];
+                    if (t) {
+                        content.push({
+                            text: t,
+                            type: TextNodeType.text,
+                        });
+                    }
+                    // Add a hard break after each paragraph, except the last one
+                    if (i < splitText.length - 1) {
+                        content.push({
+                            type: TextNodeType.hardBreak,
+                        });
+                    }
                 }
-                if (node.content) {
-                    // Walk the child content
-                    const done = walkRecursive(node.content, node, 'content');
-                    if (done)
-                        return true;
+                // Add the content to the final paragraph, or create a new one if there none
+                const lastNode = text[text.length - 1];
+                if (lastNode && lastNode.type === TextNodeType.paragraph) {
+                    lastNode.content = [...((_a = lastNode.content) !== null && _a !== void 0 ? _a : []), ...content];
+                }
+                else {
+                    text.push({
+                        type: TextNodeType.paragraph,
+                        content,
+                        attrs: {},
+                    });
                 }
             }
+            return text;
+        }
+        return `${text !== null && text !== void 0 ? text : ''}${'\n'.repeat(extraBreaks)}${textPlain !== null && textPlain !== void 0 ? textPlain : ''}`;
+    }
+    /**
+     * Check if an object is bitmark text
+     * The check looks for a special tag on the array (__tag: 'text')
+     *
+     * @param obj object that might be bitmark text
+     * @returns
+     */
+    isBitmarkText(obj) {
+        if (obj == null)
             return false;
-        };
-        walkRecursive(bodyAst, null, null);
+        if (!Array.isArray(obj))
+            return false;
+        // Check for the hidden text tag
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (obj.__tag === 'text')
+            return true;
+        return false;
     }
     //
     // WRITE FUNCTIONS
@@ -2099,211 +983,23 @@ class JsonGenerator extends AstWalkerGenerator {
             originalType: bit.isCommented ? bit.bitType : undefined,
             format: bit.textFormat,
             bitLevel: bit.bitLevel,
-            // Properties
-            id: undefined,
-            internalComment: undefined,
-            externalId: undefined,
-            spaceId: undefined,
-            padletId: undefined,
-            jupyterId: undefined,
-            jupyterExecutionCount: undefined,
-            isPublic: undefined,
-            aiGenerated: undefined,
-            machineTranslated: undefined,
-            analyticsTag: undefined,
-            feedbackEngine: undefined,
-            feedbackType: undefined,
-            disableFeedback: undefined,
-            releaseVersion: undefined,
-            releaseKind: undefined,
-            releaseDate: undefined,
-            book: undefined,
-            ageRange: undefined,
-            lang: undefined,
-            language: undefined,
-            publisher: undefined,
-            publisherName: undefined,
-            theme: undefined,
-            computerLanguage: undefined,
-            target: undefined,
-            slug: undefined,
-            tag: undefined,
-            reductionTag: undefined,
-            bubbleTag: undefined,
-            levelCEFRp: undefined,
-            levelCEFR: undefined,
-            levelILR: undefined,
-            levelACTFL: undefined,
-            icon: undefined,
-            iconTag: undefined,
-            colorTag: undefined,
-            flashcardSet: undefined,
-            subtype: undefined,
-            bookAlias: undefined,
-            coverImage: undefined,
-            coverColor: undefined,
-            publications: undefined,
-            author: undefined,
-            subject: undefined,
-            date: undefined,
-            dateEnd: undefined,
-            location: undefined,
-            kind: undefined,
-            hasMarkAsDone: undefined,
-            processHandIn: undefined,
-            action: undefined,
-            showInIndex: undefined,
-            blockId: undefined,
-            pageNo: undefined,
-            x: undefined,
-            y: undefined,
-            width: undefined,
-            height: undefined,
-            index: undefined,
-            classification: undefined,
-            availableClassifications: undefined,
-            allowedBit: undefined,
-            tableFixedHeader: undefined,
-            tableSearch: undefined,
-            tableSort: undefined,
-            tablePagination: undefined,
-            tablePaginationLimit: undefined,
-            tableHeight: undefined,
-            tableWhitespaceNoWrap: undefined,
-            tableAutoWidth: undefined,
-            tableResizableColumns: undefined,
-            quizCountItems: undefined,
-            quizStrikethroughSolutions: undefined,
-            codeLineNumbers: undefined,
-            codeMinimap: undefined,
-            stripePricingTableId: undefined,
-            stripePublishableKey: undefined,
-            thumbImage: undefined,
-            scormSource: undefined,
-            posterImage: undefined,
-            focusX: undefined,
-            focusY: undefined,
-            pointerLeft: undefined,
-            pointerTop: undefined,
-            listItemIndent: undefined,
-            backgroundWallpaper: undefined,
-            hasBookNavigation: undefined,
-            duration: undefined,
-            deeplink: undefined,
-            externalLink: undefined,
-            externalLinkText: undefined,
-            videoCallLink: undefined,
-            vendorUrl: undefined,
-            search: undefined,
-            list: undefined,
-            textReference: undefined,
-            isTracked: undefined,
-            isInfoOnly: undefined,
-            imageFirst: undefined,
-            activityType: undefined,
-            labelTrue: undefined,
-            labelFalse: undefined,
-            content2Buy: undefined,
-            mailingList: undefined,
-            buttonCaption: undefined,
-            callToActionUrl: undefined,
-            caption: undefined,
-            quotedPerson: undefined,
-            reasonableNumOfChars: undefined,
-            resolved: undefined,
-            resolvedDate: undefined,
-            resolvedBy: undefined,
-            maxCreatedBits: undefined,
-            maxDisplayLevel: undefined,
-            page: undefined,
-            productId: undefined,
-            product: undefined,
-            productVideo: undefined,
-            productFolder: undefined,
-            technicalTerm: undefined,
-            servings: undefined,
-            ratingLevelStart: undefined,
-            ratingLevelEnd: undefined,
-            ratingLevelSelected: undefined,
-            // Book data
-            title: undefined,
-            subtitle: undefined,
-            level: undefined,
-            toc: undefined,
-            progress: undefined,
-            anchor: undefined,
-            reference: undefined,
-            referenceEnd: undefined,
-            // Item, Lead, Hint, Instruction
-            item: undefined,
-            lead: undefined,
-            pageNumber: undefined,
-            marginNumber: undefined,
-            hint: undefined,
-            instruction: undefined,
-            // Example
-            isExample: undefined,
-            example: undefined,
-            // Person .conversion-xxx, page-person, etc
-            person: undefined,
-            // Marks (config)
-            marks: undefined,
-            // Extra Properties
-            extraProperties: undefined,
-            // Body
-            body: undefined,
-            // Resource
-            imagePlaceholder: undefined,
-            resource: undefined,
-            logos: undefined,
-            images: undefined,
-            // Children
-            statement: undefined,
-            isCorrect: undefined,
-            sampleSolution: undefined,
-            additionalSolutions: undefined,
-            partialAnswer: undefined,
-            elements: undefined,
-            cards: undefined,
-            definitions: undefined,
-            statements: undefined,
-            responses: undefined,
-            quizzes: undefined,
-            heading: undefined,
-            pairs: undefined,
-            matrix: undefined,
-            choices: undefined,
-            questions: undefined,
-            captionDefinitionList: undefined,
-            listItems: undefined,
-            sections: undefined,
-            // Placeholders
-            placeholders: undefined,
-            // Footer
-            footer: undefined,
         };
-        // Add the resource template if there should be a resource (indicated by resourceType) but there is none defined.
-        // if (bit.resourceType && !bitJson.resource) {
-        //   const jsonKey = ResourceTag.keyFromValue(bit.resourceType);
-        //   bitJson.resource = {
-        //     type: bit.resourceType,
-        //   } as ResourceJson;
-        //   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        //   if (jsonKey) (bitJson.resource as any)[jsonKey] = {};
-        // }
         return bitJson;
     }
     /**
      * Remove wanted properties from bit json object.
      * - This function defines the defaults for properties in the json.
      *
+     * TODO: All these defaults should come from the config and be set in the Builder.
+     *
      * @param bit
      * @returns
      */
-    cleanAndSetDefaultsForBitJson(bitJson) {
+    cleanBitJson(bitJson) {
+        var _a, _b, _c, _d, _e, _f;
         const bitType = Config.getBitType(bitJson.type);
-        const textFormat = bitJson.format;
-        const plainText = this.options.textAsPlainText;
+        // const textFormat = bitJson.format;
+        // const plainText = this.options.textAsPlainText;
         // Clear 'originalType' if not set
         if (bitJson.originalType == null)
             bitJson.originalType = undefined;
@@ -2317,8 +1013,14 @@ class JsonGenerator extends AstWalkerGenerator {
         //       The properties used are a bit random sometimes?
         //       It would be better if this functionality was generated from the bit config
         if (Config.isOfBitType(bitType, [BitType._error, BitType._comment])) {
-            // Special caes for _error and _comment bits
+            // Special case for _error and _comment bits
             delete bitJson.format;
+            delete bitJson.item;
+            delete bitJson.lead;
+            delete bitJson.pageNumber;
+            delete bitJson.marginNumber;
+            delete bitJson.hint;
+            delete bitJson.instruction;
             //
         }
         else {
@@ -2327,6 +1029,18 @@ class JsonGenerator extends AstWalkerGenerator {
             // Most bits have these defaults, but there are special cases (not sure if that is by error or design)
             if (Config.isOfBitType(bitType, [BitType.page])) {
                 // Bits without item, lead, etc
+                if (bitJson.item == null || ((_a = bitJson.item) === null || _a === void 0 ? void 0 : _a.length) === 0)
+                    delete bitJson.item;
+                if (bitJson.lead == null || ((_b = bitJson.lead) === null || _b === void 0 ? void 0 : _b.length) === 0)
+                    delete bitJson.lead;
+                if (bitJson.pageNumber == null || ((_c = bitJson.pageNumber) === null || _c === void 0 ? void 0 : _c.length) === 0)
+                    delete bitJson.pageNumber;
+                if (bitJson.marginNumber == null || ((_d = bitJson.marginNumber) === null || _d === void 0 ? void 0 : _d.length) === 0)
+                    delete bitJson.marginNumber;
+                if (bitJson.hint == null || ((_e = bitJson.hint) === null || _e === void 0 ? void 0 : _e.length) === 0)
+                    delete bitJson.hint;
+                if (bitJson.instruction == null || ((_f = bitJson.instruction) === null || _f === void 0 ? void 0 : _f.length) === 0)
+                    delete bitJson.instruction;
             }
             else {
                 // Majority of bits
@@ -2494,6 +1208,8 @@ class JsonGenerator extends AstWalkerGenerator {
                     bitJson.tableAutoWidth = true;
                 if (bitJson.tableResizableColumns == null)
                     bitJson.tableResizableColumns = false;
+                if (bitJson.tableColumnMinWidth == null)
+                    bitJson.tableColumnMinWidth = 0;
                 //
             }
             if (Config.isOfBitType(bitType, [
@@ -2634,361 +1350,42 @@ class JsonGenerator extends AstWalkerGenerator {
                 delete bitJson.example;
             }
         }
-        // Remove unwanted properties
-        // Properties
-        if (bitJson.id == null)
-            delete bitJson.id;
-        if (bitJson.internalComment == null)
-            delete bitJson.internalComment;
-        if (bitJson.externalId == null)
-            delete bitJson.externalId;
-        if (bitJson.spaceId == null)
-            delete bitJson.spaceId;
-        if (bitJson.padletId == null)
-            delete bitJson.padletId;
-        if (bitJson.jupyterId == null)
-            delete bitJson.jupyterId;
-        if (bitJson.jupyterExecutionCount == null)
-            delete bitJson.jupyterExecutionCount;
-        if (bitJson.isPublic == null)
-            delete bitJson.isPublic;
-        if (bitJson.aiGenerated == null)
-            delete bitJson.aiGenerated;
-        if (bitJson.machineTranslated == null)
-            delete bitJson.machineTranslated;
-        if (bitJson.analyticsTag == null)
-            delete bitJson.analyticsTag;
-        if (bitJson.feedbackEngine == null)
-            delete bitJson.feedbackEngine;
-        if (bitJson.feedbackType == null)
-            delete bitJson.feedbackType;
-        if (bitJson.disableFeedback == null)
-            delete bitJson.disableFeedback;
-        if (bitJson.releaseVersion == null)
-            delete bitJson.releaseVersion;
-        if (bitJson.releaseKind == null)
-            delete bitJson.releaseKind;
-        if (bitJson.releaseDate == null)
-            delete bitJson.releaseDate;
-        if (bitJson.book == null)
-            delete bitJson.book;
-        if (bitJson.ageRange == null)
-            delete bitJson.ageRange;
-        if (bitJson.lang == null)
-            delete bitJson.lang;
-        if (bitJson.language == null)
-            delete bitJson.language;
-        if (bitJson.publisher == null)
-            delete bitJson.publisher;
-        if (bitJson.publisherName == null)
-            delete bitJson.publisherName;
-        if (bitJson.theme == null)
-            delete bitJson.theme;
-        if (bitJson.computerLanguage == null)
-            delete bitJson.computerLanguage;
-        if (bitJson.target == null)
-            delete bitJson.target;
-        if (bitJson.slug == null)
-            delete bitJson.slug;
-        if (bitJson.tag == null)
-            delete bitJson.tag;
-        if (bitJson.reductionTag == null)
-            delete bitJson.reductionTag;
-        if (bitJson.bubbleTag == null)
-            delete bitJson.bubbleTag;
-        if (bitJson.levelCEFRp == null)
-            delete bitJson.levelCEFRp;
-        if (bitJson.levelCEFR == null)
-            delete bitJson.levelCEFR;
-        if (bitJson.levelILR == null)
-            delete bitJson.levelILR;
-        if (bitJson.levelACTFL == null)
-            delete bitJson.levelACTFL;
-        if (bitJson.icon == null)
-            delete bitJson.icon;
-        if (bitJson.iconTag == null)
-            delete bitJson.iconTag;
-        if (bitJson.colorTag == null)
-            delete bitJson.colorTag;
-        if (bitJson.flashcardSet == null)
-            delete bitJson.flashcardSet;
-        if (bitJson.subtype == null)
-            delete bitJson.subtype;
-        if (bitJson.bookAlias == null)
-            delete bitJson.bookAlias;
-        if (bitJson.coverImage == null)
-            delete bitJson.coverImage;
-        if (bitJson.coverColor == null)
-            delete bitJson.coverColor;
-        if (bitJson.publications == null)
-            delete bitJson.publications;
-        if (bitJson.author == null)
-            delete bitJson.author;
-        if (bitJson.subject == null)
-            delete bitJson.subject;
-        if (bitJson.date == null)
-            delete bitJson.date;
-        if (bitJson.dateEnd == null)
-            delete bitJson.dateEnd;
-        if (bitJson.location == null)
-            delete bitJson.location;
-        if (bitJson.kind == null)
-            delete bitJson.kind;
-        if (bitJson.hasMarkAsDone == null)
-            delete bitJson.hasMarkAsDone;
-        if (bitJson.processHandIn == null)
-            delete bitJson.processHandIn;
-        if (bitJson.action == null)
-            delete bitJson.action;
-        if (bitJson.showInIndex == null)
-            delete bitJson.showInIndex;
-        if (bitJson.blockId == null)
-            delete bitJson.blockId;
-        if (bitJson.pageNo == null)
-            delete bitJson.pageNo;
-        if (bitJson.x == null)
-            delete bitJson.x;
-        if (bitJson.y == null)
-            delete bitJson.y;
-        if (bitJson.width == null)
-            delete bitJson.width;
-        if (bitJson.height == null)
-            delete bitJson.height;
-        if (bitJson.index == null)
-            delete bitJson.index;
-        if (bitJson.classification == null)
-            delete bitJson.classification;
-        if (bitJson.availableClassifications == null)
-            delete bitJson.availableClassifications;
-        if (bitJson.allowedBit == null)
-            delete bitJson.allowedBit;
-        if (bitJson.tableFixedHeader == null)
-            delete bitJson.tableFixedHeader;
-        if (bitJson.tableSearch == null)
-            delete bitJson.tableSearch;
-        if (bitJson.tableSort == null)
-            delete bitJson.tableSort;
-        if (bitJson.tablePagination == null)
-            delete bitJson.tablePagination;
-        if (bitJson.tablePaginationLimit == null)
-            delete bitJson.tablePaginationLimit;
-        if (bitJson.tableHeight == null)
-            delete bitJson.tableHeight;
-        if (bitJson.tableWhitespaceNoWrap == null)
-            delete bitJson.tableWhitespaceNoWrap;
-        if (bitJson.tableAutoWidth == null)
-            delete bitJson.tableAutoWidth;
-        if (bitJson.tableResizableColumns == null)
-            delete bitJson.tableResizableColumns;
-        if (bitJson.quizCountItems == null)
-            delete bitJson.quizCountItems;
-        if (bitJson.quizStrikethroughSolutions == null)
-            delete bitJson.quizStrikethroughSolutions;
-        if (bitJson.codeLineNumbers == null)
-            delete bitJson.codeLineNumbers;
-        if (bitJson.codeMinimap == null)
-            delete bitJson.codeMinimap;
-        if (bitJson.stripePricingTableId == null)
-            delete bitJson.stripePricingTableId;
-        if (bitJson.stripePublishableKey == null)
-            delete bitJson.stripePublishableKey;
-        if (bitJson.thumbImage == null)
-            delete bitJson.thumbImage;
-        if (bitJson.scormSource == null)
-            delete bitJson.scormSource;
-        if (bitJson.posterImage == null)
-            delete bitJson.posterImage;
-        if (bitJson.focusX == null)
-            delete bitJson.focusX;
-        if (bitJson.focusY == null)
-            delete bitJson.focusY;
-        if (bitJson.pointerLeft == null)
-            delete bitJson.pointerLeft;
-        if (bitJson.pointerTop == null)
-            delete bitJson.pointerTop;
-        if (bitJson.listItemIndent == null)
-            delete bitJson.listItemIndent;
-        if (bitJson.backgroundWallpaper == null)
-            delete bitJson.backgroundWallpaper;
-        if (bitJson.hasBookNavigation == null)
-            delete bitJson.hasBookNavigation;
-        if (bitJson.duration == null)
-            delete bitJson.duration;
-        if (bitJson.deeplink == null)
-            delete bitJson.deeplink;
-        if (bitJson.externalLink == null)
-            delete bitJson.externalLink;
-        if (bitJson.externalLinkText == null)
-            delete bitJson.externalLinkText;
-        if (bitJson.videoCallLink == null)
-            delete bitJson.videoCallLink;
-        if (bitJson.vendorUrl == null)
-            delete bitJson.vendorUrl;
-        if (bitJson.search == null)
-            delete bitJson.search;
-        if (bitJson.list == null)
-            delete bitJson.list;
-        if (bitJson.textReference == null)
-            delete bitJson.textReference;
-        if (bitJson.isTracked == null)
-            delete bitJson.isTracked;
-        if (bitJson.isInfoOnly == null)
-            delete bitJson.isInfoOnly;
-        if (bitJson.imageFirst == null)
-            delete bitJson.imageFirst;
-        if (bitJson.activityType == null)
-            delete bitJson.activityType;
-        if (bitJson.labelTrue == null)
-            delete bitJson.labelTrue;
-        if (bitJson.labelFalse == null)
-            delete bitJson.labelFalse;
-        if (bitJson.content2Buy == null)
-            delete bitJson.content2Buy;
-        if (bitJson.mailingList == null)
-            delete bitJson.mailingList;
-        if (bitJson.buttonCaption == null)
-            delete bitJson.buttonCaption;
-        if (bitJson.callToActionUrl == null)
-            delete bitJson.callToActionUrl;
-        if (bitJson.caption == null)
-            delete bitJson.caption;
-        if (bitJson.quotedPerson == null)
-            delete bitJson.quotedPerson;
-        if (bitJson.resolved == null)
-            delete bitJson.resolved;
-        if (bitJson.resolvedDate == null)
-            delete bitJson.resolvedDate;
-        if (bitJson.resolvedBy == null)
-            delete bitJson.resolvedBy;
-        if (bitJson.maxCreatedBits == null)
-            delete bitJson.maxCreatedBits;
-        if (bitJson.maxDisplayLevel == null)
-            delete bitJson.maxDisplayLevel;
-        if (bitJson.page == null)
-            delete bitJson.page;
-        if (bitJson.productId == null)
-            delete bitJson.productId;
-        if (bitJson.product == null)
-            delete bitJson.product;
-        if (bitJson.productVideo == null)
-            delete bitJson.productVideo;
-        if (bitJson.productFolder == null)
-            delete bitJson.productFolder;
-        if (bitJson.technicalTerm == null)
-            delete bitJson.technicalTerm;
-        if (bitJson.servings == null)
-            delete bitJson.servings;
-        if (bitJson.ratingLevelStart == null)
-            delete bitJson.ratingLevelStart;
-        if (bitJson.ratingLevelEnd == null)
-            delete bitJson.ratingLevelEnd;
-        if (bitJson.ratingLevelSelected == null)
-            delete bitJson.ratingLevelSelected;
-        // Book data
-        if (bitJson.title == null)
-            delete bitJson.title;
-        if (bitJson.subtitle == null)
-            delete bitJson.subtitle;
-        if (bitJson.level == null)
-            delete bitJson.level;
-        if (bitJson.toc == null)
-            delete bitJson.toc;
-        if (bitJson.progress == null)
-            delete bitJson.progress;
-        if (bitJson.anchor == null)
-            delete bitJson.anchor;
-        if (bitJson.reference == null)
-            delete bitJson.reference;
-        if (bitJson.referenceEnd == null)
-            delete bitJson.referenceEnd;
-        // Item, Lead, Hint, Instruction
-        if (bitJson.item == null)
-            delete bitJson.item;
-        if (bitJson.lead == null)
-            delete bitJson.lead;
-        if (bitJson.pageNumber == null)
-            delete bitJson.pageNumber;
-        if (bitJson.marginNumber == null)
-            delete bitJson.marginNumber;
-        if (bitJson.hint == null)
-            delete bitJson.hint;
-        if (bitJson.instruction == null)
-            delete bitJson.instruction;
-        // Example
-        if (bitJson.example === undefined)
-            delete bitJson.example;
-        if (bitJson.isExample == null)
-            delete bitJson.isExample;
-        // Mark
-        if (bitJson.marks == null)
-            delete bitJson.marks;
-        // Extra Properties
-        if (bitJson.extraProperties == null)
-            delete bitJson.extraProperties;
-        // Body
-        if (bitJson.body == null && textFormat !== TextFormat.json)
-            delete bitJson.body;
-        // Placeholders
-        if (bitJson.placeholders == null || Object.keys(bitJson.placeholders).length === 0)
-            delete bitJson.placeholders;
-        // Resource
-        if (bitJson.imagePlaceholder == null)
-            delete bitJson.imagePlaceholder;
-        if (bitJson.resource == null)
-            delete bitJson.resource;
-        if (bitJson.logos == null)
-            delete bitJson.logos;
-        if (bitJson.images == null)
-            delete bitJson.images;
-        // Children
-        if (bitJson.statement == null)
-            delete bitJson.statement;
-        if (bitJson.isCorrect == null)
-            delete bitJson.isCorrect;
-        if (bitJson.sampleSolution == null)
-            delete bitJson.sampleSolution;
-        if (bitJson.additionalSolutions == null)
-            delete bitJson.additionalSolutions;
-        if (bitJson.partialAnswer == null)
-            delete bitJson.partialAnswer;
-        if (bitJson.elements == null)
-            delete bitJson.elements;
-        if (bitJson.cards == null)
-            delete bitJson.cards;
-        if (bitJson.definitions == null)
-            delete bitJson.definitions;
-        if (bitJson.statements == null)
-            delete bitJson.statements;
-        if (bitJson.responses == null)
-            delete bitJson.responses;
-        if (bitJson.quizzes == null)
-            delete bitJson.quizzes;
-        if (bitJson.heading == null)
-            delete bitJson.heading;
-        if (bitJson.pairs == null)
-            delete bitJson.pairs;
-        if (bitJson.matrix == null)
-            delete bitJson.matrix;
-        if (bitJson.table == null)
-            delete bitJson.table;
-        if (bitJson.choices == null)
-            delete bitJson.choices;
-        if (bitJson.questions == null)
-            delete bitJson.questions;
-        if (bitJson.captionDefinitionList == null)
-            delete bitJson.captionDefinitionList;
-        if (bitJson.listItems == null)
-            delete bitJson.listItems;
-        if (bitJson.sections == null)
-            delete bitJson.sections;
-        // Placeholders
-        if (!plainText || bitJson.placeholders == null)
-            delete bitJson.placeholders;
-        // Footer
-        if (bitJson.footer == null)
-            delete bitJson.footer;
         return bitJson;
     }
+    /**
+     * Convert any bitmark texts to strings.
+     */
+    convertAllBitmarkTextsToStringsForPlainText(json) {
+        if (!this.options.textAsPlainText)
+            return;
+        const obj = json;
+        for (const key in obj) {
+            const val = obj[key];
+            if (this.isBitmarkText(val)) {
+                const s = this.textGenerator.generateSync(val, TextFormat.bitmarkMinusMinus);
+                obj[key] = (Breakscape.unbreakscape(s) || '').trim();
+            }
+            else if (typeof obj[key] === 'object') {
+                this.convertAllBitmarkTextsToStringsForPlainText(obj[key]);
+            }
+        }
+    }
+    /**
+     * Remove any property with a key starting with an double underscore.
+     *
+     * @param json
+     */
+    removeTemporaryProperties(json) {
+        const obj = json;
+        for (const key in obj) {
+            if (key.startsWith('__')) {
+                delete obj[key];
+            }
+            else if (typeof obj[key] === 'object') {
+                this.removeTemporaryProperties(obj[key]);
+            }
+        }
+    }
     //
     // Writer interface
     //