@gmb/bitmark-parser-generator 1.5.14 → 1.5.16

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

@@ -36,6 +36,7 @@ const TextFormat_1 = require("../../model/enum/TextFormat");
 const TextParser_1 = require("../../parser/text/TextParser");
 const ArrayUtils_1 = require("../../utils/ArrayUtils");
 const BooleanUtils_1 = require("../../utils/BooleanUtils");
+const NumberUtils_1 = require("../../utils/NumberUtils");
 const StringUtils_1 = require("../../utils/StringUtils");
 const UrlUtils_1 = require("../../utils/UrlUtils");
 const AstWalkerGenerator_1 = require("../AstWalkerGenerator");
@@ -214,24 +215,33 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
         this.addProperty(imageSourceJson, 'trim', BooleanUtils_1.BooleanUtils.isBoolean(trim) ? trim : null, true);
         this.bitJson.imageSource = imageSourceJson;
     }
-    // bitmarkAst -> bits -> bitsValue -> partner
-    enter_partner(node, route) {
-        const partner = node.value;
+    // bitmarkAst -> bits -> bitsValue -> person
+    enter_person(node, route) {
+        const person = node.value;
         const bitType = this.getBitType(route);
         // Ignore values that are not at the bit level as they might be handled elsewhere
         const parent = this.getParentNode(route);
         if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue || !bitType)
             return;
-        const { name, avatarImage } = partner;
-        const partnerJson = {};
-        this.addProperty(partnerJson, 'name', name !== null && name !== void 0 ? name : '', true);
+        const { name, title, avatarImage } = person;
+        const personJson = {};
+        this.addProperty(personJson, 'name', name !== null && name !== void 0 ? name : '', true);
+        if (title) {
+            this.addProperty(personJson, 'title', title, true);
+        }
         if (avatarImage) {
             const res = this.parseResourceToJson(bitType, avatarImage);
             if (res && res.type === ResourceTag_1.ResourceTag.image) {
-                partnerJson.avatarImage = res.image;
+                personJson.avatarImage = res.image;
             }
         }
-        this.bitJson.partner = partnerJson;
+        if (Config_1.Config.isOfBitType(bitType, BitType_1.BitType.conversationLeft1)) {
+            // Use the legacy partner property in the JSON for conversation bits, so change to person is backwards compatible
+            this.bitJson.partner = personJson;
+        }
+        else {
+            this.bitJson.person = personJson;
+        }
     }
     // bitmarkAst -> bits -> bitsValue -> markConfig -> markConfigValue
     enter_markConfigValue(node, route) {
@@ -281,6 +291,32 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.bitJson.marginNumber = this.convertBreakscapedStringToJsonText(marginNumber, TextFormat_1.TextFormat.bitmarkMinusMinus);
         }
     }
+    // bitmarkAst -> bits -> bitsValue -> width
+    enter_width(node, route) {
+        var _a;
+        let value = node.value;
+        const bitType = this.getBitType(route);
+        const parent = this.getParentNode(route);
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.bitsValue && Config_1.Config.isOfBitType(bitType, BitType_1.BitType.extractorBlock)) {
+            value = (_a = NumberUtils_1.NumberUtils.asNumber(value, 0)) !== null && _a !== void 0 ? _a : 0;
+        }
+        // Add the property
+        this.addProperty(this.bitJson, 'width', value, true);
+        return false;
+    }
+    // bitmarkAst -> bits -> bitsValue -> height
+    enter_height(node, route) {
+        var _a;
+        let value = node.value;
+        const bitType = this.getBitType(route);
+        const parent = this.getParentNode(route);
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) === NodeType_1.NodeType.bitsValue && Config_1.Config.isOfBitType(bitType, BitType_1.BitType.extractorBlock)) {
+            value = (_a = NumberUtils_1.NumberUtils.asNumber(value, 0)) !== null && _a !== void 0 ? _a : 0;
+        }
+        // Add the property
+        this.addProperty(this.bitJson, 'height', value, true);
+        return false;
+    }
     // bitmarkAst -> bits -> bitsValue -> extraProperties
     enter_extraProperties(node, _route) {
         const extraProperties = node.value;
@@ -836,6 +872,37 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             this.bitJson.responses = responsesJson;
         }
     }
