@gmb/bitmark-parser-generator 1.35.0 → 2.0.0

package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"MarkChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA2ES,8DAAyB;AA3ElC,qDAAkD;AAClD,oEAAiE;AACjE,sDAAmD;AAInD,oDAAiD;AAEjD,6DAA0D;AAE1D,uEAAoE;AAEpE,oEAMkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,yBAAyB,CAChC,OAAgC,EAChC,YAA8B,EAC9B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC,EACjC,SAAqB;IAErB,IAAI,YAAY,KAAK,uCAAe,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAA,iDAAuB,EAAC,OAAO,EAAE,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxF,IAAI,IAAI;YAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAChB,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB;;IAEnB,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,eAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5G,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAC3C,uCAAe,CAAC,KAAK,EACrB,OAAO,EACP,UAAU,EACV,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EACjB,OAAO,CAAC,KAAK,CACd,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAEzE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,IAAI,EAAE,QAAQ,KAAc,SAAS,EAAlB,IAAI,UAAK,SAAS,EAAvC,QAA2B,CAAY,CAAC;IAE9C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,iBACvB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,uBAAU,CAAC,YAAY,EAC7C,IAAI,EAAE,MAAA,uBAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,mCAAI,uBAAU,CAAC,YAAY,IAC3D,IAAI,EACP,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"MarkChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAiFS,8DAAyB;AAjFlC,sDAAmD;AAInD,oEAAiE;AACjE,oDAAiD;AAGjD,6DAA0D;AAE1D,uEAAoE;AAEpE,oEAMkC;AAElC,SAAS,yBAAyB,CAChC,OAAgC,EAChC,YAA8B,EAC9B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC,EACjC,SAAqB;IAErB,IAAI,YAAY,KAAK,uCAAe,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAA,iDAAuB,EAAC,OAAO,EAAE,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAkC,SAAS,CACnD,OAAO,EACP,YAAY,EACZ,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,CACR,CAAC;QACF,IAAI,IAAI;YAAE,SAAS,CAAC,IAAI,CAAC,IAAgB,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAChB,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB;;IAEnB,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,eAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,SAAG,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5G,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAC3C,uCAAe,CAAC,KAAK,EACrB,OAAO,EACP,UAAU,EACV,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EACjB,OAAO,CAAC,KAAK,CACd,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAEzE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,IAAI,EAAE,QAAQ,KAAc,SAAS,EAAlB,IAAI,UAAK,SAAS,EAAvC,QAA2B,CAAY,CAAC;IAE9C,MAAM,IAAI,mBACR,IAAI,EAAE,yBAAW,CAAC,IAAI,EACtB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EACxB,IAAI,EAAE,MAAA,uBAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,mCAAI,EAAE,IACtC,IAAI,CACR,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js

