@longsightgroup/qti3-core 0.10.6 → 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 +126 -0
- 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/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 +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.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 +32 -0
- 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.map +1 -1
- package/dist/response-validation-policy.js +3 -1
- package/dist/response-validation-policy.js.map +1 -1
- package/dist/response-validation.d.ts.map +1 -1
- package/dist/response-validation.js +2 -1
- package/dist/response-validation.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 +2 -0
- package/dist/support-evidence.js.map +1 -1
- package/dist/support.d.ts.map +1 -1
- package/dist/support.js +64 -23
- package/dist/support.js.map +1 -1
- 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 +8 -3
- package/dist/trusted-item-session.js.map +1 -1
- package/dist/types.d.ts +21 -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-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/diagnostics.ts +29 -0
- package/src/index.ts +9 -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 +34 -0
- 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 +5 -1
- package/src/response-validation.ts +2 -1
- 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 +2 -0
- package/src/support.ts +84 -23
- package/src/trusted-item-session.ts +13 -2
- package/src/types.ts +30 -4
- package/src/validation-declaration-entries.ts +11 -1
- 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
|
@@ -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":"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"}
|
|
@@ -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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { parseQtiPair } from "./parser-values.js";
|
|
1
|
+
import { parseQtiPair, parseXmlBoolean } from "./parser-values.js";
|
|
2
2
|
import { qtiScalarToString, qtiValueToStringList } from "./value-format.js";
|
|
3
|
-
import {
|
|
3
|
+
import { numericValue, valuesEqual } from "./processing-values.js";
|
|
4
|
+
import { isRecordValue } from "./value-guards.js";
|
|
4
5
|
export function lookupOutcomeValue(document, identifier, value) {
|
|
5
6
|
const declaration = document.item.outcomeDeclarations.find((outcome) => outcome.identifier === identifier);
|
|
6
7
|
const lookupTable = declaration?.lookupTable;
|
|
@@ -13,9 +14,7 @@ export function lookupOutcomeValue(document, identifier, value) {
|
|
|
13
14
|
return (lookupTable.entries.find((entry) => entry.sourceValue === numeric)?.targetValue ??
|
|
14
15
|
lookupTable.defaultValue);
|
|
15
16
|
}
|
|
16
|
-
const entry =
|
|
17
|
-
.toSorted((left, right) => left.sourceValue - right.sourceValue)
|
|
18
|
-
.find((candidate) => numeric < candidate.sourceValue ||
|
|
17
|
+
const entry = lookupTable.entries.find((candidate) => numeric > candidate.sourceValue ||
|
|
19
18
|
(candidate.includeBoundary !== false && numeric === candidate.sourceValue));
|
|
20
19
|
return entry?.targetValue ?? lookupTable.defaultValue;
|
|
21
20
|
}
|
|
@@ -47,10 +46,12 @@ export function scoreAreaMapping(response, areaMapping) {
|
|
|
47
46
|
if (!pointInsideArea(parsed, entry))
|
|
48
47
|
continue;
|
|
49
48
|
matchedArea = true;
|
|
50
|
-
if (matchedAreaIndexes.has(index))
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
if (!matchedAreaIndexes.has(index)) {
|
|
50
|
+
matchedAreaIndexes.add(index);
|
|
51
|
+
score += entry.mappedValue;
|
|
52
|
+
}
|
|
53
|
+
// Authored priority applies even when this area was already counted.
|
|
54
|
+
break;
|
|
54
55
|
}
|
|
55
56
|
if (!matchedArea)
|
|
56
57
|
score += areaMapping.defaultValue;
|
|
@@ -103,16 +104,25 @@ function pointInsidePolygon(point, coords) {
|
|
|
103
104
|
return inside;
|
|
104
105
|
}
|
|
105
106
|
function scoreMapping(response, mapping, baseType) {
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
.
|
|
107
|
+
const mappedValue = (value) => {
|
|
108
|
+
const key = mappingKey(value, baseType);
|
|
109
|
+
const entry = mapping.entries.find((candidate) => {
|
|
110
|
+
if (candidate.mapKey === undefined)
|
|
111
|
+
return false;
|
|
112
|
+
const candidateKey = mappingKey(candidate.mapKey, baseType);
|
|
113
|
+
const caseSensitive = parseXmlBoolean(candidate.attributes["case-sensitive"]) ?? false;
|
|
114
|
+
return baseType === "string" && !caseSensitive
|
|
115
|
+
? candidateKey.toLowerCase() === key.toLowerCase()
|
|
116
|
+
: candidateKey === key;
|
|
117
|
+
});
|
|
118
|
+
return entry?.mappedValue ?? mapping.defaultValue;
|
|
119
|
+
};
|
|
109
120
|
if (Array.isArray(response)) {
|
|
110
|
-
const
|
|
121
|
+
const distinct = response.filter((value, index) => response.findIndex((candidate) => valuesEqual(candidate, value, false, baseType)) === index);
|
|
122
|
+
const score = distinct.reduce((sum, value) => sum + mappedValue(String(value)), 0);
|
|
111
123
|
return clampMappedScore(score, mapping.attributes);
|
|
112
124
|
}
|
|
113
|
-
const score = response === null || isRecordValue(response)
|
|
114
|
-
? 0
|
|
115
|
-
: (values.get(mappingKey(String(response), baseType)) ?? mapping.defaultValue);
|
|
125
|
+
const score = response === null || isRecordValue(response) ? 0 : mappedValue(String(response));
|
|
116
126
|
return clampMappedScore(score, mapping.attributes);
|
|
117
127
|
}
|
|
118
128
|
function mappingKey(value, baseType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-mapping.js","sourceRoot":"","sources":["../src/processing-mapping.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-mapping.js","sourceRoot":"","sources":["../src/processing-mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { QtiAttemptStateV1, QtiAttemptStatus, QtiDiagnostic, QtiPortableCustomStateValue, QtiValue } from "./types.js";
|
|
2
|
-
export declare function serialize(itemIdentifier: string, status: QtiAttemptStatus, responses: Record<string, QtiValue>, outcomes: Record<string, QtiValue>, templateValues: Record<string, QtiValue>, interactionStates: Record<string, QtiPortableCustomStateValue>, validationMessages: QtiDiagnostic[]): QtiAttemptStateV1;
|
|
1
|
+
import type { QtiAttemptStateV1, QtiBuiltInVariables, QtiAttemptStatus, QtiDiagnostic, QtiPortableCustomStateValue, QtiValue } from "./types.js";
|
|
2
|
+
export declare function serialize(itemIdentifier: string, status: QtiAttemptStatus, responses: Record<string, QtiValue>, outcomes: Record<string, QtiValue>, templateValues: Record<string, QtiValue>, interactionStates: Record<string, QtiPortableCustomStateValue>, validationMessages: QtiDiagnostic[], builtInVariables?: QtiBuiltInVariables): QtiAttemptStateV1;
|
|
3
3
|
export declare function cloneValueRecord(record: Record<string, QtiValue>): Record<string, QtiValue>;
|
|
4
4
|
export declare function clonePortableCustomStateRecord(record: Record<string, QtiPortableCustomStateValue>): Record<string, QtiPortableCustomStateValue>;
|
|
5
5
|
export declare function cloneValue(value: QtiValue): QtiValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-state.d.ts","sourceRoot":"","sources":["../src/processing-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,2BAA2B,EAC3B,QAAQ,EACT,MAAM,YAAY,CAAC;AAIpB,wBAAgB,SAAS,CACvB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,gBAAgB,EACxB,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,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,EAC9D,kBAAkB,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"processing-state.d.ts","sourceRoot":"","sources":["../src/processing-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,EACb,2BAA2B,EAC3B,QAAQ,EACT,MAAM,YAAY,CAAC;AAIpB,wBAAgB,SAAS,CACvB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,gBAAgB,EACxB,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,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,EAC9D,kBAAkB,EAAE,aAAa,EAAE,EACnC,gBAAgB,CAAC,EAAE,mBAAmB,GACrC,iBAAiB,CAcnB;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAE3F;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,GAClD,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAI7C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAIpD;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,2BAA2B,GACjC,2BAA2B,CAI7B;AAQD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAK9E"}
|
package/dist/processing-state.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { ATTEMPT_STATE_SCHEMA } from "./attempt-state-constants.js";
|
|
2
|
-
import { isRecordValue } from "./
|
|
3
|
-
export function serialize(itemIdentifier, status, responses, outcomes, templateValues, interactionStates, validationMessages) {
|
|
2
|
+
import { isRecordValue } from "./value-guards.js";
|
|
3
|
+
export function serialize(itemIdentifier, status, responses, outcomes, templateValues, interactionStates, validationMessages, builtInVariables) {
|
|
4
4
|
return {
|
|
5
5
|
schema: ATTEMPT_STATE_SCHEMA,
|
|
6
|
+
...(builtInVariables === undefined
|
|
7
|
+
? {}
|
|
8
|
+
: { builtInVariables: { ...builtInVariables, context: { ...builtInVariables.context } } }),
|
|
6
9
|
itemIdentifier,
|
|
7
10
|
status,
|
|
8
11
|
responses: cloneValueRecord(responses),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-state.js","sourceRoot":"","sources":["../src/processing-state.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processing-state.js","sourceRoot":"","sources":["../src/processing-state.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,UAAU,SAAS,CACvB,cAAsB,EACtB,MAAwB,EACxB,SAAmC,EACnC,QAAkC,EAClC,cAAwC,EACxC,iBAA8D,EAC9D,kBAAmC,EACnC,gBAAsC;IAEtC,OAAO;QACL,MAAM,EAAE,oBAAoB;QAC5B,GAAG,CAAC,gBAAgB,KAAK,SAAS;YAChC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,GAAG,gBAAgB,EAAE,OAAO,EAAE,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC;QAC5F,cAAc;QACd,MAAM;QACN,SAAS,EAAE,gBAAgB,CAAC,SAAS,CAAC;QACtC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC;QACpC,cAAc,EAAE,gBAAgB,CAAC,cAAc,CAAC;QAChD,iBAAiB,EAAE,8BAA8B,CAAC,iBAAiB,CAAC;QACpE,kBAAkB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;KACzD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAgC;IAC/D,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,MAAmD;IAEnD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,CACrF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAe;IACxC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;IAC5C,IAAI,aAAa,CAAC,KAAK,CAAC;QAAE,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,KAAkC;IAElC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACrE,IAAI,2BAA2B,CAAC,KAAK,CAAC;QAAE,OAAO,8BAA8B,CAAC,KAAK,CAAC,CAAC;IACrF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,2BAA2B,CAClC,KAAkC;IAElC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,WAA4B;IAC3D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACtC,GAAG,UAAU;QACb,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS;KACjE,CAAC,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import type { QtiBaseType,
|
|
1
|
+
import type { QtiBaseType, QtiResponseDeclaration, QtiScalarValue, QtiValue } from "./types.js";
|
|
2
2
|
export declare function isNullResponse(response: QtiValue): boolean;
|
|
3
3
|
export declare function valuesEqual(actual: QtiValue, expected: QtiValue, ordered?: boolean, baseType?: QtiBaseType): boolean;
|
|
4
4
|
export declare function qtiMatchValues(actual: QtiValue, expected: QtiValue, ordered?: boolean, baseType?: QtiBaseType): boolean | null;
|
|
5
5
|
export declare function normalizeValueForCardinality(value: QtiValue, cardinality: QtiResponseDeclaration["cardinality"]): QtiValue;
|
|
6
6
|
export declare function valueContainer(value: QtiValue): QtiScalarValue[];
|
|
7
|
-
export declare function isRecordValue(value: QtiValue): value is QtiRecordValue;
|
|
8
7
|
export declare function containsValues(collection: QtiScalarValue[], values: QtiScalarValue[], baseType?: QtiBaseType): boolean;
|
|
9
8
|
export declare function numericValue(value: QtiValue): number;
|
|
10
9
|
export declare function numericValueOrNull(value: QtiValue): number | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-values.d.ts","sourceRoot":"","sources":["../src/processing-values.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"processing-values.d.ts","sourceRoot":"","sources":["../src/processing-values.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIhG,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE1D;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,QAAQ,EAClB,OAAO,UAAQ,EACf,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CA4BT;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,QAAQ,EAClB,OAAO,UAAQ,EACf,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,GAAG,IAAI,CAGhB;AA0BD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,sBAAsB,CAAC,aAAa,CAAC,GACjD,QAAQ,CAUV;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,cAAc,EAAE,CAIhE;AAED,wBAAgB,cAAc,CAC5B,UAAU,EAAE,cAAc,EAAE,EAC5B,MAAM,EAAE,cAAc,EAAE,EACxB,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CAUT;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAKpD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAQjE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAoB9D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAMrD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAGlE;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,QAAQ,EACf,aAAa,EAAE,OAAO,EACtB,SAAS,EAAE,OAAO,GACjB,OAAO,GAAG,IAAI,CAShB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { parseQtiPair } from "./parser-values.js";
|
|
2
2
|
import { qtiValueToString } from "./value-format.js";
|
|
3
|
+
import { isRecordValue } from "./value-guards.js";
|
|
3
4
|
export function isNullResponse(response) {
|
|
4
5
|
return response === null || response === "" || (Array.isArray(response) && response.length === 0);
|
|
5
6
|
}
|
|
@@ -69,9 +70,6 @@ export function valueContainer(value) {
|
|
|
69
70
|
return [];
|
|
70
71
|
return Array.isArray(value) ? value : [value];
|
|
71
72
|
}
|
|
72
|
-
export function isRecordValue(value) {
|
|
73
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
74
|
-
}
|
|
75
73
|
export function containsValues(collection, values, baseType) {
|
|
76
74
|
const remaining = [...collection];
|
|
77
75
|
for (const value of values) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-values.js","sourceRoot":"","sources":["../src/processing-values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-values.js","sourceRoot":"","sources":["../src/processing-values.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processing-variables.d.ts","sourceRoot":"","sources":["../src/processing-variables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,uBAAuB,EACvB,sBAAsB,EAEtB,QAAQ,EACT,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"processing-variables.d.ts","sourceRoot":"","sources":["../src/processing-variables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,uBAAuB,EACvB,sBAAsB,EAEtB,QAAQ,EACT,MAAM,YAAY,CAAC;AAIpB,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,WAAW,EACrB,UAAU,EAAE,MAAM,GACjB,sBAAsB,GAAG,SAAS,CAIpC;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,WAAW,EACrB,UAAU,EAAE,MAAM,EAClB,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,GACvC,QAAQ,CAIV;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,WAAW,EACrB,UAAU,EAAE,MAAM,EAClB,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,GACvC,QAAQ,GAAG,SAAS,CAOtB;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ,CAE7F;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,uBAAuB,EACnC,QAAQ,EAAE,WAAW,GACpB,OAAO,CAYT;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,uBAAuB,EACnC,QAAQ,EAAE,WAAW,GACpB,WAAW,GAAG,SAAS,CAwBzB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { builtInVariableBaseType } from "./session-builtins.js";
|
|
1
2
|
import { parseBaseType } from "./parser-values.js";
|
|
2
3
|
export function getResponseDeclaration(document, identifier) {
|
|
3
4
|
return document.item.responseDeclarations.find((declaration) => declaration.identifier === identifier);
|
|
@@ -6,6 +7,8 @@ export function resolveVariableValue(document, identifier, responses, outcomes,
|
|
|
6
7
|
return (resolveOptionalVariableValue(document, identifier, responses, outcomes, templateValues) ?? null);
|
|
7
8
|
}
|
|
8
9
|
export function resolveOptionalVariableValue(document, identifier, responses, outcomes, templateValues) {
|
|
10
|
+
if (identifier === "completionStatus")
|
|
11
|
+
return outcomes.completionStatus ?? "not_attempted";
|
|
9
12
|
const declaration = resolveVariableDeclaration(document, identifier);
|
|
10
13
|
if (!declaration)
|
|
11
14
|
return undefined;
|
|
@@ -19,7 +22,7 @@ export function defaultValueForIdentifier(document, identifier) {
|
|
|
19
22
|
return resolveVariableDeclaration(document, identifier)?.defaultValue ?? null;
|
|
20
23
|
}
|
|
21
24
|
export function expressionIsOrdered(expression, document) {
|
|
22
|
-
if (expression.type === "ordered")
|
|
25
|
+
if (expression.type === "ordered" || expression.type === "repeat")
|
|
23
26
|
return true;
|
|
24
27
|
if (expression.type === "delete")
|
|
25
28
|
return expressionIsOrdered(expression.collection, document);
|
|
@@ -40,17 +43,19 @@ export function expressionBaseType(expression, document) {
|
|
|
40
43
|
if (expression.type === "variable" ||
|
|
41
44
|
expression.type === "correct" ||
|
|
42
45
|
expression.type === "default") {
|
|
43
|
-
return
|
|
46
|
+
return (builtInVariableBaseType(expression.identifier) ??
|
|
47
|
+
resolveVariableDeclaration(document, expression.identifier)?.baseType);
|
|
44
48
|
}
|
|
45
49
|
if (expression.type === "index")
|
|
46
50
|
return expressionBaseType(expression.expression, document);
|
|
47
51
|
if (expression.type === "delete")
|
|
48
52
|
return expressionBaseType(expression.collection, document);
|
|
49
|
-
if (expression.type === "random"
|
|
50
|
-
expression.
|
|
53
|
+
if (expression.type === "random")
|
|
54
|
+
return expressionBaseType(expression.expression, document);
|
|
55
|
+
if (expression.type === "multiple" ||
|
|
51
56
|
expression.type === "ordered" ||
|
|
52
57
|
expression.type === "repeat") {
|
|
53
|
-
return commonExpressionBaseType(expression.
|
|
58
|
+
return commonExpressionBaseType(expression.expressions, document);
|
|
54
59
|
}
|
|
55
60
|
return undefined;
|
|
56
61
|
}
|