@gmb/bitmark-parser-generator 1.4.7 → 1.4.9

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

@@ -22,6 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonGenerator = void 0;
 const Ast_1 = require("../../ast/Ast");
+const Breakscape_1 = require("../../breakscaping/Breakscape");
 const Config_1 = require("../../config/Config");
 const NodeType_1 = require("../../model/ast/NodeType");
 const BitType_1 = require("../../model/enum/BitType");
@@ -306,10 +307,10 @@ class JsonGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return;
         if (item != null) {
-            this.bitJson.item = this.toTextAstOrString(item);
+            this.bitJson.item = this.toTextAstOrString(item, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
         if (lead != null) {
-            this.bitJson.lead = this.toTextAstOrString(lead);
+            this.bitJson.lead = this.toTextAstOrString(lead, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> extraProperties
@@ -362,12 +363,12 @@ class JsonGenerator {
                 const asText = bodyPart;
                 const bodyTextPart = asText.data.bodyText;
                 // Append the text part to the full text body
-                fullBodyTextStr += bodyTextPart;
+                fullBodyTextStr = Breakscape_1.Breakscape.concatenate(fullBodyTextStr, bodyTextPart);
             }
             else {
                 const { legacyPlaceholderKey, placeholderKey } = createPlaceholderKeys(placeholderIndex);
                 // Append the placeholder to the full text body
-                fullBodyTextStr += plainText ? legacyPlaceholderKey : placeholderKey;
+                fullBodyTextStr = Breakscape_1.Breakscape.concatenate(fullBodyTextStr, plainText ? legacyPlaceholderKey : placeholderKey);
                 placeholderIndex++;
             }
         }
@@ -434,7 +435,7 @@ class JsonGenerator {
         // Ignore elements that are not at the bit level as they are handled elsewhere as quizzes
         // if (parent?.key !== NodeType.bitsValue) return;
         if (elements && elements.length > 0) {
-            this.bitJson.elements = elements;
+            this.bitJson.elements = Breakscape_1.Breakscape.unbreakscape(elements);
         }
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue
@@ -448,7 +449,7 @@ class JsonGenerator {
         if (flashcards) {
             for (const c of flashcards) {
                 // Create the flashcard
-                const flashcardJson = Object.assign(Object.assign({ question: (_a = c.question) !== null && _a !== void 0 ? _a : '', answer: (_b = c.answer) !== null && _b !== void 0 ? _b : '', alternativeAnswers: (_c = c.alternativeAnswers) !== null && _c !== void 0 ? _c : [] }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
+                const flashcardJson = Object.assign(Object.assign({ question: (_a = Breakscape_1.Breakscape.unbreakscape(c.question)) !== null && _a !== void 0 ? _a : '', answer: (_b = Breakscape_1.Breakscape.unbreakscape(c.answer)) !== null && _b !== void 0 ? _b : '', alternativeAnswers: (_c = Breakscape_1.Breakscape.unbreakscape(c.alternativeAnswers)) !== null && _c !== void 0 ? _c : [] }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
                     defaultExample: c.isDefaultExample,
                     isBoolean: true,
                 }));
@@ -470,7 +471,7 @@ class JsonGenerator {
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
             return;
         if (statement) {
-            this.bitJson.statement = (_a = statement.text) !== null && _a !== void 0 ? _a : '';
+            this.bitJson.statement = (_a = Breakscape_1.Breakscape.unbreakscape(statement.text)) !== null && _a !== void 0 ? _a : '';
             this.bitJson.isCorrect = (_b = statement.isCorrect) !== null && _b !== void 0 ? _b : false;
         }
     }
@@ -485,7 +486,7 @@ class JsonGenerator {
         if (statements) {
             for (const s of statements) {
                 // Create the statement
-                const statementJson = Object.assign(Object.assign({ statement: (_a = s.text) !== null && _a !== void 0 ? _a : '', isCorrect: !!s.isCorrect }, this.toItemLeadHintInstruction(s)), this.toExample(s, {
+                const statementJson = Object.assign(Object.assign({ statement: (_a = Breakscape_1.Breakscape.unbreakscape(s.text)) !== null && _a !== void 0 ? _a : '', isCorrect: !!s.isCorrect }, this.toItemLeadHintInstruction(s)), this.toExample(s, {
                     defaultExample: !!s.isCorrect,
                     isBoolean: true,
                 }));
@@ -517,7 +518,7 @@ class JsonGenerator {
         if (choices) {
             for (const c of choices) {
                 // Create the choice
-                const choiceJson = Object.assign(Object.assign({ choice: (_a = c.text) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
+                const choiceJson = Object.assign(Object.assign({ choice: (_a = Breakscape_1.Breakscape.unbreakscape(c.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
                     defaultExample: !!c.isCorrect,
                     isBoolean: true,
                 }));
@@ -543,7 +544,7 @@ class JsonGenerator {
         if (responses) {
             for (const r of responses) {
                 // Create the response
-                const responseJson = Object.assign(Object.assign({ response: (_a = r.text) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = r.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
+                const responseJson = Object.assign(Object.assign({ response: (_a = Breakscape_1.Breakscape.unbreakscape(r.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = r.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
                     defaultExample: !!r.isCorrect,
                     isBoolean: true,
                 }));
@@ -569,7 +570,7 @@ class JsonGenerator {
                 if (q.choices) {
                     for (const c of q.choices) {
                         // Create the choice
-                        const choiceJson = Object.assign(Object.assign({ choice: (_a = c.text) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
+                        const choiceJson = Object.assign(Object.assign({ choice: (_a = Breakscape_1.Breakscape.unbreakscape(c.text)) !== null && _a !== void 0 ? _a : '', isCorrect: (_b = c.isCorrect) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
                             defaultExample: !!c.isCorrect,
                             isBoolean: true,
                         }));
@@ -584,7 +585,7 @@ class JsonGenerator {
                 if (q.responses) {
                     for (const r of q.responses) {
                         // Create the choice
-                        const responseJson = Object.assign(Object.assign({ response: (_d = r.text) !== null && _d !== void 0 ? _d : '', isCorrect: (_e = r.isCorrect) !== null && _e !== void 0 ? _e : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
+                        const responseJson = Object.assign(Object.assign({ response: (_d = Breakscape_1.Breakscape.unbreakscape(r.text)) !== null && _d !== void 0 ? _d : '', isCorrect: (_e = r.isCorrect) !== null && _e !== void 0 ? _e : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
                             defaultExample: !!r.isCorrect,
                             isBoolean: true,
                         }));
@@ -619,28 +620,28 @@ class JsonGenerator {
             return false;
         // Create the heading
         const headingJson = {
-            forKeys: (_a = heading.forKeys) !== null && _a !== void 0 ? _a : '',
+            forKeys: (_a = Breakscape_1.Breakscape.unbreakscape(heading.forKeys)) !== null && _a !== void 0 ? _a : '',
         };
         // TODO: Should probably check wether bit is a match or a matrix and add a string for match and array for matrix
         if (Array.isArray(heading.forValues)) {
             if (heading.forValues.length > 1) {
-                headingJson.forValues = heading.forValues;
+                headingJson.forValues = Breakscape_1.Breakscape.unbreakscape(heading.forValues);
             }
             else if (heading.forValues.length === 1) {
-                headingJson.forValues = heading.forValues[0];
+                headingJson.forValues = Breakscape_1.Breakscape.unbreakscape(heading.forValues[0]);
             }
             else {
-                headingJson.forValues = heading.forValues;
+                headingJson.forValues = Breakscape_1.Breakscape.unbreakscape(heading.forValues);
             }
         }
         else {
-            headingJson.forValues = (_b = heading.forValues) !== null && _b !== void 0 ? _b : '';
+            headingJson.forValues = (_b = Breakscape_1.Breakscape.unbreakscape(heading.forValues)) !== null && _b !== void 0 ? _b : '';
         }
         this.bitJson.heading = headingJson;
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs
     enter_pairs(node, _parent, _route) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const pairs = node.value;
         const pairsJson = [];
         if (pairs) {
@@ -648,12 +649,12 @@ class JsonGenerator {
                 // Get default example
                 const defaultExample = Array.isArray(p.values) && p.values.length > 0 && p.values[0];
                 // Create the question
-                const pairJson = Object.assign(Object.assign(Object.assign({ key: (_a = p.key) !== null && _a !== void 0 ? _a : '', keyAudio: p.keyAudio ? this.addAudioResource(p.keyAudio) : undefined, keyImage: p.keyImage ? this.addImageResource(p.keyImage) : undefined, values: (_b = p.values) !== null && _b !== void 0 ? _b : [] }, this.toItemLeadHintInstruction(p)), { isCaseSensitive: (_c = p.isCaseSensitive) !== null && _c !== void 0 ? _c : true, isLongAnswer: (_d = !p.isShortAnswer) !== null && _d !== void 0 ? _d : false }), this.toExample(p, {
+                const pairJson = Object.assign(Object.assign(Object.assign({ key: (_a = Breakscape_1.Breakscape.unbreakscape(p.key)) !== null && _a !== void 0 ? _a : '', keyAudio: p.keyAudio ? this.addAudioResource(p.keyAudio) : undefined, keyImage: p.keyImage ? this.addImageResource(p.keyImage) : undefined, values: (_b = Breakscape_1.Breakscape.unbreakscape(p.values)) !== null && _b !== void 0 ? _b : [] }, this.toItemLeadHintInstruction(p)), { isCaseSensitive: (_c = p.isCaseSensitive) !== null && _c !== void 0 ? _c : true }), this.toExample(p, {
                     defaultExample,
                     isBoolean: false,
                 }));
                 // Delete unwanted properties
-                if (((_e = p.itemLead) === null || _e === void 0 ? void 0 : _e.lead) == null)
+                if (((_d = p.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete pairJson.lead;
                 if (pairJson.key) {
                     delete pairJson.keyAudio;
@@ -676,7 +677,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix
     enter_matrix(node, _parent, _route) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const matrix = node.value;
         const matrixJsonArray = [];
         if (matrix) {
@@ -688,12 +689,12 @@ class JsonGenerator {
                         // Get default example
                         const defaultExample = Array.isArray(c.values) && c.values.length > 0 && c.values[0];
                         // Create the choice
-                        const matrixCellJson = Object.assign(Object.assign({ values: (_a = c.values) !== null && _a !== void 0 ? _a : [] }, this.toItemLeadHintInstruction(c)), this.toExample(c, {
+                        const matrixCellJson = Object.assign(Object.assign(Object.assign({ values: (_a = Breakscape_1.Breakscape.unbreakscape(c.values)) !== null && _a !== void 0 ? _a : [] }, this.toItemLeadHintInstruction(c)), { isCaseSensitive: (_b = c.isCaseSensitive) !== null && _b !== void 0 ? _b : true }), this.toExample(c, {
                             defaultExample,
                             isBoolean: false,
                         }));
                         // Delete unwanted properties
-                        if (((_b = c.itemLead) === null || _b === void 0 ? void 0 : _b.lead) == null)
+                        if (((_c = c.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                             delete matrixCellJson.lead;
                         if (c.hint == null)
                             delete matrixCellJson.hint;
@@ -701,11 +702,11 @@ class JsonGenerator {
                     }
                 }
                 // Create the matrix
-                const matrixJson = Object.assign(Object.assign({ key: (_c = m.key) !== null && _c !== void 0 ? _c : '', cells: matrixCellsJson !== null && matrixCellsJson !== void 0 ? matrixCellsJson : [] }, this.toItemLeadHintInstruction(m)), { 
+                const matrixJson = Object.assign(Object.assign({ key: (_d = Breakscape_1.Breakscape.unbreakscape(m.key)) !== null && _d !== void 0 ? _d : '', cells: matrixCellsJson !== null && matrixCellsJson !== void 0 ? matrixCellsJson : [] }, this.toItemLeadHintInstruction(m)), { 
                     // ...this.toExample(m.example, m.isExample),
-                    isCaseSensitive: (_d = m.isCaseSensitive) !== null && _d !== void 0 ? _d : true, isLongAnswer: (_e = !m.isShortAnswer) !== null && _e !== void 0 ? _e : false, isExample: (_f = m.isExample) !== null && _f !== void 0 ? _f : false });
+                    isExample: (_e = m.isExample) !== null && _e !== void 0 ? _e : false });
                 // Delete unwanted properties
-                if (((_g = m.itemLead) === null || _g === void 0 ? void 0 : _g.lead) == null)
+                if (((_f = m.itemLead) === null || _f === void 0 ? void 0 : _f.lead) == null)
                     delete matrixJson.lead;
                 if (m.instruction == null)
                     delete matrixJson.instruction;
@@ -718,20 +719,18 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> questions
     enter_questions(node, _parent, _route) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const questions = node.value;
         const questionsJson = [];
         if (questions) {
             for (const q of questions) {
                 // Create the question
-                const questionJson = Object.assign(Object.assign(Object.assign({ question: (_a = q.question) !== null && _a !== void 0 ? _a : '', partialAnswer: (_b = ArrayUtils_1.ArrayUtils.asSingle(q.partialAnswer)) !== null && _b !== void 0 ? _b : '', sampleSolution: (_c = q.sampleSolution) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(q)), { 
-                    // isCaseSensitive: q.isCaseSensitive ?? true,
-                    isShortAnswer: (_d = q.isShortAnswer) !== null && _d !== void 0 ? _d : true, reasonableNumOfChars: q.reasonableNumOfChars }), this.toExample(q, {
+                const questionJson = Object.assign(Object.assign(Object.assign({ question: (_a = Breakscape_1.Breakscape.unbreakscape(q.question)) !== null && _a !== void 0 ? _a : '', partialAnswer: (_b = Breakscape_1.Breakscape.unbreakscape(ArrayUtils_1.ArrayUtils.asSingle(q.partialAnswer))) !== null && _b !== void 0 ? _b : '', sampleSolution: (_c = Breakscape_1.Breakscape.unbreakscape(q.sampleSolution)) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(q)), { reasonableNumOfChars: q.reasonableNumOfChars }), this.toExample(q, {
                     defaultExample: q.sampleSolution || '',
                     isBoolean: false,
                 }));
                 // Delete unwanted properties
-                if (((_e = q.itemLead) === null || _e === void 0 ? void 0 : _e.lead) == null)
+                if (((_d = q.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete questionJson.lead;
                 questionsJson.push(questionJson);
             }
@@ -751,7 +750,7 @@ class JsonGenerator {
         if (botResponses) {
             for (const r of botResponses) {
                 // Create the response
-                const responseJson = Object.assign({ response: (_a = r.response) !== null && _a !== void 0 ? _a : '', reaction: (_b = r.reaction) !== null && _b !== void 0 ? _b : '', feedback: (_c = r.feedback) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(r));
+                const responseJson = Object.assign({ response: (_a = Breakscape_1.Breakscape.unbreakscape(r.response)) !== null && _a !== void 0 ? _a : '', reaction: (_b = Breakscape_1.Breakscape.unbreakscape(r.reaction)) !== null && _b !== void 0 ? _b : '', feedback: (_c = Breakscape_1.Breakscape.unbreakscape(r.feedback)) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(r));
                 // Delete unwanted properties
                 if (((_d = r.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete responseJson.lead;
@@ -823,11 +822,11 @@ class JsonGenerator {
     //
     // bitmarkAst -> bits -> bitsValue -> title
     leaf_title(node, _parent, _route) {
-        this.bitJson.title = this.toTextAstOrString(node.value);
+        this.bitJson.title = this.toTextAstOrString(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     //  bitmarkAst -> bits -> bitsValue -> subtitle
     leaf_subtitle(node, _parent, _route) {
-        this.bitJson.subtitle = this.toTextAstOrString(node.value);
+        this.bitJson.subtitle = this.toTextAstOrString(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     // //  bitmarkAst -> bits -> bitsValue -> level
     leaf_level(node, _parent, _route) {
@@ -861,7 +860,7 @@ class JsonGenerator {
         // Ignore hint that is not at the bit level as it are handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return;
-        this.bitJson.hint = this.toTextAstOrString(hint);
+        this.bitJson.hint = this.toTextAstOrString(hint, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     // bitmarkAst -> bits -> bitsValue ->  * -> instruction
     leaf_instruction(node, parent, _route) {
@@ -869,12 +868,12 @@ class JsonGenerator {
         // Ignore instruction that is not at the bit level as it are handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return;
-        this.bitJson.instruction = this.toTextAstOrString(instruction);
+        this.bitJson.instruction = this.toTextAstOrString(instruction, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     // bitmarkAst -> bits -> footer -> footerText
     leaf_footerText(node, _parent, _route) {
         const footer = node.value;
-        this.bitJson.footer = this.toTextAstOrString(footer);
+        this.bitJson.footer = this.toTextAstOrString(footer, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     // bitmarkAst -> bits -> bitsValue -> markup
     leaf_markup(node, _parent, _route) {
@@ -983,7 +982,7 @@ class JsonGenerator {
         const gapJson = Object.assign(Object.assign(Object.assign(Object.assign({ type: 'gap' }, this.toItemLeadHintInstruction(data)), { isCaseSensitive: (_a = data.isCaseSensitive) !== null && _a !== void 0 ? _a : true }), this.toExample(data, {
             defaultExample,
             isBoolean: false,
-        })), { solutions: data.solutions });
+        })), { solutions: Breakscape_1.Breakscape.unbreakscape(data.solutions) });
         // Remove unwanted properties
         if (!gapJson.lead)
             delete gapJson.lead;
@@ -992,7 +991,7 @@ class JsonGenerator {
     createMarkJson(mark) {
         const data = mark.data;
         // Create the mark
-        const markJson = Object.assign(Object.assign({ type: 'mark', solution: data.solution, mark: data.mark }, this.toItemLeadHintInstruction(data)), this.toExample(data, {
+        const markJson = Object.assign(Object.assign({ type: 'mark', solution: Breakscape_1.Breakscape.unbreakscape(data.solution), mark: Breakscape_1.Breakscape.unbreakscape(data.mark) }, this.toItemLeadHintInstruction(data)), this.toExample(data, {
             defaultExample: true,
             isBoolean: true,
         }));
@@ -1007,7 +1006,7 @@ class JsonGenerator {
         // Create the select options
         const options = [];
         for (const option of data.options) {
-            const optionJson = Object.assign(Object.assign({ text: option.text, isCorrect: (_a = option.isCorrect) !== null && _a !== void 0 ? _a : false }, this.toItemLeadHintInstruction(option)), this.toExample(option, {
+            const optionJson = Object.assign(Object.assign({ text: Breakscape_1.Breakscape.unbreakscape(option.text), isCorrect: (_a = option.isCorrect) !== null && _a !== void 0 ? _a : false }, this.toItemLeadHintInstruction(option)), this.toExample(option, {
                 defaultExample: !!option.isCorrect,
                 isBoolean: true,
             }));
@@ -1018,12 +1017,10 @@ class JsonGenerator {
                 delete optionJson.lead;
             if (!optionJson.instruction)
                 delete optionJson.instruction;
-            if (!optionJson.isCaseSensitive)
-                delete optionJson.isCaseSensitive;
             options.push(optionJson);
         }
         // Create the select
-        const selectJson = Object.assign(Object.assign({ type: 'select', prefix: (_b = data.prefix) !== null && _b !== void 0 ? _b : '', postfix: (_c = data.postfix) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_d = data.isExample) !== null && _d !== void 0 ? _d : false, options });
+        const selectJson = Object.assign(Object.assign({ type: 'select', prefix: (_b = Breakscape_1.Breakscape.unbreakscape(data.prefix)) !== null && _b !== void 0 ? _b : '', postfix: (_c = Breakscape_1.Breakscape.unbreakscape(data.postfix)) !== null && _c !== void 0 ? _c : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_d = data.isExample) !== null && _d !== void 0 ? _d : false, options });
         // Remove unwanted properties
         if (!selectJson.lead)
             delete selectJson.lead;
@@ -1035,7 +1032,7 @@ class JsonGenerator {
         // Create the highlight options
         const texts = [];
         for (const text of data.texts) {
-            const textJson = Object.assign(Object.assign({ text: text.text, isCorrect: (_a = text.isCorrect) !== null && _a !== void 0 ? _a : false, isHighlighted: (_b = text.isHighlighted) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(text)), this.toExample(text, {
+            const textJson = Object.assign(Object.assign({ text: Breakscape_1.Breakscape.unbreakscape(text.text), isCorrect: (_a = text.isCorrect) !== null && _a !== void 0 ? _a : false, isHighlighted: (_b = text.isHighlighted) !== null && _b !== void 0 ? _b : false }, this.toItemLeadHintInstruction(text)), this.toExample(text, {
                 defaultExample: !!text.isCorrect,
                 isBoolean: true,
             }));
@@ -1046,12 +1043,10 @@ class JsonGenerator {
                 delete textJson.lead;
             if (!textJson.hint)
                 delete textJson.hint;
-            if (!textJson.isCaseSensitive)
-                delete textJson.isCaseSensitive;
             texts.push(textJson);
         }
         // Create the select
-        const highlightJson = Object.assign(Object.assign({ type: 'highlight', prefix: (_c = data.prefix) !== null && _c !== void 0 ? _c : '', postfix: (_d = data.postfix) !== null && _d !== void 0 ? _d : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_e = data.isExample) !== null && _e !== void 0 ? _e : false, texts });
+        const highlightJson = Object.assign(Object.assign({ type: 'highlight', prefix: (_c = Breakscape_1.Breakscape.unbreakscape(data.prefix)) !== null && _c !== void 0 ? _c : '', postfix: (_d = Breakscape_1.Breakscape.unbreakscape(data.postfix)) !== null && _d !== void 0 ? _d : '' }, this.toItemLeadHintInstruction(data)), { isExample: (_e = data.isExample) !== null && _e !== void 0 ? _e : false, texts });
         // Remove unwanted properties
         if (!highlightJson.lead)
             delete highlightJson.lead;
@@ -1187,29 +1182,29 @@ class JsonGenerator {
             resource = {
                 type: ResourceTag_1.ResourceTag.image,
                 typeAlias: ResourceTag_1.ResourceTag.image,
-                value,
+                value: value,
                 format: UrlUtils_1.UrlUtils.fileExtensionFromUrl(value),
                 provider: UrlUtils_1.UrlUtils.domainFromUrl(value),
             };
         }
         resource = resource; // Keep TS compiler happy
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.src = resource.value;
+            resourceJson.src = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.src1x != null)
-            resourceJson.src1x = resource.src1x;
+            resourceJson.src1x = Breakscape_1.Breakscape.unbreakscape(resource.src1x);
         if (resource.src2x != null)
-            resourceJson.src2x = resource.src2x;
+            resourceJson.src2x = Breakscape_1.Breakscape.unbreakscape(resource.src2x);
         if (resource.src3x != null)
-            resourceJson.src3x = resource.src3x;
+            resourceJson.src3x = Breakscape_1.Breakscape.unbreakscape(resource.src3x);
         if (resource.src4x != null)
-            resourceJson.src4x = resource.src4x;
+            resourceJson.src4x = Breakscape_1.Breakscape.unbreakscape(resource.src4x);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        resourceJson.alt = (_c = resource.alt) !== null && _c !== void 0 ? _c : '';
+        resourceJson.alt = (_c = Breakscape_1.Breakscape.unbreakscape(resource.alt)) !== null && _c !== void 0 ? _c : '';
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
@@ -1228,33 +1223,33 @@ class JsonGenerator {
         }
         resource = resource; // Keep TS compiler happy
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.src1x != null)
-            resourceJson.src1x = resource.src1x;
+            resourceJson.src1x = Breakscape_1.Breakscape.unbreakscape(resource.src1x);
         if (resource.src2x != null)
-            resourceJson.src2x = resource.src2x;
+            resourceJson.src2x = Breakscape_1.Breakscape.unbreakscape(resource.src2x);
         if (resource.src3x != null)
-            resourceJson.src3x = resource.src3x;
+            resourceJson.src3x = Breakscape_1.Breakscape.unbreakscape(resource.src3x);
         if (resource.src4x != null)
-            resourceJson.src4x = resource.src4x;
+            resourceJson.src4x = Breakscape_1.Breakscape.unbreakscape(resource.src4x);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
-        resourceJson.alt = (_c = resource.alt) !== null && _c !== void 0 ? _c : '';
+        resourceJson.alt = (_c = Breakscape_1.Breakscape.unbreakscape(resource.alt)) !== null && _c !== void 0 ? _c : '';
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addAudioResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.src = resource.value;
+            resourceJson.src = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.duration != null)
             resourceJson.duration = resource.duration;
         if (resource.mute != null)
@@ -1267,11 +1262,11 @@ class JsonGenerator {
     addAudioEmbedResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.src = resource.value;
+            resourceJson.src = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.duration != null)
             resourceJson.duration = resource.duration;
         if (resource.mute != null)
@@ -1284,11 +1279,11 @@ class JsonGenerator {
     addAudioLinkResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.duration != null)
             resourceJson.duration = resource.duration;
         if (resource.mute != null)
@@ -1302,11 +1297,11 @@ class JsonGenerator {
         var _a, _b;
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.src = resource.value;
+            resourceJson.src = Breakscape_1.Breakscape.unbreakscape(resource.value);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
         if (resource.duration != null)
@@ -1320,7 +1315,7 @@ class JsonGenerator {
         if (resource.showSubtitles != null)
             resourceJson.showSubtitles = resource.showSubtitles;
         if (resource.alt != null)
-            resourceJson.alt = resource.alt;
+            resourceJson.alt = Breakscape_1.Breakscape.unbreakscape(resource.alt);
         if (resource.posterImage != null)
             resourceJson.posterImage = this.addImageResource(resource.posterImage);
         if (resource.thumbnails != null && resource.thumbnails.length > 0) {
@@ -1336,11 +1331,11 @@ class JsonGenerator {
         var _a, _b;
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.src = resource.value;
+            resourceJson.src = Breakscape_1.Breakscape.unbreakscape(resource.value);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
         if (resource.duration != null)
@@ -1354,7 +1349,7 @@ class JsonGenerator {
         if (resource.showSubtitles != null)
             resourceJson.showSubtitles = resource.showSubtitles;
         if (resource.alt != null)
-            resourceJson.alt = resource.alt;
+            resourceJson.alt = Breakscape_1.Breakscape.unbreakscape(resource.alt);
         if (resource.posterImage != null)
             resourceJson.posterImage = this.addImageResource(resource.posterImage);
         if (resource.thumbnails != null && resource.thumbnails.length > 0) {
@@ -1370,11 +1365,11 @@ class JsonGenerator {
         var _a, _b;
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
         if (resource.duration != null)
@@ -1388,7 +1383,7 @@ class JsonGenerator {
         if (resource.showSubtitles != null)
             resourceJson.showSubtitles = resource.showSubtitles;
         if (resource.alt != null)
-            resourceJson.alt = resource.alt;
+            resourceJson.alt = Breakscape_1.Breakscape.unbreakscape(resource.alt);
         if (resource.posterImage != null)
             resourceJson.posterImage = this.addImageResource(resource.posterImage);
         if (resource.thumbnails != null && resource.thumbnails.length > 0) {
@@ -1404,11 +1399,11 @@ class JsonGenerator {
         var _a, _b;
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
         if (resource.duration != null)
@@ -1422,7 +1417,7 @@ class JsonGenerator {
         if (resource.showSubtitles != null)
             resourceJson.showSubtitles = resource.showSubtitles;
         if (resource.alt != null)
-            resourceJson.alt = resource.alt;
+            resourceJson.alt = Breakscape_1.Breakscape.unbreakscape(resource.alt);
         if (resource.posterImage != null)
             resourceJson.posterImage = this.addImageResource(resource.posterImage);
         if (resource.thumbnails != null && resource.thumbnails.length > 0) {
@@ -1438,11 +1433,11 @@ class JsonGenerator {
         var _a, _b;
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         resourceJson.width = (_a = resource.width) !== null && _a !== void 0 ? _a : null;
         resourceJson.height = (_b = resource.height) !== null && _b !== void 0 ? _b : null;
         if (resource.duration != null)
@@ -1456,7 +1451,7 @@ class JsonGenerator {
         if (resource.showSubtitles != null)
             resourceJson.showSubtitles = resource.showSubtitles;
         if (resource.alt != null)
-            resourceJson.alt = resource.alt;
+            resourceJson.alt = Breakscape_1.Breakscape.unbreakscape(resource.alt);
         if (resource.posterImage != null)
             resourceJson.posterImage = this.addImageResource(resource.posterImage);
         if (resource.thumbnails != null && resource.thumbnails.length > 0) {
@@ -1471,78 +1466,78 @@ class JsonGenerator {
     addArticleResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.body = resource.value;
-        // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
+            resourceJson.body = Breakscape_1.Breakscape.unbreakscape(resource.value);
+        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addDocumentResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
-        // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
+        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addDocumentEmbedResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
-        // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
+        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addDocumentLinkResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
-        // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
+        // if (resource.href != null) resourceJson.href = BreakscapeUtils.unbreakscape(resource.href); // It is never used (and doesn't exist in the AST model)
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addDocumentDownloadResource(resource) {
         const resourceJson = {};
         if (resource.format != null)
-            resourceJson.format = resource.format;
+            resourceJson.format = Breakscape_1.Breakscape.unbreakscape(resource.format);
         if (resource.provider != null)
-            resourceJson.provider = resource.provider;
+            resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         // if (resource.href != null) resourceJson.href = resource.href; // It is never used (and doesn't exist in the AST model)
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addAppLinkResource(resource) {
         const resourceJson = {};
-        // if (resource.format != null) resourceJson.format = resource.format;
+        // if (resource.format != null) resourceJson.format = BreakscapeUtils.unbreakscape(resource.format);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
     addWebsiteLinkResource(resource) {
         const resourceJson = {};
-        // if (resource.format != null) resourceJson.format = resource.format;
+        // if (resource.format != null) resourceJson.format = BreakscapeUtils.unbreakscape(resource.format);
         if (resource.value != null)
-            resourceJson.url = resource.value;
+            resourceJson.url = Breakscape_1.Breakscape.unbreakscape(resource.value);
         if (resource.siteName != null)
-            resourceJson.siteName = resource.siteName;
+            resourceJson.siteName = Breakscape_1.Breakscape.unbreakscape(resource.siteName);
         this.addGenericResourceProperties(resource, resourceJson);
         return resourceJson;
     }
@@ -1550,33 +1545,33 @@ class JsonGenerator {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (noDefaults) {
             if (resource.license != null)
-                resourceJson.license = (_a = resource.license) !== null && _a !== void 0 ? _a : '';
+                resourceJson.license = (_a = Breakscape_1.Breakscape.unbreakscape(resource.license)) !== null && _a !== void 0 ? _a : '';
             if (resource.copyright != null)
-                resourceJson.copyright = (_b = resource.copyright) !== null && _b !== void 0 ? _b : '';
+                resourceJson.copyright = (_b = Breakscape_1.Breakscape.unbreakscape(resource.copyright)) !== null && _b !== void 0 ? _b : '';
             if (resource.provider != null)
-                resourceJson.provider = resource.provider;
+                resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
             if (resource.showInIndex != null)
                 resourceJson.showInIndex = (_c = resource.showInIndex) !== null && _c !== void 0 ? _c : false;
             if (resource.caption != null)
-                resourceJson.caption = this.toTextAstOrString((_d = resource.caption) !== null && _d !== void 0 ? _d : '');
+                resourceJson.caption = this.toTextAstOrString((_d = resource.caption) !== null && _d !== void 0 ? _d : '', TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
         else {
-            resourceJson.license = (_e = resource.license) !== null && _e !== void 0 ? _e : '';
-            resourceJson.copyright = (_f = resource.copyright) !== null && _f !== void 0 ? _f : '';
+            resourceJson.license = (_e = Breakscape_1.Breakscape.unbreakscape(resource.license)) !== null && _e !== void 0 ? _e : '';
+            resourceJson.copyright = (_f = Breakscape_1.Breakscape.unbreakscape(resource.copyright)) !== null && _f !== void 0 ? _f : '';
             if (resource.provider != null)
-                resourceJson.provider = resource.provider;
+                resourceJson.provider = Breakscape_1.Breakscape.unbreakscape(resource.provider);
             resourceJson.showInIndex = (_g = resource.showInIndex) !== null && _g !== void 0 ? _g : false;
-            resourceJson.caption = this.toTextAstOrString((_h = resource.caption) !== null && _h !== void 0 ? _h : '');
+            resourceJson.caption = this.toTextAstOrString((_h = resource.caption) !== null && _h !== void 0 ? _h : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
         return resourceJson;
     }
     toItemLeadHintInstruction(item) {
         var _a, _b, _c, _d, _e, _f;
         return {
-            item: this.toTextAstOrString((_b = (_a = item.itemLead) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : ''),
-            lead: this.toTextAstOrString((_d = (_c = item.itemLead) === null || _c === void 0 ? void 0 : _c.lead) !== null && _d !== void 0 ? _d : ''),
-            hint: this.toTextAstOrString((_e = item.hint) !== null && _e !== void 0 ? _e : ''),
-            instruction: this.toTextAstOrString((_f = item.instruction) !== null && _f !== void 0 ? _f : ''),
+            item: this.toTextAstOrString((_b = (_a = item.itemLead) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            lead: this.toTextAstOrString((_d = (_c = item.itemLead) === null || _c === void 0 ? void 0 : _c.lead) !== null && _d !== void 0 ? _d : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            hint: this.toTextAstOrString((_e = item.hint) !== null && _e !== void 0 ? _e : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            instruction: this.toTextAstOrString((_f = item.instruction) !== null && _f !== void 0 ? _f : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
         };
     }
     toExample(node, options) {
@@ -1592,10 +1587,12 @@ class JsonGenerator {
         if (isDefaultExample) {
             exampleValue = isBoolean
                 ? BooleanUtils_1.BooleanUtils.toBoolean(defaultExample)
-                : this.toTextAstOrString(defaultExample);
+                : this.toTextAstOrString(defaultExample, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
         else {
-            exampleValue = isBoolean ? BooleanUtils_1.BooleanUtils.toBoolean(example) : this.toTextAstOrString(example);
+            exampleValue = isBoolean
+                ? BooleanUtils_1.BooleanUtils.toBoolean(example)
+                : this.toTextAstOrString(example, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
         return {
             isExample: true,
@@ -1606,16 +1603,22 @@ class JsonGenerator {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     target, name, values, singleWithoutArray) {
         if (values !== undefined) {
+            let finalValue;
             if (!Array.isArray(values))
                 values = [values];
             if (Array.isArray(values) && values.length > 0) {
-                if (singleWithoutArray && values.length >= 1) {
-                    target[name] = values[values.length - 1];
+                // Unbreakscape values that are strings
+                values = Breakscape_1.Breakscape.unbreakscape(values);
+                if (Array.isArray(values) && singleWithoutArray && values.length >= 1) {
+                    finalValue = values[values.length - 1];
                 }
                 else {
-                    target[name] = values;
+                    finalValue = values;
                 }
             }
+            // if (finalValue != null) {
+            target[name] = finalValue;
+            // }
         }
     }
     /**
@@ -1640,13 +1643,14 @@ class JsonGenerator {
      * @returns the text format
      */
     getTextFormat(route) {
+        var _a;
         for (const node of route) {
             if (node.key === NodeType_1.NodeType.bitsValue) {
                 const n = node.value;
-                return TextFormat_1.TextFormat.fromValue(n === null || n === void 0 ? void 0 : n.textFormat);
+                return (_a = TextFormat_1.TextFormat.fromValue(n === null || n === void 0 ? void 0 : n.textFormat)) !== null && _a !== void 0 ? _a : TextFormat_1.TextFormat.bitmarkMinusMinus;
             }
         }
-        return undefined;
+        return TextFormat_1.TextFormat.bitmarkMinusMinus;
     }
     /**
      * Get the bit resourceType atttachment from any node
@@ -1664,15 +1668,15 @@ class JsonGenerator {
         return undefined;
     }
     /**
-     * Convert parse a string to TextAst if required, otherwise just return the string as is.
+     * Convert parse a string to TextAst if required, otherwise just return the string but unbreakscaped.
      * @param text
      * @returns
      */
-    toTextAstOrString(text, format = TextFormat_1.TextFormat.bitmarkMinusMinus) {
+    toTextAstOrString(text, format) {
         if (!text)
             undefined;
-        if (this.options.textAsPlainText) {
-            return text;
+        if (this.options.textAsPlainText || format === TextFormat_1.TextFormat.text) {
+            return Breakscape_1.Breakscape.unbreakscape(text);
         }
         // Use the text parser to parse the text
         const textAst = this.textParser.toAst(text, {