@gmb/bitmark-parser-generator 1.34.0 → 2.0.0

package/dist/cjs/ast/Builder.js

@@ -10,22 +10,29 @@ const ResourceTag_1 = require("../model/enum/ResourceTag");
 const TextFormat_1 = require("../model/enum/TextFormat");
 const ArrayUtils_1 = require("../utils/ArrayUtils");
 const BitUtils_1 = require("../utils/BitUtils");
+const BooleanUtils_1 = require("../utils/BooleanUtils");
 const NumberUtils_1 = require("../utils/NumberUtils");
 const ObjectUtils_1 = require("../utils/ObjectUtils");
+const StringUtils_1 = require("../utils/StringUtils");
 const Env_1 = require("../utils/env/Env");
 const BaseBuilder_1 = require("./BaseBuilder");
+const ResourceBuilder_1 = require("./ResourceBuilder");
 const NodeValidator_1 = require("./rules/NodeValidator");
 /**
  * Builder to build bitmark AST node programmatically
  */
 class Builder extends BaseBuilder_1.BaseBuilder {
+    constructor() {
+        super(...arguments);
+        this.resourceBuilder = new ResourceBuilder_1.ResourceBuilder();
+    }
     /**
      * Build bitmark node
      *
      * @param data - data for the node
      * @returns
      */
-    bitmark(data) {
+    buildBitmark(data) {
         const { bits, errors } = data;
         const node = {
             bits,
@@ -41,49 +48,44 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    bit(data) {
-        var _a;
-        const { bitType, bitLevel, textFormat, resourceType, isCommented, id, internalComment, externalId, spaceId, padletId, jupyterId, jupyterExecutionCount, isPublic, aiGenerated, machineTranslated, analyticsTag, feedbackEngine, feedbackType, disableFeedback, releaseVersion, releaseKind, releaseDate, ageRange, lang, language, publisher, publisherName, theme, computerLanguage, target, slug, tag, reductionTag, bubbleTag, levelCEFRp, levelCEFR, levelILR, levelACTFL, icon, iconTag, colorTag, flashcardSet, subtype, bookAlias, coverImage, coverColor, publications, author, subject, date, dateEnd, location, kind, hasMarkAsDone, processHandIn, action, showInIndex, blockId, pageNo, x, y, width, height, index, classification, availableClassifications, allowedBit, tableFixedHeader, tableSearch, tableSort, tablePagination, tablePaginationLimit, tableHeight, tableWhitespaceNoWrap, tableAutoWidth, tableResizableColumns, quizCountItems, quizStrikethroughSolutions, codeLineNumbers, codeMinimap, stripePricingTableId, stripePublishableKey, thumbImage, scormSource, posterImage, focusX, focusY, pointerLeft, pointerTop, listItemIndent, backgroundWallpaper, hasBookNavigation, duration, referenceProperty, deeplink, externalLink, externalLinkText, videoCallLink, vendorUrl, search, bot, list, textReference, isTracked, isInfoOnly, imageFirst, activityType, labelTrue, labelFalse, content2Buy, mailingList, buttonCaption, callToActionUrl, caption, book, quotedPerson, partialAnswer, reasonableNumOfChars, sampleSolution, additionalSolutions, resolved, resolvedDate, resolvedBy, maxCreatedBits, maxDisplayLevel, page, productId, product, productList, productVideo, productVideoList, productFolder, technicalTerm, servings, ratingLevelStart, ratingLevelEnd, ratingLevelSelected, title, subtitle, level, toc, progress, anchor, reference, referenceEnd, isCaseSensitive, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example, imageSource, person, markConfig, extraProperties, imagePlaceholder, resources: _resources, body, footer, markup, parser, } = data;
-        const bitConfig = Config_1.Config.getBitConfig(bitType);
-        // Convert resources into an array
-        const resources = ArrayUtils_1.ArrayUtils.asArray(_resources);
+    buildBit(data) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const bitConfig = Config_1.Config.getBitConfig(data.bitType);
+        const textFormat = (_a = TextFormat_1.TextFormat.fromValue(data.textFormat)) !== null && _a !== void 0 ? _a : bitConfig.textFormatDefault;
+        // Validate and convert resources, and ensure it is an array
+        // const resources = ArrayUtils.asArray(resourcesIn);
         // Set the card node data
-        const cardNode = this.cardNode(data);
+        const cardNode = this.buildCardNode(data.bitType, textFormat, data);
         // Add reasonableNumOfChars to the bit only for essay bits (in other cases it will be pushed down the tree)
-        const reasonableNumOfCharsProperty = Config_1.Config.isOfBitType(bitType, BitType_1.BitType.essay)
-            ? this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.reasonableNumOfChars, reasonableNumOfChars)
+        const reasonableNumOfCharsProperty = Config_1.Config.isOfBitType(data.bitType, BitType_1.BitType.essay)
+            ? this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.reasonableNumOfChars, data.reasonableNumOfChars)
             : undefined;
+        const convertedExample = Object.assign({}, this.toExample(data.__isDefaultExample, data.example));
         // NOTE: Node order is important and is defined here
-        const node = Object.assign(Object.assign({ bitType,
-            bitLevel, textFormat: (_a = TextFormat_1.TextFormat.fromValue(textFormat)) !== null && _a !== void 0 ? _a : bitConfig.textFormatDefault, resourceType: ResourceTag_1.ResourceTag.fromValue(resourceType), isCommented, id: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.id, id), internalComment: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.internalComment, internalComment), externalId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalId, externalId), spaceId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.spaceId, spaceId), padletId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.padletId, padletId), jupyterId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.jupyterId, jupyterId), jupyterExecutionCount: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.jupyterExecutionCount, jupyterExecutionCount), isPublic: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isPublic, isPublic), aiGenerated: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.aiGenerated, aiGenerated), machineTranslated: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.machineTranslated, machineTranslated), analyticsTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.analyticsTag, analyticsTag), feedbackEngine: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.feedbackEngine, feedbackEngine), feedbackType: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.feedbackType, feedbackType), disableFeedback: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.disableFeedback, disableFeedback), releaseVersion: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseVersion, releaseVersion), releaseKind: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseKind, releaseKind), releaseDate: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseDate, releaseDate), book, ageRange: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.ageRange, ageRange), lang: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.lang, lang), language: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.language, language), publisher: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publisher, publisher), publisherName: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publisherName, publisherName), theme: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.theme, theme), computerLanguage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.computerLanguage, computerLanguage), target: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.target, target), slug: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.slug, slug), tag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tag, tag), reductionTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.reductionTag, reductionTag), bubbleTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bubbleTag, bubbleTag), levelCEFRp: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelCEFRp, levelCEFRp), levelCEFR: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelCEFR, levelCEFR), levelILR: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelILR, levelILR), levelACTFL: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelACTFL, levelACTFL), icon: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.icon, icon), iconTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.iconTag, iconTag), colorTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.colorTag, colorTag), flashcardSet: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.flashcardSet, flashcardSet), subtype: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.subtype, subtype), bookAlias: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bookAlias, bookAlias), coverImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.coverImage, coverImage), coverColor: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.coverColor, coverColor), publications: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publications, publications), author: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.author, author), subject: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.subject, subject), date: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.date, date), dateEnd: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.dateEnd, dateEnd), location: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.location, location), kind: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.kind, kind), hasMarkAsDone: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.hasMarkAsDone, hasMarkAsDone), processHandIn: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.processHandIn, processHandIn), action: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.action, action), showInIndex: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.showInIndex, showInIndex), blockId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.blockId, blockId), pageNo: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pageNo, pageNo), x: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.x, x), y: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.y, y), width: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.width, width), height: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.height, height), index: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.index, index), classification: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.classification, classification), availableClassifications: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.availableClassifications, availableClassifications), allowedBit: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.allowedBit, allowedBit), tableFixedHeader: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableFixedHeader, tableFixedHeader), tableSearch: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableSearch, tableSearch), tableSort: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableSort, tableSort), tablePagination: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tablePagination, tablePagination), tablePaginationLimit: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tablePaginationLimit, tablePaginationLimit), tableHeight: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableHeight, tableHeight), tableWhitespaceNoWrap: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableWhitespaceNoWrap, tableWhitespaceNoWrap), tableAutoWidth: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableAutoWidth, tableAutoWidth), tableResizableColumns: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableResizableColumns, tableResizableColumns), quizCountItems: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quizCountItems, quizCountItems), quizStrikethroughSolutions: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quizStrikethroughSolutions, quizStrikethroughSolutions), codeLineNumbers: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.codeLineNumbers, codeLineNumbers), codeMinimap: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.codeMinimap, codeMinimap), stripePricingTableId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.stripePricingTableId, stripePricingTableId), stripePublishableKey: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.stripePublishableKey, stripePublishableKey), thumbImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.thumbImage, thumbImage), scormSource: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.scormSource, scormSource), posterImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.posterImage, posterImage), focusX: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.focusX, focusX), focusY: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.focusY, focusY), pointerLeft: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pointerLeft, pointerLeft), pointerTop: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pointerTop, pointerTop), listItemIndent: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.listItemIndent, listItemIndent), backgroundWallpaper: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.backgroundWallpaper, backgroundWallpaper), hasBookNavigation: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.hasBookNavigation, hasBookNavigation), deeplink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.deeplink, deeplink), externalLink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalLink, externalLink), externalLinkText: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalLinkText, externalLinkText), videoCallLink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.videoCallLink, videoCallLink), vendorUrl: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.vendorUrl, vendorUrl), search: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.search, search), bot: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bot, bot), duration: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.duration, duration), referenceProperty: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.property_reference, referenceProperty), list: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.list, list), textReference: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.textReference, textReference), isTracked: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isTracked, isTracked), isInfoOnly: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isInfoOnly, isInfoOnly), imageFirst: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.imageFirst, imageFirst), activityType: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.activityType, activityType), labelTrue: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.labelTrue, labelTrue), labelFalse: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.labelFalse, labelFalse), content2Buy: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.content2Buy, content2Buy), mailingList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.mailingList, mailingList), buttonCaption: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.buttonCaption, buttonCaption), callToActionUrl: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.callToActionUrl, callToActionUrl), caption, quotedPerson: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quotedPerson, quotedPerson), partialAnswer: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.partialAnswer, partialAnswer), reasonableNumOfChars: reasonableNumOfCharsProperty, sampleSolution: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.property_sampleSolution, sampleSolution), additionalSolutions: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.additionalSolutions, additionalSolutions), resolved: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolved, resolved), resolvedDate: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolvedDate, resolvedDate), resolvedBy: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolvedBy, resolvedBy), maxCreatedBits: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.maxCreatedBits, maxCreatedBits), maxDisplayLevel: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.maxDisplayLevel, maxDisplayLevel), page: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.page, page), productId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productId, productId), product: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.product, product), productList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productList, productList), productVideo: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productVideo, productVideo), productVideoList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productVideoList, productVideoList), productFolder: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productFolder, productFolder), technicalTerm,
-            servings,
-            ratingLevelStart,
-            ratingLevelEnd, ratingLevelSelected: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.ratingLevelSelected, ratingLevelSelected), title,
-            subtitle, level: NumberUtils_1.NumberUtils.asNumber(level), toc: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.toc, toc), progress: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.progress, progress), anchor,
-            reference,
-            referenceEnd,
-            markConfig, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExample(isDefaultExample, example)), { imageSource,
-            person,
-            imagePlaceholder,
-            resources,
-            body,
-            cardNode,
-            footer,
-            markup,
-            parser, 
+        const node = Object.assign(Object.assign({ bitType: data.bitType, bitLevel: data.bitLevel, textFormat, resourceType: ResourceTag_1.ResourceTag.fromValue(data.resourceType), isCommented: data.isCommented, 
+            // Properties
+            id: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.id, data.id), internalComment: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.internalComment, data.internalComment), externalId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalId, data.externalId), spaceId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.spaceId, data.spaceId), padletId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.padletId, data.padletId), jupyterId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.jupyterId, data.jupyterId), jupyterExecutionCount: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.jupyterExecutionCount, data.jupyterExecutionCount), isPublic: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isPublic, data.isPublic), aiGenerated: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.aiGenerated, data.aiGenerated), machineTranslated: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.machineTranslated, data.machineTranslated), analyticsTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.analyticsTag, data.analyticsTag), feedbackEngine: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.feedbackEngine, data.feedbackEngine), feedbackType: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.feedbackType, data.feedbackType), disableFeedback: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.disableFeedback, data.disableFeedback), releaseVersion: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseVersion, data.releaseVersion), releaseKind: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseKind, data.releaseKind), releaseDate: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.releaseDate, data.releaseDate), book: data.book, ageRange: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.ageRange, data.ageRange), lang: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.lang, data.lang), language: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.language, data.language), publisher: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publisher, data.publisher), publisherName: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publisherName, data.publisherName), theme: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.theme, data.theme), computerLanguage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.computerLanguage, data.computerLanguage), target: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.target, data.target), slug: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.slug, data.slug), tag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tag, data.tag), reductionTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.reductionTag, data.reductionTag), bubbleTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bubbleTag, data.bubbleTag), levelCEFRp: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelCEFRp, data.levelCEFRp), levelCEFR: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelCEFR, data.levelCEFR), levelILR: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelILR, data.levelILR), levelACTFL: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.levelACTFL, data.levelACTFL), icon: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.icon, data.icon), iconTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.iconTag, data.iconTag), colorTag: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.colorTag, data.colorTag), flashcardSet: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.flashcardSet, data.flashcardSet), subtype: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.subtype, data.subtype), bookAlias: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bookAlias, data.bookAlias), coverImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.coverImage, data.coverImage), coverColor: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.coverColor, data.coverColor), publications: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.publications, data.publications), author: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.author, data.author), subject: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.subject, data.subject), date: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.date, data.date), dateEnd: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.dateEnd, data.dateEnd), location: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.location, data.location), kind: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.kind, data.kind), hasMarkAsDone: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.hasMarkAsDone, data.hasMarkAsDone), processHandIn: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.processHandIn, data.processHandIn), action: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.action, data.action), showInIndex: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.showInIndex, data.showInIndex), blockId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.blockId, data.blockId), pageNo: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pageNo, data.pageNo), x: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.x, data.x), y: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.y, data.y), width: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.width, data.width), height: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.height, data.height), index: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.index, data.index), classification: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.classification, data.classification), availableClassifications: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.availableClassifications, data.availableClassifications), allowedBit: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.allowedBit, data.allowedBit), tableFixedHeader: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableFixedHeader, data.tableFixedHeader), tableSearch: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableSearch, data.tableSearch), tableSort: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableSort, data.tableSort), tablePagination: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tablePagination, data.tablePagination), tablePaginationLimit: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tablePaginationLimit, data.tablePaginationLimit), tableHeight: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableHeight, data.tableHeight), tableWhitespaceNoWrap: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableWhitespaceNoWrap, data.tableWhitespaceNoWrap), tableAutoWidth: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableAutoWidth, data.tableAutoWidth), tableResizableColumns: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableResizableColumns, data.tableResizableColumns), tableColumnMinWidth: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.tableColumnMinWidth, data.tableColumnMinWidth), quizCountItems: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quizCountItems, data.quizCountItems), quizStrikethroughSolutions: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quizStrikethroughSolutions, data.quizStrikethroughSolutions), codeLineNumbers: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.codeLineNumbers, data.codeLineNumbers), codeMinimap: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.codeMinimap, data.codeMinimap), stripePricingTableId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.stripePricingTableId, data.stripePricingTableId), stripePublishableKey: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.stripePublishableKey, data.stripePublishableKey), thumbImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.thumbImage, data.thumbImage), scormSource: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.scormSource, data.scormSource), posterImage: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.posterImage, data.posterImage), focusX: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.focusX, data.focusX), focusY: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.focusY, data.focusY), pointerLeft: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pointerLeft, data.pointerLeft), pointerTop: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.pointerTop, data.pointerTop), listItemIndent: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.listItemIndent, data.listItemIndent), backgroundWallpaper: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.backgroundWallpaper, data.backgroundWallpaper), hasBookNavigation: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.hasBookNavigation, data.hasBookNavigation), duration: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.duration, data.duration), deeplink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.deeplink, data.deeplink), externalLink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalLink, data.externalLink), externalLinkText: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.externalLinkText, data.externalLinkText), videoCallLink: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.videoCallLink, data.videoCallLink), vendorUrl: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.vendorUrl, data.vendorUrl), search: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.search, data.search), list: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.list, data.list), textReference: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.textReference, data.textReference), isTracked: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isTracked, data.isTracked), isInfoOnly: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.isInfoOnly, data.isInfoOnly), imageFirst: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.imageFirst, data.imageFirst), activityType: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.activityType, data.activityType), labelTrue: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.labelTrue, data.labelTrue), labelFalse: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.labelFalse, data.labelFalse), content2Buy: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.content2Buy, data.content2Buy), mailingList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.mailingList, data.mailingList), buttonCaption: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.buttonCaption, data.buttonCaption), callToActionUrl: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.callToActionUrl, data.callToActionUrl), caption: this.handleJsonText(data.caption), quotedPerson: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.quotedPerson, data.quotedPerson), reasonableNumOfChars: reasonableNumOfCharsProperty, resolved: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolved, data.resolved), resolvedDate: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolvedDate, data.resolvedDate), resolvedBy: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.resolvedBy, data.resolvedBy), maxCreatedBits: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.maxCreatedBits, data.maxCreatedBits), maxDisplayLevel: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.maxDisplayLevel, data.maxDisplayLevel), page: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.page, data.page), productId: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productId, data.productId), product: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.product, data.product), productList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productList, data.productList), productVideo: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productVideo, data.productVideo), productVideoList: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productVideoList, data.productVideoList), productFolder: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.productFolder, data.productFolder), technicalTerm: this.buildTechnicalTerm(data.technicalTerm), servings: this.buildServings(data.servings), ratingLevelStart: this.buildRatingLevelStartEnd(data.ratingLevelStart), ratingLevelEnd: this.buildRatingLevelStartEnd(data.ratingLevelEnd), ratingLevelSelected: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.ratingLevelSelected, data.ratingLevelSelected), markConfig: this.buildMarkConfigs(data.markConfig), imageSource: this.buildImageSource(data.imageSource), person: this.buildPerson(data.bitType, data.person), bot: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.bot, data.bot), referenceProperty: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.property_reference, data.referenceProperty), 
+            // Book data
+            title: this.handleJsonText(data.title), subtitle: this.handleJsonText(data.subtitle), level: NumberUtils_1.NumberUtils.asNumber(data.level), toc: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.toc, data.toc), progress: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.progress, data.progress), anchor: data.anchor, reference: data.reference, referenceEnd: data.referenceEnd, 
+            // Item, Lead, Hint, Instruction
+            item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), pageNumber: this.handleJsonText(data.pageNumber), marginNumber: this.handleJsonText(data.marginNumber), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction), partialAnswer: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.partialAnswer, data.partialAnswer), sampleSolution: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.property_sampleSolution, data.sampleSolution), additionalSolutions: this.toAstProperty(PropertyConfigKey_1.PropertyConfigKey.additionalSolutions, data.additionalSolutions) }, this.toExample(data.__isDefaultExample, data.example)), { 
+            // Person
+            // Body
+            body: this.buildBody(textFormat, data.body), imagePlaceholder: ArrayUtils_1.ArrayUtils.asSingle(this.resourceBuilder.resourceFromResourceDataJson(data.bitType, ResourceTag_1.ResourceTag.image, (_b = data.imagePlaceholder) === null || _b === void 0 ? void 0 : _b.image)), resources: ArrayUtils_1.ArrayUtils.asArray(this.resourceBuilder.resourceFromResourceJson(data.bitType, data.resources)), cardNode, footer: this.buildFooter(data.footer), markup: data.markup, parser: data.parser, 
             // Must always be last in the AST so key clashes are avoided correctly with other properties
-            extraProperties: this.parseExtraProperties(extraProperties) });
+            extraProperties: this.parseExtraProperties(data.extraProperties), 
+            // Private properties
+            __isDefaultExample: (_c = data.__isDefaultExample) !== null && _c !== void 0 ? _c : false });
         // Push reasonableNumOfChars down the tree for the interview bit
