@gmb/bitmark-parser-generator 1.4.10 → 1.4.12
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/breakscaping/Breakscape.js +1 -5
- package/dist/cjs/breakscaping/Breakscape.js.map +1 -1
- package/dist/cjs/config/Config.js +10 -2
- package/dist/cjs/config/Config.js.map +1 -1
- package/dist/cjs/config/raw/bits.js +4 -2
- package/dist/cjs/config/raw/bits.js.map +1 -1
- package/dist/cjs/config/raw/tags.js +0 -3
- package/dist/cjs/config/raw/tags.js.map +1 -1
- package/dist/cjs/generated/build-info.js +1 -1
- package/dist/cjs/generated/parser/bitmark/bitmark-peggy-parser.js +93 -564
- package/dist/cjs/generated/parser/bitmark/bitmark-peggy-parser.js.map +1 -1
- package/dist/cjs/generator/json/JsonGenerator.js +33 -23
- package/dist/cjs/generator/json/JsonGenerator.js.map +1 -1
- package/dist/cjs/generator/text/TextGenerator.js +8 -0
- package/dist/cjs/generator/text/TextGenerator.js.map +1 -1
- package/dist/cjs/info/InfoBuilder.js +2 -2
- package/dist/cjs/info/InfoBuilder.js.map +1 -1
- package/dist/cjs/model/config/enum/TagConfigKey.js +0 -1
- package/dist/cjs/model/config/enum/TagConfigKey.js.map +1 -1
- package/dist/cjs/model/enum/BitType.js +1 -0
- package/dist/cjs/model/enum/BitType.js.map +1 -1
- package/dist/cjs/model/enum/Tag.js +0 -1
- package/dist/cjs/model/enum/Tag.js.map +1 -1
- package/dist/cjs/model/enum/TextNodeType.js +1 -0
- package/dist/cjs/model/enum/TextNodeType.js.map +1 -1
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserProcessor.js +17 -0
- package/dist/cjs/parser/bitmark/peg/BitmarkPegParserProcessor.js.map +1 -1
- package/dist/cjs/parser/json/JsonParser.js +97 -61
- package/dist/cjs/parser/json/JsonParser.js.map +1 -1
- package/dist/cjs/parser/text/TextParser.js +7 -2
- package/dist/cjs/parser/text/TextParser.js.map +1 -1
- package/dist/esm/breakscaping/Breakscape.js +1 -5
- package/dist/esm/breakscaping/Breakscape.js.map +1 -1
- package/dist/esm/config/Config.js +10 -2
- package/dist/esm/config/Config.js.map +1 -1
- package/dist/esm/config/raw/bits.js +4 -2
- package/dist/esm/config/raw/bits.js.map +1 -1
- package/dist/esm/config/raw/tags.js +0 -3
- package/dist/esm/config/raw/tags.js.map +1 -1
- package/dist/esm/generated/build-info.js +1 -1
- package/dist/esm/generated/parser/bitmark/bitmark-peggy-parser.js +93 -564
- package/dist/esm/generated/parser/bitmark/bitmark-peggy-parser.js.map +1 -1
- package/dist/esm/generator/json/JsonGenerator.js +33 -23
- package/dist/esm/generator/json/JsonGenerator.js.map +1 -1
- package/dist/esm/generator/text/TextGenerator.js +8 -0
- package/dist/esm/generator/text/TextGenerator.js.map +1 -1
- package/dist/esm/info/InfoBuilder.js +2 -2
- package/dist/esm/info/InfoBuilder.js.map +1 -1
- package/dist/esm/model/config/enum/TagConfigKey.js +0 -1
- package/dist/esm/model/config/enum/TagConfigKey.js.map +1 -1
- package/dist/esm/model/enum/BitType.js +1 -0
- package/dist/esm/model/enum/BitType.js.map +1 -1
- package/dist/esm/model/enum/Tag.js +0 -1
- package/dist/esm/model/enum/Tag.js.map +1 -1
- package/dist/esm/model/enum/TextNodeType.js +1 -0
- package/dist/esm/model/enum/TextNodeType.js.map +1 -1
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserProcessor.js +17 -0
- package/dist/esm/parser/bitmark/peg/BitmarkPegParserProcessor.js.map +1 -1
- package/dist/esm/parser/json/JsonParser.js +97 -61
- package/dist/esm/parser/json/JsonParser.js.map +1 -1
- package/dist/esm/parser/text/TextParser.js +7 -2
- package/dist/esm/parser/text/TextParser.js.map +1 -1
- package/dist/types/breakscaping/Breakscape.d.ts.map +1 -1
- package/dist/types/config/Config.d.ts.map +1 -1
- package/dist/types/config/raw/bits.d.ts.map +1 -1
- package/dist/types/config/raw/tags.d.ts.map +1 -1
- package/dist/types/generated/parser/bitmark/bitmark-peggy-parser.d.ts.map +1 -1
- package/dist/types/generator/json/JsonGenerator.d.ts +15 -7
- package/dist/types/generator/json/JsonGenerator.d.ts.map +1 -1
- package/dist/types/generator/text/TextGenerator.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/TextNodes.d.ts +2 -1
- package/dist/types/model/ast/TextNodes.d.ts.map +1 -1
- package/dist/types/model/config/enum/ConfigKey.d.ts +0 -2
- package/dist/types/model/config/enum/ConfigKey.d.ts.map +1 -1
- package/dist/types/model/config/enum/TagConfigKey.d.ts +0 -3
- package/dist/types/model/config/enum/TagConfigKey.d.ts.map +1 -1
- package/dist/types/model/enum/BitType.d.ts +2 -0
- package/dist/types/model/enum/BitType.d.ts.map +1 -1
- package/dist/types/model/enum/Tag.d.ts +0 -2
- package/dist/types/model/enum/Tag.d.ts.map +1 -1
- package/dist/types/model/enum/TextNodeType.d.ts +2 -0
- package/dist/types/model/enum/TextNodeType.d.ts.map +1 -1
- package/dist/types/model/json/BitJson.d.ts +49 -49
- package/dist/types/model/json/BitJson.d.ts.map +1 -1
- package/dist/types/model/json/BodyBitJson.d.ts +17 -17
- package/dist/types/model/json/BodyBitJson.d.ts.map +1 -1
- package/dist/types/model/json/ResourceJson.d.ts +2 -2
- package/dist/types/model/json/ResourceJson.d.ts.map +1 -1
- package/dist/types/model/parser/ParserInfo.d.ts +1 -0
- package/dist/types/model/parser/ParserInfo.d.ts.map +1 -1
- package/dist/types/parser/bitmark/peg/BitmarkPegParserProcessor.d.ts +1 -0
- package/dist/types/parser/bitmark/peg/BitmarkPegParserProcessor.d.ts.map +1 -1
- package/dist/types/parser/json/JsonParser.d.ts +23 -3
- package/dist/types/parser/json/JsonParser.d.ts.map +1 -1
- package/dist/types/parser/text/TextParser.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -177,6 +177,9 @@ class BitmarkPegParserProcessor {
|
|
|
177
177
|
// Bit type was invalid, so ignore the bit, returning instead the parsing errors
|
|
178
178
|
if (!bitType || bitType.root === RootBitType._error)
|
|
179
179
|
return this.invalidBit();
|
|
180
|
+
// Bit type was comment, so ignore the bit, returning the comment info instead
|
|
181
|
+
if (bitType.root === RootBitType._comment)
|
|
182
|
+
return this.commentBit();
|
|
180
183
|
if (DEBUG_BIT_CONTENT_RAW)
|
|
181
184
|
this.debugPrint('BIT CONTENT RAW', bitContent);
|
|
182
185
|
const isTrueFalseV1 = bitType.root === RootBitType.trueFalse1;
|
|
@@ -239,6 +242,17 @@ class BitmarkPegParserProcessor {
|
|
|
239
242
|
});
|
|
240
243
|
return { value: bit };
|
|
241
244
|
}
|
|
245
|
+
// Build bit for commented bit
|
|
246
|
+
commentBit() {
|
|
247
|
+
// Build the errors
|
|
248
|
+
this.parser.errors = this.buildBitLevelErrors();
|
|
249
|
+
// Build the error bit
|
|
250
|
+
const bit = builder.bit({
|
|
251
|
+
bitType: Config.getBitType(RootBitType._comment),
|
|
252
|
+
parser: this.parser,
|
|
253
|
+
});
|
|
254
|
+
return { value: bit };
|
|
255
|
+
}
|
|
242
256
|
// Build bit header
|
|
243
257
|
buildBitHeader(bitType, textFormatAndResourceType) {
|
|
244
258
|
var _a;
|
|
@@ -247,6 +261,9 @@ class BitmarkPegParserProcessor {
|
|
|
247
261
|
if (validBitType.root === RootBitType._error) {
|
|
248
262
|
this.addError(`Invalid bit type: '${bitType}'`);
|
|
249
263
|
}
|
|
264
|
+
else if (validBitType.root === RootBitType._comment) {
|
|
265
|
+
this.parser.commentedBitType = `[.${bitType.slice(1)}]`;
|
|
266
|
+
}
|
|
250
267
|
return {
|
|
251
268
|
bitType: validBitType,
|
|
252
269
|
textFormat: (_a = textFormatAndResourceType.textFormat) !== null && _a !== void 0 ? _a : TextFormat.bitmarkMinusMinus,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BitmarkPegParserProcessor.js","sourceRoot":"","sources":["../../../../../src/parser/bitmark/peg/BitmarkPegParserProcessor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BitmarkPegParserProcessor.js","sourceRoot":"","sources":["../../../../../src/parser/bitmark/peg/BitmarkPegParserProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,12 +165,12 @@ class JsonParser {
|
|
|
165
165
|
// Convert reference to referenceProperty
|
|
166
166
|
const { reference, referenceProperty } = this.referenceToAst(referenceIn);
|
|
167
167
|
// Build bit
|
|
168
|
-
const bitNode = builder.bit(Object.assign(Object.assign(Object.assign({ bitType, textFormat: format, resourceType: resourceAttachmentType, id: this.
|
|
169
|
-
focusY, deeplink: this.
|
|
170
|
-
isInfoOnly, labelTrue: this.
|
|
171
|
-
maxCreatedBits, book: this.
|
|
168
|
+
const bitNode = builder.bit(Object.assign(Object.assign(Object.assign({ bitType, textFormat: format, resourceType: resourceAttachmentType, id: this.convertStringToBreakscapedString(id), externalId: this.convertStringToBreakscapedString(externalId), spaceId: this.convertStringToBreakscapedString(spaceId), padletId: this.convertStringToBreakscapedString(padletId), jupyterId: this.convertStringToBreakscapedString(jupyterId), jupyterExecutionCount, aiGenerated: AIGenerated, releaseVersion: this.convertStringToBreakscapedString(releaseVersion), ageRange, lang: this.convertStringToBreakscapedString(lang), language: this.convertStringToBreakscapedString(language), computerLanguage: this.convertStringToBreakscapedString(computerLanguage), target: this.convertStringToBreakscapedString(target), tag: this.convertStringToBreakscapedString(tag), icon: this.convertStringToBreakscapedString(icon), iconTag: this.convertStringToBreakscapedString(iconTag), colorTag: this.convertStringToBreakscapedString(colorTag), flashcardSet: this.convertStringToBreakscapedString(flashcardSet), subtype: this.convertStringToBreakscapedString(subtype), bookAlias: this.convertStringToBreakscapedString(bookAlias), coverImage: this.convertStringToBreakscapedString(coverImage), publisher: this.convertStringToBreakscapedString(publisher), publications: this.convertStringToBreakscapedString(publications), author: this.convertStringToBreakscapedString(author), date: this.convertStringToBreakscapedString(date), location: this.convertStringToBreakscapedString(location), theme: this.convertStringToBreakscapedString(theme), kind: this.convertStringToBreakscapedString(kind), action: this.convertStringToBreakscapedString(action), duration: this.convertStringToBreakscapedString(duration), referenceProperty: this.convertStringToBreakscapedString(referenceProperty), thumbImage: this.convertStringToBreakscapedString(thumbImage), focusX,
|
|
169
|
+
focusY, deeplink: this.convertStringToBreakscapedString(deeplink), externalLink: this.convertStringToBreakscapedString(externalLink), externalLinkText: this.convertStringToBreakscapedString(externalLinkText), videoCallLink: this.convertStringToBreakscapedString(videoCallLink), bot: this.convertStringToBreakscapedString(bot), list: this.convertStringToBreakscapedString(list), textReference: this.convertStringToBreakscapedString(textReference), isTracked,
|
|
170
|
+
isInfoOnly, labelTrue: this.convertStringToBreakscapedString(labelTrue), labelFalse: this.convertStringToBreakscapedString(labelFalse), content2Buy: this.convertStringToBreakscapedString(content2Buy), quotedPerson: this.convertStringToBreakscapedString(quotedPerson), reasonableNumOfChars,
|
|
171
|
+
maxCreatedBits, book: this.convertStringToBreakscapedString(book), title: this.convertJsonTextToBreakscapedString(title), subtitle: this.convertJsonTextToBreakscapedString(subtitle), level,
|
|
172
172
|
toc,
|
|
173
|
-
progress, anchor: this.
|
|
173
|
+
progress, anchor: this.convertStringToBreakscapedString(anchor), reference: this.convertStringToBreakscapedString(reference), referenceEnd: this.convertStringToBreakscapedString(referenceEnd) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)), { imageSource: imageSourceNode, partner: partnerNode, markConfig: markConfigNode, resources: resourcesNode, body: bodyNode, sampleSolution: this.convertStringToBreakscapedString(sampleSolution), elements: this.convertStringToBreakscapedString(elements), flashcards: flashcardNodes, statements: statementNodes, responses: responseNodes, quizzes: quizNodes, heading: headingNode, pairs: pairsNodes, matrix: matrixNodes, choices: choiceNodes, questions: questionNodes, botResponses: botResponseNodes, footer: footerNode }));
|
|
174
174
|
return bitNode;
|
|
175
175
|
}
|
|
176
176
|
imageSourceBitToAst(imageSource) {
|
|
@@ -179,9 +179,9 @@ class JsonParser {
|
|
|
179
179
|
if (imageSource) {
|
|
180
180
|
const { url, mockupId, format, size, trim } = imageSource;
|
|
181
181
|
node = builder.imageSource({
|
|
182
|
-
url: (_a = this.
|
|
183
|
-
mockupId: (_b = this.
|
|
184
|
-
format: this.
|
|
182
|
+
url: (_a = this.convertStringToBreakscapedString(url)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING,
|
|
183
|
+
mockupId: (_b = this.convertStringToBreakscapedString(mockupId)) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING,
|
|
184
|
+
format: this.convertStringToBreakscapedString(format),
|
|
185
185
|
size,
|
|
186
186
|
trim,
|
|
187
187
|
});
|
|
@@ -194,7 +194,7 @@ class JsonParser {
|
|
|
194
194
|
if (partner) {
|
|
195
195
|
const avatarImage = this.resourceDataToAst(ResourceTag.image, partner.avatarImage);
|
|
196
196
|
node = builder.partner({
|
|
197
|
-
name: (_a = this.
|
|
197
|
+
name: (_a = this.convertStringToBreakscapedString(partner.name)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING,
|
|
198
198
|
avatarImage,
|
|
199
199
|
});
|
|
200
200
|
}
|
|
@@ -207,9 +207,9 @@ class JsonParser {
|
|
|
207
207
|
for (const m of marks) {
|
|
208
208
|
const { mark, color, emphasis } = m;
|
|
209
209
|
const node = builder.markConfig({
|
|
210
|
-
mark: (_a = this.
|
|
211
|
-
color: this.
|
|
212
|
-
emphasis: this.
|
|
210
|
+
mark: (_a = this.convertStringToBreakscapedString(mark)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING,
|
|
211
|
+
color: this.convertStringToBreakscapedString(color),
|
|
212
|
+
emphasis: this.convertStringToBreakscapedString(emphasis),
|
|
213
213
|
});
|
|
214
214
|
nodes.push(node);
|
|
215
215
|
}
|
|
@@ -224,7 +224,7 @@ class JsonParser {
|
|
|
224
224
|
if (Array.isArray(flashcards)) {
|
|
225
225
|
for (const c of flashcards) {
|
|
226
226
|
const { question, answer, alternativeAnswers, item, lead, hint, instruction, example } = c;
|
|
227
|
-
const node = builder.flashcard(Object.assign(Object.assign({ question: (_a = this.
|
|
227
|
+
const node = builder.flashcard(Object.assign(Object.assign({ question: (_a = this.convertStringToBreakscapedString(question)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, answer: this.convertStringToBreakscapedString(answer), alternativeAnswers: this.convertStringToBreakscapedString(alternativeAnswers) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
228
228
|
nodes.push(node);
|
|
229
229
|
}
|
|
230
230
|
}
|
|
@@ -236,13 +236,13 @@ class JsonParser {
|
|
|
236
236
|
var _a, _b;
|
|
237
237
|
const nodes = [];
|
|
238
238
|
if (statement) {
|
|
239
|
-
const node = builder.statement(Object.assign({ text: (_a = this.
|
|
239
|
+
const node = builder.statement(Object.assign({ text: (_a = this.convertStringToBreakscapedString(statement)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, isCorrect: isCorrect !== null && isCorrect !== void 0 ? isCorrect : false }, this.parseExample(example)));
|
|
240
240
|
nodes.push(node);
|
|
241
241
|
}
|
|
242
242
|
if (Array.isArray(statements)) {
|
|
243
243
|
for (const s of statements) {
|
|
244
244
|
const { statement, isCorrect, item, lead, hint, instruction, example } = s;
|
|
245
|
-
const node = builder.statement(Object.assign(Object.assign({ text: (_b = this.
|
|
245
|
+
const node = builder.statement(Object.assign(Object.assign({ text: (_b = this.convertStringToBreakscapedString(statement)) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING, isCorrect }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
246
246
|
nodes.push(node);
|
|
247
247
|
}
|
|
248
248
|
}
|
|
@@ -256,7 +256,7 @@ class JsonParser {
|
|
|
256
256
|
if (Array.isArray(choices)) {
|
|
257
257
|
for (const c of choices) {
|
|
258
258
|
const { choice, isCorrect, item, lead, hint, instruction, example } = c;
|
|
259
|
-
const node = builder.choice(Object.assign(Object.assign({ text: (_a = this.
|
|
259
|
+
const node = builder.choice(Object.assign(Object.assign({ text: (_a = this.convertStringToBreakscapedString(choice)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, isCorrect }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
260
260
|
nodes.push(node);
|
|
261
261
|
}
|
|
262
262
|
}
|
|
@@ -273,7 +273,7 @@ class JsonParser {
|
|
|
273
273
|
if (Array.isArray(responses)) {
|
|
274
274
|
for (const r of responses) {
|
|
275
275
|
const { response, isCorrect, item, lead, hint, instruction, example } = r;
|
|
276
|
-
const node = builder.response(Object.assign(Object.assign({ text: (_a = this.
|
|
276
|
+
const node = builder.response(Object.assign(Object.assign({ text: (_a = this.convertStringToBreakscapedString(response)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, isCorrect }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
277
277
|
nodes.push(node);
|
|
278
278
|
}
|
|
279
279
|
}
|
|
@@ -287,7 +287,7 @@ class JsonParser {
|
|
|
287
287
|
if (Array.isArray(options)) {
|
|
288
288
|
for (const o of options) {
|
|
289
289
|
const { text, isCorrect, item, lead, hint, instruction, example } = o;
|
|
290
|
-
const node = builder.selectOption(Object.assign(Object.assign({ text: (_a = this.
|
|
290
|
+
const node = builder.selectOption(Object.assign(Object.assign({ text: (_a = this.convertStringToBreakscapedString(text)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, isCorrect }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
291
291
|
nodes.push(node);
|
|
292
292
|
}
|
|
293
293
|
}
|
|
@@ -299,7 +299,7 @@ class JsonParser {
|
|
|
299
299
|
if (Array.isArray(highlightTexts)) {
|
|
300
300
|
for (const t of highlightTexts) {
|
|
301
301
|
const { text, isCorrect, isHighlighted, item, lead, hint, instruction, example } = t;
|
|
302
|
-
const node = builder.highlightText(Object.assign(Object.assign({ text: (_a = this.
|
|
302
|
+
const node = builder.highlightText(Object.assign(Object.assign({ text: (_a = this.convertStringToBreakscapedString(text)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, isCorrect,
|
|
303
303
|
isHighlighted }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
304
304
|
nodes.push(node);
|
|
305
305
|
}
|
|
@@ -326,8 +326,8 @@ class JsonParser {
|
|
|
326
326
|
let node;
|
|
327
327
|
if (heading) {
|
|
328
328
|
node = builder.heading({
|
|
329
|
-
forKeys: (_a = this.
|
|
330
|
-
forValues: (_b = this.
|
|
329
|
+
forKeys: (_a = this.convertStringToBreakscapedString(heading.forKeys)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING,
|
|
330
|
+
forValues: (_b = this.convertStringToBreakscapedString(heading.forValues)) !== null && _b !== void 0 ? _b : [],
|
|
331
331
|
});
|
|
332
332
|
}
|
|
333
333
|
return node;
|
|
@@ -340,7 +340,7 @@ class JsonParser {
|
|
|
340
340
|
const { key, keyAudio, keyImage, values, item, lead, hint, instruction, example, isCaseSensitive } = p;
|
|
341
341
|
const audio = this.resourceDataToAst(ResourceTag.audio, keyAudio);
|
|
342
342
|
const image = this.resourceDataToAst(ResourceTag.image, keyImage);
|
|
343
|
-
const node = builder.pair(Object.assign(Object.assign(Object.assign({ key: this.
|
|
343
|
+
const node = builder.pair(Object.assign(Object.assign(Object.assign({ key: this.convertStringToBreakscapedString(key), keyAudio: audio, keyImage: image, values: (_a = this.convertStringToBreakscapedString(values)) !== null && _a !== void 0 ? _a : [] }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)), { isCaseSensitive }));
|
|
344
344
|
nodes.push(node);
|
|
345
345
|
}
|
|
346
346
|
}
|
|
@@ -354,7 +354,7 @@ class JsonParser {
|
|
|
354
354
|
if (Array.isArray(matrix)) {
|
|
355
355
|
for (const m of matrix) {
|
|
356
356
|
const { key, cells, item, lead, hint, instruction, example } = m;
|
|
357
|
-
const node = builder.matrix(Object.assign(Object.assign({ key: (_a = this.
|
|
357
|
+
const node = builder.matrix(Object.assign(Object.assign({ key: (_a = this.convertStringToBreakscapedString(key)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, cells: (_b = this.matrixCellsToAst(cells)) !== null && _b !== void 0 ? _b : [] }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
358
358
|
nodes.push(node);
|
|
359
359
|
}
|
|
360
360
|
}
|
|
@@ -368,7 +368,7 @@ class JsonParser {
|
|
|
368
368
|
if (Array.isArray(matrixCells)) {
|
|
369
369
|
for (const mc of matrixCells) {
|
|
370
370
|
const { values, item, lead, hint, instruction, isCaseSensitive, example } = mc;
|
|
371
|
-
const node = builder.matrixCell(Object.assign(Object.assign(Object.assign({ values: (_a = this.
|
|
371
|
+
const node = builder.matrixCell(Object.assign(Object.assign(Object.assign({ values: (_a = this.convertStringToBreakscapedString(values)) !== null && _a !== void 0 ? _a : [] }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), { isCaseSensitive }), this.parseExample(example)));
|
|
372
372
|
nodes.push(node);
|
|
373
373
|
}
|
|
374
374
|
}
|
|
@@ -382,7 +382,7 @@ class JsonParser {
|
|
|
382
382
|
if (Array.isArray(questions)) {
|
|
383
383
|
for (const q of questions) {
|
|
384
384
|
const { question, partialAnswer, sampleSolution, item, lead, hint, instruction, example, reasonableNumOfChars, } = q;
|
|
385
|
-
const node = builder.question(Object.assign(Object.assign(Object.assign({ question: (_a = this.
|
|
385
|
+
const node = builder.question(Object.assign(Object.assign(Object.assign({ question: (_a = this.convertStringToBreakscapedString(question)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, partialAnswer: this.convertStringToBreakscapedString(partialAnswer), sampleSolution: this.convertStringToBreakscapedString(sampleSolution) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)), { reasonableNumOfChars }));
|
|
386
386
|
nodes.push(node);
|
|
387
387
|
}
|
|
388
388
|
}
|
|
@@ -400,12 +400,12 @@ class JsonParser {
|
|
|
400
400
|
for (const r of responses) {
|
|
401
401
|
const { response, reaction, feedback, item, lead, hint } = r;
|
|
402
402
|
const node = builder.botResponse({
|
|
403
|
-
response: (_a = this.
|
|
404
|
-
reaction: (_b = this.
|
|
405
|
-
feedback: (_c = this.
|
|
406
|
-
item: this.
|
|
407
|
-
lead: this.
|
|
408
|
-
hint: this.
|
|
403
|
+
response: (_a = this.convertStringToBreakscapedString(response)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING,
|
|
404
|
+
reaction: (_b = this.convertStringToBreakscapedString(reaction)) !== null && _b !== void 0 ? _b : Breakscape.EMPTY_STRING,
|
|
405
|
+
feedback: (_c = this.convertStringToBreakscapedString(feedback)) !== null && _c !== void 0 ? _c : Breakscape.EMPTY_STRING,
|
|
406
|
+
item: this.convertJsonTextToBreakscapedString(item),
|
|
407
|
+
lead: this.convertJsonTextToBreakscapedString(lead),
|
|
408
|
+
hint: this.convertJsonTextToBreakscapedString(hint),
|
|
409
409
|
});
|
|
410
410
|
nodes.push(node);
|
|
411
411
|
}
|
|
@@ -480,19 +480,19 @@ class JsonParser {
|
|
|
480
480
|
node = resourceBuilder.resource({
|
|
481
481
|
type,
|
|
482
482
|
// Generic (except Article / Document)
|
|
483
|
-
value: this.
|
|
483
|
+
value: this.convertStringToBreakscapedString(url),
|
|
484
484
|
// ImageLikeResource / AudioLikeResource / VideoLikeResource / Article / Document
|
|
485
|
-
format: this.
|
|
485
|
+
format: this.convertStringToBreakscapedString(data.format),
|
|
486
486
|
// ImageLikeResource
|
|
487
|
-
src1x: this.
|
|
488
|
-
src2x: this.
|
|
489
|
-
src3x: this.
|
|
490
|
-
src4x: this.
|
|
491
|
-
caption: this.
|
|
487
|
+
src1x: this.convertStringToBreakscapedString(data.src1x),
|
|
488
|
+
src2x: this.convertStringToBreakscapedString(data.src2x),
|
|
489
|
+
src3x: this.convertStringToBreakscapedString(data.src3x),
|
|
490
|
+
src4x: this.convertStringToBreakscapedString(data.src4x),
|
|
491
|
+
caption: this.convertJsonTextToBreakscapedString(data.caption),
|
|
492
492
|
// ImageLikeResource / VideoLikeResource
|
|
493
493
|
width: (_a = data.width) !== null && _a !== void 0 ? _a : undefined,
|
|
494
494
|
height: (_b = data.height) !== null && _b !== void 0 ? _b : undefined,
|
|
495
|
-
alt: this.
|
|
495
|
+
alt: this.convertStringToBreakscapedString(data.alt),
|
|
496
496
|
// VideoLikeResource
|
|
497
497
|
duration: data.duration,
|
|
498
498
|
mute: data.mute,
|
|
@@ -502,10 +502,10 @@ class JsonParser {
|
|
|
502
502
|
posterImage,
|
|
503
503
|
thumbnails,
|
|
504
504
|
// WebsiteLinkResource
|
|
505
|
-
siteName: this.
|
|
505
|
+
siteName: this.convertStringToBreakscapedString(data.siteName),
|
|
506
506
|
// Generic Resource
|
|
507
|
-
license: this.
|
|
508
|
-
copyright: this.
|
|
507
|
+
license: this.convertStringToBreakscapedString(data.license),
|
|
508
|
+
copyright: this.convertStringToBreakscapedString(data.copyright),
|
|
509
509
|
showInIndex: data.showInIndex,
|
|
510
510
|
});
|
|
511
511
|
}
|
|
@@ -518,12 +518,13 @@ class JsonParser {
|
|
|
518
518
|
if (Array.isArray(body)) {
|
|
519
519
|
// Body is an array (prosemirror like JSON)
|
|
520
520
|
// Parse the body to string in case it is in JSON format
|
|
521
|
-
bodyStr = this.
|
|
521
|
+
bodyStr = this.convertJsonTextToBreakscapedString(body, textFormat);
|
|
522
522
|
// Get the placeholders from the text parser
|
|
523
523
|
placeholders = this.textGenerator.getPlaceholders();
|
|
524
524
|
}
|
|
525
525
|
else {
|
|
526
526
|
// Body is a string (legacy)
|
|
527
|
+
// bodyStr = this.parseText(body, textFormat);
|
|
527
528
|
bodyStr = body;
|
|
528
529
|
}
|
|
529
530
|
// Placeholders
|
|
@@ -554,8 +555,7 @@ class JsonParser {
|
|
|
554
555
|
return node;
|
|
555
556
|
}
|
|
556
557
|
bodyTextToAst(bodyText) {
|
|
557
|
-
|
|
558
|
-
return builder.bodyText({ text: (_a = this.parseText(bodyText)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING });
|
|
558
|
+
return builder.bodyText({ text: bodyText !== null && bodyText !== void 0 ? bodyText : Breakscape.EMPTY_STRING });
|
|
559
559
|
}
|
|
560
560
|
bodyBitToAst(bit) {
|
|
561
561
|
switch (bit.type) {
|
|
@@ -576,10 +576,10 @@ class JsonParser {
|
|
|
576
576
|
return hightlight;
|
|
577
577
|
}
|
|
578
578
|
}
|
|
579
|
-
return this.bodyTextToAst(
|
|
579
|
+
return this.bodyTextToAst(Breakscape.EMPTY_STRING);
|
|
580
580
|
}
|
|
581
581
|
footerToAst(footerText, textFormat) {
|
|
582
|
-
const text = this.
|
|
582
|
+
const text = this.convertJsonTextToBreakscapedString(footerText, textFormat);
|
|
583
583
|
if (text) {
|
|
584
584
|
return builder.footerText({ text });
|
|
585
585
|
}
|
|
@@ -601,14 +601,14 @@ class JsonParser {
|
|
|
601
601
|
var _a;
|
|
602
602
|
const { item, lead, hint, instruction, example, isCaseSensitive, solutions } = bit;
|
|
603
603
|
// Build bit
|
|
604
|
-
const bitNode = builder.gap(Object.assign(Object.assign(Object.assign({ solutions: (_a = this.
|
|
604
|
+
const bitNode = builder.gap(Object.assign(Object.assign(Object.assign({ solutions: (_a = this.convertStringToBreakscapedString(solutions)) !== null && _a !== void 0 ? _a : [] }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)), { isCaseSensitive }));
|
|
605
605
|
return bitNode;
|
|
606
606
|
}
|
|
607
607
|
markBitToAst(bit) {
|
|
608
608
|
var _a;
|
|
609
609
|
const { solution, mark, item, lead, hint, instruction, example } = bit;
|
|
610
610
|
// Build bit
|
|
611
|
-
const bitNode = builder.mark(Object.assign(Object.assign({ solution: (_a = this.
|
|
611
|
+
const bitNode = builder.mark(Object.assign(Object.assign({ solution: (_a = this.convertStringToBreakscapedString(solution)) !== null && _a !== void 0 ? _a : Breakscape.EMPTY_STRING, mark: this.convertStringToBreakscapedString(mark) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
612
612
|
return bitNode;
|
|
613
613
|
}
|
|
614
614
|
selectBitToAst(bit) {
|
|
@@ -616,7 +616,7 @@ class JsonParser {
|
|
|
616
616
|
// Build options bits
|
|
617
617
|
const selectOptionNodes = this.selectOptionBitsToAst(options);
|
|
618
618
|
// Build bit
|
|
619
|
-
const node = builder.select(Object.assign(Object.assign({ options: selectOptionNodes, prefix: this.
|
|
619
|
+
const node = builder.select(Object.assign(Object.assign({ options: selectOptionNodes, prefix: this.convertStringToBreakscapedString(prefix), postfix: this.convertStringToBreakscapedString(postfix) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
620
620
|
return node;
|
|
621
621
|
}
|
|
622
622
|
highlightBitToAst(bit) {
|
|
@@ -624,38 +624,45 @@ class JsonParser {
|
|
|
624
624
|
// Build options bits
|
|
625
625
|
const highlightTextNodes = this.highlightTextBitsToAst(texts);
|
|
626
626
|
// Build bit
|
|
627
|
-
const node = builder.highlight(Object.assign(Object.assign({ texts: highlightTextNodes, prefix: this.
|
|
627
|
+
const node = builder.highlight(Object.assign(Object.assign({ texts: highlightTextNodes, prefix: this.convertStringToBreakscapedString(prefix), postfix: this.convertStringToBreakscapedString(postfix) }, this.parseItemLeadHintInstruction(item, lead, hint, instruction)), this.parseExample(example)));
|
|
628
628
|
return node;
|
|
629
629
|
}
|
|
630
630
|
parseItemLeadHintInstruction(item, lead, hint, instruction) {
|
|
631
631
|
return {
|
|
632
|
-
item: this.
|
|
633
|
-
lead: this.
|
|
634
|
-
hint: this.
|
|
635
|
-
instruction: this.
|
|
632
|
+
item: this.convertJsonTextToBreakscapedString(item),
|
|
633
|
+
lead: this.convertJsonTextToBreakscapedString(lead),
|
|
634
|
+
hint: this.convertJsonTextToBreakscapedString(hint),
|
|
635
|
+
instruction: this.convertJsonTextToBreakscapedString(instruction),
|
|
636
636
|
};
|
|
637
637
|
}
|
|
638
638
|
parseExample(example) {
|
|
639
639
|
if (example == null)
|
|
640
640
|
return undefined;
|
|
641
|
-
const exampleStr = this.
|
|
641
|
+
const exampleStr = this.convertJsonTextToBreakscapedString(example);
|
|
642
642
|
if (exampleStr) {
|
|
643
643
|
return { example: exampleStr };
|
|
644
644
|
}
|
|
645
645
|
return { example: !!example };
|
|
646
646
|
}
|
|
647
647
|
/**
|
|
648
|
-
*
|
|
649
|
-
*
|
|
648
|
+
* Convert the JsonText from the JSON to the AST format:
|
|
649
|
+
* Input:
|
|
650
|
+
* - Bitmark v2: breakscaped string
|
|
651
|
+
* - Bitmark v3: bitmark text JSON (TextAst)
|
|
652
|
+
* Output:
|
|
653
|
+
* - breakscaped string
|
|
650
654
|
*
|
|
651
|
-
*
|
|
655
|
+
* In the case of Bitmark v2 type texts, there is nothing to do but cast the type.
|
|
656
|
+
*
|
|
657
|
+
* @param breakscaped string or TextAst or breakscaped string[] or TextAst[]
|
|
652
658
|
* @param textFormat format of TextAst
|
|
653
659
|
* @returns Breakscaped string or breakscaped string[]
|
|
654
660
|
*/
|
|
655
|
-
|
|
661
|
+
convertJsonTextToBreakscapedString(text, textFormat) {
|
|
656
662
|
if (text == null)
|
|
657
663
|
return undefined;
|
|
658
664
|
if (this.textParser.isAst(text)) {
|
|
665
|
+
// Use the text generator to convert the TextAst to breakscaped string
|
|
659
666
|
// this.ast.printTree(text, NodeType.textAst);
|
|
660
667
|
const parsedText = this.textGenerator.generateSync(text, textFormat);
|
|
661
668
|
return parsedText;
|
|
@@ -665,16 +672,45 @@ class JsonParser {
|
|
|
665
672
|
for (let i = 0, len = text.length; i < len; i++) {
|
|
666
673
|
const t = text[i];
|
|
667
674
|
if (this.textParser.isAst(t)) {
|
|
675
|
+
// Use the text generator to convert the TextAst to breakscaped string
|
|
668
676
|
// this.ast.printTree(text, NodeType.textAst);
|
|
669
677
|
const parsedText = this.textGenerator.generateSync(t, textFormat);
|
|
670
678
|
strArray[i] = parsedText;
|
|
671
679
|
}
|
|
672
680
|
else {
|
|
673
|
-
strArray[i] = Breakscape.breakscape(t);
|
|
681
|
+
// strArray[i] = Breakscape.breakscape(t as string);
|
|
682
|
+
strArray[i] = t;
|
|
674
683
|
}
|
|
675
684
|
}
|
|
676
685
|
return strArray;
|
|
677
686
|
}
|
|
687
|
+
// return Breakscape.breakscape(text as string) as R;
|
|
688
|
+
return text;
|
|
689
|
+
}
|
|
690
|
+
/**
|
|
691
|
+
* Convert the string from the JSON to the AST format:
|
|
692
|
+
* Input:
|
|
693
|
+
* - Bitmark v2/v3: string
|
|
694
|
+
* Output:
|
|
695
|
+
* - breakscaped string
|
|
696
|
+
*
|
|
697
|
+
* In the case of Bitmark v2 type texts, there is nothing to do but cast the type.
|
|
698
|
+
*
|
|
699
|
+
* @param text string or TextAst or string[] or TextAst[]
|
|
700
|
+
* @param textFormat format of TextAst
|
|
701
|
+
* @returns Breakscaped string or breakscaped string[]
|
|
702
|
+
*/
|
|
703
|
+
convertStringToBreakscapedString(text) {
|
|
704
|
+
if (text == null)
|
|
705
|
+
return undefined;
|
|
706
|
+
if (Array.isArray(text)) {
|
|
707
|
+
const strArray = [];
|
|
708
|
+
for (let i = 0, len = text.length; i < len; i++) {
|
|
709
|
+
const t = text[i];
|
|
710
|
+
strArray[i] = Breakscape.breakscape(t);
|
|
711
|
+
}
|
|
712
|
+
return strArray;
|
|
713
|
+
}
|
|
678
714
|
return Breakscape.breakscape(text);
|
|
679
715
|
}
|
|
680
716
|
}
|