@@ -12,12 +12,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.markConfigChainContentProcessor = markConfigChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const Config_1 = require("../../../../config/Config");
 const PropertyTag_1 = require("../../../../model/enum/PropertyTag");
 const StringUtils_1 = require("../../../../utils/StringUtils");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
 function markConfigChainContentProcessor(context, _contentDepth, bitType, textFormat, tagsConfig, content, target) {
     var _a;
     const { key: tag } = content;
@@ -32,8 +31,9 @@ function markConfigChainContentProcessor(context, _contentDepth, bitType, textFo
     if (context.DEBUG_CHAIN_TAGS)
         context.debugPrint('mark TAGS', tags);
     // Extract the name from the content tag
-    const mark = ((_a = StringUtils_1.StringUtils.trimmedString(content.value)) !== null && _a !== void 0 ? _a : 'unknown');
-    const config = builder.markConfig(Object.assign({ mark, emphasis: 'underline' }, tags));
-    markConfig.push(config);
+    const mark = Breakscape_1.Breakscape.unbreakscape(((_a = StringUtils_1.StringUtils.trimmedString(content.value)) !== null && _a !== void 0 ? _a : 'unknown'));
+    const config = Object.assign({ mark, emphasis: 'underline' }, tags);
+    if (config)
+        markConfig.push(config);
 }
 //# sourceMappingURL=MarkConfigChainContentProcessor.js.map

package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"MarkConfigChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA8DS,0EAA+B;AA9DxC,qDAAkD;AAClD,sDAAmD;AAInD,oEAAiE;AAEjE,+DAA4D;AAE5D,oEAOkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,+BAA+B,CACtC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;;IAEjC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAAuB,CAAC;IAE7C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAErC,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,aAAa,GAAG,eAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,yBAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAExF,6DAA6D;IAC7D,MAAM,KAAiC,OAAO,CAAC,mBAAmB,CAChE,uCAAe,CAAC,KAAK,EACrB,OAAO,EACP,UAAU,EACV,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,EACpB,OAAO,CAAC,KAAK,CACd,EANK,EAAE,IAAI,EAAE,WAAW,OAMxB,EAN6B,IAAI,cAA5B,QAA8B,CAMnC,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAEpE,wCAAwC;IACxC,MAAM,IAAI,GAAsB,CAAC,MAAA,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAI,SAAS,CAAsB,CAAC;IAE7G,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,iBAC/B,IAAI,EACJ,QAAQ,EAAE,WAAgC,IACvC,IAAI,EACP,CAAC;IAEH,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"MarkConfigChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA+DS,0EAA+B;AA/DxC,oEAAiE;AACjE,sDAAmD;AAInD,oEAAiE;AAGjE,+DAA4D;AAE5D,oEAOkC;AAElC,SAAS,+BAA+B,CACtC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;;IAEjC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAAuB,CAAC;IAE7C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAErC,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,aAAa,GAAG,eAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,yBAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAExF,6DAA6D;IAC7D,MAAM,KAAiC,OAAO,CAAC,mBAAmB,CAChE,uCAAe,CAAC,KAAK,EACrB,OAAO,EACP,UAAU,EACV,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,EACpB,OAAO,CAAC,KAAK,CACd,EANK,EAAE,IAAI,EAAE,WAAW,OAMxB,EAN6B,IAAI,cAA5B,QAA8B,CAMnC,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAEpE,wCAAwC;IACxC,MAAM,IAAI,GAAW,uBAAU,CAAC,YAAY,CAC1C,CAAC,MAAA,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAI,SAAS,CAAsB,CAC7E,CAAC;IAEF,MAAM,MAAM,mBACV,IAAI,EACJ,QAAQ,EAAE,WAAqB,IAC5B,IAAI,CACR,CAAC;IAEF,IAAI,MAAM;QAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.personChainContentProcessor = personChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const ResourceTag_1 = require("../../../../model/enum/ResourceTag");
 const StringUtils_1 = require("../../../../utils/StringUtils");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
 function personChainContentProcessor(context, _contentDepth, bitType, textFormat, tagsConfig, content, target) {
     // const { value } = content as TypeValue;
     if (context.DEBUG_CHAIN_CONTENT)
@@ -15,16 +14,16 @@ function personChainContentProcessor(context, _contentDepth, bitType, textFormat
         context.debugPrint('person TAGS', tags);
     const { propertyTitle, resources } = tags;
     // Extract the name from the content tag
-    const name = StringUtils_1.StringUtils.trimmedString(content.value);
+    const name = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value));
     // Extract the title from the propertyTitle tag
     const title = StringUtils_1.StringUtils.trimmedString(propertyTitle);
     // Extract avatarImage from the resources
     const avatarImage = extractAvatarImage(context, resources);
-    const person = builder.person({
+    const person = {
         name,
         title,
         avatarImage,
-    });
+    };
     target.person = person;
 }
 function extractAvatarImage(context, resources) {
@@ -35,7 +34,7 @@ function extractAvatarImage(context, resources) {
     if (resources) {
         for (const r of resources.reverse()) {
             if (!avatarImage && ResourceTag_1.ResourceTag.image === r.type) {
-                avatarImage = r;
+                avatarImage = r.image;
             }
             else {
                 excessResources.push(r);

package/dist/cjs/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"PersonChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.ts"],"names":[],"mappings":";;AAsFS,kEAA2B;AAtFpC,qDAAkD;AAKlD,oEAAiE;AAEjE,+DAA4D;AAE5D,oEAMkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,2BAA2B,CAClC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAEtE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAE1C,wCAAwC;IACxC,MAAM,IAAI,GAAG,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAsB,CAAC;IAE3E,+CAA+C;IAC/C,MAAM,KAAK,GAAG,yBAAW,CAAC,aAAa,CAAC,aAAa,CAAsB,CAAC;IAE5E,yCAAyC;IACzC,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC5B,IAAI;QACJ,KAAK;QACL,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;AACzB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAgC,EAChC,SAAiC;IAEjC,yCAAyC;IACzC,8EAA8E;IAC9E,IAAI,WAAsC,CAAC;IAC3C,MAAM,eAAe,GAAe,EAAE,CAAC;IAEvC,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,IAAI,yBAAW,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBACjD,WAAW,GAAG,CAAkB,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,8CAA8C;QAC9C,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC;QAEjD,oDAAoD;QACpD,OAAO,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,MAAM,qDAAqD,CAAC,CAAC;IACrG,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"PersonChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.ts"],"names":[],"mappings":";;AAqFS,kEAA2B;AArFpC,oEAAiE;AAIjE,oEAAiE;AAIjE,+DAA4D;AAE5D,oEAMkC;AAElC,SAAS,2BAA2B,CAClC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAE/E,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAEtE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAE1C,wCAAwC;IACxC,MAAM,IAAI,GAAG,uBAAU,CAAC,YAAY,CAAC,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAsB,CAAC,CAAC;IAEpG,+CAA+C;IAC/C,MAAM,KAAK,GAAG,yBAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAEvD,yCAAyC;IACzC,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAwB;QAClC,IAAI;QACJ,KAAK;QACL,WAAW;KACZ,CAAC;IAEF,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;AACzB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAgC,EAChC,SAAqC;IAErC,yCAAyC;IACzC,8EAA8E;IAC9E,IAAI,WAA0C,CAAC;IAC/C,MAAM,eAAe,GAAmB,EAAE,CAAC;IAE3C,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,IAAI,yBAAW,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBACjD,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,8CAA8C;QAC9C,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC;QAEjD,oDAAoD;QACpD,OAAO,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,MAAM,qDAAqD,CAAC,CAAC;IACrG,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.propertyContentProcessor = propertyContentProcessor;
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const Config_1 = require("../../../../config/Config");
+const PropertyTagConfig_1 = require("../../../../model/config/PropertyTagConfig");
+const ConfigKey_1 = require("../../../../model/config/enum/ConfigKey");
 const PropertyConfigKey_1 = require("../../../../model/config/enum/PropertyConfigKey");
 const PropertyFormat_1 = require("../../../../model/enum/PropertyFormat");
 const PropertyTag_1 = require("../../../../model/enum/PropertyTag");
 const ResourceTag_1 = require("../../../../model/enum/ResourceTag");
+const TextFormat_1 = require("../../../../model/enum/TextFormat");
 const BooleanUtils_1 = require("../../../../utils/BooleanUtils");
 const NumberUtils_1 = require("../../../../utils/NumberUtils");
 const StringUtils_1 = require("../../../../utils/StringUtils");
+const TextParser_1 = require("../../../text/TextParser");
 const BookChainContentProcessor_1 = require("./BookChainContentProcessor");
 const ExampleTagContentProcessor_1 = require("./ExampleTagContentProcessor");
 const ImageSourceChainContentProcessor_1 = require("./ImageSourceChainContentProcessor");
@@ -20,6 +25,7 @@ const ResourceContentProcessor_1 = require("./ResourceContentProcessor");
 const ServingsChainContentProcessor_1 = require("./ServingsChainContentProcessor");
 const TechnicalTermChainContentProcessor_1 = require("./TechnicalTermChainContentProcessor");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
+const textParser = new TextParser_1.TextParser();
 function propertyContentProcessor(context, contentDepth, bitType, textFormat, tagsConfig, content, target) {
     const { value } = content;
     let { key: tag } = content;
@@ -87,19 +93,23 @@ function propertyContentProcessor(context, contentDepth, bitType, textFormat, ta
                 return undefined;
             if (c) {
                 switch (c.format) {
-                    case PropertyFormat_1.PropertyFormat.string:
-                        return StringUtils_1.StringUtils.isString(v) ? StringUtils_1.StringUtils.string(v) : undefined;
+                    // case PropertyFormat.string:
+                    //   return StringUtils.isString(v) ? StringUtils.string(v) : undefined;
                     case PropertyFormat_1.PropertyFormat.trimmedString:
-                        return StringUtils_1.StringUtils.isString(v) ? StringUtils_1.StringUtils.trimmedString(v) : undefined;
+                        return Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.isString(v) ? StringUtils_1.StringUtils.trimmedString(v) : undefined);
                     case PropertyFormat_1.PropertyFormat.number:
-                        return NumberUtils_1.NumberUtils.asNumber(v);
+                        return NumberUtils_1.NumberUtils.asNumber(Breakscape_1.Breakscape.unbreakscape(v));
                     case PropertyFormat_1.PropertyFormat.boolean:
-                        return BooleanUtils_1.BooleanUtils.toBoolean(v, true);
+                        return BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v), true);
                     case PropertyFormat_1.PropertyFormat.invertedBoolean:
-                        return !BooleanUtils_1.BooleanUtils.toBoolean(v, true);
+                        return !BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v), true);
+                    case PropertyFormat_1.PropertyFormat.bitmarkMinusMinus:
+                        return textParser.toAst(v, { textFormat: TextFormat_1.TextFormat.bitmarkMinusMinus });
+                    case PropertyFormat_1.PropertyFormat.bitmarkPlusPlus:
+                        return textParser.toAst(v, { textFormat: TextFormat_1.TextFormat.bitmarkMinusMinus });
                 }
             }
-            return v;
+            return Breakscape_1.Breakscape.unbreakscape(v);
         };
         // Convert property and key as needed
         v = processValue(v);
