@gmb/bitmark-parser-generator 1.5.7 → 1.5.9

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

@@ -307,7 +307,7 @@ class JsonGenerator {
     // bitmarkAst -> bits -> bitsValue -> itemLead
     enter_itemLead(node, parent, _route) {
         const itemLead = node.value;
-        const { item, lead } = itemLead;
+        const { item, lead, pageNumber, marginNumber } = itemLead;
         // Ignore item / lead that are not at the bit level as they are handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue)
             return;
@@ -317,6 +317,12 @@ class JsonGenerator {
         if (lead != null) {
             this.bitJson.lead = this.convertBreakscapedStringToJsonText(lead, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
+        if (pageNumber != null) {
+            this.bitJson.pageNumber = this.convertBreakscapedStringToJsonText(pageNumber, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        }
+        if (marginNumber != null) {
+            this.bitJson.marginNumber = this.convertBreakscapedStringToJsonText(marginNumber, TextFormat_1.TextFormat.bitmarkMinusMinus);
+        }
     }
     // bitmarkAst -> bits -> bitsValue -> extraProperties
     enter_extraProperties(node, _parent, _route) {
@@ -351,6 +357,13 @@ class JsonGenerator {
         }
         // Create this list item
         this.listItem = Object.assign(Object.assign({}, this.toItemLeadHintInstruction(node.value)), { body: this.bodyDefault });
+        // Delete unwanted properties
+        const nv = node.value;
+        const li = this.listItem;
+        if (nv.pageNumber == null)
+            delete li.pageNumber;
+        if (nv.marginNumber == null)
+            delete li.marginNumber;
         listItems.push(this.listItem);
     }
     exit_cardBitsValue(_node, _parent, _route) {
@@ -486,7 +499,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> flashcards -> flashcardsValue
     enter_flashcards(node, parent, _route) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const flashcards = node.value;
         // Ignore responses that are not at the correct level as they are potentially handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
@@ -502,6 +515,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_d = c.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete flashcardJson.lead;
+                if (((_e = c.itemLead) === null || _e === void 0 ? void 0 : _e.pageNumber) == null)
+                    delete flashcardJson.pageNumber;
+                if (((_f = c.itemLead) === null || _f === void 0 ? void 0 : _f.marginNumber) == null)
+                    delete flashcardJson.marginNumber;
                 flashcardsJson.push(flashcardJson);
             }
         }
@@ -523,7 +540,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> statements -> statementsValue
     enter_statements(node, parent, _route) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const statements = node.value;
         // Ignore statements that are not at the card node level as they are handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
@@ -541,6 +558,10 @@ class JsonGenerator {
                     delete statementJson.item;
                 if (((_c = s.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                     delete statementJson.lead;
+                if (((_d = s.itemLead) === null || _d === void 0 ? void 0 : _d.pageNumber) == null)
+                    delete statementJson.pageNumber;
+                if (((_e = s.itemLead) === null || _e === void 0 ? void 0 : _e.marginNumber) == null)
+                    delete statementJson.marginNumber;
                 if ((s === null || s === void 0 ? void 0 : s.hint) == null)
                     delete statementJson.hint;
                 if ((s === null || s === void 0 ? void 0 : s.instruction) == null)
@@ -555,7 +576,7 @@ class JsonGenerator {
     // bitmarkAst -> bits -> bitsValue -> choices
     // X bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> choices
     enter_choices(node, parent, _route) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const choices = node.value;
         // Ignore choices that are not at the bit level as they are handled elsewhere as quizzes
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
@@ -571,6 +592,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_c = c.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                     delete choiceJson.lead;
+                if (((_d = c.itemLead) === null || _d === void 0 ? void 0 : _d.pageNumber) == null)
+                    delete choiceJson.pageNumber;
+                if (((_e = c.itemLead) === null || _e === void 0 ? void 0 : _e.marginNumber) == null)
+                    delete choiceJson.marginNumber;
                 choicesJson.push(choiceJson);
             }
         }
@@ -581,7 +606,7 @@ class JsonGenerator {
     // bitmarkAst -> bits -> bitsValue -> responses
     // X bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes -> quizzesValue -> responses
     enter_responses(node, parent, _route) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const responses = node.value;
         // Ignore responses that are not at the correct level as they are handled elsewhere as quizzes
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
@@ -597,6 +622,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_c = r.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                     delete responseJson.lead;
+                if (((_d = r.itemLead) === null || _d === void 0 ? void 0 : _d.pageNumber) == null)
+                    delete responseJson.pageNumber;
+                if (((_e = r.itemLead) === null || _e === void 0 ? void 0 : _e.marginNumber) == null)
+                    delete responseJson.marginNumber;
                 responsesJson.push(responseJson);
             }
         }
@@ -606,7 +635,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> quizzes
     enter_quizzes(node, _parent, _route) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const quizzes = node.value;
         const quizzesJson = [];
         if (quizzes) {
@@ -623,6 +652,10 @@ class JsonGenerator {
                         // Delete unwanted properties
                         if (((_c = q.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                             delete choiceJson.lead;
+                        if (((_d = q.itemLead) === null || _d === void 0 ? void 0 : _d.pageNumber) == null)
+                            delete choiceJson.pageNumber;
+                        if (((_e = q.itemLead) === null || _e === void 0 ? void 0 : _e.marginNumber) == null)
+                            delete choiceJson.marginNumber;
                         choicesJson.push(choiceJson);
                     }
                 }
@@ -631,21 +664,29 @@ class JsonGenerator {
                 if (q.responses) {
                     for (const r of q.responses) {
                         // Create the choice
-                        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, {
+                        const responseJson = Object.assign(Object.assign({ response: (_f = Breakscape_1.Breakscape.unbreakscape(r.text)) !== null && _f !== void 0 ? _f : '', isCorrect: (_g = r.isCorrect) !== null && _g !== void 0 ? _g : false }, this.toItemLeadHintInstruction(r)), this.toExample(r, {
                             defaultExample: !!r.isCorrect,
                             isBoolean: true,
                         }));
                         // Delete unwanted properties
-                        if (((_f = q.itemLead) === null || _f === void 0 ? void 0 : _f.lead) == null)
+                        if (((_h = q.itemLead) === null || _h === void 0 ? void 0 : _h.lead) == null)
                             delete responseJson.lead;
+                        if (((_j = q.itemLead) === null || _j === void 0 ? void 0 : _j.pageNumber) == null)
+                            delete responseJson.pageNumber;
+                        if (((_k = q.itemLead) === null || _k === void 0 ? void 0 : _k.marginNumber) == null)
+                            delete responseJson.marginNumber;
                         responsesJson.push(responseJson);
                     }
                 }
                 // Create the quiz
-                const quizJson = Object.assign(Object.assign({}, this.toItemLeadHintInstruction(q)), { isExample: (_g = q.isExample) !== null && _g !== void 0 ? _g : false, choices: q.choices ? choicesJson : undefined, responses: q.responses ? responsesJson : undefined });
+                const quizJson = Object.assign(Object.assign({}, this.toItemLeadHintInstruction(q)), { isExample: (_l = q.isExample) !== null && _l !== void 0 ? _l : false, choices: q.choices ? choicesJson : undefined, responses: q.responses ? responsesJson : undefined });
                 // Delete unwanted properties
-                if (((_h = q.itemLead) === null || _h === void 0 ? void 0 : _h.lead) == null)
+                if (((_m = q.itemLead) === null || _m === void 0 ? void 0 : _m.lead) == null)
                     delete quizJson.lead;
+                if (((_o = q.itemLead) === null || _o === void 0 ? void 0 : _o.pageNumber) == null)
+                    delete quizJson.pageNumber;
+                if (((_p = q.itemLead) === null || _p === void 0 ? void 0 : _p.marginNumber) == null)
+                    delete quizJson.marginNumber;
                 quizzesJson.push(quizJson);
             }
         }
@@ -687,7 +728,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> pairs
     enter_pairs(node, _parent, route) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const pairs = node.value;
         const pairsJson = [];
         const bitType = this.getBitType(route);
@@ -703,6 +744,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_d = p.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete pairJson.lead;
+                if (((_e = p.itemLead) === null || _e === void 0 ? void 0 : _e.pageNumber) == null)
+                    delete pairJson.pageNumber;
+                if (((_f = p.itemLead) === null || _f === void 0 ? void 0 : _f.marginNumber) == null)
+                    delete pairJson.marginNumber;
                 if (pairJson.key) {
                     delete pairJson.keyAudio;
                     delete pairJson.keyImage;
@@ -724,7 +769,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> matrix
     enter_matrix(node, _parent, _route) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const matrix = node.value;
         const matrixJsonArray = [];
         if (matrix) {
@@ -743,18 +788,26 @@ class JsonGenerator {
                         // Delete unwanted properties
                         if (((_c = c.itemLead) === null || _c === void 0 ? void 0 : _c.lead) == null)
                             delete matrixCellJson.lead;
+                        if (((_d = c.itemLead) === null || _d === void 0 ? void 0 : _d.pageNumber) == null)
+                            delete matrixCellJson.pageNumber;
+                        if (((_e = c.itemLead) === null || _e === void 0 ? void 0 : _e.marginNumber) == null)
+                            delete matrixCellJson.marginNumber;
                         if (c.hint == null)
                             delete matrixCellJson.hint;
                         matrixCellsJson.push(matrixCellJson);
                     }
                 }
                 // Create the matrix
-                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)), { 
+                const matrixJson = Object.assign(Object.assign({ key: (_f = Breakscape_1.Breakscape.unbreakscape(m.key)) !== null && _f !== void 0 ? _f : '', cells: matrixCellsJson !== null && matrixCellsJson !== void 0 ? matrixCellsJson : [] }, this.toItemLeadHintInstruction(m)), { 
                     // ...this.toExample(m.example, m.isExample),
-                    isExample: (_e = m.isExample) !== null && _e !== void 0 ? _e : false });
+                    isExample: (_g = m.isExample) !== null && _g !== void 0 ? _g : false });
                 // Delete unwanted properties
-                if (((_f = m.itemLead) === null || _f === void 0 ? void 0 : _f.lead) == null)
+                if (((_h = m.itemLead) === null || _h === void 0 ? void 0 : _h.lead) == null)
                     delete matrixJson.lead;
+                if (((_j = m.itemLead) === null || _j === void 0 ? void 0 : _j.pageNumber) == null)
+                    delete matrixJson.pageNumber;
+                if (((_k = m.itemLead) === null || _k === void 0 ? void 0 : _k.marginNumber) == null)
+                    delete matrixJson.marginNumber;
                 if (m.instruction == null)
                     delete matrixJson.instruction;
                 matrixJsonArray.push(matrixJson);
@@ -766,7 +819,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> questions
     enter_questions(node, _parent, _route) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const questions = node.value;
         const questionsJson = [];
         if (questions) {
@@ -779,6 +832,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_d = q.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete questionJson.lead;
+                if (((_e = q.itemLead) === null || _e === void 0 ? void 0 : _e.pageNumber) == null)
+                    delete questionJson.pageNumber;
+                if (((_f = q.itemLead) === null || _f === void 0 ? void 0 : _f.marginNumber) == null)
+                    delete questionJson.marginNumber;
                 questionsJson.push(questionJson);
             }
         }
@@ -788,7 +845,7 @@ class JsonGenerator {
     }
     // bitmarkAst -> bits -> bitsValue -> cardNode -> botResponses
     enter_botResponses(node, parent, _route) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const botResponses = node.value;
         // Ignore responses that are not at the cardNode level as they are handled elsewhere
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
@@ -801,6 +858,10 @@ class JsonGenerator {
                 // Delete unwanted properties
                 if (((_d = r.itemLead) === null || _d === void 0 ? void 0 : _d.lead) == null)
                     delete responseJson.lead;
+                if (((_e = r.itemLead) === null || _e === void 0 ? void 0 : _e.pageNumber) == null)
+                    delete responseJson.pageNumber;
+                if (((_f = r.itemLead) === null || _f === void 0 ? void 0 : _f.marginNumber) == null)
+                    delete responseJson.marginNumber;
                 if (r.hint == null)
                     delete responseJson.hint;
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1038,8 +1099,9 @@ class JsonGenerator {
             isBoolean: false,
         })), { solutions: Breakscape_1.Breakscape.unbreakscape(data.solutions) });
         // Remove unwanted properties
-        if (!gapJson.lead)
-            delete gapJson.lead;
+        // if (!data.itemLead?.lead) delete gapJson.lead;
+        // if (!data.itemLead?.pageNumber) delete gapJson.pageNumber;
+        // if (!data.itemLead?.marginNumber) delete gapJson.marginNumber;
         return gapJson;
     }
     createMarkJson(mark) {
@@ -1050,8 +1112,9 @@ class JsonGenerator {
             isBoolean: true,
         }));
         // Remove unwanted properties
-        if (!markJson.lead)
-            delete markJson.lead;
+        // if (!data.itemLead?.lead) delete markJson.lead;
+        // if (!data.itemLead?.pageNumber) delete markJson.pageNumber;
+        // if (!data.itemLead?.marginNumber) delete markJson.marginNumber;
         return markJson;
     }
     createSelectJson(select) {
@@ -1065,19 +1128,19 @@ class JsonGenerator {
                 isBoolean: true,
             }));
             // Remove unwanted properties