-        if (Config_1.Config.isOfBitType(bitType, BitType_1.BitType.interview)) {
-            this.pushDownTree(undefined, undefined, cardNode, 'questions', PropertyConfigKey_1.PropertyConfigKey.reasonableNumOfChars, reasonableNumOfChars);
+        if (Config_1.Config.isOfBitType(data.bitType, BitType_1.BitType.interview)) {
+            this.pushDownTree(undefined, undefined, cardNode, 'questions', PropertyConfigKey_1.PropertyConfigKey.reasonableNumOfChars, data.reasonableNumOfChars);
         }
         // Push isCaseSensitive down the tree for the cloze, match and match-matrix bits
-        this.pushDownTree(body, [BodyBitType_1.BodyBitType.gap], undefined, undefined, PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, isCaseSensitive);
-        this.pushDownTree(undefined, undefined, cardNode, 'pairs', PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, isCaseSensitive);
-        this.pushDownTree(undefined, undefined, cardNode, ['matrix', 'cells'], PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, isCaseSensitive);
-        // If isDefaultExample is set at the bit level, push the default example down the tree to the relevant nodes
-        this.pushExampleDownTree(body, cardNode, isDefaultExample, example);
+        this.pushDownTree([data.body, ...((_e = (_d = cardNode === null || cardNode === void 0 ? void 0 : cardNode.cardBits) === null || _d === void 0 ? void 0 : _d.map((cardBit) => cardBit.body)) !== null && _e !== void 0 ? _e : [])], [BodyBitType_1.BodyBitType.gap], undefined, 'isCaseSensitive', PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, (_f = data.isCaseSensitive) !== null && _f !== void 0 ? _f : true);
+        this.pushDownTree(undefined, undefined, cardNode, 'pairs', PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, (_g = data.isCaseSensitive) !== null && _g !== void 0 ? _g : true);
+        this.pushDownTree(undefined, undefined, cardNode, ['matrix', 'cells'], PropertyConfigKey_1.PropertyConfigKey.isCaseSensitive, (_h = data.isCaseSensitive) !== null && _h !== void 0 ? _h : true);
+        // If __isDefaultExample is set at the bit level, push the default example down the tree to the relevant nodes
+        this.pushExampleDownTree(data.body, cardNode, data.__isDefaultExample, convertedExample.example);
         // Set default values
         this.setDefaultBitValues(node);
         // Set the 'isExample' flags
@@ -93,45 +95,88 @@ class Builder extends BaseBuilder_1.BaseBuilder {
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
-            ignoreEmptyString: ['example'],
+            ignoreUndefined: ['example'],
+            ignoreEmptyArrays: ['item', 'lead', 'pageNumber', 'marginNumber', 'hint', 'instruction'],
         });
         // Validate and correct invalid bits as much as possible
         return NodeValidator_1.NodeValidator.validateBit(node);
     }