+    // bitmarkAst -> bits -> bitsValue -> cardNode -> ingredients -> ingredientsValue
+    enter_ingredients(node, route) {
+        var _a, _b, _c, _d, _e, _f;
+        const ingredients = node.value;
+        // Ignore statements that are not at the card node level as they are handled elsewhere
+        const parent = this.getParentNode(route);
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
+            return;
+        const ingredientsJson = [];
+        if (ingredients) {
+            for (const i of ingredients) {
+                // Create the ingredient
+                const ingredientJson = {
+                    checked: (_a = i.checked) !== null && _a !== void 0 ? _a : false,
+                    item: (_b = Breakscape_1.Breakscape.unbreakscape(i.item)) !== null && _b !== void 0 ? _b : '',
+                    quantity: (_c = i.quantity) !== null && _c !== void 0 ? _c : 0,
+                    unit: (_d = Breakscape_1.Breakscape.unbreakscape(i.unit)) !== null && _d !== void 0 ? _d : '',
+                    unitAbbr: (_e = Breakscape_1.Breakscape.unbreakscape(i.unitAbbr)) !== null && _e !== void 0 ? _e : '',
+                    disableCalculation: (_f = i.disableCalculation) !== null && _f !== void 0 ? _f : false,
+                };
+                // Delete unwanted properties
+                if ((i === null || i === void 0 ? void 0 : i.unitAbbr) == null)
+                    delete ingredientJson.unitAbbr;
+                // if (i?.instruction == null) delete ingredientJson.instruction;
+                ingredientsJson.push(ingredientJson);
+            }
+        }
+        if (ingredientsJson.length > 0) {
+            this.bitJson.ingredients = ingredientsJson;
+        }
+    }
     // bitmarkAst -> bits -> bitsValue -> resources
     enter_resources(node, route) {
         var _a;
@@ -903,7 +970,11 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
     // Terminal nodes (leaves)
     //
     // bitmarkAst -> bits -> bitsValue -> title
-    leaf_title(node, _route) {
+    leaf_title(node, route) {
+        // Ignore title that are not at the bit or card node level as they are handled elsewhere
+        const parent = this.getParentNode(route);
+        if ((parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.bitsValue && (parent === null || parent === void 0 ? void 0 : parent.key) !== NodeType_1.NodeType.cardNode)
+            return;
         this.bitJson.title = this.convertBreakscapedStringToJsonText(node.value, TextFormat_1.TextFormat.bitmarkMinusMinus);
     }
     //  bitmarkAst -> bits -> bitsValue -> subtitle
@@ -1037,7 +1108,11 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
                 continue;
             if (astKey === PropertyTag_1.PropertyTag.imageSource)
                 continue;
-            if (astKey === PropertyTag_1.PropertyTag.partner)
+            if (astKey === PropertyTag_1.PropertyTag.person)
+                continue;
+            if (astKey === PropertyTag_1.PropertyTag.width)
+                continue;
+            if (astKey === PropertyTag_1.PropertyTag.height)
                 continue;
             if (astKey === PropertyAstKey_1.PropertyAstKey.markConfig)
                 continue;
@@ -1905,12 +1980,15 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             id: undefined,
             internalComment: undefined,
             externalId: undefined,
+            bookId: undefined,
             spaceId: undefined,
             padletId: undefined,
             jupyterId: undefined,
             jupyterExecutionCount: undefined,
             AIGenerated: undefined,
             releaseVersion: undefined,
+            releaseKind: undefined,
+            releaseDate: undefined,
             book: undefined,
             ageRange: undefined,
             lang: undefined,
@@ -1934,8 +2012,14 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             location: undefined,
             kind: undefined,
             action: undefined,
+            blockId: undefined,
+            pageNo: undefined,
+            x: undefined,
+            y: undefined,
             width: undefined,
             height: undefined,
+            index: undefined,
+            classification: undefined,
             thumbImage: undefined,
             scormSource: undefined,
             posterImage: undefined,
@@ -1957,6 +2041,7 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             labelTrue: undefined,
             labelFalse: undefined,
             content2Buy: undefined,
+            mailingList: undefined,
             buttonCaption: undefined,
             quotedPerson: undefined,
             reasonableNumOfChars: undefined,
@@ -1968,6 +2053,8 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             product: undefined,
             productVideo: undefined,
             productFolder: undefined,
+            technicalTerm: undefined,
+            portions: undefined,
             // Book data
             title: undefined,
             subtitle: undefined,
@@ -1987,8 +2074,8 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             // Example
             isExample: undefined,
             example: undefined,
-            // Partner .conversion-xxx only
-            partner: undefined,
+            // Person .conversion-xxx, page-person, etc
+            person: undefined,
             // Marks (config)
             marks: undefined,
             // Extra Properties
@@ -2281,6 +2368,8 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             delete bitJson.internalComment;
         if (bitJson.externalId == null)
             delete bitJson.externalId;
+        if (bitJson.bookId == null)
+            delete bitJson.bookId;
         if (bitJson.spaceId == null)
             delete bitJson.spaceId;
         if (bitJson.padletId == null)
@@ -2293,6 +2382,10 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             delete bitJson.AIGenerated;
         if (bitJson.releaseVersion == null)
             delete bitJson.releaseVersion;
+        if (bitJson.releaseKind == null)
+            delete bitJson.releaseKind;
+        if (bitJson.releaseDate == null)
+            delete bitJson.releaseDate;
         if (bitJson.book == null)
             delete bitJson.book;
         if (bitJson.ageRange == null)
@@ -2339,10 +2432,22 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             delete bitJson.kind;
         if (bitJson.action == null)
             delete bitJson.action;
+        if (bitJson.blockId == null)
+            delete bitJson.blockId;
+        if (bitJson.pageNo == null)
+            delete bitJson.pageNo;
+        if (bitJson.x == null)
+            delete bitJson.x;
+        if (bitJson.y == null)
+            delete bitJson.y;
         if (bitJson.width == null)
             delete bitJson.width;
         if (bitJson.height == null)
             delete bitJson.height;
+        if (bitJson.index == null)
+            delete bitJson.index;
+        if (bitJson.classification == null)
+            delete bitJson.classification;
         if (bitJson.thumbImage == null)
             delete bitJson.thumbImage;
         if (bitJson.scormSource == null)
@@ -2385,6 +2490,8 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             delete bitJson.labelFalse;
         if (bitJson.content2Buy == null)
             delete bitJson.content2Buy;
+        if (bitJson.mailingList == null)
+            delete bitJson.mailingList;
         if (bitJson.buttonCaption == null)
             delete bitJson.buttonCaption;
         if (bitJson.quotedPerson == null)
@@ -2405,6 +2512,10 @@ class JsonGenerator extends AstWalkerGenerator_1.AstWalkerGenerator {
             delete bitJson.productVideo;
         if (bitJson.productFolder == null)
             delete bitJson.productFolder;
+        if (bitJson.technicalTerm == null)
+            delete bitJson.technicalTerm;
+        if (bitJson.portions == null)
+            delete bitJson.portions;
         // Book data
         if (bitJson.title == null)
             delete bitJson.title;