@longsightgroup/qti3-core 0.10.5 → 0.11.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/README.md +153 -4
- package/dist/adaptive-turn-materializer.js +4 -5
- package/dist/adaptive-turn-materializer.js.map +1 -1
- package/dist/adaptive-turn.d.ts.map +1 -1
- package/dist/adaptive-turn.js +1 -0
- package/dist/adaptive-turn.js.map +1 -1
- package/dist/attempt-state.d.ts.map +1 -1
- package/dist/attempt-state.js +41 -1
- package/dist/attempt-state.js.map +1 -1
- package/dist/catalog.d.ts +8 -0
- package/dist/catalog.d.ts.map +1 -1
- package/dist/catalog.js +10 -0
- package/dist/catalog.js.map +1 -1
- package/dist/diagnostics.d.ts +13 -0
- package/dist/diagnostics.d.ts.map +1 -0
- package/dist/diagnostics.js +28 -0
- package/dist/diagnostics.js.map +1 -0
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/item-scoring-expectation.d.ts +2 -0
- package/dist/item-scoring-expectation.d.ts.map +1 -1
- package/dist/item-scoring-expectation.js +8 -0
- package/dist/item-scoring-expectation.js.map +1 -1
- package/dist/item-submission-materialization.d.ts.map +1 -1
- package/dist/item-submission-materialization.js +2 -0
- package/dist/item-submission-materialization.js.map +1 -1
- package/dist/parser-processing.d.ts.map +1 -1
- package/dist/parser-processing.js +8 -18
- package/dist/parser-processing.js.map +1 -1
- package/dist/parser-values.d.ts.map +1 -1
- package/dist/parser-values.js +1 -3
- package/dist/parser-values.js.map +1 -1
- package/dist/parser.js +36 -6
- package/dist/parser.js.map +1 -1
- package/dist/processing-equality.d.ts +10 -0
- package/dist/processing-equality.d.ts.map +1 -0
- package/dist/processing-equality.js +78 -0
- package/dist/processing-equality.js.map +1 -0
- package/dist/processing-evaluator-comparison.d.ts.map +1 -1
- package/dist/processing-evaluator-comparison.js +14 -9
- package/dist/processing-evaluator-comparison.js.map +1 -1
- package/dist/processing-evaluator-numeric.d.ts.map +1 -1
- package/dist/processing-evaluator-numeric.js +2 -1
- package/dist/processing-evaluator-numeric.js.map +1 -1
- package/dist/processing-evaluator-string.d.ts.map +1 -1
- package/dist/processing-evaluator-string.js +26 -10
- package/dist/processing-evaluator-string.js.map +1 -1
- package/dist/processing-evaluator-variable.d.ts.map +1 -1
- package/dist/processing-evaluator-variable.js +9 -3
- package/dist/processing-evaluator-variable.js.map +1 -1
- package/dist/processing-evaluator.d.ts +5 -1
- package/dist/processing-evaluator.d.ts.map +1 -1
- package/dist/processing-evaluator.js +13 -4
- package/dist/processing-evaluator.js.map +1 -1
- package/dist/processing-expression-children.d.ts.map +1 -1
- package/dist/processing-expression-children.js +2 -3
- package/dist/processing-expression-children.js.map +1 -1
- package/dist/processing-expression-tags.d.ts +2 -1
- package/dist/processing-expression-tags.d.ts.map +1 -1
- package/dist/processing-expression-tags.js +2 -1
- package/dist/processing-expression-tags.js.map +1 -1
- package/dist/processing-mapping.d.ts.map +1 -1
- package/dist/processing-mapping.js +26 -16
- package/dist/processing-mapping.js.map +1 -1
- package/dist/processing-state.d.ts +2 -2
- package/dist/processing-state.d.ts.map +1 -1
- package/dist/processing-state.js +5 -2
- package/dist/processing-state.js.map +1 -1
- package/dist/processing-values.d.ts +1 -2
- package/dist/processing-values.d.ts.map +1 -1
- package/dist/processing-values.js +1 -3
- package/dist/processing-values.js.map +1 -1
- package/dist/processing-variables.d.ts.map +1 -1
- package/dist/processing-variables.js +10 -5
- package/dist/processing-variables.js.map +1 -1
- package/dist/qti-package-assets.d.ts.map +1 -1
- package/dist/qti-package-assets.js +16 -10
- package/dist/qti-package-assets.js.map +1 -1
- package/dist/qti-package-manifest.d.ts +1 -0
- package/dist/qti-package-manifest.d.ts.map +1 -1
- package/dist/qti-package-manifest.js +1 -0
- package/dist/qti-package-manifest.js.map +1 -1
- package/dist/qti-package-metadata.d.ts.map +1 -1
- package/dist/qti-package-metadata.js +11 -0
- package/dist/qti-package-metadata.js.map +1 -1
- package/dist/qti-package-plan.d.ts +1 -1
- package/dist/qti-package-plan.d.ts.map +1 -1
- package/dist/qti-package-types.d.ts +9 -0
- package/dist/qti-package-types.d.ts.map +1 -1
- package/dist/qti-package-xml.d.ts +6 -1
- package/dist/qti-package-xml.d.ts.map +1 -1
- package/dist/qti-package-xml.js +11 -6
- package/dist/qti-package-xml.js.map +1 -1
- package/dist/qti-package-zip.d.ts +13 -1
- package/dist/qti-package-zip.d.ts.map +1 -1
- package/dist/qti-package-zip.js +185 -54
- package/dist/qti-package-zip.js.map +1 -1
- package/dist/qti-package.d.ts +12 -5
- package/dist/qti-package.d.ts.map +1 -1
- package/dist/qti-package.js +63 -8
- package/dist/qti-package.js.map +1 -1
- package/dist/response-validation-policy.d.ts +3 -1
- package/dist/response-validation-policy.d.ts.map +1 -1
- package/dist/response-validation-policy.js +66 -6
- package/dist/response-validation-policy.js.map +1 -1
- package/dist/response-validation.d.ts +3 -1
- package/dist/response-validation.d.ts.map +1 -1
- package/dist/response-validation.js +32 -10
- package/dist/response-validation.js.map +1 -1
- package/dist/scoring-disposition-policy.d.ts.map +1 -1
- package/dist/scoring-disposition-policy.js +6 -2
- package/dist/scoring-disposition-policy.js.map +1 -1
- package/dist/serializer-processing-expressions.d.ts.map +1 -1
- package/dist/serializer-processing-expressions.js +2 -10
- package/dist/serializer-processing-expressions.js.map +1 -1
- package/dist/server-scoring.d.ts.map +1 -1
- package/dist/server-scoring.js +1 -0
- package/dist/server-scoring.js.map +1 -1
- package/dist/session-builtins.d.ts +16 -0
- package/dist/session-builtins.d.ts.map +1 -0
- package/dist/session-builtins.js +58 -0
- package/dist/session-builtins.js.map +1 -0
- package/dist/session.d.ts +5 -1
- package/dist/session.d.ts.map +1 -1
- package/dist/session.js +63 -11
- package/dist/session.js.map +1 -1
- package/dist/support-evidence.d.ts.map +1 -1
- package/dist/support-evidence.js +16 -3
- package/dist/support-evidence.js.map +1 -1
- package/dist/support.d.ts.map +1 -1
- package/dist/support.js +72 -24
- package/dist/support.js.map +1 -1
- package/dist/text-response.d.ts +9 -0
- package/dist/text-response.d.ts.map +1 -0
- package/dist/text-response.js +102 -0
- package/dist/text-response.js.map +1 -0
- package/dist/trusted-item-session.d.ts +4 -1
- package/dist/trusted-item-session.d.ts.map +1 -1
- package/dist/trusted-item-session.js +12 -6
- package/dist/trusted-item-session.js.map +1 -1
- package/dist/types.d.ts +23 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/validation-declaration-entries.d.ts.map +1 -1
- package/dist/validation-declaration-entries.js +11 -1
- package/dist/validation-declaration-entries.js.map +1 -1
- package/dist/validation-interactions.d.ts.map +1 -1
- package/dist/validation-interactions.js +102 -12
- package/dist/validation-interactions.js.map +1 -1
- package/dist/validation-item-children.d.ts +4 -0
- package/dist/validation-item-children.d.ts.map +1 -0
- package/dist/validation-item-children.js +45 -0
- package/dist/validation-item-children.js.map +1 -0
- package/dist/validation-processing.d.ts.map +1 -1
- package/dist/validation-processing.js +45 -12
- package/dist/validation-processing.js.map +1 -1
- package/dist/validation.d.ts.map +1 -1
- package/dist/validation.js +12 -0
- package/dist/validation.js.map +1 -1
- package/dist/value-guards.d.ts +4 -0
- package/dist/value-guards.d.ts.map +1 -0
- package/dist/value-guards.js +5 -0
- package/dist/value-guards.js.map +1 -0
- package/dist/xml-schema-regex-data.d.ts +48 -0
- package/dist/xml-schema-regex-data.d.ts.map +1 -0
- package/dist/xml-schema-regex-data.js +403 -0
- package/dist/xml-schema-regex-data.js.map +1 -0
- package/dist/xml-schema-regex-parser.d.ts +31 -0
- package/dist/xml-schema-regex-parser.d.ts.map +1 -0
- package/dist/xml-schema-regex-parser.js +245 -0
- package/dist/xml-schema-regex-parser.js.map +1 -0
- package/dist/xml-schema-regex.d.ts +14 -0
- package/dist/xml-schema-regex.d.ts.map +1 -0
- package/dist/xml-schema-regex.js +114 -0
- package/dist/xml-schema-regex.js.map +1 -0
- package/package.json +1 -1
- package/src/adaptive-turn-materializer.ts +4 -3
- package/src/adaptive-turn.ts +1 -0
- package/src/attempt-state.ts +54 -1
- package/src/catalog.ts +29 -0
- package/src/diagnostics.ts +29 -0
- package/src/index.ts +16 -0
- package/src/item-scoring-expectation.ts +8 -0
- package/src/item-submission-materialization.ts +2 -0
- package/src/parser-processing.ts +15 -18
- package/src/parser-values.ts +1 -5
- package/src/parser.ts +38 -6
- package/src/processing-equality.ts +104 -0
- package/src/processing-evaluator-comparison.ts +19 -14
- package/src/processing-evaluator-numeric.ts +2 -6
- package/src/processing-evaluator-string.ts +25 -18
- package/src/processing-evaluator-variable.ts +8 -3
- package/src/processing-evaluator.ts +20 -7
- package/src/processing-expression-children.ts +2 -3
- package/src/processing-expression-tags.ts +2 -1
- package/src/processing-mapping.ts +31 -25
- package/src/processing-state.ts +6 -1
- package/src/processing-values.ts +2 -11
- package/src/processing-variables.ts +9 -7
- package/src/qti-package-assets.ts +20 -13
- package/src/qti-package-manifest.ts +1 -0
- package/src/qti-package-metadata.ts +11 -0
- package/src/qti-package-plan.ts +1 -1
- package/src/qti-package-types.ts +10 -0
- package/src/qti-package-xml.ts +11 -6
- package/src/qti-package-zip.ts +330 -97
- package/src/qti-package.ts +106 -7
- package/src/response-validation-policy.ts +76 -4
- package/src/response-validation.ts +51 -5
- package/src/scoring-disposition-policy.ts +7 -2
- package/src/serializer-processing-expressions.ts +8 -25
- package/src/server-scoring.ts +1 -0
- package/src/session-builtins.ts +75 -0
- package/src/session.ts +64 -8
- package/src/support-evidence.ts +16 -3
- package/src/support.ts +94 -24
- package/src/text-response.ts +106 -0
- package/src/trusted-item-session.ts +17 -5
- package/src/types.ts +32 -4
- package/src/validation-declaration-entries.ts +11 -1
- package/src/validation-interactions.ts +139 -14
- package/src/validation-item-children.ts +48 -0
- package/src/validation-processing.ts +47 -10
- package/src/validation.ts +14 -0
- package/src/value-guards.ts +6 -0
- package/src/xml-schema-regex-data.ts +404 -0
- package/src/xml-schema-regex-parser.ts +234 -0
- package/src/xml-schema-regex.ts +115 -0
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { parseFiniteNumber, parseXmlBoolean } from "./parser-values.js";
|
|
2
|
+
function parseTolerance(attributes = {}) {
|
|
3
|
+
const mode = attributes["tolerance-mode"] ?? "exact";
|
|
4
|
+
if (mode !== "exact" && mode !== "absolute" && mode !== "relative") {
|
|
5
|
+
return {
|
|
6
|
+
ok: false,
|
|
7
|
+
message: "qti-equal requires exact, absolute, or relative tolerance-mode.",
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
const lowerAttribute = attributes["include-lower-bound"];
|
|
11
|
+
const upperAttribute = attributes["include-upper-bound"];
|
|
12
|
+
const includeLower = lowerAttribute === undefined ? true : parseXmlBoolean(lowerAttribute);
|
|
13
|
+
const includeUpper = upperAttribute === undefined ? true : parseXmlBoolean(upperAttribute);
|
|
14
|
+
if (includeLower === undefined || includeUpper === undefined) {
|
|
15
|
+
return { ok: false, message: "qti-equal boundary flags must be boolean." };
|
|
16
|
+
}
|
|
17
|
+
if (mode === "exact")
|
|
18
|
+
return { ok: true, value: { mode } };
|
|
19
|
+
const tolerances = attributes.tolerance?.trim().split(/\s+/) ?? [];
|
|
20
|
+
const [lower, upper = lower] = tolerances;
|
|
21
|
+
if (!lower || !upper || tolerances.length > 2) {
|
|
22
|
+
return {
|
|
23
|
+
ok: false,
|
|
24
|
+
message: "qti-equal requires one or two tolerance values in absolute or relative mode.",
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
return { ok: true, value: { mode, lower, upper, includeLower, includeUpper } };
|
|
28
|
+
}
|
|
29
|
+
/** Validate tolerance attributes and numeric literal or declared-variable operands. */
|
|
30
|
+
export function validateEqualTolerance(expression, variables, diagnostics) {
|
|
31
|
+
const parsed = parseTolerance(expression.attributes);
|
|
32
|
+
const messages = [];
|
|
33
|
+
if (!parsed.ok)
|
|
34
|
+
messages.push(parsed.message);
|
|
35
|
+
else if (parsed.value.mode !== "exact") {
|
|
36
|
+
for (const token of [parsed.value.lower, parsed.value.upper]) {
|
|
37
|
+
const number = parseFiniteNumber(token);
|
|
38
|
+
if (number === undefined ? !variables.has(token) : number < 0) {
|
|
39
|
+
messages.push("qti-equal tolerance must be nonnegative numeric values or declared variable references.");
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
for (const message of messages) {
|
|
45
|
+
diagnostics.push({
|
|
46
|
+
code: "processing.equal.tolerance",
|
|
47
|
+
severity: "error",
|
|
48
|
+
message,
|
|
49
|
+
source: expression.source,
|
|
50
|
+
path: expression.source?.path,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
/** Compare single numeric operands using QTI absolute/relative tolerance and boundary rules. */
|
|
55
|
+
export function equalWithTolerance(expression, left, right, resolve) {
|
|
56
|
+
if (typeof left !== "number" || typeof right !== "number")
|
|
57
|
+
return null;
|
|
58
|
+
const parsed = parseTolerance(expression.attributes);
|
|
59
|
+
if (!parsed.ok)
|
|
60
|
+
return null;
|
|
61
|
+
const tolerance = parsed.value;
|
|
62
|
+
if (tolerance.mode === "exact")
|
|
63
|
+
return left === right;
|
|
64
|
+
const lower = parseFiniteNumber(tolerance.lower) ?? resolve(tolerance.lower);
|
|
65
|
+
const upper = parseFiniteNumber(tolerance.upper) ?? resolve(tolerance.upper);
|
|
66
|
+
if (typeof lower !== "number" ||
|
|
67
|
+
typeof upper !== "number" ||
|
|
68
|
+
!Number.isFinite(lower) ||
|
|
69
|
+
!Number.isFinite(upper) ||
|
|
70
|
+
lower < 0 ||
|
|
71
|
+
upper < 0)
|
|
72
|
+
return null;
|
|
73
|
+
const minimum = tolerance.mode === "absolute" ? left - lower : left * (1 - lower / 100);
|
|
74
|
+
const maximum = tolerance.mode === "absolute" ? left + upper : left * (1 + upper / 100);
|
|
75
|
+
return ((tolerance.includeLower ? right >= minimum : right > minimum) &&
|
|
76
|
+
(tolerance.includeUpper ? right <= maximum : right < maximum));
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=processing-equality.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processing-equality.js","sourceRoot":"","sources":["../src/processing-equality.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-comparison.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-comparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-evaluator-comparison.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-comparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,KAAK,oBAAoB,GAAG,OAAO,CACjC,uBAAuB,EACvB;IACE,IAAI,EACA,OAAO,GACP,OAAO,GACP,cAAc,GACd,gBAAgB,GAChB,iBAAiB,GACjB,QAAQ,GACR,QAAQ,GACR,UAAU,CAAC;CAChB,CACF,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,iBAAiB,GACzB,QAAQ,CAsGV"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { equalWithTolerance } from "./processing-equality.js";
|
|
1
2
|
import { assertNever } from "./assert-never.js";
|
|
2
3
|
import { containsValues, durationSeconds, numericValueOrNull, qtiMatchValues, valuesEqual, valueContainer, } from "./processing-values.js";
|
|
3
4
|
import { expressionBaseType, expressionIsOrdered } from "./processing-variables.js";
|
|
@@ -14,16 +15,17 @@ export function evaluateComparisonExpression(expression, context) {
|
|
|
14
15
|
case "equal": {
|
|
15
16
|
const left = context.evaluate(expression.left);
|
|
16
17
|
const right = context.evaluate(expression.right);
|
|
17
|
-
return left
|
|
18
|
-
? null
|
|
19
|
-
: valuesEqual(left, right, false, expressionBaseType(expression.left, context.document) ??
|
|
20
|
-
expressionBaseType(expression.right, context.document));
|
|
18
|
+
return equalWithTolerance(expression, left, right, (identifier) => context.evaluate({ type: "variable", identifier }));
|
|
21
19
|
}
|
|
22
20
|
case "equalRounded": {
|
|
23
|
-
const
|
|
21
|
+
const figures = typeof expression.figures === "number"
|
|
22
|
+
? expression.figures
|
|
23
|
+
: context.evaluate({ type: "variable", identifier: expression.figures });
|
|
24
|
+
const validRounding = typeof figures === "number" &&
|
|
25
|
+
Number.isInteger(figures) &&
|
|
24
26
|
(expression.roundingMode === "decimalPlaces"
|
|
25
|
-
?
|
|
26
|
-
: expression.roundingMode === "significantFigures" &&
|
|
27
|
+
? figures >= 0
|
|
28
|
+
: expression.roundingMode === "significantFigures" && figures > 0);
|
|
27
29
|
if (!validRounding)
|
|
28
30
|
return null;
|
|
29
31
|
const left = context.evaluate(expression.left);
|
|
@@ -34,8 +36,8 @@ export function evaluateComparisonExpression(expression, context) {
|
|
|
34
36
|
const rightNumber = numericValueOrNull(right);
|
|
35
37
|
if (leftNumber === null || rightNumber === null)
|
|
36
38
|
return null;
|
|
37
|
-
const roundedLeft = roundWithMode(leftNumber, expression.roundingMode,
|
|
38
|
-
const roundedRight = roundWithMode(rightNumber, expression.roundingMode,
|
|
39
|
+
const roundedLeft = roundWithMode(leftNumber, expression.roundingMode, figures);
|
|
40
|
+
const roundedRight = roundWithMode(rightNumber, expression.roundingMode, figures);
|
|
39
41
|
return roundedLeft === null || roundedRight === null ? null : roundedLeft === roundedRight;
|
|
40
42
|
}
|
|
41
43
|
case "numericCompare": {
|
|
@@ -95,6 +97,9 @@ export function evaluateComparisonExpression(expression, context) {
|
|
|
95
97
|
return null;
|
|
96
98
|
const baseType = expressionBaseType(expression.collection, context.document) ??
|
|
97
99
|
expressionBaseType(expression.values, context.document);
|
|
100
|
+
if (expressionIsOrdered(expression.collection, context.document)) {
|
|
101
|
+
return collection.some((_, offset) => valuesEqual(collection.slice(offset, offset + values.length), values, true, baseType));
|
|
102
|
+
}
|
|
98
103
|
return containsValues(collection, values, baseType);
|
|
99
104
|
}
|
|
100
105
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-comparison.js","sourceRoot":"","sources":["../src/processing-evaluator-comparison.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,WAAW,EACX,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAiB1D,MAAM,UAAU,4BAA4B,CAC1C,UAAgC,EAChC,OAA0B;IAE1B,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,cAAc,CACnB,IAAI,EACJ,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC;gBACpD,mBAAmB,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,EACzD,kBAAkB,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC;gBACnD,kBAAkB,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CACzD,CAAC;QACJ,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-comparison.js","sourceRoot":"","sources":["../src/processing-evaluator-comparison.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-numeric.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-numeric.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-evaluator-numeric.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-numeric.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,KAAK,iBAAiB,GAAG,OAAO,CAC9B,uBAAuB,EACvB;IACE,IAAI,EACA,KAAK,GACL,SAAS,GACT,KAAK,GACL,KAAK,GACL,UAAU,GACV,QAAQ,GACR,OAAO,GACP,eAAe,GACf,gBAAgB,GAChB,OAAO,GACP,SAAS,GACT,UAAU,GACV,gBAAgB,GAChB,KAAK,GACL,KAAK,GACL,cAAc,GACd,cAAc,GACd,eAAe,CAAC;CACrB,CACF,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,iBAAiB,EAC7B,OAAO,EAAE,iBAAiB,GACzB,QAAQ,CA8FV"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { assertNever } from "./assert-never.js";
|
|
2
2
|
import { generalizedGcd, generalizedLcm, mathOperatorValue, roundToDecimalPlaces, roundToSignificantFigures, statsOperatorValue, } from "./processing-operators.js";
|
|
3
|
-
import {
|
|
3
|
+
import { numericValue, numericValueOrNull, valueContainer } from "./processing-values.js";
|
|
4
|
+
import { isRecordValue } from "./value-guards.js";
|
|
4
5
|
export function evaluateNumericExpression(expression, context) {
|
|
5
6
|
switch (expression.type) {
|
|
6
7
|
case "sum": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-numeric.js","sourceRoot":"","sources":["../src/processing-evaluator-numeric.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-numeric.js","sourceRoot":"","sources":["../src/processing-evaluator-numeric.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-string.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-string.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAKnE,KAAK,gBAAgB,GAAG,OAAO,CAC7B,uBAAuB,EACvB;IAAE,IAAI,EAAE,aAAa,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAA;CAAE,CACtE,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,QAAQ,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-string.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-string.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAKnE,KAAK,gBAAgB,GAAG,OAAO,CAC7B,uBAAuB,EACvB;IAAE,IAAI,EAAE,aAAa,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAA;CAAE,CACtE,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,iBAAiB,GACzB,QAAQ,CAmDV"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { assertNever } from "./assert-never.js";
|
|
2
|
-
import {
|
|
3
|
-
import { isRecordValue
|
|
4
|
-
import {
|
|
2
|
+
import { stringMatch } from "./processing-values.js";
|
|
3
|
+
import { isRecordValue } from "./value-guards.js";
|
|
4
|
+
import { matchXmlSchemaRegex, patternVariableIdentifier } from "./xml-schema-regex.js";
|
|
5
5
|
export function evaluateStringExpression(expression, context) {
|
|
6
6
|
switch (expression.type) {
|
|
7
7
|
case "stringMatch":
|
|
@@ -12,15 +12,31 @@ export function evaluateStringExpression(expression, context) {
|
|
|
12
12
|
const value = context.evaluate(expression.expression);
|
|
13
13
|
if (value === null)
|
|
14
14
|
return null;
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
expression.pattern
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
const reference = patternVariableIdentifier(expression.pattern);
|
|
16
|
+
const pattern = reference === undefined
|
|
17
|
+
? expression.pattern
|
|
18
|
+
: context.evaluate({ type: "variable", identifier: reference });
|
|
19
|
+
if (pattern === null)
|
|
20
|
+
return null;
|
|
21
|
+
if (typeof value !== "string" || typeof pattern !== "string") {
|
|
22
|
+
context.diagnostics.push({
|
|
23
|
+
code: "processing.pattern.type",
|
|
24
|
+
severity: "error",
|
|
25
|
+
message: "Pattern matching requires a single string pattern and operand.",
|
|
26
|
+
source: expression.source,
|
|
27
|
+
});
|
|
22
28
|
return null;
|
|
23
29
|
}
|
|
30
|
+
const result = matchXmlSchemaRegex(pattern, value);
|
|
31
|
+
if (result.ok)
|
|
32
|
+
return result.matches;
|
|
33
|
+
context.diagnostics.push({
|
|
34
|
+
code: `processing.pattern.${result.problem.code}`,
|
|
35
|
+
severity: "error",
|
|
36
|
+
message: result.problem.message,
|
|
37
|
+
source: expression.source,
|
|
38
|
+
});
|
|
39
|
+
return null;
|
|
24
40
|
}
|
|
25
41
|
case "fieldValue": {
|
|
26
42
|
const value = context.evaluate(expression.expression);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-string.js","sourceRoot":"","sources":["../src/processing-evaluator-string.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-string.js","sourceRoot":"","sources":["../src/processing-evaluator-string.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAOvF,MAAM,UAAU,wBAAwB,CACtC,UAA4B,EAC5B,OAA0B;IAE1B,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,aAAa;YAChB,OAAO,WAAW,CAChB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAClC,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,SAAS,CACrB,CAAC;QACJ,KAAK,WAAW;YACd,OAAO,WAAW,CAChB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EACjC,UAAU,CAAC,aAAa,EACxB,IAAI,CACL,CAAC;QACJ,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAChC,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,OAAO,GACX,SAAS,KAAK,SAAS;gBACrB,CAAC,CAAC,UAAU,CAAC,OAAO;gBACpB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;YACpE,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC7D,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;oBACvB,IAAI,EAAE,yBAAyB;oBAC/B,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE,gEAAgE;oBACzE,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACnD,IAAI,MAAM,CAAC,EAAE;gBAAE,OAAO,MAAM,CAAC,OAAO,CAAC;YACrC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;gBACvB,IAAI,EAAE,sBAAsB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjD,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;gBAC/B,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACtD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnF,CAAC;QACD;YACE,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-variable.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-variable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AASnE,KAAK,kBAAkB,GAAG,OAAO,CAC/B,uBAAuB,EACvB;IACE,IAAI,EACA,QAAQ,GACR,cAAc,GACd,aAAa,GACb,kBAAkB,GAClB,SAAS,GACT,SAAS,GACT,UAAU,CAAC;CAChB,CACF,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,iBAAiB,GACzB,QAAQ,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-variable.d.ts","sourceRoot":"","sources":["../src/processing-evaluator-variable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AASnE,KAAK,kBAAkB,GAAG,OAAO,CAC/B,uBAAuB,EACvB;IACE,IAAI,EACA,QAAQ,GACR,cAAc,GACd,aAAa,GACb,kBAAkB,GAClB,SAAS,GACT,SAAS,GACT,UAAU,CAAC;CAChB,CACF,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,iBAAiB,GACzB,QAAQ,CA0DV"}
|
|
@@ -5,7 +5,7 @@ import { defaultValueForIdentifier, getResponseDeclaration, resolveVariableValue
|
|
|
5
5
|
export function evaluateVariableExpression(expression, context) {
|
|
6
6
|
switch (expression.type) {
|
|
7
7
|
case "isNull":
|
|
8
|
-
return isNullResponse(context.
|
|
8
|
+
return isNullResponse(context.evaluate(expression.expression));
|
|
9
9
|
case "matchCorrect": {
|
|
10
10
|
const declaration = getResponseDeclaration(context.document, expression.correctIdentifier);
|
|
11
11
|
return declaration
|
|
@@ -27,11 +27,17 @@ export function evaluateVariableExpression(expression, context) {
|
|
|
27
27
|
case "correct":
|
|
28
28
|
return context.correctResponses[expression.identifier] ?? null;
|
|
29
29
|
case "default":
|
|
30
|
-
return
|
|
31
|
-
|
|
30
|
+
return Object.hasOwn(context.defaultValues, expression.identifier)
|
|
31
|
+
? (context.defaultValues[expression.identifier] ?? null)
|
|
32
|
+
: defaultValueForIdentifier(context.document, expression.identifier);
|
|
33
|
+
case "variable": {
|
|
34
|
+
const builtIn = context.builtInVariable(expression.identifier);
|
|
35
|
+
if (builtIn !== undefined)
|
|
36
|
+
return builtIn;
|
|
32
37
|
return (resolveVariableValue(context.document, expression.identifier, context.responses, context.outcomes, context.templateValues) ??
|
|
33
38
|
context.undeclaredResponseValue(expression.identifier) ??
|
|
34
39
|
null);
|
|
40
|
+
}
|
|
35
41
|
default:
|
|
36
42
|
return assertNever(expression);
|
|
37
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator-variable.js","sourceRoot":"","sources":["../src/processing-evaluator-variable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,2BAA2B,CAAC;AAgBnC,MAAM,UAAU,0BAA0B,CACxC,UAA8B,EAC9B,OAA0B;IAE1B,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"processing-evaluator-variable.js","sourceRoot":"","sources":["../src/processing-evaluator-variable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,2BAA2B,CAAC;AAgBnC,MAAM,UAAU,0BAA0B,CACxC,UAA8B,EAC9B,OAA0B;IAE1B,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACjE,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;YAC3F,OAAO,WAAW;gBAChB,CAAC,CAAC,cAAc,CACZ,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,EAChD,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,IAAI,EAC9D,WAAW,CAAC,WAAW,KAAK,SAAS,EACrC,WAAW,CAAC,QAAQ,CACrB;gBACH,CAAC,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;YACpF,OAAO,WAAW;gBAChB,CAAC,CAAC,kBAAkB,CAChB,WAAW,EACX,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,EAChD,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CACxD;gBACH,CAAC,CAAC,CAAC,CAAC;QACR,CAAC;QACD,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;YACpF,OAAO,WAAW,EAAE,WAAW;gBAC7B,CAAC,CAAC,gBAAgB,CACd,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,EAChD,WAAW,CAAC,WAAW,CACxB;gBACH,CAAC,CAAC,CAAC,CAAC;QACR,CAAC;QACD,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC;QACjE,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,UAAU,CAAC;gBAChE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC;gBACxD,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACzE,KAAK,UAAU,CAAC,CAAC,CAAC;YAChB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC/D,IAAI,OAAO,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC;YAC1C,OAAO,CACL,oBAAoB,CAClB,OAAO,CAAC,QAAQ,EAChB,UAAU,CAAC,UAAU,EACrB,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,cAAc,CACvB;gBACD,OAAO,CAAC,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC;gBACtD,IAAI,CACL,CAAC;QACJ,CAAC;QACD;YACE,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { QtiDocument, QtiProcessingExpression, QtiValue } from "./types.js";
|
|
1
|
+
import type { QtiDiagnostic, QtiDocument, QtiProcessingExpression, QtiValue } from "./types.js";
|
|
2
2
|
import type { QtiCustomOperatorRegistry } from "./custom-operators.js";
|
|
3
3
|
export interface EvaluationContext {
|
|
4
4
|
document: QtiDocument;
|
|
@@ -6,6 +6,9 @@ export interface EvaluationContext {
|
|
|
6
6
|
outcomes: Record<string, QtiValue>;
|
|
7
7
|
templateValues: Record<string, QtiValue>;
|
|
8
8
|
correctResponses: Record<string, QtiValue>;
|
|
9
|
+
defaultValues: Record<string, QtiValue>;
|
|
10
|
+
diagnostics: QtiDiagnostic[];
|
|
11
|
+
builtInVariable(identifier: string): QtiValue | undefined;
|
|
9
12
|
allowedUndeclaredResponseIdentifiers: ReadonlySet<string>;
|
|
10
13
|
random: () => number;
|
|
11
14
|
customOperators: QtiCustomOperatorRegistry;
|
|
@@ -15,6 +18,7 @@ export interface EvaluationContext {
|
|
|
15
18
|
undeclaredResponseValue(identifier: string): QtiValue | undefined;
|
|
16
19
|
}
|
|
17
20
|
export interface EvaluationOptions {
|
|
21
|
+
builtInVariable?: ((identifier: string) => QtiValue | undefined) | undefined;
|
|
18
22
|
allowedUndeclaredResponseIdentifiers?: ReadonlySet<string> | readonly string[] | undefined;
|
|
19
23
|
}
|
|
20
24
|
export declare function createEvaluationContext(document: QtiDocument, responses: Record<string, QtiValue>, outcomes: Record<string, QtiValue>, templateValues: Record<string, QtiValue>, correctResponses: Record<string, QtiValue>, random: () => number, customOperators: QtiCustomOperatorRegistry, options?: EvaluationOptions): EvaluationContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator.d.ts","sourceRoot":"","sources":["../src/processing-evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-evaluator.d.ts","sourceRoot":"","sources":["../src/processing-evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAevE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxC,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC1D,oCAAoC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,EAAE,MAAM,MAAM,CAAC;IACrB,eAAe,EAAE,yBAAyB,CAAC;IAC3C,QAAQ,CAAC,UAAU,EAAE,uBAAuB,GAAG,QAAQ,CAAC;IACxD,UAAU,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC5D,eAAe,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;IACzE,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnE;AAED,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,QAAQ,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAC7E,oCAAoC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAC5F;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,WAAW,EACrB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAClC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACxC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC1C,MAAM,EAAE,MAAM,MAAM,EACpB,eAAe,EAAE,yBAAyB,EAC1C,OAAO,GAAE,iBAAsB,GAC9B,iBAAiB,CAqDnB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,iBAAiB,GACzB,QAAQ,CA8EV"}
|
|
@@ -7,7 +7,8 @@ import { evaluateGeometryExpression } from "./processing-evaluator-geometry.js";
|
|
|
7
7
|
import { evaluateNumericExpression } from "./processing-evaluator-numeric.js";
|
|
8
8
|
import { evaluateStringExpression } from "./processing-evaluator-string.js";
|
|
9
9
|
import { evaluateVariableExpression } from "./processing-evaluator-variable.js";
|
|
10
|
-
import {
|
|
10
|
+
import { numericValueOrNull } from "./processing-values.js";
|
|
11
|
+
import { isRecordValue } from "./value-guards.js";
|
|
11
12
|
export function createEvaluationContext(document, responses, outcomes, templateValues, correctResponses, random, customOperators, options = {}) {
|
|
12
13
|
const allowedUndeclaredResponseIdentifiers = options.allowedUndeclaredResponseIdentifiers instanceof Set
|
|
13
14
|
? options.allowedUndeclaredResponseIdentifiers
|
|
@@ -18,6 +19,12 @@ export function createEvaluationContext(document, responses, outcomes, templateV
|
|
|
18
19
|
outcomes,
|
|
19
20
|
templateValues,
|
|
20
21
|
correctResponses,
|
|
22
|
+
defaultValues: {},
|
|
23
|
+
diagnostics: [],
|
|
24
|
+
builtInVariable: options.builtInVariable ??
|
|
25
|
+
((identifier) => identifier === "completionStatus"
|
|
26
|
+
? (outcomes.completionStatus ?? "not_attempted")
|
|
27
|
+
: undefined),
|
|
21
28
|
allowedUndeclaredResponseIdentifiers,
|
|
22
29
|
random,
|
|
23
30
|
customOperators,
|
|
@@ -69,10 +76,12 @@ export function evaluateProcessingExpression(expression, context) {
|
|
|
69
76
|
}
|
|
70
77
|
case "randomFloat":
|
|
71
78
|
return expression.min + context.random() * (expression.max - expression.min);
|
|
72
|
-
case "random":
|
|
73
|
-
|
|
79
|
+
case "random": {
|
|
80
|
+
const values = context.evaluate(expression.expression);
|
|
81
|
+
if (!Array.isArray(values) || values.length === 0)
|
|
74
82
|
return null;
|
|
75
|
-
return
|
|
83
|
+
return values[Math.floor(context.random() * values.length)] ?? null;
|
|
84
|
+
}
|
|
76
85
|
case "isNull":
|
|
77
86
|
case "matchCorrect":
|
|
78
87
|
case "mapResponse":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-evaluator.js","sourceRoot":"","sources":["../src/processing-evaluator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,GACzB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"processing-evaluator.js","sourceRoot":"","sources":["../src/processing-evaluator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-expression-children.d.ts","sourceRoot":"","sources":["../src/processing-expression-children.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAG1D,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,uBAAuB,GAAG,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"processing-expression-children.d.ts","sourceRoot":"","sources":["../src/processing-expression-children.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAG1D,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,uBAAuB,GAAG,uBAAuB,EAAE,CAiEjG"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { assertNever } from "./assert-never.js";
|
|
2
2
|
export function expressionChildren(expression) {
|
|
3
3
|
switch (expression.type) {
|
|
4
|
-
case "random":
|
|
5
|
-
return expression.values;
|
|
6
4
|
case "multiple":
|
|
7
5
|
case "ordered":
|
|
8
6
|
case "sum":
|
|
@@ -31,6 +29,8 @@ export function expressionChildren(expression) {
|
|
|
31
29
|
case "stringMatch":
|
|
32
30
|
case "substring":
|
|
33
31
|
return [expression.left, expression.right];
|
|
32
|
+
case "isNull":
|
|
33
|
+
case "random":
|
|
34
34
|
case "not":
|
|
35
35
|
case "round":
|
|
36
36
|
case "roundTo":
|
|
@@ -52,7 +52,6 @@ export function expressionChildren(expression) {
|
|
|
52
52
|
case "baseValue":
|
|
53
53
|
case "correct":
|
|
54
54
|
case "default":
|
|
55
|
-
case "isNull":
|
|
56
55
|
case "mapResponse":
|
|
57
56
|
case "mapResponsePoint":
|
|
58
57
|
case "matchCorrect":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-expression-children.js","sourceRoot":"","sources":["../src/processing-expression-children.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,UAAU,kBAAkB,CAAC,UAAmC;IACpE,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,
|
|
1
|
+
{"version":3,"file":"processing-expression-children.js","sourceRoot":"","sources":["../src/processing-expression-children.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,UAAU,kBAAkB,CAAC,UAAmC;IACpE,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,KAAK,CAAC;QACX,KAAK,SAAS,CAAC;QACf,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK,CAAC;QACX,KAAK,cAAc,CAAC;QACpB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB;YACnB,OAAO,UAAU,CAAC,WAAW,CAAC;QAChC,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,eAAe,CAAC;QACrB,KAAK,gBAAgB,CAAC;QACtB,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,cAAc,CAAC;QACpB,KAAK,gBAAgB,CAAC;QACtB,KAAK,iBAAiB,CAAC;QACvB,KAAK,aAAa,CAAC;QACnB,KAAK,WAAW;YACd,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;QAC7C,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,KAAK,CAAC;QACX,KAAK,OAAO,CAAC;QACb,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,gBAAgB,CAAC;QACtB,KAAK,OAAO,CAAC;QACb,KAAK,eAAe,CAAC;QACrB,KAAK,cAAc,CAAC;QACpB,KAAK,YAAY,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjC,KAAK,eAAe;YAClB,OAAO,UAAU,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC3D,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,UAAU;YACb,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,aAAa,CAAC;QACnB,KAAK,kBAAkB,CAAC;QACxB,KAAK,cAAc,CAAC;QACpB,KAAK,cAAc,CAAC;QACpB,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa,CAAC;QACnB,KAAK,eAAe,CAAC;QACrB,KAAK,UAAU;YACb,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;AACH,CAAC"}
|
|
@@ -14,6 +14,8 @@ export declare const identifierExpressionTags: {
|
|
|
14
14
|
};
|
|
15
15
|
export type IdentifierExpressionType = keyof typeof identifierExpressionTags;
|
|
16
16
|
export declare const unaryExpressionTags: {
|
|
17
|
+
readonly isNull: "qti-is-null";
|
|
18
|
+
readonly random: "qti-random";
|
|
17
19
|
readonly containerSize: "qti-container-size";
|
|
18
20
|
readonly round: "qti-round";
|
|
19
21
|
readonly truncate: "qti-truncate";
|
|
@@ -40,7 +42,6 @@ export declare const leftRightExpressionTags: {
|
|
|
40
42
|
readonly power: "qti-power";
|
|
41
43
|
readonly integerDivide: "qti-integer-divide";
|
|
42
44
|
readonly integerModulus: "qti-integer-modulus";
|
|
43
|
-
readonly equal: "qti-equal";
|
|
44
45
|
};
|
|
45
46
|
export type LeftRightExpressionType = keyof typeof leftRightExpressionTags;
|
|
46
47
|
export declare const numericCompareTags: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-expression-tags.d.ts","sourceRoot":"","sources":["../src/processing-expression-tags.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,wBAAwB;;;;;;CAM3B,CAAC;AAEX,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,wBAAwB,CAAC;AAE7E,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"processing-expression-tags.d.ts","sourceRoot":"","sources":["../src/processing-expression-tags.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,wBAAwB;;;;;;CAM3B,CAAC;AAEX,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,wBAAwB,CAAC;AAE7E,eAAO,MAAM,mBAAmB;;;;;;;CAOtB,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,MAAM,OAAO,mBAAmB,CAAC;AAEnE,eAAO,MAAM,kBAAkB;;;;;;;;;;;CAWrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAEjE,eAAO,MAAM,uBAAuB;;;;;;;CAO1B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,uBAAuB,CAAC;AAE3E,eAAO,MAAM,kBAAkB;;;;;CAKrB,CAAC;AAEX,eAAO,MAAM,mBAAmB;;;CAGtB,CAAC"}
|
|
@@ -13,6 +13,8 @@ export const identifierExpressionTags = {
|
|
|
13
13
|
variable: "qti-variable",
|
|
14
14
|
};
|
|
15
15
|
export const unaryExpressionTags = {
|
|
16
|
+
isNull: "qti-is-null",
|
|
17
|
+
random: "qti-random",
|
|
16
18
|
containerSize: "qti-container-size",
|
|
17
19
|
round: "qti-round",
|
|
18
20
|
truncate: "qti-truncate",
|
|
@@ -37,7 +39,6 @@ export const leftRightExpressionTags = {
|
|
|
37
39
|
power: "qti-power",
|
|
38
40
|
integerDivide: "qti-integer-divide",
|
|
39
41
|
integerModulus: "qti-integer-modulus",
|
|
40
|
-
equal: "qti-equal",
|
|
41
42
|
};
|
|
42
43
|
export const numericCompareTags = {
|
|
43
44
|
lt: "qti-lt",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-expression-tags.js","sourceRoot":"","sources":["../src/processing-expression-tags.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,cAAc;CAChB,CAAC;AAIX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,aAAa,EAAE,oBAAoB;IACnC,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,cAAc;IACxB,cAAc,EAAE,sBAAsB;CAC9B,CAAC;AAIX,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;IACtB,GAAG,EAAE,SAAS;IACd,OAAO,EAAE,aAAa;IACtB,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;IACd,EAAE,EAAE,QAAQ;IACZ,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACN,CAAC;AAIX,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,cAAc,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"processing-expression-tags.js","sourceRoot":"","sources":["../src/processing-expression-tags.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,cAAc;CAChB,CAAC;AAIX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,YAAY;IACpB,aAAa,EAAE,oBAAoB;IACnC,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,cAAc;IACxB,cAAc,EAAE,sBAAsB;CAC9B,CAAC;AAIX,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;IACtB,GAAG,EAAE,SAAS;IACd,OAAO,EAAE,aAAa;IACtB,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;IACd,EAAE,EAAE,QAAQ;IACZ,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACN,CAAC;AAIX,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,cAAc,EAAE,qBAAqB;CAC7B,CAAC;AAIX,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,EAAE,EAAE,QAAQ;IACZ,GAAG,EAAE,SAAS;IACd,EAAE,EAAE,QAAQ;IACZ,GAAG,EAAE,SAAS;CACN,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,EAAE,EAAE,iBAAiB;IACrB,GAAG,EAAE,kBAAkB;CACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-mapping.d.ts","sourceRoot":"","sources":["../src/processing-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-mapping.d.ts","sourceRoot":"","sources":["../src/processing-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAMhF,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,WAAW,EACrB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,QAAQ,GACd,QAAQ,CAoBV;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,EACnC,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,QAAQ,GACxB,MAAM,CAWR;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,GAC9D,MAAM,CA4BR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAS9E;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/B,KAAK,EAAE,WAAW,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAC3E,OAAO,CAoBT"}
|