-            if (!optionJson.item)
-                delete optionJson.item;
-            if (!optionJson.lead)
-                delete optionJson.lead;
-            if (!optionJson.instruction)
-                delete optionJson.instruction;
+            // if (!option.itemLead?.item) delete optionJson.item;
+            // if (!option.itemLead?.lead) delete optionJson.lead;
+            // if (!option.itemLead?.pageNumber) delete optionJson.pageNumber;
+            // if (!option.itemLead?.marginNumber) delete optionJson.marginNumber;
+            // if (!option.instruction) delete optionJson.instruction;
             options.push(optionJson);
         }
         // Create the select
         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;
+        // if (!data.itemLead?.lead) delete selectJson.lead;
+        // if (!data.itemLead?.pageNumber) delete selectJson.pageNumber;
+        // if (!data.itemLead?.marginNumber) delete selectJson.marginNumber;
         return selectJson;
     }
     createHighlightJson(highlight) {
@@ -1091,19 +1154,17 @@ class JsonGenerator {
                 isBoolean: true,
             }));
             // Remove unwanted properties
-            if (!textJson.item)
-                delete textJson.item;
-            if (!textJson.lead)
-                delete textJson.lead;
-            if (!textJson.hint)
-                delete textJson.hint;
+            // if (!text.itemLead?.item) delete textJson.item;
+            // if (!text.itemLead?.lead) delete textJson.lead;
+            // if (!text.itemLead?.pageNumber) delete textJson.pageNumber;
+            // if (!text.itemLead?.marginNumber) delete textJson.marginNumber;
+            // if (!text.hint) delete textJson.hint;
             texts.push(textJson);
         }
         // Create the select
         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;
