@gmb/bitmark-parser-generator 3.22.0 → 3.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/bitmark-parser-generator.min.js +1 -1
- package/dist/browser/bundle-report.html +2 -2
- package/dist/cjs/ast/Builder.js +65 -61
- package/dist/cjs/ast/Builder.js.map +1 -1
- package/dist/cjs/breakscaping/Breakscape.js +37 -13
- package/dist/cjs/breakscaping/Breakscape.js.map +1 -1
- package/dist/cjs/config/raw/bits.js +6 -6
- package/dist/cjs/config/raw/bits.js.map +1 -1
- package/dist/cjs/config/raw/cardSets.js +46 -18
- package/dist/cjs/config/raw/cardSets.js.map +1 -1
- package/dist/cjs/generated/build-info.js +1 -1
- package/dist/cjs/generator/bitmark/BitmarkGenerator.js +4 -5
- package/dist/cjs/generator/bitmark/BitmarkGenerator.js.map +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/model/config/enum/CardSetConfigKey.js +4 -2
- package/dist/cjs/model/config/enum/CardSetConfigKey.js.map +1 -1
- package/dist/cjs/model/enum/TextFormat.js +2 -1
- package/dist/cjs/model/enum/TextFormat.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserHelper.js +2 -2
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserHelper.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserProcessor.js +2 -2
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserTypes.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserValidator.js +11 -9
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserValidator.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/BookChainContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/BookChainContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/CardContentProcessor.js +71 -65
- package/dist/cjs/parser/bitmark/peg/contentProcessors/CardContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ClozeTagContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ClozeTagContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/DefaultTagContentProcessor.js +7 -2
- package/dist/cjs/parser/bitmark/peg/contentProcessors/DefaultTagContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js +15 -10
- package/dist/cjs/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js +7 -2
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.js +4 -1
- package/dist/cjs/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.js.map +1 -1
- package/dist/esm/ast/Builder.js +65 -61
- package/dist/esm/ast/Builder.js.map +1 -1
- package/dist/esm/breakscaping/Breakscape.js +37 -13
- package/dist/esm/breakscaping/Breakscape.js.map +1 -1
- package/dist/esm/config/raw/bits.js +6 -6
- package/dist/esm/config/raw/bits.js.map +1 -1
- package/dist/esm/config/raw/cardSets.js +46 -18
- package/dist/esm/config/raw/cardSets.js.map +1 -1
- package/dist/esm/generated/build-info.js +1 -1
- package/dist/esm/generator/bitmark/BitmarkGenerator.js +4 -5
- package/dist/esm/generator/bitmark/BitmarkGenerator.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/model/config/enum/CardSetConfigKey.js +4 -2
- package/dist/esm/model/config/enum/CardSetConfigKey.js.map +1 -1
- package/dist/esm/model/enum/TextFormat.js +2 -1
- package/dist/esm/model/enum/TextFormat.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserHelper.js +2 -2
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserHelper.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserProcessor.js +2 -2
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserTypes.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserValidator.js +11 -9
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserValidator.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/BookChainContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/BookChainContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/CardContentProcessor.js +71 -65
- package/dist/esm/parser/bitmark/peg/contentProcessors/CardContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ClozeTagContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ClozeTagContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/DefaultTagContentProcessor.js +7 -2
- package/dist/esm/parser/bitmark/peg/contentProcessors/DefaultTagContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js +16 -11
- package/dist/esm/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js +7 -2
- package/dist/esm/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.js +4 -1
- package/dist/esm/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.js.map +1 -1
- package/dist/types/ast/Builder.d.ts +2 -16
- package/dist/types/ast/Builder.d.ts.map +1 -1
- package/dist/types/breakscaping/Breakscape.d.ts.map +1 -1
- package/dist/types/config/raw/cardSets.d.ts.map +1 -1
- package/dist/types/generator/bitmark/BitmarkGenerator.d.ts +1 -1
- package/dist/types/generator/bitmark/BitmarkGenerator.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/model/ast/Nodes.d.ts +1 -2
- package/dist/types/model/ast/Nodes.d.ts.map +1 -1
- package/dist/types/model/config/enum/CardSetConfigKey.d.ts +4 -4
- package/dist/types/model/config/enum/CardSetConfigKey.d.ts.map +1 -1
- package/dist/types/model/enum/TextFormat.d.ts +2 -0
- package/dist/types/model/enum/TextFormat.d.ts.map +1 -1
- package/dist/types/model/json/BitJson.d.ts +4 -13
- package/dist/types/model/json/BitJson.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/BitmarkPegParserTypes.d.ts +1 -2
- package/dist/types/parser/bitmark/peg/BitmarkPegParserTypes.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/BitmarkPegParserValidator.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/BookChainContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/CardContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/ClozeTagContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/DefaultTagContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.d.ts.map +1 -1
- package/package.json +14 -3
package/dist/cjs/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkConfigChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"MarkConfigChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/MarkConfigChainContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA6DS,0EAA+B;AA7DxC,oEAAiE;AACjE,sDAAmD;AAGnD,oEAAiE;AACjE,kEAA+D;AAE/D,+DAA4D;AAE5D,oEAOkC;AAElC,SAAS,+BAA+B,CACtC,OAAgC,EAChC,aAA+B,EAC/B,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,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,EACpB,OAAO,CAAC,KAAK,CACd,EAJK,EAAE,IAAI,EAAE,WAAW,OAIxB,EAJ6B,IAAI,cAA5B,QAA8B,CAInC,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,EAC5E;QACE,UAAU,EAAE,uBAAU,CAAC,GAAG;KAC3B,CACF,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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.personChainContentProcessor = personChainContentProcessor;
|
|
4
4
|
const Breakscape_1 = require("../../../../breakscaping/Breakscape");
|
|
5
5
|
const ResourceTag_1 = require("../../../../model/enum/ResourceTag");
|
|
6
|
+
const TextFormat_1 = require("../../../../model/enum/TextFormat");
|
|
6
7
|
const StringUtils_1 = require("../../../../utils/StringUtils");
|
|
7
8
|
const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
|
|
8
9
|
function personChainContentProcessor(context, _contentDepth, tagsConfig, content, target) {
|
|
@@ -14,7 +15,9 @@ function personChainContentProcessor(context, _contentDepth, tagsConfig, content
|
|
|
14
15
|
context.debugPrint('person TAGS', tags);
|
|
15
16
|
const { propertyTitle, resources } = tags;
|
|
16
17
|
// Extract the name from the content tag
|
|
17
|
-
const name = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value)
|
|
18
|
+
const name = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value), {
|
|
19
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
20
|
+
});
|
|
18
21
|
// Extract the title from the propertyTitle tag
|
|
19
22
|
const title = StringUtils_1.StringUtils.trimmedString(propertyTitle);
|
|
20
23
|
// Extract avatarImage from the resources
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersonChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"PersonChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PersonChainContentProcessor.ts"],"names":[],"mappings":";;AAoFS,kEAA2B;AApFpC,oEAAiE;AAGjE,oEAAiE;AACjE,kEAA+D;AAG/D,+DAA4D;AAE5D,oEAMkC;AAElC,SAAS,2BAA2B,CAClC,OAAgC,EAChC,aAA+B,EAC/B,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,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAE3F,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,EAAE;QAClG,UAAU,EAAE,uBAAU,CAAC,GAAG;KAC3B,CAAC,CAAC;IAEH,+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"}
|
|
@@ -62,11 +62,6 @@ function propertyContentProcessor(context, contentDepth, tagsConfig, content, ta
|
|
|
62
62
|
(0, PersonChainContentProcessor_1.personChainContentProcessor)(context, contentDepth, propertyConfig.chain, content, target);
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
-
else if (configKey === PropertyConfigKey_1.PropertyConfigKey.icon && contentDepth === BitmarkPegParserTypes_1.BitContentLevel.Card) {
|
|
66
|
-
// TODO - now the property is handled should be part of the config, not hardcoded here with the depth
|
|
67
|
-
(0, ResourceContentProcessor_1.resourceContentProcessor)(context, contentDepth, tagsConfig, content, target);
|
|
68
|
-
return;
|
|
69
|
-
}
|
|
70
65
|
else if (configKey === PropertyConfigKey_1.PropertyConfigKey.imageSource) {
|
|
71
66
|
(0, ImageSourceChainContentProcessor_1.imageSourceChainContentProcessor)(context, contentDepth, tagsConfig, content, target);
|
|
72
67
|
return;
|
|
@@ -101,13 +96,21 @@ function propertyContentProcessor(context, contentDepth, tagsConfig, content, ta
|
|
|
101
96
|
// case PropertyFormat.string:
|
|
102
97
|
// return StringUtils.isString(v) ? StringUtils.string(v) : undefined;
|
|
103
98
|
case PropertyFormat_1.PropertyFormat.trimmedString:
|
|
104
|
-
return Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.isString(v) ? StringUtils_1.StringUtils.trimmedString(v) : undefined
|
|
99
|
+
return Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.isString(v) ? StringUtils_1.StringUtils.trimmedString(v) : undefined, {
|
|
100
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
101
|
+
});
|
|
105
102
|
case PropertyFormat_1.PropertyFormat.number:
|
|
106
|
-
return NumberUtils_1.NumberUtils.asNumber(Breakscape_1.Breakscape.unbreakscape(v
|
|
103
|
+
return NumberUtils_1.NumberUtils.asNumber(Breakscape_1.Breakscape.unbreakscape(v, {
|
|
104
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
105
|
+
}));
|
|
107
106
|
case PropertyFormat_1.PropertyFormat.boolean:
|
|
108
|
-
return BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v
|
|
107
|
+
return BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v, {
|
|
108
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
109
|
+
}), true);
|
|
109
110
|
case PropertyFormat_1.PropertyFormat.invertedBoolean:
|
|
110
|
-
return !BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v
|
|
111
|
+
return !BooleanUtils_1.BooleanUtils.toBoolean(Breakscape_1.Breakscape.unbreakscape(v, {
|
|
112
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
113
|
+
}), true);
|
|
111
114
|
case PropertyFormat_1.PropertyFormat.bitmarkMinusMinus:
|
|
112
115
|
v = StringUtils_1.StringUtils.isString(v) ? v : '';
|
|
113
116
|
return textParser.toAst(v, {
|
|
@@ -122,7 +125,9 @@ function propertyContentProcessor(context, contentDepth, tagsConfig, content, ta
|
|
|
122
125
|
});
|
|
123
126
|
}
|
|
124
127
|
}
|
|
125
|
-
return Breakscape_1.Breakscape.unbreakscape(v
|
|
128
|
+
return Breakscape_1.Breakscape.unbreakscape(v, {
|
|
129
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
130
|
+
});
|
|
126
131
|
};
|
|
127
132
|
// Convert property and key as needed
|
|
128
133
|
v = processValue(v);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"PropertyContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/PropertyContentProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.referenceTagContentProcessor = referenceTagContentProcessor;
|
|
4
4
|
const Breakscape_1 = require("../../../../breakscaping/Breakscape");
|
|
5
|
+
const TextFormat_1 = require("../../../../model/enum/TextFormat");
|
|
5
6
|
const StringUtils_1 = require("../../../../utils/StringUtils");
|
|
6
7
|
function referenceTagContentProcessor(_context, _contentDepth, _tagsConfig, content, target, isReferenceEnd) {
|
|
7
8
|
const { value } = content;
|
|
8
9
|
const trimmedStringValue = StringUtils_1.StringUtils.trimmedString(value);
|
|
9
10
|
if (isReferenceEnd) {
|
|
10
|
-
target.referenceEnd = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue
|
|
11
|
+
target.referenceEnd = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue, {
|
|
12
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
13
|
+
});
|
|
11
14
|
}
|
|
12
15
|
else {
|
|
13
|
-
target.reference = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue
|
|
16
|
+
target.reference = Breakscape_1.Breakscape.unbreakscape(trimmedStringValue, {
|
|
17
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
18
|
+
});
|
|
14
19
|
}
|
|
15
20
|
}
|
|
16
21
|
//# sourceMappingURL=ReferenceTagContentProcessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ReferenceTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ReferenceTagContentProcessor.ts"],"names":[],"mappings":";;AAoCS,oEAA4B;AApCrC,oEAAiE;AAGjE,kEAA+D;AAC/D,+DAA4D;AAU5D,SAAS,4BAA4B,CACnC,QAAiC,EACjC,aAA+B,EAC/B,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,EAAE;YAChE,UAAU,EAAE,uBAAU,CAAC,GAAG;SAC3B,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,SAAS,GAAG,uBAAU,CAAC,YAAY,CAAC,kBAAkB,EAAE;YAC7D,UAAU,EAAE,uBAAU,CAAC,GAAG;SAC3B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -19,6 +19,7 @@ const Breakscape_1 = require("../../../../breakscaping/Breakscape");
|
|
|
19
19
|
const Config_1 = require("../../../../config/Config");
|
|
20
20
|
const Count_1 = require("../../../../model/enum/Count");
|
|
21
21
|
const ResourceTag_1 = require("../../../../model/enum/ResourceTag");
|
|
22
|
+
const TextFormat_1 = require("../../../../model/enum/TextFormat");
|
|
22
23
|
const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
|
|
23
24
|
// const builder = new Builder();
|
|
24
25
|
const resourceBuilder = new ResourceBuilder_1.ResourceBuilder();
|
|
@@ -127,7 +128,9 @@ function resourceContentProcessor(context, _contentDepth, tagsConfig, content, t
|
|
|
127
128
|
// Build the poster image resource
|
|
128
129
|
posterImageResource = resourceBuilder.resource(context, Object.assign({ type: ResourceTag_1.ResourceTag.image, value: posterImage }, posterImageTags)).image;
|
|
129
130
|
}
|
|
130
|
-
const resource = resourceBuilder.resource(context, Object.assign({ type, value: Breakscape_1.Breakscape.unbreakscape(value
|
|
131
|
+
const resource = resourceBuilder.resource(context, Object.assign({ type, value: Breakscape_1.Breakscape.unbreakscape(value, {
|
|
132
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
133
|
+
}), posterImage: posterImageResource }, tags));
|
|
131
134
|
if (resource)
|
|
132
135
|
resources.push(resource);
|
|
133
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ResourceContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/ResourceContentProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.technicalTermChainContentProcessor = technicalTermChainContentProcessor;
|
|
4
4
|
const Breakscape_1 = require("../../../../breakscaping/Breakscape");
|
|
5
|
+
const TextFormat_1 = require("../../../../model/enum/TextFormat");
|
|
5
6
|
const StringUtils_1 = require("../../../../utils/StringUtils");
|
|
6
7
|
const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
|
|
7
8
|
function technicalTermChainContentProcessor(context, _contentDepth, tagsConfig, content, target) {
|
|
@@ -13,7 +14,9 @@ function technicalTermChainContentProcessor(context, _contentDepth, tagsConfig,
|
|
|
13
14
|
context.debugPrint('technicalTerm TAGS', tags);
|
|
14
15
|
const { lang } = tags;
|
|
15
16
|
// Extract the technicalTerm from the content tag
|
|
16
|
-
const technicalTerm = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value)
|
|
17
|
+
const technicalTerm = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(content.value), {
|
|
18
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
19
|
+
});
|
|
17
20
|
const node = {
|
|
18
21
|
technicalTerm,
|
|
19
22
|
lang,
|
package/dist/cjs/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TechnicalTermChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"TechnicalTermChainContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TechnicalTermChainContentProcessor.ts"],"names":[],"mappings":";;AA6CS,gFAAkC;AA7C3C,oEAAiE;AAGjE,kEAA+D;AAE/D,+DAA4D;AAE5D,oEAMkC;AAElC,SAAS,kCAAkC,CACzC,OAAgC,EAChC,aAA+B,EAC/B,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,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAE3F,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,EAAE;QAC3G,UAAU,EAAE,uBAAU,CAAC,GAAG;KAC3B,CAAC,CAAC;IAEH,MAAM,IAAI,GAA+B;QACvC,aAAa;QACb,IAAI;KACL,CAAC;IAEF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;AAC9B,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.trueFalseTagContentProcessor = trueFalseTagContentProcessor;
|
|
4
4
|
const Breakscape_1 = require("../../../../breakscaping/Breakscape");
|
|
5
|
+
const TextFormat_1 = require("../../../../model/enum/TextFormat");
|
|
5
6
|
const StringUtils_1 = require("../../../../utils/StringUtils");
|
|
6
7
|
const BitmarkPegParserTypes_1 = require("../BitmarkPegParserTypes");
|
|
7
8
|
function trueFalseTagContentProcessor(_context, _contentDepth, content, target) {
|
|
@@ -9,7 +10,9 @@ function trueFalseTagContentProcessor(_context, _contentDepth, content, target)
|
|
|
9
10
|
const trueFalse = target.trueFalse;
|
|
10
11
|
if (!trueFalse)
|
|
11
12
|
return;
|
|
12
|
-
const trimmedStringValue = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(value)
|
|
13
|
+
const trimmedStringValue = Breakscape_1.Breakscape.unbreakscape(StringUtils_1.StringUtils.trimmedString(value), {
|
|
14
|
+
textFormat: TextFormat_1.TextFormat.tag,
|
|
15
|
+
});
|
|
13
16
|
trueFalse.push({
|
|
14
17
|
text: trimmedStringValue,
|
|
15
18
|
isCorrect: type === BitmarkPegParserTypes_1.TypeKey.True,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrueFalseTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"TrueFalseTagContentProcessor.js","sourceRoot":"","sources":["../../../../../../src/parser/bitmark/peg/contentProcessors/TrueFalseTagContentProcessor.ts"],"names":[],"mappings":";;AAoCS,oEAA4B;AApCrC,oEAAiE;AAEjE,kEAA+D;AAC/D,+DAA4D;AAE5D,oEAOkC;AAElC,SAAS,4BAA4B,CACnC,QAAiC,EACjC,aAA+B,EAC/B,OAAmB,EACnB,MAAiC;IAEjC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAoB,CAAC;IAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IAEnC,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,MAAM,kBAAkB,GAAG,uBAAU,CAAC,YAAY,CAAC,yBAAW,CAAC,aAAa,CAAC,KAAK,CAAsB,EAAE;QACxG,UAAU,EAAE,uBAAU,CAAC,GAAG;KAC3B,CAAC,CAAC;IAEH,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,kBAAkB;QACxB,SAAS,EAAE,IAAI,KAAK,+BAAO,CAAC,IAAI;QAChC,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;AACL,CAAC"}
|
package/dist/esm/ast/Builder.js
CHANGED
|
@@ -458,17 +458,17 @@ class Builder extends BaseBuilder {
|
|
|
458
458
|
* @returns
|
|
459
459
|
*/
|
|
460
460
|
buildPair(context, data) {
|
|
461
|
-
var _a, _b
|
|
461
|
+
var _a, _b;
|
|
462
462
|
if (!data)
|
|
463
463
|
return undefined;
|
|
464
464
|
// Set default example
|
|
465
465
|
const defaultExample = Array.isArray(data.__valuesAst) && data.__valuesAst.length > 0 ? data.__valuesAst[0] : null;
|
|
466
466
|
// Process the keyAudio and keyImage resources
|
|
467
|
-
const keyAudio =
|
|
468
|
-
const keyImage =
|
|
467
|
+
const keyAudio = this.resourceBuilder.resourceFromResourceJson(context, data.keyAudio);
|
|
468
|
+
const keyImage = this.resourceBuilder.resourceFromResourceJson(context, data.keyImage);
|
|
469
469
|
// NOTE: Node order is important and is defined here
|
|
470
|
-
const node = Object.assign(Object.assign({ key: (
|
|
471
|
-
keyImage, item: this.handleJsonText(context, true, data.item), lead: this.handleJsonText(context, true, data.lead), hint: this.handleJsonText(context, true, data.hint), instruction: this.handleJsonText(context, true, data.instruction), isCaseSensitive: data.isCaseSensitive }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { values: (
|
|
470
|
+
const node = Object.assign(Object.assign({ key: (_a = data.key) !== null && _a !== void 0 ? _a : '', keyAudio,
|
|
471
|
+
keyImage, item: this.handleJsonText(context, true, data.item), lead: this.handleJsonText(context, true, data.lead), hint: this.handleJsonText(context, true, data.hint), instruction: this.handleJsonText(context, true, data.instruction), isCaseSensitive: data.isCaseSensitive }, this.toExample(data.__isDefaultExample, data.example, defaultExample)), { values: (_b = data.values) !== null && _b !== void 0 ? _b : [], __valuesAst: data.__valuesAst });
|
|
472
472
|
// Remove Unset Optionals
|
|
473
473
|
ObjectUtils.removeUnwantedProperties(node, {
|
|
474
474
|
ignoreAllFalse: true,
|
|
@@ -1128,8 +1128,7 @@ class Builder extends BaseBuilder {
|
|
|
1128
1128
|
return node;
|
|
1129
1129
|
}
|
|
1130
1130
|
buildTextAndIcon(context, data, textAsStrings = false) {
|
|
1131
|
-
|
|
1132
|
-
const icon = (_a = ArrayUtils.asSingle(this.resourceBuilder.resourceFromResourceDataJson(context, ResourceTag.image, data === null || data === void 0 ? void 0 : data.icon))) === null || _a === void 0 ? void 0 : _a.image;
|
|
1131
|
+
const icon = this.resourceBuilder.resourceFromResourceJson(context, data === null || data === void 0 ? void 0 : data.icon);
|
|
1133
1132
|
// Ensure text is bitmark text
|
|
1134
1133
|
let text = this.handleJsonText(context, true, data === null || data === void 0 ? void 0 : data.text);
|
|
1135
1134
|
if (textAsStrings) {
|
|
@@ -1301,58 +1300,61 @@ class Builder extends BaseBuilder {
|
|
|
1301
1300
|
});
|
|
1302
1301
|
return node;
|
|
1303
1302
|
}
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
-
}
|
|
1328
|
-
|
|
1329
|
-
|
|
1330
|
-
|
|
1331
|
-
|
|
1332
|
-
|
|
1333
|
-
|
|
1334
|
-
|
|
1335
|
-
|
|
1336
|
-
|
|
1337
|
-
|
|
1338
|
-
|
|
1339
|
-
|
|
1340
|
-
|
|
1341
|
-
|
|
1342
|
-
|
|
1343
|
-
|
|
1344
|
-
|
|
1345
|
-
|
|
1346
|
-
|
|
1347
|
-
|
|
1348
|
-
|
|
1349
|
-
|
|
1350
|
-
|
|
1351
|
-
|
|
1352
|
-
|
|
1353
|
-
|
|
1354
|
-
|
|
1355
|
-
|
|
1303
|
+
// DEPRECATED - TO BE REMOVED IN FUTURE
|
|
1304
|
+
// /**
|
|
1305
|
+
// * Build captionDefinition node
|
|
1306
|
+
// *
|
|
1307
|
+
// * @param data - data for the node
|
|
1308
|
+
// * @returns
|
|
1309
|
+
// */
|
|
1310
|
+
// protected buildCaptionDefinition(
|
|
1311
|
+
// _context: BuildContext,
|
|
1312
|
+
// data: Partial<CaptionDefinitionJson> | undefined,
|
|
1313
|
+
// ): CaptionDefinitionJson | undefined {
|
|
1314
|
+
// if (!data) return undefined;
|
|
1315
|
+
// // NOTE: Node order is important and is defined here
|
|
1316
|
+
// const node: CaptionDefinitionJson = {
|
|
1317
|
+
// // term: this.convertJsonTextToAstText(data.term),
|
|
1318
|
+
// // description: this.convertJsonTextToAstText(data.description),
|
|
1319
|
+
// term: data.term ?? '',
|
|
1320
|
+
// definition: data.definition ?? '',
|
|
1321
|
+
// };
|
|
1322
|
+
// // Remove Unset Optionals
|
|
1323
|
+
// ObjectUtils.removeUnwantedProperties(node, {
|
|
1324
|
+
// ignoreEmptyString: ['term', 'description'],
|
|
1325
|
+
// // ignoreAllUndefined: true,
|
|
1326
|
+
// });
|
|
1327
|
+
// return node;
|
|
1328
|
+
// }
|
|
1329
|
+
// /**
|
|
1330
|
+
// * Build captionDefinitionList node
|
|
1331
|
+
// *
|
|
1332
|
+
// * @param data - data for the node
|
|
1333
|
+
// * @returns
|
|
1334
|
+
// */
|
|
1335
|
+
// protected buildCaptionDefinitionList(
|
|
1336
|
+
// context: BuildContext,
|
|
1337
|
+
// data: Partial<CaptionDefinitionListJson> | undefined,
|
|
1338
|
+
// ): CaptionDefinitionListJson | undefined {
|
|
1339
|
+
// if (!data) return undefined;
|
|
1340
|
+
// // NOTE: Node order is important and is defined here
|
|
1341
|
+
// const node: CaptionDefinitionListJson = {
|
|
1342
|
+
// columns: data.columns ?? [],
|
|
1343
|
+
// definitions: (data.definitions ?? [])
|
|
1344
|
+
// .map((d) => {
|
|
1345
|
+
// return this.buildCaptionDefinition(context, {
|
|
1346
|
+
// term: d.term,
|
|
1347
|
+
// definition: d.definition,
|
|
1348
|
+
// });
|
|
1349
|
+
// })
|
|
1350
|
+
// .filter((d) => d != null),
|
|
1351
|
+
// };
|
|
1352
|
+
// // Remove Unset Optionals
|
|
1353
|
+
// ObjectUtils.removeUnwantedProperties(node, {
|
|
1354
|
+
// ignoreAllEmptyArrays: true,
|
|
1355
|
+
// });
|
|
1356
|
+
// return node;
|
|
1357
|
+
// }
|
|
1356
1358
|
/**
|
|
1357
1359
|
* Build card bit[] node
|
|
1358
1360
|
*
|
|
@@ -1402,12 +1404,13 @@ class Builder extends BaseBuilder {
|
|
|
1402
1404
|
// Private
|
|
1403
1405
|
//
|
|
1404
1406
|
buildCardNode(context, data) {
|
|
1407
|
+
var _a;
|
|
1405
1408
|
const node = {
|
|
1406
1409
|
heading: this.buildHeading(context, data.heading),
|
|
1407
1410
|
questions: this.buildQuestions(context, data.questions),
|
|
1408
1411
|
elements: data.elements,
|
|
1409
1412
|
flashcards: this.buildFlashcards(context, data.flashcards),
|
|
1410
|
-
definitions: this.buildDefinitionList(context, data.definitions),
|
|
1413
|
+
definitions: this.buildDefinitionList(context, (_a = data.definitions) !== null && _a !== void 0 ? _a : data.legend),
|
|
1411
1414
|
statement: this.buildStatement(context, data.statement),
|
|
1412
1415
|
statements: this.buildStatements(context, data.statements),
|
|
1413
1416
|
choices: this.buildChoices(context, data.choices),
|
|
@@ -1420,7 +1423,8 @@ class Builder extends BaseBuilder {
|
|
|
1420
1423
|
table: this.buildTable(context, data.table),
|
|
1421
1424
|
botResponses: this.buildBotResponses(context, data.botResponses),
|
|
1422
1425
|
ingredients: this.buildIngredients(context, data.ingredients),
|
|
1423
|
-
|
|
1426
|
+
// DEPRECATED - TO BE REMOVED IN FUTURE
|
|
1427
|
+
// captionDefinitionList: this.buildCaptionDefinitionList(context, data.captionDefinitionList),
|
|
1424
1428
|
cardBits: this.buildCardBits(context, data.cardBits),
|
|
1425
1429
|
};
|
|
1426
1430
|
// Remove Unset Optionals
|