+    /**
+     * Build choice[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildChoices(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildChoice(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build choice node
      *
      * @param data - data for the node
      * @returns
      */
-    choice(data) {
-        const { text, isCorrect, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
+    buildChoice(data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ text, isCorrect: !!isCorrect, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExampleBoolean(isDefaultExample, example));
+        const node = Object.assign({ choice: (_a = data.choice) !== null && _a !== void 0 ? _a : '', isCorrect: !!data.isCorrect, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, !!data.isCorrect));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item', 'hint', 'instruction'],
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build response[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildResponses(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildResponse(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build response node
      *
      * @param data - data for the node
      * @returns
      */
-    response(data) {
-        const { text, isCorrect, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
+    buildResponse(data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ text, isCorrect: !!isCorrect, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExampleBoolean(isDefaultExample, example));
+        const node = Object.assign({ response: (_a = data.response) !== null && _a !== void 0 ? _a : '', isCorrect: !!data.isCorrect, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, !!data.isCorrect));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item', 'hint', 'instruction'],
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build bot response[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildBotResponses(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.botResponse(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build bot response node
      *
@@ -139,44 +184,79 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @returns
      */
     botResponse(data) {
-        const { response, reaction, feedback, item, lead, pageNumber, marginNumber, hint } = data;
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            response,
-            reaction,
-            feedback,
-            itemLead: this.itemLead(item, lead, pageNumber, marginNumber),
-            hint,
+            response: (_a = data.response) !== null && _a !== void 0 ? _a : '',
+            reaction: (_b = data.reaction) !== null && _b !== void 0 ? _b : '',
+            feedback: (_c = data.feedback) !== null && _c !== void 0 ? _c : '',
+            item: this.handleJsonText(data.item),
+            lead: this.handleJsonText(data.lead),
+            hint: this.handleJsonText(data.hint),
         };
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreEmptyString: ['response', 'reaction', 'feedback'],
+            ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item'],
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build quiz[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildQuizzes(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildQuiz(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build quiz node
      *
      * @param data - data for the node
      * @returns
      */
-    quiz(data) {
-        const { choices, responses, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
-        // Push isDefaultExample down the tree
-        this.pushExampleDownTreeBoolean(isDefaultExample, example, true, choices);
-        this.pushExampleDownTreeBoolean(isDefaultExample, example, false, responses);
+    buildQuiz(data) {
+        if (!data)
+            return undefined;
+        const convertedExample = Object.assign({}, this.toExample(data.__isDefaultExample, data.__defaultExample));
+        let choices;
+        let responses;
+        if (data.choices) {
+            choices = this.buildChoices(data.choices);
+            // Push __isDefaultExample down the tree
+            this.pushExampleDownTreeBoolean(data.__isDefaultExample, convertedExample.example, true, choices);
+        }
+        else if (data.responses) {
+            responses = this.buildResponses(data.responses);
+            // Push __isDefaultExample down the tree
+            this.pushExampleDownTreeBoolean(data.__isDefaultExample, convertedExample.example, false, responses);
+        }
+        else {
+            // No choices or responses, not a valid quiz
+            return undefined;
+        }
         // NOTE: Node order is important and is defined here
         const node = {
-            itemLead: this.itemLead(item, lead, pageNumber, marginNumber),
-            hint,
-            instruction,
-            isExample: isDefaultExample || example != null,
-            choices,
-            responses,
+            item: this.handleJsonText(data.item),
+            lead: this.handleJsonText(data.lead),
+            hint: this.handleJsonText(data.hint),
+            instruction: this.handleJsonText(data.instruction),
+            isExample: !!data.__defaultExample,
+            choices: choices,
+            responses: responses,
         };
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item', 'hint', 'instruction'],
         });
         return node;
     }
@@ -186,69 +266,126 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    heading(data) {
-        var _a;
-        const { forKeys, forValues } = data;
-        if (forKeys == null)
+    buildHeading(data) {
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
+        if (data.forKeys == null)
             return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            forKeys: forKeys || Breakscape_1.Breakscape.EMPTY_STRING,
-            forValues: (_a = ArrayUtils_1.ArrayUtils.asArray(forValues)) !== null && _a !== void 0 ? _a : [],
+            forKeys: (_a = data.forKeys) !== null && _a !== void 0 ? _a : '',
+            forValues: (_c = (_b = data.forValues) !== null && _b !== void 0 ? _b : data.__forValuesDefault) !== null && _c !== void 0 ? _c : '',
         };
         // Remove Unset Optionals
-        // ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreAllFalse: true,
+            ignoreEmptyString: ['forKeys', 'forValues'],
+            ignoreEmptyArrays: ['forValues'],
+        });
         return node;
     }
+    /**
+     * Build pair[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildPairs(bitType, data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildPair(bitType, d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build pair node
      *
      * @param data - data for the node
      * @returns
      */
-    pair(data) {
-        const { key, keyAudio, keyImage, values, item, lead, pageNumber, marginNumber, hint, instruction, isCaseSensitive, isDefaultExample, example, } = data;
+    buildPair(bitType, data) {
+        var _a, _b, _c, _d;
+        if (!data)
+            return undefined;
+        // Set default example
+        const defaultExample = Array.isArray(data.__valuesAst) && data.__valuesAst.length > 0 ? data.__valuesAst[0] : null;
+        // Process the keyAudio and keyImage resources
+        const keyAudio = (_a = ArrayUtils_1.ArrayUtils.asSingle(this.resourceBuilder.resourceFromResourceDataJson(bitType, ResourceTag_1.ResourceTag.audio, data.keyAudio))) === null || _a === void 0 ? void 0 : _a.audio;
+        const keyImage = (_b = ArrayUtils_1.ArrayUtils.asSingle(this.resourceBuilder.resourceFromResourceDataJson(bitType, ResourceTag_1.ResourceTag.image, data.keyImage))) === null || _b === void 0 ? void 0 : _b.image;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign(Object.assign({ key,
-            keyAudio,
-            keyImage, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExample(isDefaultExample, example)), { isCaseSensitive,
-            values });
+        const node = Object.assign(Object.assign({ key: (_c = data.key) !== null && _c !== void 0 ? _c : '', keyAudio,
+            keyImage, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction), isCaseSensitive: data.isCaseSensitive }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { values: (_d = data.values) !== null && _d !== void 0 ? _d : [], __valuesAst: data.__valuesAst });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item', 'hint', 'instruction', 'values'],
+            ignoreUndefined: ['example', 'isCaseSensitive'],
         });
+        // if (node.key) {
+        //   delete node.keyAudio;
+        //   delete node.keyImage;
+        // }
+        // if (node.keyAudio != null) {
+        //   delete node.key;
+        //   delete node.keyImage;
+        // }
+        // if (node.keyImage != null) {
+        //   delete node.key;
+        //   delete node.keyAudio;
+        // }
         return node;
     }
+    /**
+     * Build matrix[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildMatricies(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildMatrix(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build matrix node
      *
      * @param data - data for the node
      * @returns
      */
-    matrix(data) {
-        const { key, cells, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample } = data;
+    buildMatrix(data) {
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
+        // const convertedExample = {
+        //   ...this.toExample(__isDefaultExample, example),
+        // };
+        // // Push __isDefaultExample down the tree
+        // this.pushExampleDownTreeBoolean(__isDefaultExample, convertedExample.example, true, choices);
+        // this.pushExampleDownTreeBoolean(__isDefaultExample, convertedExample.example, false, responses);
         let isExample = false;
         // Set isExample for matrix based on isExample for cells
-        for (const c of cells !== null && cells !== void 0 ? cells : []) {
-            if (isDefaultExample && !c.isExample) {
-                c.isDefaultExample = true;
+        for (const c of (_a = data.cells) !== null && _a !== void 0 ? _a : []) {
+            if (data.__isDefaultExample && !c.isExample) {
                 c.isExample = true;
             }
             isExample = c.isExample ? true : isExample;
         }
         // NOTE: Node order is important and is defined here
         const node = {
-            key,
-            itemLead: this.itemLead(item, lead, pageNumber, marginNumber),
-            hint,
-            instruction,
+            key: (_b = data.key) !== null && _b !== void 0 ? _b : '',
+            item: this.handleJsonText(data.item),
+            lead: this.handleJsonText(data.lead),
+            hint: this.handleJsonText(data.hint),
+            instruction: this.handleJsonText(data.instruction),
             isExample,
-            cells,
+            cells: ((_c = data.cells) !== null && _c !== void 0 ? _c : []).map((c) => this.buildMatrixCell(c)).filter((c) => c != null),
         };
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['hint', 'item', 'cells'],
+            ignoreUndefined: ['isCaseSensitive'],
         });
         return node;
     }
@@ -258,15 +395,19 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    matrixCell(data) {
-        const { values, item, lead, pageNumber, marginNumber, hint, instruction, isCaseSensitive, isDefaultExample, example, } = data;
+    buildMatrixCell(data) {
+        var _a;
+        if (!data)
+            return undefined;
+        // Set default example
+        const defaultExample = Array.isArray(data.__valuesAst) && data.__valuesAst.length > 0 ? data.__valuesAst[0] : null;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ values, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction,
-            isCaseSensitive }, this.toExample(isDefaultExample, example));
+        const node = Object.assign(Object.assign({ values: (_a = data.values) !== null && _a !== void 0 ? _a : [], item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction), isCaseSensitive: data.isCaseSensitive }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { __valuesAst: data.__valuesAst });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['instruction', 'item', 'values'],
+            ignoreUndefined: ['example', 'isCaseSensitive'],
         });
         return node;
     }
@@ -276,12 +417,14 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    table(data) {
-        const { columns, rows } = data;
+    buildTable(dataIn) {
+        var _a, _b;
+        if (!dataIn)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            columns,
-            rows,
+            columns: (_a = dataIn.columns) !== null && _a !== void 0 ? _a : [],
+            data: ((_b = dataIn.data) !== null && _b !== void 0 ? _b : []).map((row) => row !== null && row !== void 0 ? row : []),
         };
         // Remove Unset Optionals
         // ObjectUtils.removeUnwantedProperties(node, {
@@ -289,81 +432,235 @@ class Builder extends BaseBuilder_1.BaseBuilder {
         // });
         return node;
     }
+    /**
+     * Build question[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildQuestions(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildQuestion(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build question node
      *
      * @param data - data for the node
      * @returns
      */
-    question(data) {
-        const { question, partialAnswer, item, lead, pageNumber, marginNumber, hint, instruction, reasonableNumOfChars, sampleSolution, additionalSolutions, isDefaultExample, example, } = data;
+    buildQuestion(data) {
+        var _a, _b, _c, _d, _e;
+        if (!data)
+            return undefined;
+        // Set default example
+        const defaultExample = data.__sampleSolutionAst;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign(Object.assign({ itemLead: this.itemLead(item, lead, pageNumber, marginNumber), question,
-            partialAnswer,
-            hint,
-            instruction }, this.toExample(isDefaultExample, example)), { reasonableNumOfChars,
-            sampleSolution,
-            additionalSolutions });
+        const node = Object.assign(Object.assign({ question: (_a = data.question) !== null && _a !== void 0 ? _a : '', partialAnswer: (_b = data.partialAnswer) !== null && _b !== void 0 ? _b : '', sampleSolution: (_c = data.sampleSolution) !== null && _c !== void 0 ? _c : '', additionalSolutions: ((_d = data.additionalSolutions) !== null && _d !== void 0 ? _d : undefined), reasonableNumOfChars: ((_e = data.reasonableNumOfChars) !== null && _e !== void 0 ? _e : undefined), item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { __sampleSolutionAst: data.__sampleSolutionAst });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
-            ignoreEmptyString: ['question'],
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['item', 'hint', 'instruction'],
+            ignoreUndefined: ['example'],
+            ignoreEmptyString: ['question', 'partialAnswer', 'sampleSolution'],
         });
         return node;
     }
+    /**
+     * Build ingredient[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildIngredients(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildIngredient(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build ingredient node
      *
      * @param data - data for the node
      * @returns
      */
-    ingredient(data) {
-        const { title, checked, item, quantity, unit, unitAbbr, decimalPlaces, disableCalculation } = data;
+    buildIngredient(data) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            title,
-            checked: checked !== null && checked !== void 0 ? checked : false,
-            item,
-            quantity,
-            unit,
-            unitAbbr,
-            decimalPlaces,
-            disableCalculation,
+            title: (_a = data.title) !== null && _a !== void 0 ? _a : '',
+            checked: (_b = data.checked) !== null && _b !== void 0 ? _b : false,
+            item: (_c = data.item) !== null && _c !== void 0 ? _c : '',
+            quantity: (_d = data.quantity) !== null && _d !== void 0 ? _d : 0,
+            unit: (_e = data.unit) !== null && _e !== void 0 ? _e : '',
+            unitAbbr: (_f = data.unitAbbr) !== null && _f !== void 0 ? _f : '',
+            decimalPlaces: (_g = data.decimalPlaces) !== null && _g !== void 0 ? _g : 1,
+            disableCalculation: (_h = data.disableCalculation) !== null && _h !== void 0 ? _h : false,
         };
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            // ignoreAllEmptyArrays: true,
+            // ignoreUndefined: ['example'],
+            ignoreEmptyString: ['item', 'unit'],
         });
         return node;
     }
     /**
      * Build body node
+     * - Handles JSON, Bitmark text, and plain text
+     *   - body: set to either string, TextAst, or JSON
+     *   - bodyBits: set to array of BodyBitJson (will be validated and merged into body if it is a string)
+     *   - placeholders: set to placeholders from v2 JSON when body is a v2 JSON string
+     *   - bodyString: set to the original string if body is a string (only used for card body)
      *
      * @param data - data for the node
      * @returns
      */
-    body(data) {
-        const { bodyParts, bodyJson } = data;
-        const node = {
-            bodyParts,
-            bodyJson,
+    buildBody(textFormat, data) {
+        if (!data)
+            return undefined;
+        let body;
+        const bodyBits = [];
+        const placeholders = data.placeholders;
+        const bodyString = data.bodyString;
+        // Handle JSON type body
+        const handleJsonBody = () => {
+            // Attempt to parse a string body as JSON to support the legacy format
+            if (typeof data.body === 'string') {
+                try {
+                    body = JSON.parse(data.body);
+                }
+                catch (e) {
+                    // Could not parse JSON - set body to null
+                    body = null;
+                }
+            }
+            else {
+                body = data.body;
+            }
         };
-        return node;
-    }
-    /**
-     * Build bodyPartText node
-     *
-     * @param data - data for the node
-     * @returns
-     */
-    bodyText(data) {
-        const { text } = data;
-        // NOTE: Node order is important and is defined here
+        // Handle Bitmark text type body (both AST v3 and plain text v2)
+        const handleBitmarkTextBody = () => {
+            var _a;
+            let rawBody = data.body;
+            let bodyStr;
+            const placeholderNodes = {};
+            // TODO - process body bits through the correct builders.
+            if (StringUtils_1.StringUtils.isString(data.body)) {
+                // Body is a string (legacy bitmark v2, or not bitmark--/++)
+                bodyStr = ((_a = data.body) !== null && _a !== void 0 ? _a : '').trim();
+                rawBody = [];
+            }
+            else if (Array.isArray(data.body)) {
+                // Body is an array (prosemirror like JSON)
+                // Already in the correct format
+            }
+            else {
+                // body is invalid
+                rawBody = [];
+            }
+            if (placeholders) {
+                for (const [key, val] of Object.entries(placeholders)) {
+                    // const bit = this.bodyBitToAst(val);
+                    // placeholderNodes[key] = bit as BodyBit;
+                    placeholderNodes[key] = val;
+                }
+            }
+            if (bodyStr) {
+                // Breakscape
+                bodyStr = Breakscape_1.Breakscape.breakscape(bodyStr, {
+                    textFormat: TextFormat_1.TextFormat.bitmarkMinusMinus, // Treat as bitmark-- for v2 text
+                });
+                // Convert placeholders {1} to [!1], etc.
+                let index = 0;
+                const newPlaceholderNodes = [];
+                for (const [key, val] of Object.entries(placeholderNodes)) {
+                    if (bodyStr) {
+                        const newKey = `[!${index}]`;
+                        bodyStr = bodyStr.replace(`${key}`, newKey);
+                        newPlaceholderNodes.push(val);
+                        index++;
+                    }
+                }
+                // Convert the body string to AST
+                rawBody = this.textParser.toAst(bodyStr, {
+                    textFormat: TextFormat_1.TextFormat.bitmarkMinusMinus, // Treat as bitmark-- for v2 text
+                });
+                const replaceBitsRecursive = (bodyText) => {
+                    for (let i = 0, len = bodyText.length; i < len; i++) {
+                        const bodyPart = bodyText[i];
+                        if (bodyPart.type === 'bit') {
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            const index = bodyPart.index;
+                            if (newPlaceholderNodes[index] != null) {
+                                bodyText[i] = newPlaceholderNodes[index];
+                            }
+                        }
+                        else {
+                            if (bodyPart.content)
+                                replaceBitsRecursive(bodyPart.content);
+                        }
+                    }
+                };
+                // Replace the placeholders with the AST
+                replaceBitsRecursive(rawBody);
+            }
+            // Process the body bits to ensure they are valid
+            this.textParser.walkBodyBits(rawBody, (parent, index, bodyBit) => {
+                // Ensure the body bit is valid
+                let parsedBit;
+                switch (bodyBit.type) {
+                    case BodyBitType_1.BodyBitType.gap:
+                        parsedBit = this.buildGap(bodyBit);
+                        break;
+                    case BodyBitType_1.BodyBitType.mark:
+                        parsedBit = this.buildMark(bodyBit);
+                        break;
+                    case BodyBitType_1.BodyBitType.select:
+                        parsedBit = this.buildSelect(bodyBit);
+                        break;
+                    case BodyBitType_1.BodyBitType.highlight:
+                        parsedBit = this.buildHighlight(bodyBit);
+                        break;
+                    default:
+                    // TODO?? Ensure other parts are valid
+                }
+                if (parsedBit != undefined) {
+                    parent[index] = parsedBit;
+                    bodyBits.push(parsedBit);
+                }
+            });
+            // Set the body
+            body = rawBody;
+            // Mark the body as text
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            body.__tag = 'text';
+        };
+        const handlePlainTextBody = () => {
+            body = data.body;
+        };
+        const isBitmarkText = textFormat === TextFormat_1.TextFormat.bitmarkMinusMinus || textFormat === TextFormat_1.TextFormat.bitmarkPlusPlus;
+        if (textFormat === TextFormat_1.TextFormat.json) {
+            // JSON
+            handleJsonBody();
+        }
+        else if (isBitmarkText) {
+            // Bitmark text (either ast or string)
+            handleBitmarkTextBody();
+        }
+        else {
+            // Text but not bitmark (plain text)
+            handlePlainTextBody();
+        }
         const node = {
-            type: BodyBitType_1.BodyBitType.text,
-            data: {
-                bodyText: text,
-            },
+            body,
+            bodyBits,
+            bodyString,
+            // Placeholders are only ever parsed into AST, never stored directly
         };
         return node;
     }
@@ -373,11 +670,11 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    footerText(data) {
-        const { text } = data;
-        // NOTE: Node order is important and is defined here
+    buildFooter(data) {
+        if (!data)
+            return undefined;
         const node = {
-            footerText: text,
+            footer: this.handleJsonText(data.footer),
         };
         return node;
     }
@@ -387,38 +684,54 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    gap(data) {
-        const { solutions, item, lead, pageNumber, marginNumber, hint, instruction, isCaseSensitive, isDefaultExample, example, } = data;
-        // const defaultExample = Array.isArray(solutions) && solutions.length === 1 ? solutions[0] : null;
+    buildGap(data) {
+        var _a;
+        if (!data)
+            return undefined;
+        // Set default example
+        const defaultExample = Array.isArray(data.__solutionsAst) && data.__solutionsAst.length > 0 ? data.__solutionsAst[0] : null;
         // NOTE: Node order is important and is defined here
-        const node = {
-            type: BodyBitType_1.BodyBitType.gap,
-            data: Object.assign({ solutions, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-                instruction,
-                isCaseSensitive }, this.toExample(isDefaultExample, example)),
-        };
+        const node = Object.assign(Object.assign({ type: BodyBitType_1.BodyBitType.gap, solutions: (_a = data.solutions) !== null && _a !== void 0 ? _a : [], item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction), isCaseSensitive: data.isCaseSensitive }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { __solutionsAst: data.__solutionsAst });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreUndefined: ['example', 'isCaseSensitive'],
         });
         return node;
     }
+    /**
+     * Build mark configs node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildMarkConfigs(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildMarkConfig(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build mark config node
      *
      * @param data - data for the node
      * @returns
      */
-    markConfig(data) {
-        const { mark, color, emphasis } = data;
+    buildMarkConfig(data) {
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            mark,
-            color,
-            emphasis,
+            mark: (_a = data.mark) !== null && _a !== void 0 ? _a : 'unknown',
+            color: (_b = data.color) !== null && _b !== void 0 ? _b : '',
+            emphasis: (_c = data.emphasis) !== null && _c !== void 0 ? _c : '',
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreAllEmptyString: true,
+        });
         return node;
     }
     /**
@@ -427,17 +740,19 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    mark(data) {
-        const { solution, mark, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
+    buildMark(data) {
+        var _a, _b;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = {
-            type: BodyBitType_1.BodyBitType.mark,
-            data: Object.assign({ solution,
-                mark, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-                instruction }, this.toExample(isDefaultExample, example)),
-        };
+        const node = Object.assign({ type: BodyBitType_1.BodyBitType.mark, solution: (_a = data.solution) !== null && _a !== void 0 ? _a : '', mark: (_b = data.mark) !== null && _b !== void 0 ? _b : '', item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, true));
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreUndefined: ['example'],
+            ignoreEmptyString: ['solution', 'mark'],
+        });
         return node;
     }
     /**
@@ -446,40 +761,49 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    select(data) {
-        const { options, prefix, postfix, item, lead, pageNumber, marginNumber, hint, instruction } = data;
+    buildSelect(data) {
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = {
-            type: BodyBitType_1.BodyBitType.select,
-            data: {
-                prefix,
-                options,
-                postfix,
-                itemLead: this.itemLead(item, lead, pageNumber, marginNumber),
-                hint,
-                instruction,
-            },
-        };
+        const node = Object.assign(Object.assign({ type: BodyBitType_1.BodyBitType.select, options: (_a = this.buildSelectOptions(data.options)) !== null && _a !== void 0 ? _a : [], prefix: (_b = data.prefix) !== null && _b !== void 0 ? _b : '', postfix: (_c = data.postfix) !== null && _c !== void 0 ? _c : '', item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(false, undefined, undefined)), { __hintString: data.__hintString, __instructionString: data.__instructionString });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreEmptyString: ['prefix', 'postfix'],
         });
         return node;
     }
+    /**
+     * Build selectOption[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildSelectOptions(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildSelectOption(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build selectOption node
      *
      * @param data - data for the node
      * @returns
      */
-    selectOption(data) {
-        const { text, isCorrect, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
+    buildSelectOption(data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ text, isCorrect: !!isCorrect, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExample(isDefaultExample, example));
+        const node = Object.assign({ text: (_a = data.text) !== null && _a !== void 0 ? _a : '', isCorrect: !!data.isCorrect, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, !!data.isCorrect));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreUndefined: ['example'],
         });
         return node;
     }
@@ -489,95 +813,143 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    highlight(data) {
-        const { texts, prefix, postfix, item, lead, pageNumber, marginNumber, hint, instruction } = data;
+    buildHighlight(data) {
+        var _a, _b, _c;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = {
-            type: BodyBitType_1.BodyBitType.highlight,
-            data: {
-                prefix,
-                texts,
-                postfix,
-                itemLead: this.itemLead(item, lead, pageNumber, marginNumber),
-                hint,
-                instruction,
-            },
-        };
+        const node = Object.assign({ type: BodyBitType_1.BodyBitType.highlight, texts: (_a = this.buildHighlightTexts(data.texts)) !== null && _a !== void 0 ? _a : [], prefix: (_b = data.prefix) !== null && _b !== void 0 ? _b : '', postfix: (_c = data.postfix) !== null && _c !== void 0 ? _c : '', item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(false, undefined, undefined));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreEmptyString: ['prefix', 'postfix'],
         });
         return node;
     }
+    /**
+     * Build highlightText[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildHighlightTexts(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildHighlightText(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build highlightText node
      *
      * @param data - data for the node
      * @returns
      */
-    highlightText(data) {
-        const { text, isCorrect, isHighlighted, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example, } = data;
+    buildHighlightText(data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ text, isCorrect: !!isCorrect, isHighlighted: !!isHighlighted, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExample(isDefaultExample, example));
+        const node = Object.assign({ text: (_a = data.text) !== null && _a !== void 0 ? _a : '', isCorrect: !!data.isCorrect, isHighlighted: !!data.isHighlighted, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, !!data.isCorrect));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreAllEmptyArrays: true,
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build flashcards node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildFlashcards(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildFlashcard(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build flashcard node
      *
      * @param data - data for the node
      * @returns
      */
-    flashcard(data) {
-        const { question, answer, alternativeAnswers, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example, } = data;
+    buildFlashcard(data) {
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ question,
-            answer,
-            alternativeAnswers, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExampleBoolean(isDefaultExample, example));
+        const node = Object.assign({ question: this.handleJsonText(data.question), answer: this.handleJsonText(data.answer), alternativeAnswers: this.handleJsonText(data.alternativeAnswers), item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, true));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['question', 'answer', 'alternativeAnswers', 'item', 'hint', 'instruction'],
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build definitionListItem[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildDefinitionList(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildDefinitionListItem(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build definitionListItem node
      *
      * @param data - data for the node
      * @returns
      */
-    definitionListItem(data) {
-        const { term, description, alternativeDefinitions, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example, } = data;
+    buildDefinitionListItem(data) {
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ term,
-            description,
-            alternativeDefinitions, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExampleBoolean(isDefaultExample, example));
+        const node = Object.assign({ term: this.handleJsonText(data.term, TextFormat_1.TextFormat.bitmarkMinusMinus), definition: this.handleJsonText(data.definition), alternativeDefinitions: this.handleJsonText(data.alternativeDefinitions), item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, true));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            ignoreEmptyArrays: ['question', 'answer', 'alternativeDefinitions', 'item', 'hint', 'instruction'],
+            ignoreUndefined: ['example'],
         });
         return node;
     }
+    /**
+     * Build statement[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildStatements(data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildStatement(d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
+    }
     /**
      * Build statement node
      *
      * @param data - data for the node
      * @returns
      */
-    statement(data) {
-        const { text, isCorrect, item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example } = data;
+    buildStatement(data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign({ text, isCorrect: !!isCorrect, itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExampleBoolean(isDefaultExample, example));
+        const node = Object.assign({ statement: (_a = data.statement) !== null && _a !== void 0 ? _a : '', isCorrect: !!data.isCorrect, item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example, !!data.isCorrect));
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
+            // ignoreAllEmptyArrays: true,
+            ignoreUndefined: ['example'],
         });
         return node;
     }
@@ -587,19 +959,23 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    imageSource(data) {
+    buildImageSource(data) {
+        if (!data)
+            return undefined;
         const { url, mockupId, size, format, trim } = data;
         // NOTE: Node order is important and is defined here
         const node = {
-            url,
-            mockupId,
-            size,
-            format,
-            trim,
+            url: url !== null && url !== void 0 ? url : '',
+            mockupId: mockupId !== null && mockupId !== void 0 ? mockupId : '',
+            size: (size !== null && size !== void 0 ? size : null),
+            format: (format !== null && format !== void 0 ? format : null),
+            trim: (BooleanUtils_1.BooleanUtils.isBoolean(trim) ? trim : null),
         };
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreFalse: ['trim'],
+            ignoreEmptyString: ['url', 'mockupId'],
+            ignoreAllUndefined: true,
         });
         return node;
     }
@@ -609,16 +985,23 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    person(data) {
+    buildPerson(bitType, data) {
+        var _a;
+        if (!data)
+            return undefined;
         const { name, title, avatarImage } = data;
+        // { name: string; title?: string; avatarImage?: ImageResourceJson }
         // NOTE: Node order is important and is defined here
         const node = {
-            name,
-            title,
-            avatarImage,
+            name: name !== null && name !== void 0 ? name : '',
+            title: (title !== null && title !== void 0 ? title : undefined),
+            avatarImage: (_a = ArrayUtils_1.ArrayUtils.asSingle(this.resourceBuilder.resourceFromResourceDataJson(bitType, ResourceTag_1.ResourceTag.image, avatarImage))) === null || _a === void 0 ? void 0 : _a.image,
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreEmptyString: ['name'],
+            ignoreAllUndefined: true,
+        });
         return node;
     }
     /**
@@ -627,15 +1010,20 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    technicalTerm(data) {
+    buildTechnicalTerm(data) {
+        if (!data)
+            return undefined;
         const { technicalTerm, lang } = data;
         // NOTE: Node order is important and is defined here
         const node = {
-            technicalTerm,
-            lang,
+            technicalTerm: technicalTerm !== null && technicalTerm !== void 0 ? technicalTerm : '',
+            lang: lang !== null && lang !== void 0 ? lang : '',
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreEmptyString: ['technicalTerm'],
+            // ignoreAllUndefined: true,
+        });
         return node;
     }
     /**
@@ -644,19 +1032,24 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    servings(data) {
+    buildServings(data) {
+        if (!data)
+            return undefined;
         const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = data;
         // NOTE: Node order is important and is defined here
         const node = {
-            servings,
-            unit,
-            unitAbbr,
-            decimalPlaces,
-            disableCalculation,
-            hint,
+            servings: servings !== null && servings !== void 0 ? servings : 0,
+            unit: unit !== null && unit !== void 0 ? unit : '',
+            unitAbbr: unitAbbr !== null && unitAbbr !== void 0 ? unitAbbr : '',
+            decimalPlaces: decimalPlaces !== null && decimalPlaces !== void 0 ? decimalPlaces : 1,
+            disableCalculation: disableCalculation !== null && disableCalculation !== void 0 ? disableCalculation : false,
+            hint: hint !== null && hint !== void 0 ? hint : '',
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreEmptyString: ['servings', 'unit'],
+            // ignoreAllUndefined: true,
+        });
         return node;
     }
     /**
@@ -665,15 +1058,20 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    ratingLevelStartEnd(data) {
+    buildRatingLevelStartEnd(data) {
+        if (!data)
+            return undefined;
         const { level, label } = data;
         // NOTE: Node order is important and is defined here
         const node = {
-            level,
-            label,
+            level: level !== null && level !== void 0 ? level : 0,
+            label: this.handleJsonText(label),
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+        // ignoreEmptyArrays: ['servings', 'unit'],
+        // ignoreAllUndefined: true,
+        });
         return node;
     }
     /**
@@ -682,15 +1080,22 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    captionDefinition(data) {
-        const { term, description } = data;
+    buildCaptionDefinition(data) {
+        var _a, _b;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            term,
-            description,
+            // term: this.convertJsonTextToAstText(data.term),
+            // description: this.convertJsonTextToAstText(data.description),
+            term: (_a = data.term) !== null && _a !== void 0 ? _a : '',
+            definition: (_b = data.definition) !== null && _b !== void 0 ? _b : '',
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreEmptyString: ['term', 'description'],
+            // ignoreAllUndefined: true,
+        });
         return node;
     }
     /**
@@ -699,32 +1104,39 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    captionDefinitionList(data) {
-        const { columns, definitions } = data;
+    buildCaptionDefinitionList(data) {
+        var _a, _b;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
         const node = {
-            columns,
-            definitions,
+            columns: (_a = data.columns) !== null && _a !== void 0 ? _a : [],
+            definitions: ((_b = data.definitions) !== null && _b !== void 0 ? _b : [])
+                .map((d) => {
+                return this.buildCaptionDefinition({
+                    term: d.term,
+                    definition: d.definition,
+                });
+            })
+                .filter((d) => d != null),
         };
         // Remove Unset Optionals
-        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
+            ignoreAllEmptyArrays: true,
+        });
         return node;
     }
-    //
-    // Private
-    //
-    itemLead(item, lead, pageNumber, marginNumber) {
-        let node;
-        // NOTE: Node order is important and is defined here
-        if (item || lead || pageNumber || marginNumber) {
-            node = {
-                item,
-                lead,
-                pageNumber,
-                marginNumber,
-            };
-        }
-        return node;
+    /**
+     * Build card bit[] node
+     *
+     * @param data - data for the node
+     * @returns
+     */
+    buildCardBits(textFormat, data) {
+        if (!Array.isArray(data))
+            return undefined;
+        const nodes = data.map((d) => this.buildCardBit(textFormat, d)).filter((d) => d != null);
+        return nodes.length > 0 ? nodes : undefined;
     }
     /**
      * Build card bit node
@@ -732,116 +1144,101 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param data - data for the node
      * @returns
      */
-    cardBit(data) {
-        const { item, lead, pageNumber, marginNumber, hint, instruction, isDefaultExample, example, extraProperties, body, } = data;
+    buildCardBit(textFormat, data) {
+        var _a;
+        if (!data)
+            return undefined;
         // NOTE: Node order is important and is defined here
-        const node = Object.assign(Object.assign({ itemLead: this.itemLead(item, lead, pageNumber, marginNumber), hint,
-            instruction }, this.toExample(isDefaultExample, example)), { body, 
+        const node = Object.assign(Object.assign({ item: this.handleJsonText(data.item), lead: this.handleJsonText(data.lead), hint: this.handleJsonText(data.hint), instruction: this.handleJsonText(data.instruction) }, this.toExample(data.__isDefaultExample, data.example)), { __isDefaultExample: (_a = data.__isDefaultExample) !== null && _a !== void 0 ? _a : false, body: this.buildBody(textFormat, data.body), 
             // Must always be last in the AST so key clashes are avoided correctly with other properties
-            extraProperties: this.parseExtraProperties(extraProperties) });
+            extraProperties: this.parseExtraProperties(data.extraProperties) });
         // Remove Unset Optionals
         ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node, {
             ignoreAllFalse: true,
-            ignoreEmptyString: ['example'],
+            // ignoreEmptyArrays: ['example'],
+            ignoreUndefined: ['example'],
         });
         // Validate and correct invalid bits as much as possible
         return NodeValidator_1.NodeValidator.validateCardBit(node);
     }
-    cardNode(data) {
-        let node;
-        const { questions, elements, flashcards, definitions, statement, statements, choices, responses, quizzes, heading, pairs, matrix, table, botResponses, ingredients, captionDefinitionList, cardBits, } = data;
-        if (questions ||
-            elements ||
-            flashcards ||
-            definitions ||
-            statement ||
-            statements ||
-            choices ||
-            responses ||
-            quizzes ||
-            heading ||
-            pairs ||
-            matrix ||
-            table ||
-            botResponses ||
-            ingredients ||
-            captionDefinitionList ||
-            cardBits) {
-            node = {
-                questions,
-                elements,
-                flashcards,
-                definitions,
-                statement,
-                statements,
-                choices,
-                responses,
-                quizzes,
-                heading,
-                pairs,
-                matrix,
-                table,
-                botResponses,
-                ingredients,
-                captionDefinitionList,
-                cardBits,
-            };
-            // Remove Unset Optionals
-            ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
-        }
-        return node;
+    //
+    // Private
+    //
+    buildCardNode(bitType, textFormat, data) {
+        const node = {
+            questions: this.buildQuestions(data.questions),
+            elements: data.elements,
+            flashcards: this.buildFlashcards(data.flashcards),
+            definitions: this.buildDefinitionList(data.definitions),
+            statement: this.buildStatement(data.statement),
+            statements: this.buildStatements(data.statements),
+            choices: this.buildChoices(data.choices),
+            responses: this.buildResponses(data.responses),
+            quizzes: this.buildQuizzes(data.quizzes),
+            heading: this.buildHeading(data.heading),
+            pairs: this.buildPairs(bitType, data.pairs),
+            matrix: this.buildMatricies(data.matrix),
+            table: this.buildTable(data.table),
+            botResponses: this.buildBotResponses(data.botResponses),
+            ingredients: this.buildIngredients(data.ingredients),
+            captionDefinitionList: this.buildCaptionDefinitionList(data.captionDefinitionList),
+            cardBits: this.buildCardBits(textFormat, data.cardBits),
+        };
+        // Remove Unset Optionals
+        ObjectUtils_1.ObjectUtils.removeUnwantedProperties(node);
+        return Object.keys(node).length > 0 ? node : undefined;
     }
     /**
      * Set examples down the tree
      *
      * @param body
      * @param cardNode
-     * @param isDefaultExample
+     * @param __isDefaultExample
      * @param example
      * @returns true if any of the answers has an example, otherwise undefined
      */
-    pushExampleDownTree(body, cardNode, isDefaultExample, example) {
-        if (isDefaultExample || example) {
+    pushExampleDownTree(body, cardNode, __isDefaultExample, example) {
+        if (__isDefaultExample || example != null) {
             if (cardNode) {
-                this.pushExampleDownTreeString(isDefaultExample, example, cardNode.pairs);
-                this.pushExampleDownTreeBoolean(isDefaultExample, example, false, cardNode.flashcards);
-                this.pushExampleDownTreeBoolean(isDefaultExample, example, false, cardNode.definitions);
-                this.pushExampleDownTreeBoolean(isDefaultExample, example, true, cardNode.choices);
-                this.pushExampleDownTreeBoolean(isDefaultExample, example, false, cardNode.responses, cardNode.statements, cardNode.statement);
+                this.pushExampleDownTreeString(__isDefaultExample, example, cardNode.pairs);
+                this.pushExampleDownTreeBoolean(__isDefaultExample, example, false, cardNode.flashcards);
+                this.pushExampleDownTreeBoolean(__isDefaultExample, example, false, cardNode.definitions);
+                this.pushExampleDownTreeBoolean(__isDefaultExample, example, true, cardNode.choices);
+                this.pushExampleDownTreeBoolean(__isDefaultExample, example, false, cardNode.responses, cardNode.statements, cardNode.statement);
                 if (cardNode.quizzes) {
                     for (const quiz of cardNode.quizzes) {
-                        this.pushExampleDownTreeBoolean(isDefaultExample, example, true, quiz.choices);
-                        this.pushExampleDownTreeBoolean(isDefaultExample, example, false, quiz.responses);
+                        this.pushExampleDownTreeBoolean(__isDefaultExample, example, true, quiz.choices);
+                        this.pushExampleDownTreeBoolean(__isDefaultExample, example, false, quiz.responses);
                     }
                 }
                 if (cardNode.matrix) {
                     for (const m of cardNode.matrix) {
-                        this.pushExampleDownTreeString(isDefaultExample, example, m.cells);
+                        this.pushExampleDownTreeString(__isDefaultExample, example, m.cells);
                     }
                 }
             }
             if (body) {
-                this.pushExampleDownTreeBodyBits(isDefaultExample, example, body);
+                this.pushExampleDownTreeBodyBits(__isDefaultExample, example, body);
             }
         }
     }
     /**
      * Set examples for boolean nodes
      *
-     * @param isDefaultExample
+     * @param __isDefaultExample
      * @param example
      * @param onlyCorrect
      * @param nodes
      * @returns true if any of the answers has an example, otherwise undefined
      */
-    pushExampleDownTreeBoolean(isDefaultExample, example, onlyCorrect, ...nodes) {
-        if (!isDefaultExample && !example)
+    pushExampleDownTreeBoolean(__isDefaultExample, example, onlyCorrect, ...nodes) {
+        if (!__isDefaultExample && example == null)
             return;
         if (Array.isArray(nodes)) {
             for (const ds of nodes) {
                 if (ds) {
                     const exampleNodes = Array.isArray(ds) ? ds : [ds];
-                    BitUtils_1.BitUtils.fillBooleanExample(exampleNodes, isDefaultExample, example, onlyCorrect);
+                    BitUtils_1.BitUtils.fillBooleanExample(exampleNodes, __isDefaultExample, example, onlyCorrect);
                 }
             }
         }
@@ -849,49 +1246,48 @@ class Builder extends BaseBuilder_1.BaseBuilder {
     /**
      * Set examples for string nodes
      *
-     * @param isDefaultExample
+     * @param __isDefaultExample
      * @param example
      * @param nodes
      * @returns true if any of the answers has an example, otherwise undefined
      */
-    pushExampleDownTreeString(isDefaultExample, example, ...nodes) {
-        if (!isDefaultExample && !example)
+    pushExampleDownTreeString(__isDefaultExample, example, ...nodes) {
+        if (!__isDefaultExample && !example)
             return;
         if (Array.isArray(nodes)) {
             for (const ds of nodes) {
                 if (ds) {
                     const exampleNodes = Array.isArray(ds) ? ds : [ds];
-                    BitUtils_1.BitUtils.fillStringExample(exampleNodes, isDefaultExample, example, false);
+                    BitUtils_1.BitUtils.fillStringExample(exampleNodes, __isDefaultExample, example, false);
                 }
             }
         }
     }
-    pushExampleDownTreeBodyBits(isDefaultExample, example, body) {
-        if (!isDefaultExample && !example)
-            return;
-        if (!body || !body.bodyParts || body.bodyParts.length === 0)
+    pushExampleDownTreeBodyBits(__isDefaultExample, example, body) {
+        if (!__isDefaultExample && !example)
             return;
-        for (const part of body.bodyParts) {
+        const bodyBitsJson = this.textParser.extractBodyBits(body === null || body === void 0 ? void 0 : body.body);
+        for (const part of bodyBitsJson) {
             if (part) {
                 switch (part.type) {
                     case BodyBitType_1.BodyBitType.gap: {
                         const gap = part;
-                        BitUtils_1.BitUtils.fillStringExample([gap.data], isDefaultExample, example, false);
+                        BitUtils_1.BitUtils.fillStringExample([gap], __isDefaultExample, example, false);
                         break;
                     }
                     case BodyBitType_1.BodyBitType.mark: {
                         const mark = part;
-                        BitUtils_1.BitUtils.fillBooleanExample([mark.data], isDefaultExample, example, false);
+                        BitUtils_1.BitUtils.fillBooleanExample([mark], __isDefaultExample, example, false);
                         break;
                     }
                     case BodyBitType_1.BodyBitType.select: {
                         const select = part;
-                        BitUtils_1.BitUtils.fillBooleanExample(select.data.options, isDefaultExample, example, true);
+                        BitUtils_1.BitUtils.fillBooleanExample(select.options, __isDefaultExample, example, true);
                         break;
                     }
                     case BodyBitType_1.BodyBitType.highlight: {
                         const highlight = part;
-                        BitUtils_1.BitUtils.fillBooleanExample(highlight.data.texts, isDefaultExample, example, true);
+                        BitUtils_1.BitUtils.fillBooleanExample(highlight.texts, __isDefaultExample, example, true);
                         break;
                     }
                 }
@@ -903,7 +1299,7 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      *
      * This function is not type safe and should be used with care
      *
-     * @param body set if the value should be passed down the body to the body bits
+     * @param body/body[] set if the value should be passed down the body to the body bits / card body bits
      * @param bodyBitTypes body bit types to push the value down to
      * @param cardNode set if the value should be passed down the card node
      * @param path path for the value
@@ -925,14 +1321,22 @@ class Builder extends BaseBuilder_1.BaseBuilder {
             }
         }
         // Add value to body bit types if required
-        if (bodyBitTypes && body && body.bodyParts && body.bodyParts.length > 0) {
-            for (const part of body.bodyParts) {
-                if (part) {
-                    if (bodyBitTypes.indexOf(part.type) !== -1) {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        const data = part.data;
-                        if (data[path] == null) {
-                            data[path] = value;
+        if (body) {
+            const bodyArray = (Array.isArray(body) ? body : [body]);
+            for (const b of bodyArray) {
+                if (b && b.body && bodyBitTypes) {
+                    const bodyBitsJson = this.textParser.extractBodyBits(b.body);
+                    if (bodyBitTypes && bodyBitsJson && bodyBitsJson.length > 0) {
+                        for (const part of bodyBitsJson) {
+                            if (part) {
+                                if (bodyBitTypes.indexOf(part.type) !== -1) {
+                                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                    const data = part;
+                                    if (data[path] == null) {
+                                        data[path] = value;
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -960,12 +1364,12 @@ class Builder extends BaseBuilder_1.BaseBuilder {
      * @param bit
      */
     setIsExampleFlags(bit) {
+        // bit.isExample = false;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        bit.isExample = false;
         const checkIsExample = (example) => {
             if (!example)
                 return false;
-            if (example.isDefaultExample || example.example != undefined) {
+            if ( /*example.__isDefaultExample ||*/example.isExample || example.example != undefined) {
                 example.isExample = true;
                 bit.isExample = true;
             }
@@ -981,32 +1385,31 @@ class Builder extends BaseBuilder_1.BaseBuilder {
         };
         const { body, cardNode } = bit;
         // Body bit level
-        if (body && body.bodyParts) {
-            for (const bodyPart of body.bodyParts) {
-                switch (bodyPart.type) {
-                    case BodyBitType_1.BodyBitType.gap:
-                    case BodyBitType_1.BodyBitType.mark: {
-                        checkIsExample(bodyPart.data);
-                        break;
-                    }
-                    case BodyBitType_1.BodyBitType.select: {
-                        const select = bodyPart;
-                        let hasExample = false;
-                        for (const option of select.data.options) {
-                            hasExample = checkIsExample(option) ? true : hasExample;
-                        }
-                        select.data.isExample = hasExample;
-                        break;
+        const bodyBitsJson = this.textParser.extractBodyBits(body === null || body === void 0 ? void 0 : body.body);
+        for (const bodyPart of bodyBitsJson) {
+            switch (bodyPart.type) {
+                case BodyBitType_1.BodyBitType.gap:
+                case BodyBitType_1.BodyBitType.mark: {
+                    checkIsExample(bodyPart);
+                    break;
+                }
+                case BodyBitType_1.BodyBitType.select: {
+                    const select = bodyPart;
+                    let hasExample = false;
+                    for (const option of select.options) {
+                        hasExample = checkIsExample(option) ? true : hasExample;
                     }
-                    case BodyBitType_1.BodyBitType.highlight: {
-                        const highlight = bodyPart;
-                        let hasExample = false;
-                        for (const text of highlight.data.texts) {
-                            hasExample = checkIsExample(text) ? true : hasExample;
-                        }
-                        highlight.data.isExample = hasExample;
-                        break;
+                    select.isExample = hasExample;
+                    break;
+                }
+                case BodyBitType_1.BodyBitType.highlight: {
+                    const highlight = bodyPart;
+                    let hasExample = false;
+                    for (const text of highlight.texts) {
+                        hasExample = checkIsExample(text) ? true : hasExample;
                     }
+                    highlight.isExample = hasExample;
+                    break;
                 }
             }
         }