+        // if (!data.itemLead?.lead) delete highlightJson.lead;
         return highlightJson;
     }
     parseResourceToJson(bitType, resource) {
@@ -1622,12 +1683,14 @@ class JsonGenerator {
         return resourceJson;
     }
     toItemLeadHintInstruction(item) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return {
             item: this.convertBreakscapedStringToJsonText((_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.convertBreakscapedStringToJsonText((_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.convertBreakscapedStringToJsonText((_e = item.hint) !== null && _e !== void 0 ? _e : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
-            instruction: this.convertBreakscapedStringToJsonText((_f = item.instruction) !== null && _f !== void 0 ? _f : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            pageNumber: this.convertBreakscapedStringToJsonText((_f = (_e = item.itemLead) === null || _e === void 0 ? void 0 : _e.pageNumber) !== null && _f !== void 0 ? _f : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            marginNumber: this.convertBreakscapedStringToJsonText((_h = (_g = item.itemLead) === null || _g === void 0 ? void 0 : _g.marginNumber) !== null && _h !== void 0 ? _h : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            hint: this.convertBreakscapedStringToJsonText((_j = item.hint) !== null && _j !== void 0 ? _j : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
+            instruction: this.convertBreakscapedStringToJsonText((_k = item.instruction) !== null && _k !== void 0 ? _k : Breakscape_1.Breakscape.EMPTY_STRING, TextFormat_1.TextFormat.bitmarkMinusMinus),
         };
     }
     toExample(node, options) {
@@ -1769,6 +1832,8 @@ class JsonGenerator {
      * Input:
      *  - breakscaped string
      * Output:
+     *  - text: plain text
+     *  - json: bitmark text JSON
      *  - Bitmark v2: breakscaped string
      *  - Bitmark v3: bitmark text JSON (TextAst)
      *
@@ -1780,7 +1845,8 @@ class JsonGenerator {
     convertBreakscapedStringToJsonText(text, format) {
         if (!text)
             undefined;
-        if (this.options.textAsPlainText || format === TextFormat_1.TextFormat.text) {
+        const asPlainText = this.options.textAsPlainText || format === TextFormat_1.TextFormat.text || format === TextFormat_1.TextFormat.json;
+        if (asPlainText) {
             return text || Breakscape_1.Breakscape.EMPTY_STRING;
         }
         // Use the text parser to parse the text
@@ -1870,6 +1936,8 @@ class JsonGenerator {
             ageRange: undefined,
             lang: undefined,
             language: undefined,
+            publisher: undefined,
+            theme: undefined,
             computerLanguage: undefined,
             target: undefined,
             tag: undefined,
@@ -1880,13 +1948,11 @@ class JsonGenerator {
             subtype: undefined,
             bookAlias: undefined,
             coverImage: undefined,
-            publisher: undefined,
             publications: undefined,
             author: undefined,
             subject: undefined,
             date: undefined,
             location: undefined,
-            theme: undefined,
             kind: undefined,
             action: undefined,
             thumbImage: undefined,
@@ -1929,6 +1995,8 @@ class JsonGenerator {
             // Item, Lead, Hint, Instruction
             item: undefined,
             lead: undefined,
+            pageNumber: undefined,
+            marginNumber: undefined,
             hint: undefined,
             instruction: undefined,
             // Example
@@ -2242,6 +2310,10 @@ class JsonGenerator {
             delete bitJson.lang;
         if (bitJson.language == null)
             delete bitJson.language;
+        if (bitJson.publisher == null)
+            delete bitJson.publisher;
+        if (bitJson.theme == null)
+            delete bitJson.theme;
         if (bitJson.computerLanguage == null)
             delete bitJson.computerLanguage;
         if (bitJson.target == null)
@@ -2262,8 +2334,6 @@ class JsonGenerator {
             delete bitJson.bookAlias;
         if (bitJson.coverImage == null)
             delete bitJson.coverImage;
-        if (bitJson.publisher == null)
-            delete bitJson.publisher;
         if (bitJson.publications == null)
             delete bitJson.publications;
         if (bitJson.author == null)
@@ -2274,8 +2344,6 @@ class JsonGenerator {
             delete bitJson.date;
         if (bitJson.location == null)
             delete bitJson.location;
-        if (bitJson.theme == null)
-            delete bitJson.theme;
         if (bitJson.kind == null)
             delete bitJson.kind;
         if (bitJson.action == null)
@@ -2356,6 +2424,10 @@ class JsonGenerator {
             delete bitJson.item;
         if (bitJson.lead == null)
             delete bitJson.lead;
+        if (bitJson.pageNumber == null)
+            delete bitJson.pageNumber;
+        if (bitJson.marginNumber == null)
+            delete bitJson.marginNumber;
         if (bitJson.hint == null)
             delete bitJson.hint;
         if (bitJson.instruction == null)