@@ -126,5 +136,11 @@ function propertyContentProcessor(context, contentDepth, bitType, textFormat, ta
         // Unknown (extra) property
         addProperty(target.extraProperties, tag, value, propertyConfig);
     }
+    // HACKS: Need to allow properties for different bits and in chains to have different/multiple formats!
+    // This is not currently supported by the config system; it would need to be extended to support this.
+    // That is a bit job, so instead there are just some hacks here for the few cases where it is currently needed :(
+    if (tag === PropertyTag_1.PropertyTag.tag_sampleSolution) {
+        addProperty(target, '__sampleSolutionAst', value, new PropertyTagConfig_1.PropertyTagConfig(ConfigKey_1.ConfigKey.sampleSolution, PropertyTag_1.PropertyTag.tag_sampleSolution, 1, 1, undefined, undefined, undefined, true, PropertyFormat_1.PropertyFormat.bitmarkMinusMinus, undefined, undefined));
+    }
 }
 //# sourceMappingURL=PropertyContentProcessor.js.map

package/dist/cjs/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PropertyContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/RatingLevelChainContentProcessor.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ratingLevelChainContentProcessor = ratingLevelChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
 const PropertyTag_1 = require("../../../../model/enum/PropertyTag");
 const NumberUtils_1 = require("../../../../utils/NumberUtils");
