@gmb/bitmark-parser-generator 1.35.0 → 2.0.0

package/dist/esm/parser/bitmark/peg/contentProcessors/CardContentProcessor.js

@@ -9,7 +9,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { Builder } from '../../../../ast/Builder';
 import { Breakscape } from '../../../../breakscaping/Breakscape';
 import { Config } from '../../../../config/Config';
 import { CardSetConfigKey } from '../../../../model/config/enum/CardSetConfigKey';
@@ -19,7 +18,6 @@ import { ResourceTag } from '../../../../model/enum/ResourceTag';
 import { NumberUtils } from '../../../../utils/NumberUtils';
 import { BitmarkPegParserValidator } from '../BitmarkPegParserValidator';
 import { BitContentLevel, } from '../BitmarkPegParserTypes';
-const builder = new Builder();
 function buildCards(context, bitType, textFormat, parsedCardSet, statementV1, statementsV1, choicesV1, responsesV1) {
     var _a;
     if (context.DEBUG_CARD_SET)
@@ -67,7 +65,7 @@ function buildCards(context, bitType, textFormat, parsedCardSet, statementV1, st
             break;
         case CardSetConfigKey._clozeList:
         case CardSetConfigKey._exampleBitList:
-            result = parseCardBits(context, bitType, processedCardSet);
+            result = parseCardBits(context, bitType, textFormat, processedCardSet);
             break;
         case CardSetConfigKey._captionDefinitionsList:
             // ==> captionDefinitionsList
@@ -82,6 +80,7 @@ function buildCards(context, bitType, textFormat, parsedCardSet, statementV1, st
     return result;
 }
 function processCardSet(context, bitType, textFormat, parsedCardSet) {
+    var _a;
     const processedCardSet = {
         cards: [],
         internalComments: [],
@@ -119,7 +118,7 @@ function processCardSet(context, bitType, textFormat, parsedCardSet) {
                 // Validate the cardBody
                 tags.cardBody = BitmarkPegParserValidator.checkCardBody(context, BitContentLevel.Card, bitType, tags.cardBody, processedCard.no, processedSide.no, processedVariant.no);
                 // Reduce the card body parts to a breakscaped string
-                tags.cardBodyStr = cardBodyToBreakscapedString(tags.cardBody);
+                tags.cardBodyStr = (_a = tags.cardBody) === null || _a === void 0 ? void 0 : _a.bodyString;
                 processedVariant.data = tags;
                 // Add any internal comments
                 if (tags.internalComments)
@@ -132,10 +131,12 @@ function processCardSet(context, bitType, textFormat, parsedCardSet) {
     return processedCardSet;
 }
 function parseFlashcardLike(context, bitType, cardSet) {
+    var _a;
     const flashcards = [];
     const definitions = [];
-    let question = Breakscape.EMPTY_STRING;
-    let answer;
+    let question = [];
+    let questionString = '';
+    let answer = [];
     let alternativeAnswers = [];
     let cardIndex = 0;
     let variantIndex = 0;
@@ -144,24 +145,25 @@ function parseFlashcardLike(context, bitType, cardSet) {
     const onlyOneCardAllowed = bitType === BitType.flashcard1;
     for (const card of cardSet.cards) {
         // Reset the question and answers
-        question = Breakscape.EMPTY_STRING;
-        answer = undefined;
+        question = [];
+        answer = [];
         alternativeAnswers = [];
         variantIndex = 0;
         extraTags = {};
         for (const side of card.sides) {
             for (const content of side.variants) {
-                const _a = content.data, { cardBodyStr } = _a, tags = __rest(_a, ["cardBodyStr"]);
+                const _b = content.data, { cardBody } = _b, tags = __rest(_b, ["cardBody"]);
                 extraTags = Object.assign(Object.assign({}, extraTags), tags);
                 if (variantIndex === 0) {
                     questionVariant = content;
-                    question = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                    question = cardBody === null || cardBody === void 0 ? void 0 : cardBody.body;
+                    questionString = ((_a = cardBody === null || cardBody === void 0 ? void 0 : cardBody.bodyString) !== null && _a !== void 0 ? _a : '');
                 }
                 else if (variantIndex === 1) {
-                    answer = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                    answer = cardBody === null || cardBody === void 0 ? void 0 : cardBody.body;
                 }
                 else {
-                    alternativeAnswers.push(cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING);
+                    alternativeAnswers.push(cardBody === null || cardBody === void 0 ? void 0 : cardBody.body);
                 }
                 variantIndex++;
             }
@@ -169,14 +171,19 @@ function parseFlashcardLike(context, bitType, cardSet) {
         // Add the flashcard
         if (cardIndex === 0 || !onlyOneCardAllowed) {
             if (Config.isOfBitType(bitType, BitType.definitionList)) {
-                // .definitions-list
-                definitions.push(builder.definitionListItem(Object.assign({ term: question, description: answer, alternativeDefinitions: alternativeAnswers.length > 0 ? alternativeAnswers : undefined }, extraTags)));
+                // .definition-list
+                const dl = Object.assign({ term: question, definition: answer, alternativeDefinitions: alternativeAnswers }, extraTags);
+                if (dl)
+                    definitions.push(dl);
             }
             else {
                 // .flashcard
                 // if (question) {
-                flashcards.push(builder.flashcard(Object.assign({ question,
-                    answer, alternativeAnswers: alternativeAnswers.length > 0 ? alternativeAnswers : undefined }, extraTags)));
+                const fc = Object.assign({ question,
+                    answer,
+                    alternativeAnswers }, extraTags);
+                if (fc)
+                    flashcards.push(fc);
                 // } else {
                 //   context.addWarning('Ignoring card with empty question', questionVariant);
                 // }
@@ -184,7 +191,7 @@ function parseFlashcardLike(context, bitType, cardSet) {
         }
         else {
             // Only one card allowed, add a warning and ignore the card
-            context.addWarning(`Bit '${bitType}' should only contain one card. Ignore subsequent card: '${question}'`, questionVariant);
+            context.addWarning(`Bit '${bitType}' should only contain one card. Ignore subsequent card: '${questionString}'`, questionVariant);
             break;
         }
         cardIndex++;
@@ -202,7 +209,7 @@ function parseElements(_context, _bitType, cardSet) {
             for (const content of side.variants) {
                 const tags = content.data;
                 // if (tags.cardBody) {
-                elements.push((_a = tags.cardBodyStr) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING);
+                elements.push((_a = tags.cardBodyStr) !== null && _a !== void 0 ? _a : '');
                 // } else {
                 //   context.addWarning('Ignoring card with empty element', content);
                 // }
@@ -214,19 +221,23 @@ function parseElements(_context, _bitType, cardSet) {
     };
 }
 function parseStatements(_context, _bitType, cardSet, statementV1, statementsV1) {
+    var _a;
     const statements = [];
     for (const card of cardSet.cards) {
         for (const side of card.sides) {
             for (const content of side.variants) {
-                const _a = content.data, { statements: chainedStatements } = _a, tags = __rest(_a, ["statements"]);
+                const _b = content.data, { statements: chainedStatements, statement: _ignore } = _b, tags = __rest(_b, ["statements", "statement"]);
+                // Remove statement from rest, tags
+                _ignore;
                 // Re-build the statement, adding any tags that were not in the True/False chain
                 // These tags are actually not in the correct place, but we can still interpret them and fix the data.
                 // As .true-false only has one statement per card, we can just add the extra tags to the statement.
                 if (Array.isArray(chainedStatements)) {
                     for (const s of chainedStatements) {
                         // if (s.text) {
-                        const statement = builder.statement(Object.assign(Object.assign(Object.assign({}, s), s.itemLead), tags));
-                        statements.push(statement);
+                        const statement = Object.assign({ statement: (_a = s.statement) !== null && _a !== void 0 ? _a : '', isCorrect: s.isCorrect, item: s.item, lead: s.lead, hint: s.hint, instruction: s.instruction, example: s.example }, tags);
+                        if (statement)
+                            statements.push(statement);
                         // } else {
                         //   context.addWarning('Ignoring card with empty statement', content);
                         // }
@@ -257,24 +268,31 @@ function parseQuiz(_context, bitType, cardSet, choicesV1, responsesV1) {
     let exampleCard;
     for (const card of cardSet.cards) {
         isDefaultExampleCard = false;
-        exampleCard = Breakscape.EMPTY_STRING;
+        exampleCard = undefined;
         for (const side of card.sides) {
             for (const content of side.variants) {
-                const _a = content.data, { isDefaultExample, example } = _a, tags = __rest(_a, ["isDefaultExample", "example"]);
+                const _a = content.data, { __isDefaultExample, example } = _a, tags = __rest(_a, ["__isDefaultExample", "example"]);
                 // Example
-                isDefaultExampleCard = isDefaultExample === true ? true : isDefaultExampleCard;
+                isDefaultExampleCard = __isDefaultExample === true ? true : isDefaultExampleCard;
                 exampleCard = example ? example : exampleCard;
                 // Insert choices / responses
                 if (tags.trueFalse && tags.trueFalse.length > 0) {
                     const responsesOrChoices = [];
-                    const builderFunc = insertResponses ? builder.response : builder.choice;
                     for (const tf of tags.trueFalse) {
-                        const { isDefaultExample: isDefaultExampleTf, example: exampleTf } = tf, tfTags = __rest(tf, ["isDefaultExample", "example"]);
-                        const isDefaultExample = isDefaultExampleTf || isDefaultExampleCard;
+                        const { __isDefaultExample: isDefaultExampleTf, example: exampleTf } = tf, tfTags = __rest(tf, ["__isDefaultExample", "example"]);
+                        const __isDefaultExample = isDefaultExampleTf || isDefaultExampleCard;
                         const example = exampleTf || exampleCard;
-                        const response = builderFunc(Object.assign(Object.assign({}, tfTags), { isDefaultExample,
-                            example }));
-                        responsesOrChoices.push(response);
+                        const response = {
+                            isCorrect: tfTags.isCorrect,
+                            __isDefaultExample,
+                            example,
+                        };
+                        if (insertResponses)
+                            response.response = tfTags.text;
+                        else
+                            response.choice = tfTags.text;
+                        if (response)
+                            responsesOrChoices.push(response);
                     }
                     if (insertResponses)
                         tags.responses = responsesOrChoices;
@@ -282,8 +300,9 @@ function parseQuiz(_context, bitType, cardSet, choicesV1, responsesV1) {
                         tags.choices = responsesOrChoices;
                 }
                 // if (tags.choices || tags.responses) {
-                const quiz = builder.quiz(Object.assign(Object.assign({}, tags), { isDefaultExample: isDefaultExampleCard, example: exampleCard }));
-                quizzes.push(quiz);
+                const quiz = Object.assign(Object.assign({}, tags), { choices: tags.choices, responses: tags.responses, __isDefaultExample: isDefaultExampleCard, __defaultExample: exampleCard });
+                if (quiz)
+                    quizzes.push(quiz);
                 // } else {
                 //   context.addWarning('Ignoring card with empty quiz', content);
                 // }
@@ -292,16 +311,18 @@ function parseQuiz(_context, bitType, cardSet, choicesV1, responsesV1) {
     }
     // Add a quiz for the V1 choices / responses
     if (insertChoices && Array.isArray(choicesV1) && choicesV1.length > 0) {
-        const quiz = builder.quiz({
+        const quiz = {
             choices: choicesV1,
-        });
-        quizzes.push(quiz);
+        };
+        if (quiz)
+            quizzes.push(quiz);
     }
     if (insertResponses && Array.isArray(responsesV1) && responsesV1.length > 0) {
-        const quiz = builder.quiz({
+        const quiz = {
             responses: responsesV1,
-        });
-        quizzes.push(quiz);
+        };
+        if (quiz)
+            quizzes.push(quiz);
     }
     return {
         quizzes: quizzes.length > 0 ? quizzes : undefined,
@@ -315,8 +336,9 @@ function parseQuestions(_context, _bitType, cardSet) {
             for (const content of side.variants) {
                 const tags = content.data;
                 // if (tags.cardBody) {
-                const q = builder.question(Object.assign({ question: (_a = tags.cardBodyStr) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING }, tags));
-                questions.push(q);
+                const q = Object.assign({ question: (_a = tags.cardBodyStr) !== null && _a !== void 0 ? _a : '' }, tags);
+                if (q)
+                    questions.push(q);
                 // }
                 // else {
                 //   context.addWarning('Ignoring card with empty body text', content);
@@ -328,7 +350,7 @@ function parseQuestions(_context, _bitType, cardSet) {
         questions: questions.length > 0 ? questions : undefined,
     };
 }
-function parseMatchPairs(_context, _bitType, cardSet) {
+function parseMatchPairs(_context, bitType, cardSet) {
     let sideIdx = 0;
     let isHeading = false;
     let heading;
@@ -337,6 +359,7 @@ function parseMatchPairs(_context, _bitType, cardSet) {
     let forValues = [];
     let pairKey = undefined;
     let pairValues = [];
+    let _pairValuesAst = [];
     let keyAudio = undefined;
     let keyImage = undefined;
     let extraTags = {};
@@ -351,28 +374,29 @@ function parseMatchPairs(_context, _bitType, cardSet) {
         forValues = [];
         pairKey = undefined;
         pairValues = [];
+        _pairValuesAst = [];
         keyAudio = undefined;
         keyImage = undefined;
         sideIdx = 0;
         extraTags = {};
         isDefaultExampleCard = false;
-        exampleCard = Breakscape.EMPTY_STRING;
+        exampleCard = undefined;
         for (const side of card.sides) {
             for (const content of side.variants) {
                 // variant = content;
-                const _a = content.data, { cardBodyStr, title, resources, isDefaultExample, example } = _a, tags = __rest(_a, ["cardBodyStr", "title", "resources", "isDefaultExample", "example"]);
+                const _a = content.data, { cardBody, cardBodyStr, title, resources, __isDefaultExample, example } = _a, tags = __rest(_a, ["cardBody", "cardBodyStr", "title", "resources", "__isDefaultExample", "example"]);
                 // Example
-                isDefaultExampleCard = isDefaultExample === true ? true : isDefaultExampleCard;
+                isDefaultExampleCard = __isDefaultExample === true ? true : isDefaultExampleCard;
                 exampleCard = example ? example : exampleCard;
                 // Get the 'heading' which is the [#title] at level 1
-                const heading = title && title[1];
+                const heading = title && title[1].titleString;
                 if (heading != null)
                     isHeading = true;
                 if (sideIdx === 0) {
                     // First side
                     forKeys = heading;
                     if (heading != null) {
-                        isDefaultExampleCardSet = isDefaultExample === true ? true : isDefaultExampleCardSet;
+                        isDefaultExampleCardSet = __isDefaultExample === true ? true : isDefaultExampleCardSet;
                         exampleCardSet = example ? example : exampleCardSet;
                     }
                     else if (Array.isArray(resources) && resources.length > 0) {
@@ -380,10 +404,10 @@ function parseMatchPairs(_context, _bitType, cardSet) {
                         const resource = resources[0];
                         // console.log('WARNING: Match card has resource on first side', tags.resource);
                         if (resource.type === ResourceTag.audio) {
-                            keyAudio = resource;
+                            keyAudio = resource.audio;
                         }
                         else if (resource.type === ResourceTag.image) {
-                            keyImage = resource;
+                            keyImage = resource.image;
                         }
                     }
                     else {
@@ -393,17 +417,19 @@ function parseMatchPairs(_context, _bitType, cardSet) {
                 }
                 else {
                     // Subsequent sides
-                    forValues.push(heading !== null && heading !== void 0 ? heading : Breakscape.EMPTY_STRING);
+                    forValues.push(heading !== null && heading !== void 0 ? heading : '');
                     if (heading != null) {
-                        isDefaultExampleCardSet = isDefaultExample === true ? true : isDefaultExampleCardSet;
+                        isDefaultExampleCardSet = __isDefaultExample === true ? true : isDefaultExampleCardSet;
                         exampleCardSet = example ? example : exampleCardSet;
                     }
                     else if (title == null) {
                         // If not a heading, it is a pair
-                        const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                        const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : '';
+                        const valueAst = cardBody === null || cardBody === void 0 ? void 0 : cardBody.body;
                         pairValues.push(value);
+                        _pairValuesAst.push(valueAst);
                         if ((isDefaultExampleCardSet || isDefaultExampleCard) && !exampleCard)
-                            exampleCard = value;
+                            exampleCard = valueAst;
                     }
                     // Fix: https://github.com/getMoreBrain/cosmic/issues/5454
                     delete tags.item;
@@ -415,22 +441,37 @@ function parseMatchPairs(_context, _bitType, cardSet) {
             sideIdx++;
         }
         if (isHeading) {
-            heading = builder.heading({
-                forKeys: forKeys !== null && forKeys !== void 0 ? forKeys : Breakscape.EMPTY_STRING,
-                forValues,
-            });
+            let forValuesFinal = forValues;
+            if (Config.isOfBitType(bitType, BitType.matchMatrix)) {
+                // forValues is an array of values
+                forValuesFinal = forValues;
+            }
+            else {
+                // Standard match, forValues is a single value
+                if (forValues.length >= 1) {
+                    forValuesFinal = forValues[forValues.length - 1];
+                }
+                else {
+                    forValuesFinal = '';
+                }
+            }
+            heading = {
+                forKeys: forKeys !== null && forKeys !== void 0 ? forKeys : '',
+                forValues: forValuesFinal,
+            };
         }
         else {
             // if (pairKey || keyAudio || keyImage) {
-            // Calculate final example and isDefaultExample
+            // Calculate final example and __isDefaultExample
             if (isDefaultExampleCard)
                 exampleCardSet = undefined;
-            const isDefaultExample = isDefaultExampleCard || isDefaultExampleCardSet;
+            const __isDefaultExample = isDefaultExampleCard || isDefaultExampleCardSet;
             const example = exampleCard || exampleCardSet;
-            const pair = builder.pair(Object.assign(Object.assign({ key: pairKey !== null && pairKey !== void 0 ? pairKey : Breakscape.EMPTY_STRING, keyAudio,
-                keyImage, values: pairValues }, extraTags), { isDefaultExample,
-                example }));
-            pairs.push(pair);
+            const pair = Object.assign(Object.assign({ key: pairKey !== null && pairKey !== void 0 ? pairKey : '', keyAudio,
+                keyImage, values: pairValues, __valuesAst: _pairValuesAst }, extraTags), { __isDefaultExample,
+                example });
+            if (pair)
+                pairs.push(pair);
             // } else {
             //   context.addWarning('Ignoring card with empty body text', variant);
             // }
@@ -452,6 +493,7 @@ function parseMatchMatrix(_context, _bitType, cardSet) {
     const matrix = [];
     let matrixCells = [];
     let matrixCellValues = [];
+    let _matrixCellValuesAst = [];
     let matrixCellTags = {};
     let isDefaultExampleCardSet = false;
     let exampleCardSet;
@@ -474,27 +516,29 @@ function parseMatchMatrix(_context, _bitType, cardSet) {
         // keyImage = undefined;
         matrixCells = [];
         matrixCellValues = [];
+        _matrixCellValuesAst = [];
         sideIdx = 0;
         isDefaultExampleCard = false;
-        exampleCard = Breakscape.EMPTY_STRING;
+        exampleCard = undefined;
         isCaseSensitiveMatrix = undefined;
         for (const side of card.sides) {
             matrixCellValues = [];
+            _matrixCellValuesAst = [];
             matrixCellTags = {};
             isDefaultExampleSide = false;
-            exampleSide = Breakscape.EMPTY_STRING;
+            exampleSide = undefined;
             isCaseSensitiveCell = undefined;
             for (const content of side.variants) {
                 // variant = content;
                 const tags = content.data;
-                const { title, cardBodyStr, isDefaultExample, example, isCaseSensitive } = tags, restTags = __rest(tags, ["title", "cardBodyStr", "isDefaultExample", "example", "isCaseSensitive"]);
+                const { title, cardBody, cardBodyStr, __isDefaultExample, example, isCaseSensitive } = tags, restTags = __rest(tags, ["title", "cardBody", "cardBodyStr", "__isDefaultExample", "example", "isCaseSensitive"]);
                 // Example
-                isDefaultExampleSide = isDefaultExample === true ? true : isDefaultExampleSide;
+                isDefaultExampleSide = __isDefaultExample === true ? true : isDefaultExampleSide;
                 exampleSide = example ? example : exampleSide;
                 // Merge the tags into the matrix cell tags
                 Object.assign(matrixCellTags, restTags);
                 // Get the 'heading' which is the [#title] at level 1
-                const heading = title && title[1];
+                const heading = title && title[1].titleString;
                 if (heading != null)
                     isHeading = true;
                 if (sideIdx === 0) {
@@ -508,14 +552,14 @@ function parseMatchMatrix(_context, _bitType, cardSet) {
                         //   } else if (tags.resource.type === ResourceTag.image) {
                         //     keyImage = tags.resource as ImageResource;
                         //   }
-                        isDefaultExampleCardSet = isDefaultExample === true ? true : isDefaultExampleCardSet;
+                        isDefaultExampleCardSet = __isDefaultExample === true ? true : isDefaultExampleCardSet;
                         exampleCardSet = example ? example : exampleCardSet;
                     }
                     else {
                         // If not a heading or resource, it is a matrix
                         matrixKey = cardBodyStr;
                         matrixKeyTags = restTags;
-                        isDefaultExampleCard = isDefaultExample === true ? true : isDefaultExampleCard;
+                        isDefaultExampleCard = __isDefaultExample === true ? true : isDefaultExampleCard;
                         exampleCard = example ? example : exampleCard;
                         isCaseSensitiveMatrix = isCaseSensitive != null ? isCaseSensitive : isCaseSensitiveMatrix;
                     }
@@ -524,48 +568,51 @@ function parseMatchMatrix(_context, _bitType, cardSet) {
                     // Subsequent sides
                     forValues.push(heading !== null && heading !== void 0 ? heading : Breakscape.EMPTY_STRING);
                     if (heading != null) {
-                        isDefaultExampleCardSet = isDefaultExample === true ? true : isDefaultExampleCardSet;
+                        isDefaultExampleCardSet = __isDefaultExample === true ? true : isDefaultExampleCardSet;
                         exampleCardSet = example ? example : exampleCardSet;
                     }
                     else if (tags.title == null) {
                         // If not a heading, it is a matrix cell value
                         const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                        const valueAst = cardBody === null || cardBody === void 0 ? void 0 : cardBody.body;
                         matrixCellValues.push(value);
+                        _matrixCellValuesAst.push(valueAst);
                         if ((isDefaultExampleCardSet || isDefaultExampleSide) && !exampleSide)
-                            exampleSide = value;
+                            exampleSide = valueAst;
                         isCaseSensitiveCell = isCaseSensitive != null ? isCaseSensitive : isCaseSensitiveMatrix;
                     }
                 }
             }
             // Finished looping variants, create matrix cell
             if (sideIdx > 0) {
-                // Calculate final example and isDefaultExample
+                // Calculate final example and __isDefaultExample
                 if (isDefaultExampleSide)
                     exampleCard = exampleCardSet = undefined;
                 if (isDefaultExampleCard)
                     exampleCardSet = undefined;
-                const isDefaultExample = isDefaultExampleSide || isDefaultExampleCard || isDefaultExampleCardSet;
+                const __isDefaultExample = isDefaultExampleSide || isDefaultExampleCard || isDefaultExampleCardSet;
                 const example = exampleSide || exampleCard || exampleCardSet;
-                const matrixCell = builder.matrixCell(Object.assign(Object.assign({ values: matrixCellValues }, matrixCellTags), { isDefaultExample,
-                    example, isCaseSensitive: isCaseSensitiveCell }));
-                matrixCells.push(matrixCell);
+                const matrixCell = Object.assign(Object.assign({ values: matrixCellValues, __valuesAst: _matrixCellValuesAst }, matrixCellTags), { __isDefaultExample: __isDefaultExample, example, isCaseSensitive: isCaseSensitiveCell });
+                if (matrixCell)
+                    matrixCells.push(matrixCell);
             }
             sideIdx++;
         }
         if (isHeading) {
-            heading = builder.heading({
+            heading = {
                 forKeys: forKeys !== null && forKeys !== void 0 ? forKeys : Breakscape.EMPTY_STRING,
                 forValues,
-            });
+            };
         }
         else {
             // if (matrixKey) {
-            const m = builder.matrix(Object.assign({ key: matrixKey !== null && matrixKey !== void 0 ? matrixKey : Breakscape.EMPTY_STRING, 
+            const m = Object.assign({ key: matrixKey !== null && matrixKey !== void 0 ? matrixKey : Breakscape.EMPTY_STRING, 
                 // item: matrixItem ?? Breakscape.EMPTY_STRING,
                 // keyAudio,
                 // keyImage,
-                cells: matrixCells }, matrixKeyTags));
-            matrix.push(m);
+                cells: matrixCells }, matrixKeyTags);
+            if (m)
+                matrix.push(m);
             // } else {
             //   context.addWarning('Ignoring card with empty body text', variant);
             // }
@@ -591,15 +638,15 @@ function parseTable(_context, _bitType, cardSet) {
                 const tags = content.data;
                 const { title, cardBodyStr } = tags;
                 // Get the 'heading' which is the [#title] at level 1
-                const heading = title && title[1];
+                const heading = title && title[1].titleString;
                 if (cardIdx === 0 && heading != null)
                     isHeading = true;
                 if (isHeading) {
-                    columns.push(heading !== null && heading !== void 0 ? heading : Breakscape.EMPTY_STRING);
+                    columns.push(heading !== null && heading !== void 0 ? heading : '');
                 }
                 else {
                     // If not a heading, it is a row cell value
-                    const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                    const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : '';
                     rowValues.push(value);
                 }
             }
@@ -609,10 +656,10 @@ function parseTable(_context, _bitType, cardSet) {
         }
         cardIdx++;
     }
-    const table = builder.table({
+    const table = {
         columns,
-        rows,
-    });
+        data: rows,
+    };
     return { table };
 }
 function parseBotActionResponses(_context, _bitType, cardSet) {
@@ -620,9 +667,10 @@ function parseBotActionResponses(_context, _bitType, cardSet) {
     for (const card of cardSet.cards) {
         for (const side of card.sides) {
             for (const content of side.variants) {
-                const _a = content.data, { instruction, reaction, cardBodyStr: feedback } = _a, tags = __rest(_a, ["instruction", "reaction", "cardBodyStr"]);
-                const botResponse = builder.botResponse(Object.assign({ response: instruction !== null && instruction !== void 0 ? instruction : Breakscape.EMPTY_STRING, reaction: reaction !== null && reaction !== void 0 ? reaction : Breakscape.EMPTY_STRING, feedback: feedback !== null && feedback !== void 0 ? feedback : Breakscape.EMPTY_STRING }, tags));
-                botResponses.push(botResponse);
+                const _a = content.data, { __instructionString, reaction, cardBodyStr: feedback } = _a, tags = __rest(_a, ["__instructionString", "reaction", "cardBodyStr"]);
+                const botResponse = Object.assign({ response: __instructionString !== null && __instructionString !== void 0 ? __instructionString : Breakscape.EMPTY_STRING, reaction: reaction !== null && reaction !== void 0 ? reaction : Breakscape.EMPTY_STRING, feedback: feedback !== null && feedback !== void 0 ? feedback : Breakscape.EMPTY_STRING }, tags);
+                if (botResponse)
+                    botResponses.push(botResponse);
             }
         }
     }
@@ -635,26 +683,32 @@ function parseIngredients(_context, _bitType, cardSet) {
     for (const card of cardSet.cards) {
         for (const side of card.sides) {
             for (const content of side.variants) {
-                const _a = content.data, { title: titleArray, instruction, unit, unitAbbr, decimalPlaces, disableCalculation, cardBodyStr: item, cardBody } = _a, tags = __rest(_a, ["title", "instruction", "unit", "unitAbbr", "decimalPlaces", "disableCalculation", "cardBodyStr", "cardBody"]);
+                const _a = content.data, { title: titleArray, __instructionString, unit, unitAbbr, decimalPlaces, disableCalculation, cardBodyStr, cardBody } = _a, tags = __rest(_a, ["title", "__instructionString", "unit", "unitAbbr", "decimalPlaces", "disableCalculation", "cardBodyStr", "cardBody"]);
                 // Extract 'title' from title array (if present)
                 // Extract 'quantity' from either then unchained instruction, or from the select (otherwise use 0)
                 // Extract checked from the select options (if present, otherwise checked is false))
-                const title = Array.isArray(titleArray) && titleArray.length > 0 ? titleArray[titleArray.length - 1] : undefined;
+                const title = Array.isArray(titleArray) && titleArray.length > 0
+                    ? titleArray[titleArray.length - 1].titleString
+                    : undefined;
                 let checked = false;
-                let quantity = NumberUtils.asNumber(instruction);
-                if (cardBody && cardBody.bodyParts) {
-                    const select = cardBody.bodyParts.find((part) => part.type === BodyBitType.select);
+                let quantity = NumberUtils.asNumber(__instructionString);
+                if (cardBody && cardBody.bodyBits) {
+                    const select = cardBody.bodyBits.find((c) => c.type === BodyBitType.select);
                     if (select) {
-                        quantity = select.data.instruction ? NumberUtils.asNumber(select.data.instruction) : quantity;
-                        if (select.data.options && select.data.options.length > 0) {
-                            checked = select.data.options[0].isCorrect;
+                        quantity = select.__instructionString ? NumberUtils.asNumber(select.__instructionString) : quantity;
+                        if (select.options && select.options.length > 0) {
+                            checked = select.options[0].isCorrect;
                         }
                     }
                 }
-                const trimmedItem = item ? item.trim() : Breakscape.EMPTY_STRING;
-                const ingredient = builder.ingredient(Object.assign({ title,
-                    checked, item: trimmedItem, quantity, unit: unit !== null && unit !== void 0 ? unit : Breakscape.EMPTY_STRING, unitAbbr: unitAbbr !== null && unitAbbr !== void 0 ? unitAbbr : Breakscape.EMPTY_STRING, decimalPlaces: decimalPlaces !== null && decimalPlaces !== void 0 ? decimalPlaces : 1, disableCalculation: disableCalculation }, tags));
-                ingredients.push(ingredient);
+                const ingredient = Object.assign({ title,
+                    checked, 
+                    // TS compiler very weird. It doesn't recognize that cardBodyStr is a string|undefined, even if cast!
+                    // Casting to 'any' to avoid the error
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    item: cardBodyStr, quantity, unit: unit !== null && unit !== void 0 ? unit : Breakscape.EMPTY_STRING, unitAbbr: unitAbbr !== null && unitAbbr !== void 0 ? unitAbbr : Breakscape.EMPTY_STRING, decimalPlaces: decimalPlaces !== null && decimalPlaces !== void 0 ? decimalPlaces : 1, disableCalculation: disableCalculation }, tags);
+                if (ingredient)
+                    ingredients.push(ingredient);
             }
         }
     }
@@ -677,15 +731,15 @@ function parseCaptionDefinitionsList(_context, _bitType, cardSet) {
                 const tags = content.data;
                 const { title, cardBodyStr } = tags;
                 // Get the 'heading' which is the [#title] at level 1
-                const heading = title && title[1];
+                const heading = title && title[1].titleString;
                 if (cardIdx === 0 && heading != null)
                     isHeading = true;
                 if (isHeading) {
-                    columns.push(heading !== null && heading !== void 0 ? heading : Breakscape.EMPTY_STRING);
+                    columns.push(heading !== null && heading !== void 0 ? heading : '');
                 }
                 else {
                     // If not a heading, it is a row cell value
-                    const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : Breakscape.EMPTY_STRING;
+                    const value = cardBodyStr !== null && cardBodyStr !== void 0 ? cardBodyStr : '';
                     rowValues.push(value);
                 }
             }
@@ -695,24 +749,29 @@ function parseCaptionDefinitionsList(_context, _bitType, cardSet) {
         }
         cardIdx++;
     }
-    const captionDefinitionList = builder.captionDefinitionList({
-        columns,
-        definitions: rows.map((row) => {
-            return builder.captionDefinition({
-                term: row[0],
-                description: row[1],
-            });
-        }),
-    });
+    const captionDefinitionList = columns.length > 0
+        ? {
+            columns,
+            definitions: rows
+                .map((row) => {
+                const col = {
+                    term: row[0],
+                    definition: row[1],
+                };
+                return col;
+            })
+                .filter((d) => d != null),
+        }
+        : undefined;
     return { captionDefinitionList };
 }
-function parseCardBits(_context, _bitType, cardSet) {
+function parseCardBits(_context, _bitType, _textFormat, cardSet) {
     const cardBits = [];
     for (const card of cardSet.cards) {
         for (const side of card.sides) {
             for (const content of side.variants) {
                 const _a = content.data, { cardBody: body } = _a, rest = __rest(_a, ["cardBody"]);
-                const cardBit = builder.cardBit(Object.assign({ body }, rest));
+                const cardBit = Object.assign({ body }, rest);
                 if (cardBit)
                     cardBits.push(cardBit);
             }
@@ -722,18 +781,5 @@ function parseCardBits(_context, _bitType, cardSet) {
         cardBits: cardBits.length > 0 ? cardBits : undefined,
     };
 }
-function cardBodyToBreakscapedString(cardBody) {
-    let bodyStr = '';
-    if (cardBody && cardBody.bodyParts) {
-        for (const bodyPart of cardBody.bodyParts) {
-            if (bodyPart.type === BodyBitType.text) {
-                const asText = bodyPart;
-                const bodyTextPart = asText.data.bodyText;
-                bodyStr += bodyTextPart;
-            }
-        }
-    }
-    return bodyStr;
-}
 export { buildCards };
 //# sourceMappingURL=CardContentProcessor.js.map