@longsightgroup/qti3-core 0.9.10 → 0.10.0

package/src/validation.ts

@@ -23,6 +23,7 @@ import {
 } from "./validation-geometry.js";
 import {
   isBaseType,
+  isBooleanAttribute,
   isCardinality,
   isFiniteNumber,
   isInteger,
@@ -82,7 +83,7 @@ function validateAssessmentItemRoot(item: QtiAssessmentItem, diagnostics: QtiDia
       path: item.source?.path,
       source: item.source,
     });
-  } else if (!isXmlBoolean(timeDependent)) {
+  } else if (!isBooleanAttribute(timeDependent)) {
     diagnostics.push({
       code: "assessmentItem.timeDependent.boolean",
       severity: "error",
@@ -93,10 +94,6 @@ function validateAssessmentItemRoot(item: QtiAssessmentItem, diagnostics: QtiDia
   }
 }
 
-function isXmlBoolean(value: string): boolean {
-  return value === "true" || value === "false" || value === "1" || value === "0";
-}
-
 function validateItemBody(item: QtiAssessmentItem, diagnostics: QtiDiagnostic[]): void {
   if (item.itemBodySource) return;
   diagnostics.push({
@@ -219,7 +216,7 @@ function isValidDeclarationBaseValue(value: string, baseType: QtiBaseType): bool
     case "float":
       return isFiniteNumber(value);
     case "boolean":
-      return value === "true" || value === "false";
+      return isBooleanAttribute(value);
     case "point":
       return isPoint(value);
     case "pair":
@@ -669,6 +666,19 @@ function validateCatalogCard(
     });
   }
 
+  if (isCatalogCardEntry(card)) {
+    const defaultAttribute = card.attributes.default;
+    if (defaultAttribute !== undefined && !isBooleanAttribute(defaultAttribute)) {
+      diagnostics.push({
+        code: "catalog.cardEntry.default.boolean",
+        severity: "error",
+        message: `qti-card-entry default must be an XML boolean, found ${defaultAttribute}.`,
+        path: card.source?.path,
+        source: card.source,
+      });
+    }
+  }
+
   const defaultEntries = entries.filter((entry) => entry.default);
   if (defaultEntries.length > 1) {
     diagnostics.push({
@@ -698,6 +708,12 @@ function validateCatalogCard(
   }
 }
 
+function isCatalogCardEntry(
+  card: QtiCatalogCard | QtiCatalogCardEntry,
+): card is QtiCatalogCardEntry {
+  return !("entries" in card);
+}
+
 function validateCatalogHtmlContent(nodes: QtiContentNode[], diagnostics: QtiDiagnostic[]): void {
   for (const node of nodes) {
     if (node.kind === "element") {