+const TextParser_1 = require("../../../text/TextParser");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
+const textParser = new TextParser_1.TextParser();
 function ratingLevelChainContentProcessor(context, _contentDepth, bitType, textFormat, tagsConfig, content, target) {
     var _a;
     const { key, value } = content;
@@ -17,10 +17,10 @@ function ratingLevelChainContentProcessor(context, _contentDepth, bitType, textF
     const { label } = tags;
     // Extract the technicalTerm from the content tag
     const level = (_a = NumberUtils_1.NumberUtils.asNumber(value)) !== null && _a !== void 0 ? _a : 0;
-    const node = builder.ratingLevelStartEnd({
+    const node = {
         level,
-        label,
-    });
+        label: label ? textParser.toAst(label) : undefined,
+    };
     switch (key) {
         case PropertyTag_1.PropertyTag.ratingLevelStart:
             target.ratingLevelStart = node;

package/dist/cjs/parser/bitmark/peg/contentProcessors/RatingLevelChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"RatingLevelChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/RatingLevelChainContentProcessor.ts"],"names":[],"mappings":";;AA2DS,4EAAgC;AA3DzC,qDAAkD;AAGlD,oEAAiE;AAEjE,+DAA4D;AAE5D,oEAOkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,gCAAgC,CACvC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;;IAEjC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAuB,CAAC;IAE/C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAEpF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAE3E,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvB,iDAAiD;IACjD,MAAM,KAAK,GAAG,MAAA,yBAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,mCAAI,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC;QACvC,KAAK;QACL,KAAK;KACN,CAAC,CAAC;IAEH,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,yBAAW,CAAC,gBAAgB;YAC/B,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAE/B,MAAM;QACR,KAAK,yBAAW,CAAC,cAAc;YAC7B,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;YAE7B,MAAM;QACR,QAAQ;QACR,aAAa;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"RatingLevelChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/RatingLevelChainContentProcessor.ts"],"names":[],"mappings":";;AA4DS,4EAAgC;AA1DzC,oEAAiE;AAGjE,+DAA4D;AAC5D,yDAAsD;AAEtD,oEAOkC;AAElC,MAAM,UAAU,GAAG,IAAI,uBAAU,EAAE,CAAC;AAEpC,SAAS,gCAAgC,CACvC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;;IAEjC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAuB,CAAC;IAE/C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAEpF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAE3E,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvB,iDAAiD;IACjD,MAAM,KAAK,GAAG,MAAA,yBAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,mCAAI,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAqC;QAC7C,KAAK;QACL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KACnD,CAAC;IAEF,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,yBAAW,CAAC,gBAAgB;YAC/B,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAE/B,MAAM;QACR,KAAK,yBAAW,CAAC,cAAc;YAC7B,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;YAE7B,MAAM;QACR,QAAQ;QACR,aAAa;IACf,CAAC;AACH,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.referenceTagContentProcessor = referenceTagContentProcessor;
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const StringUtils_1 = require("../../../../utils/StringUtils");
 function referenceTagContentProcessor(_context, _contentDepth, _bitType, _textFormat, _tagsConfig, content, target, isReferenceEnd) {
     const { value } = content;
     const trimmedStringValue = StringUtils_1.StringUtils.trimmedString(value);
     if (isReferenceEnd) {
-        target.referenceEnd = trimmedStringValue;
+        target.referenceEnd = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue);
     }
     else {
-        target.reference = trimmedStringValue;
+        target.reference = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue);
     }
 }
 //# sourceMappingURL=ReferenceTagContentProcessor.js.map

package/dist/cjs/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReferenceTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.ts"],"names":[],"mappings":";;AAkCS,oEAA4B;AA9BrC,+DAA4D;AAU5D,SAAS,4BAA4B,CACnC,QAAiC,EACjC,aAA+B,EAC/B,QAAqB,EACrB,WAA2B,EAC3B,WAAmC,EACnC,OAAmB,EACnB,MAAiC,EACjC,cAAuB;IAEvB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAoB,CAAC;IAEvC,MAAM,kBAAkB,GAAG,yBAAW,CAAC,aAAa,CAAC,KAAK,CAAsB,CAAC;IAEjF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,YAAY,GAAG,kBAAkB,CAAC;IAC3C,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,SAAS,GAAG,kBAAkB,CAAC;IACxC,CAAC;AACH,CAAC"}
+{"version":3,"file":"ReferenceTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.ts"],"names":[],"mappings":";;AAmCS,oEAA4B;AAnCrC,oEAAiE;AAKjE,+DAA4D;AAU5D,SAAS,4BAA4B,CACnC,QAAiC,EACjC,aAA+B,EAC/B,QAAqB,EACrB,WAA2B,EAC3B,WAAmC,EACnC,OAAmB,EACnB,MAAiC,EACjC,cAAuB;IAEvB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAoB,CAAC;IAEvC,MAAM,kBAAkB,GAAG,yBAAW,CAAC,aAAa,CAAC,KAAK,CAAsB,CAAC;IAEjF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,YAAY,GAAG,uBAAU,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,SAAS,GAAG,uBAAU,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACjE,CAAC;AACH,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js

@@ -15,6 +15,7 @@ exports.buildResources = buildResources;
 exports.resourceContentProcessor = resourceContentProcessor;
 exports.propertyStyleResourceContentProcessor = propertyStyleResourceContentProcessor;
 const ResourceBuilder_1 = require("../../../../ast/ResourceBuilder");
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const Config_1 = require("../../../../config/Config");
 const Count_1 = require("../../../../model/enum/Count");
 const ResourceTag_1 = require("../../../../model/enum/ResourceTag");
@@ -41,8 +42,8 @@ function buildResources(context, bitType, resourceTypeAttachment, resources) {
     // Find the excess resources and ensure we have the minimum resources
     if (resources) {
         for (const r of resources.reverse()) {
-            let countMin = (_a = countsMin.get(r.typeAlias)) !== null && _a !== void 0 ? _a : 0;
-            let countMax = (_b = countsMax.get(r.typeAlias)) !== null && _b !== void 0 ? _b : 0;
+            let countMin = (_a = countsMin.get(r.__typeAlias)) !== null && _a !== void 0 ? _a : 0;
+            let countMax = (_b = countsMax.get(r.__typeAlias)) !== null && _b !== void 0 ? _b : 0;
             // Decrement the minimum count and later ensure it is 0
             countMin = Math.max(0, countMin - 1);
             if (countMax === Count_1.Count.infinity) {
@@ -57,8 +58,8 @@ function buildResources(context, bitType, resourceTypeAttachment, resources) {
                 excessResources.unshift(r);
             }
             // Set the new counts
-            countsMin.set(r.typeAlias, countMin);
-            countsMax.set(r.typeAlias, countMax);
+            countsMin.set(r.__typeAlias, countMin);
+            countsMax.set(r.__typeAlias, countMax);
         }
     }
     // Raise a warning if the resource type is specified in the bit header, but no extra resource attachment is allowed
@@ -86,8 +87,13 @@ function resourceContentProcessor(context, _contentDepth, bitType, textFormat, t
         // Parse the resource chain
         const resourceConfig = Config_1.Config.getTagConfigForTag(tagsConfig, type);
         const _a = context.bitContentProcessor(BitmarkPegParserTypes_1.BitContentLevel.Chain, bitType, textFormat, resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.chain, chain), { posterImage } = _a, tags = __rest(_a, ["posterImage"]);
-        const resource = resourceBuilder.resource(Object.assign({ type,
-            value, posterImage: posterImage }, tags));
+        const posterImageResource = posterImage
+            ? resourceBuilder.resource(bitType, {
+                type: ResourceTag_1.ResourceTag.image,
+                value: posterImage,
+            }).image
+            : undefined;
+        const resource = resourceBuilder.resource(bitType, Object.assign({ type, value: Breakscape_1.Breakscape.unbreakscape(value), posterImage: posterImageResource }, tags));
         if (resource)
             resources.push(resource);
     }
@@ -101,8 +107,13 @@ function propertyStyleResourceContentProcessor(context, _contentDepth, bitType,
         // Parse the resource chain
         const resourceConfig = Config_1.Config.getTagConfigForTag(tagsConfig, type);
         const _b = context.bitContentProcessor(BitmarkPegParserTypes_1.BitContentLevel.Chain, bitType, textFormat, resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.chain, chain), { posterImage } = _b, tags = __rest(_b, ["posterImage"]);
-        const resource = resourceBuilder.resource(Object.assign({ type,
-            value, posterImage: posterImage }, tags));
+        const posterImageResource = posterImage
+            ? resourceBuilder.resource(bitType, {
+                type: ResourceTag_1.ResourceTag.image,
+                value: posterImage,
+            }).image
+            : undefined;
+        const resource = resourceBuilder.resource(bitType, Object.assign({ type, value: Breakscape_1.Breakscape.unbreakscape(value), posterImage: posterImageResource }, tags));
         if (resource)
             target.propertyStyleResources[key] = resource;
     }

package/dist/cjs/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ResourceContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/ServingsChainContentProcessor.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.servingsChainContentProcessor = servingsChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
 const NumberUtils_1 = require("../../../../utils/NumberUtils");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
 function servingsChainContentProcessor(context, _contentDepth, bitType, textFormat, tagsConfig, content, target) {
     // const { value } = content as TypeValue;
     var _a;
@@ -13,17 +11,17 @@ function servingsChainContentProcessor(context, _contentDepth, bitType, textForm
     const tags = context.bitContentProcessor(BitmarkPegParserTypes_1.BitContentLevel.Chain, bitType, textFormat, tagsConfig, content.chain);
     if (context.DEBUG_CHAIN_TAGS)
         context.debugPrint('servings TAGS', tags);
-    const { unit, unitAbbr, decimalPlaces, disableCalculation, hint } = tags;
+    const { unit, unitAbbr, decimalPlaces, disableCalculation, __hintString } = tags;
     // Extract the servings from the content tag
     const servings = (_a = NumberUtils_1.NumberUtils.asNumber(content.value)) !== null && _a !== void 0 ? _a : 1;
-    const node = builder.servings({
+    const node = {
         servings,
         unit,
         unitAbbr,
         decimalPlaces: decimalPlaces !== null && decimalPlaces !== void 0 ? decimalPlaces : 1,
         disableCalculation,
-        hint,
-    });
+        hint: __hintString,
+    };
     target.servings = node;
 }
 //# sourceMappingURL=ServingsChainContentProcessor.js.map

package/dist/cjs/parser/bitmark/peg/contentProcessors/ServingsChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServingsChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ServingsChainContentProcessor.ts"],"names":[],"mappings":";;AAkDS,sEAA6B;AAlDtC,qDAAkD;AAIlD,+DAA4D;AAE5D,oEAMkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,6BAA6B,CACpC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEjF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAExE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAEzE,4CAA4C;IAC5C,MAAM,QAAQ,GAAG,MAAA,yBAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAI,CAAC,CAAC;IAE1D,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC5B,QAAQ;QACR,IAAI;QACJ,QAAQ;QACR,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,CAAC;QACjC,kBAAkB;QAClB,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;AACzB,CAAC"}
+{"version":3,"file":"ServingsChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ServingsChainContentProcessor.ts"],"names":[],"mappings":";;AAgDS,sEAA6B;AA5CtC,+DAA4D;AAE5D,oEAMkC;AAElC,SAAS,6BAA6B,CACpC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEjF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAExE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEjF,4CAA4C;IAC5C,MAAM,QAAQ,GAAG,MAAA,yBAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAI,CAAC,CAAC;IAE1D,MAAM,IAAI,GAA0B;QAClC,QAAQ;QACR,IAAI;QACJ,QAAQ;QACR,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,CAAC;QACjC,kBAAkB;QAClB,IAAI,EAAE,YAAY;KACnB,CAAC;IAEF,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;AACzB,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.technicalTermChainContentProcessor = technicalTermChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
+const Breakscape_1 = require("../../../../breakscaping/Breakscape");
 const StringUtils_1 = require("../../../../utils/StringUtils");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
 function technicalTermChainContentProcessor(context, _contentDepth, bitType, textFormat, tagsConfig, content, target) {
     // const { value } = content as TypeValue;
     if (context.DEBUG_CHAIN_CONTENT)
@@ -14,11 +13,11 @@ function technicalTermChainContentProcessor(context, _contentDepth, bitType, tex
         context.debugPrint('technicalTerm TAGS', tags);
     const { lang } = tags;
     // Extract the technicalTerm from the content tag
-    const technicalTerm = StringUtils_1.StringUtils.trimmedString(content.value);
-    const node = builder.technicalTerm({
+    const technicalTerm = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value));
+    const node = {
         technicalTerm,
         lang,
-    });
+    };
     target.technicalTerm = node;
 }
 //# sourceMappingURL=TechnicalTermChainContentProcessor.js.map

package/dist/cjs/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"TechnicalTermChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.ts"],"names":[],"mappings":";;AA+CS,gFAAkC;AA/C3C,qDAAkD;AAKlD,+DAA4D;AAE5D,oEAMkC;AAElC,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;AAE9B,SAAS,kCAAkC,CACzC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAEtF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAE7E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAEtB,iDAAiD;IACjD,MAAM,aAAa,GAAG,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAsB,CAAC;IAEpF,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;QACjC,aAAa;QACb,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"TechnicalTermChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.ts"],"names":[],"mappings":";;AA8CS,gFAAkC;AA9C3C,oEAAiE;AAMjE,+DAA4D;AAE5D,oEAMkC;AAElC,SAAS,kCAAkC,CACzC,OAAgC,EAChC,aAA+B,EAC/B,OAAoB,EACpB,UAA0B,EAC1B,UAAkC,EAClC,OAAmB,EACnB,MAAiC;IAEjC,0CAA0C;IAE1C,IAAI,OAAO,CAAC,mBAAmB;QAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAEtF,MAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,uCAAe,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhH,IAAI,OAAO,CAAC,gBAAgB;QAAE,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAE7E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAEtB,iDAAiD;IACjD,MAAM,aAAa,GAAG,uBAAU,CAAC,YAAY,CAAC,yBAAW,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAsB,CAAC,CAAC;IAE7G,MAAM,IAAI,GAA+B;QACvC,aAAa;QACb,IAAI;KACL,CAAC;IAEF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;AAC9B,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/TitleTagContentProcessor.js

@@ -5,6 +5,8 @@ exports.buildTitles = buildTitles;
 const Config_1 = require("../../../../config/Config");
 const BitType_1 = require("../../../../model/enum/BitType");
 const StringUtils_1 = require("../../../../utils/StringUtils");
+const TextParser_1 = require("../../../text/TextParser");
+const textParser = new TextParser_1.TextParser();
 function titleTagContentProcessor(_context, _contentDepth, _bitType, _textFormat, _tagsConfig, content, target) {
     const { value } = content;
     const title = target.title;
@@ -15,24 +17,31 @@ function titleTagContentProcessor(_context, _contentDepth, _bitType, _textFormat
     const titleValue = value;
     const titleText = StringUtils_1.StringUtils.trimmedString(titleValue.title);
     const level = titleValue.level.length;
-    title[level] = titleText;
+    title[level] = {
+        //
+        titleAst: textParser.toAst(titleText !== null && titleText !== void 0 ? titleText : ''),
+        titleString: titleText !== null && titleText !== void 0 ? titleText : '',
+    };
 }
 function buildTitles(_context, bitType, title) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     title = title !== null && title !== void 0 ? title : [];
     if (Config_1.Config.isOfBitType(bitType, BitType_1.BitType.chapter)) {
         let t;
         if (title.length > 0)
             t = title[title.length - 1];
         return {
-            title: t,
+            title: (_a = t === null || t === void 0 ? void 0 : t.titleAst) !== null && _a !== void 0 ? _a : [],
+            titleString: (_b = t === null || t === void 0 ? void 0 : t.titleString) !== null && _b !== void 0 ? _b : '',
             level: title.length > 0 ? title.length - 1 : undefined,
         };
     }
     else {
         return {
-            title: (_a = title[1]) !== null && _a !== void 0 ? _a : undefined,
-            subtitle: (_b = title[2]) !== null && _b !== void 0 ? _b : undefined,
+            title: (_d = (_c = title[1]) === null || _c === void 0 ? void 0 : _c.titleAst) !== null && _d !== void 0 ? _d : undefined,
+            titleString: (_f = (_e = title[1]) === null || _e === void 0 ? void 0 : _e.titleString) !== null && _f !== void 0 ? _f : undefined,
+            subtitle: (_h = (_g = title[2]) === null || _g === void 0 ? void 0 : _g.titleAst) !== null && _h !== void 0 ? _h : undefined,
+            subtitleString: (_k = (_j = title[2]) === null || _j === void 0 ? void 0 : _j.titleString) !== null && _k !== void 0 ? _k : undefined,
         };
     }
 }

package/dist/cjs/parser/bitmark/peg/contentProcessors/TitleTagContentProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"TitleTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TitleTagContentProcessor.ts"],"names":[],"mappings":";;AA8DS,4DAAwB;AAAE,kCAAW;AA9D9C,sDAAmD;AAGnD,4DAAsE;AAEtE,+DAA4D;AAW5D,SAAS,wBAAwB,CAC/B,QAAiC,EACjC,aAA+B,EAC/B,QAAqB,EACrB,WAA2B,EAC3B,WAAmC,EACnC,OAAmB,EACnB,MAAiC;IAEjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAoB,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAE3B,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,gCAAgC;IAChC,8DAA8D;IAC9D,MAAM,UAAU,GAAuC,KAAY,CAAC;IACpE,MAAM,SAAS,GAAG,yBAAW,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAsB,CAAC;IACnF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;IACtC,KAAK,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAC3B,CAAC;AAED,SAAS,WAAW,CAClB,QAAiC,EACjC,OAAoB,EACpB,KAAsC;;IAEtC,KAAK,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;IAEpB,IAAI,eAAM,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,IAAI,CAAgC,CAAC;QACrC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAElD,OAAO;YACL,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;SACvD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO;YACL,KAAK,EAAE,MAAA,KAAK,CAAC,CAAC,CAAC,mCAAI,SAAS;YAC5B,QAAQ,EAAE,MAAA,KAAK,CAAC,CAAC,CAAC,mCAAI,SAAS;SAChC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"TitleTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TitleTagContentProcessor.ts"],"names":[],"mappings":";;AAyES,4DAAwB;AAAE,kCAAW;AAzE9C,sDAAmD;AAInD,4DAAsE;AAEtE,+DAA4D;AAC5D,yDAAsD;AAWtD,MAAM,UAAU,GAAG,IAAI,uBAAU,EAAE,CAAC;AAEpC,SAAS,wBAAwB,CAC/B,QAAiC,EACjC,aAA+B,EAC/B,QAAqB,EACrB,WAA2B,EAC3B,WAAmC,EACnC,OAAmB,EACnB,MAAiC;IAEjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAoB,CAAC;IAEvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAE3B,IAAI,CAAC,KAAK;QAAE,OAAO;IAEnB,gCAAgC;IAChC,8DAA8D;IAC9D,MAAM,UAAU,GAAuC,KAAY,CAAC;IACpE,MAAM,SAAS,GAAG,yBAAW,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAsB,CAAC;IACnF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;IACtC,KAAK,CAAC,KAAK,CAAC,GAAG;QACb,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;QAC3C,WAAW,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAClB,QAAiC,EACjC,OAAoB,EACpB,KAA+D;;IAE/D,KAAK,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;IAEpB,IAAI,eAAM,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,IAAI,CAAyD,CAAC;QAC9D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAElD,OAAO;YACL,KAAK,EAAE,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,mCAAI,EAAE;YACxB,WAAW,EAAE,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,WAAW,mCAAI,EAAE;YACjC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;SACvD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO;YACL,KAAK,EAAE,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,QAAQ,mCAAI,SAAS;YACtC,WAAW,EAAE,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,WAAW,mCAAI,SAAS;YAC/C,QAAQ,EAAE,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,QAAQ,mCAAI,SAAS;YACzC,cAAc,EAAE,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,WAAW,mCAAI,SAAS;SACnD,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/cjs/parser/bitmark/peg/contentProcessors/TrueFalseChainContentProcessor.js

@@ -12,12 +12,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trueFalseChainContentProcessor = trueFalseChainContentProcessor;
-const Builder_1 = require("../../../../ast/Builder");
 const Config_1 = require("../../../../config/Config");
 const BitType_1 = require("../../../../model/enum/BitType");
+const BodyBitType_1 = require("../../../../model/enum/BodyBitType");
 const TrueFalseTagContentProcessor_1 = require("./TrueFalseTagContentProcessor");
 const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
-const builder = new Builder_1.Builder();
 function trueFalseChainContentProcessor(context, contentDepth, bitType, textFormat, tagsConfig, content, target, bodyParts) {
     if (contentDepth === BitmarkPegParserTypes_1.BitContentLevel.Chain) {
         (0, TrueFalseTagContentProcessor_1.trueFalseTagContentProcessor)(context, BitmarkPegParserTypes_1.BitContentLevel.Chain, bitType, textFormat, content, target);
@@ -84,8 +83,15 @@ function buildStatement(context, bitType, textFormat, tagsConfig, trueFalseConte
     if (context.DEBUG_CHAIN_TAGS)
         context.debugPrint('trueFalse V1 tags (statement)', tags);
     let statement;
+    let firstTrueFalse;
     if (trueFalse && trueFalse.length > 0) {
-        statement = builder.statement(Object.assign(Object.assign({}, trueFalse[0]), tags));
+        firstTrueFalse = trueFalse[0];
+    }
+    if (firstTrueFalse) {
+        // Have to remove the statement JSON tag to keep typescript happy
+        const { statement: _ignore } = tags, tagsRest = __rest(tags, ["statement"]);
+        _ignore;
+        statement = Object.assign(Object.assign(Object.assign({}, firstTrueFalse), { statement: firstTrueFalse.text }), tagsRest);
     }
     return statement;
 }
@@ -115,22 +121,28 @@ function buildStatementsChoicesResponses(context, bitType, textFormat, tagsConfi
         const _a = context.bitContentProcessor(BitmarkPegParserTypes_1.BitContentLevel.Chain, bitType, textFormat, tagsConfig, contents), { trueFalse } = _a, tags = __rest(_a, ["trueFalse"]);
         if (context.DEBUG_CHAIN_TAGS)
             context.debugPrint('trueFalse V1 tags (choices/responses)', tags);
-        if (insertStatements) {
-            if (trueFalse && trueFalse.length > 0) {
-                const statement = builder.statement(Object.assign(Object.assign({}, trueFalse[0]), tags));
-                statements.push(statement);
-            }
+        let firstTrueFalse;
+        if (trueFalse && trueFalse.length > 0) {
+            firstTrueFalse = trueFalse[0];
         }
-        else if (insertChoices) {
-            if (trueFalse && trueFalse.length > 0) {
-                const choice = builder.choice(Object.assign(Object.assign({}, trueFalse[0]), tags));
-                choices.push(choice);
+        if (firstTrueFalse) {
+            if (insertStatements) {
+                // Have to remove the statement JSON tag to keep typescript happy
+                const { statement: _ignore } = tags, tagsRest = __rest(tags, ["statement"]);
+                _ignore;
+                const statement = Object.assign(Object.assign(Object.assign({}, firstTrueFalse), { statement: firstTrueFalse.text }), tagsRest);
+                if (statement)
+                    statements.push(statement);
             }
-        }
-        else if (insertResponses) {
-            if (trueFalse && trueFalse.length > 0) {
-                const response = builder.response(Object.assign(Object.assign({}, trueFalse[0]), tags));
-                responses.push(response);
+            else if (insertChoices) {
+                const choice = Object.assign(Object.assign(Object.assign({}, firstTrueFalse), { choice: firstTrueFalse.text }), tags);
+                if (choice)
+                    choices.push(choice);
+            }
+            else if (insertResponses) {
+                const response = Object.assign(Object.assign(Object.assign({}, firstTrueFalse), { response: firstTrueFalse.text }), tags);
+                if (response)
+                    responses.push(response);
             }
         }
     }
@@ -155,10 +167,12 @@ function buildHighlight(context, bitType, textFormat, tagsConfig, highlightConte
     const texts = [];
     if (trueFalse) {
         for (const tf of trueFalse) {
-            texts.push(builder.highlightText(Object.assign(Object.assign({}, tf), { isHighlighted: false })));
+            const ht = Object.assign(Object.assign({}, tf), { isHighlighted: false });
+            if (ht)
+                texts.push(ht);
         }
     }
-    const highlight = builder.highlight(Object.assign({ texts }, tags));
+    const highlight = Object.assign({ type: BodyBitType_1.BodyBitType.highlight, texts: texts }, tags);
     return highlight;
 }
 function buildSelect(context, bitType, textFormat, tagsConfig, selectContent) {
@@ -170,10 +184,12 @@ function buildSelect(context, bitType, textFormat, tagsConfig, selectContent) {
     const options = [];
     if (trueFalse) {
         for (const tf of trueFalse) {
-            options.push(builder.selectOption(tf));
+            const so = tf;
+            if (so)
+                options.push(so);
         }
     }
-    const select = builder.select(Object.assign({ options }, tags));
+    const select = Object.assign({ type: BodyBitType_1.BodyBitType.select, options: options }, tags);
     return select;
 }
 //# sourceMappingURL=TrueFalseChainContentProcessor.js.map