@playcademy/sandbox 0.10.1-beta.2 → 0.10.1-beta.3

package/dist/cli.js

@@ -1128,7 +1128,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.10.1-beta.2",
+    version: "0.10.1-beta.3",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -11002,19 +11002,22 @@ function scorePlatformAssessmentItem(item, responses) {
     isCorrect: verdicts.length > 0 && verdicts.every(Boolean)
   };
 }
+function reviewStandardRef({
+  framework,
+  identifier
+}) {
+  return { framework, identifier };
+}
 function reportReviewRequiredPairUnavailable(review, administeredItemIdentifiers2, report) {
-  if (!review.requireBothQuestions) {
-    return;
-  }
   const administered = new Set(administeredItemIdentifiers2);
   const failures = [];
-  for (const standard of review.standards) {
+  for (const standard of review.standards.filter((entry) => entry.requireBothQuestions)) {
     const key = assessmentStandardRefKey(standard);
     const selected = new Set(review.selections.filter((selection) => assessmentStandardRefKey(selection.standard) === key).map((selection) => selection.itemIdentifier));
     const administeredCount = [...selected].filter((identifier) => administered.has(identifier)).length;
     if (selected.size < 2 || administeredCount === 1) {
       failures.push({
-        standard,
+        standard: reviewStandardRef(standard),
         reason: selected.size < 2 ? "selection_shortage" : "not_administered",
         requiredCount: 2,
         selectedCount: selected.size,
@@ -11057,6 +11060,9 @@ function canonicalRequestStandards(standards) {
   }
   const canonical = new Map;
   for (const input of standards) {
+    if (input.requireBothQuestions !== undefined && typeof input.requireBothQuestions !== "boolean") {
+      throw new Error("review standard requireBothQuestions must be a boolean");
+    }
     const standard = canonicalAssessmentStandardRef(input);
     if (!reviewStandardFieldsWithinLimits(standard)) {
       throw new RangeError(`Review standard fields may contain at most ${TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standardFieldLength} characters`);
@@ -11065,13 +11071,19 @@ function canonicalRequestStandards(standards) {
       throw new Error("Review standards require a framework and identifier");
     }
     const key = assessmentStandardRefKey(standard);
-    if (!canonical.has(key)) {
-      canonical.set(key, standard);
+    if (!canonical.has(key) || input.requireBothQuestions) {
+      canonical.set(key, {
+        ...standard,
+        ...input.requireBothQuestions ? { requireBothQuestions: true } : {}
+      });
     }
   }
-  return [...canonical.values()].toSorted((left, right) => compareCodeUnits(assessmentStandardRefKey(left), assessmentStandardRefKey(right)));
+  return [...canonical.values()];
 }
 function normalizeReviewRequest(request) {
+  if ("requireBothQuestions" in request && request.requireBothQuestions !== undefined) {
+    throw new Error("Set requireBothQuestions on individual review standards, not the review request");
+  }
   const candidateItemsPerStandard = request.candidateItemsPerStandard ?? 1;
   if (!Number.isInteger(candidateItemsPerStandard) || candidateItemsPerStandard <= 0 || candidateItemsPerStandard > TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard) {
     throw new RangeError(`candidateItemsPerStandard must be a positive integer at most ${TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard}`);
@@ -11082,20 +11094,20 @@ function normalizeReviewRequest(request) {
   }
   return {
     standards,
-    candidateItemsPerStandard,
-    ...request.requireBothQuestions ? { requireBothQuestions: true } : {}
+    candidateItemsPerStandard
   };
 }
 function reviewRequestFingerprint(request, policy) {
   const normalized = normalizeReviewRequest(request);
+  const requiredStandardKeys = normalized.standards.filter((standard) => standard.requireBothQuestions).map(assessmentStandardRefKey);
   return JSON.stringify({
     kind: "standards-review",
     policy: {
       version: policy.version
     },
     candidateItemsPerStandard: normalized.candidateItemsPerStandard,
-    ...normalized.requireBothQuestions ? { requireBothQuestions: true } : {},
-    standardKeys: normalized.standards.map(assessmentStandardRefKey)
+    standardKeys: normalized.standards.map(assessmentStandardRefKey),
+    ...requiredStandardKeys.length > 0 ? { requiredStandardKeys } : {}
   });
 }
 function reviewQuestionLineItemId(parentLineItemId, itemIdentifier) {
@@ -11321,9 +11333,10 @@ function rankedCandidatesByStandard(bank, exposures) {
   return byStandard;
 }
 function reviewSlots(request) {
-  return request.standards.flatMap((standard) => Array.from({ length: request.candidateItemsPerStandard }, () => ({
-    standard,
-    standardKey: assessmentStandardRefKey(standard)
+  return request.standards.flatMap((standard, servingIndex) => Array.from({ length: request.candidateItemsPerStandard }, () => ({
+    standard: reviewStandardRef(standard),
+    standardKey: assessmentStandardRefKey(standard),
+    servingIndex
   })));
 }
 function matchingCandidates(candidatesByStandard, slotCount) {
@@ -11436,7 +11449,7 @@ function fulfillment(request, candidatesByStandard, selections) {
     const selected = selectedByStandard.get(key) ?? 0;
     return selected < request.candidateItemsPerStandard ? [
       {
-        standard,
+        standard: reviewStandardRef(standard),
         requested: request.candidateItemsPerStandard,
         selected,
         eligible: candidatesByStandard.get(key)?.length ?? 0
@@ -11461,10 +11474,10 @@ function fulfillment(request, candidatesByStandard, selections) {
 function selectReviewItems(input) {
   const request = normalizeReviewRequest(input.request);
   const candidatesByStandard = rankedCandidatesByStandard(input.bank, input.exposures);
-  const slots = reviewSlots(request);
+  const slots = reviewSlots(request).toSorted((left, right) => compareCodeUnits(left.standardKey, right.standardKey));
   const boundedCandidates = matchingCandidates(candidatesByStandard, slots.length);
   const selected = preferredDistinctMatching(slots, boundedCandidates);
-  const selections = [...selected.entries()].toSorted(([left], [right]) => left - right).map(([index, itemIdentifier]) => ({
+  const selections = [...selected.entries()].toSorted(([left], [right]) => slots[left].servingIndex - slots[right].servingIndex || left - right).map(([index, itemIdentifier]) => ({
     standard: slots[index].standard,
     itemIdentifier
   }));
@@ -11603,6 +11616,9 @@ function isAssessmentScore(value) {
 function isAssessmentStandardRef(value) {
   return isRecord(value) && typeof value.framework === "string" && value.framework.length > 0 && typeof value.identifier === "string" && value.identifier.length > 0;
 }
+function isAssessmentReviewStandard(value) {
+  return isRecord(value) && isAssessmentStandardRef(value) && (value.requireBothQuestions === undefined || typeof value.requireBothQuestions === "boolean");
+}
 function isReviewFulfillment(value) {
   if (!isRecord(value) || value.status !== "complete" && value.status !== "partial" || !Number.isInteger(value.requestedItemCount) || !Number.isInteger(value.selectedItemCount) || !Array.isArray(value.shortages)) {
     return false;
@@ -11677,7 +11693,7 @@ function isRoutedDiagnosticAttemptMetadata(value, itemSubmissions, responseVersi
   });
 }
 function isReviewAttemptMetadata(value) {
-  return isRecord(value) && typeof value.requestFingerprint === "string" && typeof value.bankRevision === "string" && Array.isArray(value.standards) && value.standards.every(isAssessmentStandardRef) && Number.isInteger(value.candidateItemsPerStandard) && (value.requireBothQuestions === undefined || typeof value.requireBothQuestions === "boolean") && Array.isArray(value.selections) && value.selections.every((selection) => isRecord(selection) && isAssessmentStandardRef(selection.standard) && typeof selection.itemIdentifier === "string") && isReviewFulfillment(value.fulfillment);
+  return isRecord(value) && typeof value.requestFingerprint === "string" && typeof value.bankRevision === "string" && Array.isArray(value.standards) && value.standards.every(isAssessmentReviewStandard) && Number.isInteger(value.candidateItemsPerStandard) && value.requireBothQuestions === undefined && Array.isArray(value.selections) && value.selections.every((selection) => isRecord(selection) && isAssessmentStandardRef(selection.standard) && typeof selection.itemIdentifier === "string") && isReviewFulfillment(value.fulfillment);
 }
 function isOptionalInteger(value) {
   return value === undefined || Number.isInteger(value);
@@ -12375,8 +12391,8 @@ var init_assessment_runtime2 = __esm(() => {
     }),
     StartAssessmentBaseSchema.extend({
       purpose: exports_external.literal("review"),
-      requireBothQuestions: exports_external.boolean().optional(),
-      standards: exports_external.array(AssessmentStandardRefSchema2).min(1).max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standards),
+      requireBothQuestions: exports_external.never().optional(),
+      standards: exports_external.array(AssessmentStandardRefSchema2.and(exports_external.object({ requireBothQuestions: exports_external.boolean().optional() }))).min(1).max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standards),
       candidateItemsPerStandard: exports_external.number().int().positive().max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard).optional()
     }),
     StartAssessmentBaseSchema.extend({
@@ -100346,7 +100362,6 @@ function buildConventionalAssessmentSnapshot(input) {
       purpose: metadata2.purpose,
       standards: [...metadata2.review.standards],
       candidateItemsPerStandard: metadata2.review.candidateItemsPerStandard,
-      ...metadata2.review.requireBothQuestions ? { requireBothQuestions: true } : {},
       selections: [...metadata2.review.selections],
       fulfillment: metadata2.review.fulfillment
     };
@@ -102818,13 +102833,11 @@ function buildPreparedAssessmentMetadata(plan, timestamp6, testName) {
       review: {
         requestFingerprint: reviewRequestFingerprint({
           standards: plan.review.standards,
-          candidateItemsPerStandard: plan.review.candidateItemsPerStandard,
-          requireBothQuestions: plan.review.requireBothQuestions
+          candidateItemsPerStandard: plan.review.candidateItemsPerStandard
         }, DEFAULT_REVIEW_SELECTION_POLICY),
         bankRevision: plan.review.bankRevision,
         standards: plan.review.standards,
         candidateItemsPerStandard: plan.review.candidateItemsPerStandard,
-        ...plan.review.requireBothQuestions ? { requireBothQuestions: true } : {},
         selections: plan.review.selections,
         fulfillment: plan.review.fulfillment
       }
@@ -104007,7 +104020,6 @@ var init_timeback_assessment_runtime_service = __esm(async () => {
           bankRevision: catalog.bank.bankRevision,
           standards: [...normalized.standards],
           candidateItemsPerStandard: normalized.candidateItemsPerStandard,
-          ...normalized.requireBothQuestions ? { requireBothQuestions: true } : {},
           selections: [...selected.selections],
           fulfillment: selected.fulfillment
         }
@@ -104279,7 +104291,6 @@ var init_timeback_assessment_runtime_service = __esm(async () => {
             bankRevision: source.bank.bankRevision,
             standards: [...normalizedRequest.standards],
             candidateItemsPerStandard: normalizedRequest.candidateItemsPerStandard,
-            ...normalizedRequest.requireBothQuestions ? { requireBothQuestions: true } : {},
             selections: [...selected.selections],
             fulfillment: selected.fulfillment
           }

package/dist/server.js

@@ -1127,7 +1127,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.10.1-beta.2",
+    version: "0.10.1-beta.3",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -11001,19 +11001,22 @@ function scorePlatformAssessmentItem(item, responses) {
     isCorrect: verdicts.length > 0 && verdicts.every(Boolean)
   };
 }
+function reviewStandardRef({
+  framework,
+  identifier
+}) {
+  return { framework, identifier };
+}
 function reportReviewRequiredPairUnavailable(review, administeredItemIdentifiers2, report) {
-  if (!review.requireBothQuestions) {
-    return;
-  }
   const administered = new Set(administeredItemIdentifiers2);
   const failures = [];
-  for (const standard of review.standards) {
+  for (const standard of review.standards.filter((entry) => entry.requireBothQuestions)) {
     const key = assessmentStandardRefKey(standard);
     const selected = new Set(review.selections.filter((selection) => assessmentStandardRefKey(selection.standard) === key).map((selection) => selection.itemIdentifier));
     const administeredCount = [...selected].filter((identifier) => administered.has(identifier)).length;
     if (selected.size < 2 || administeredCount === 1) {
       failures.push({
-        standard,
+        standard: reviewStandardRef(standard),
         reason: selected.size < 2 ? "selection_shortage" : "not_administered",
         requiredCount: 2,
         selectedCount: selected.size,
@@ -11056,6 +11059,9 @@ function canonicalRequestStandards(standards) {
   }
   const canonical = new Map;
   for (const input of standards) {
+    if (input.requireBothQuestions !== undefined && typeof input.requireBothQuestions !== "boolean") {
+      throw new Error("review standard requireBothQuestions must be a boolean");
+    }
     const standard = canonicalAssessmentStandardRef(input);
     if (!reviewStandardFieldsWithinLimits(standard)) {
       throw new RangeError(`Review standard fields may contain at most ${TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standardFieldLength} characters`);
@@ -11064,13 +11070,19 @@ function canonicalRequestStandards(standards) {
       throw new Error("Review standards require a framework and identifier");
     }
     const key = assessmentStandardRefKey(standard);
-    if (!canonical.has(key)) {
-      canonical.set(key, standard);
+    if (!canonical.has(key) || input.requireBothQuestions) {
+      canonical.set(key, {
+        ...standard,
+        ...input.requireBothQuestions ? { requireBothQuestions: true } : {}
+      });
     }
   }
-  return [...canonical.values()].toSorted((left, right) => compareCodeUnits(assessmentStandardRefKey(left), assessmentStandardRefKey(right)));
+  return [...canonical.values()];
 }
 function normalizeReviewRequest(request) {
+  if ("requireBothQuestions" in request && request.requireBothQuestions !== undefined) {
+    throw new Error("Set requireBothQuestions on individual review standards, not the review request");
+  }
   const candidateItemsPerStandard = request.candidateItemsPerStandard ?? 1;
   if (!Number.isInteger(candidateItemsPerStandard) || candidateItemsPerStandard <= 0 || candidateItemsPerStandard > TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard) {
     throw new RangeError(`candidateItemsPerStandard must be a positive integer at most ${TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard}`);
@@ -11081,20 +11093,20 @@ function normalizeReviewRequest(request) {
   }
   return {
     standards,
-    candidateItemsPerStandard,
-    ...request.requireBothQuestions ? { requireBothQuestions: true } : {}
+    candidateItemsPerStandard
   };
 }
 function reviewRequestFingerprint(request, policy) {
   const normalized = normalizeReviewRequest(request);
+  const requiredStandardKeys = normalized.standards.filter((standard) => standard.requireBothQuestions).map(assessmentStandardRefKey);
   return JSON.stringify({
     kind: "standards-review",
     policy: {
       version: policy.version
     },
     candidateItemsPerStandard: normalized.candidateItemsPerStandard,
-    ...normalized.requireBothQuestions ? { requireBothQuestions: true } : {},
-    standardKeys: normalized.standards.map(assessmentStandardRefKey)
+    standardKeys: normalized.standards.map(assessmentStandardRefKey),
+    ...requiredStandardKeys.length > 0 ? { requiredStandardKeys } : {}
   });
 }
 function reviewQuestionLineItemId(parentLineItemId, itemIdentifier) {
@@ -11320,9 +11332,10 @@ function rankedCandidatesByStandard(bank, exposures) {
   return byStandard;
 }
 function reviewSlots(request) {
-  return request.standards.flatMap((standard) => Array.from({ length: request.candidateItemsPerStandard }, () => ({
-    standard,
-    standardKey: assessmentStandardRefKey(standard)
+  return request.standards.flatMap((standard, servingIndex) => Array.from({ length: request.candidateItemsPerStandard }, () => ({
+    standard: reviewStandardRef(standard),
+    standardKey: assessmentStandardRefKey(standard),
+    servingIndex
   })));
 }
 function matchingCandidates(candidatesByStandard, slotCount) {
@@ -11435,7 +11448,7 @@ function fulfillment(request, candidatesByStandard, selections) {
     const selected = selectedByStandard.get(key) ?? 0;
     return selected < request.candidateItemsPerStandard ? [
       {
-        standard,
+        standard: reviewStandardRef(standard),
         requested: request.candidateItemsPerStandard,
         selected,
         eligible: candidatesByStandard.get(key)?.length ?? 0
@@ -11460,10 +11473,10 @@ function fulfillment(request, candidatesByStandard, selections) {
 function selectReviewItems(input) {
   const request = normalizeReviewRequest(input.request);
   const candidatesByStandard = rankedCandidatesByStandard(input.bank, input.exposures);
-  const slots = reviewSlots(request);
+  const slots = reviewSlots(request).toSorted((left, right) => compareCodeUnits(left.standardKey, right.standardKey));
   const boundedCandidates = matchingCandidates(candidatesByStandard, slots.length);
   const selected = preferredDistinctMatching(slots, boundedCandidates);
-  const selections = [...selected.entries()].toSorted(([left], [right]) => left - right).map(([index, itemIdentifier]) => ({
+  const selections = [...selected.entries()].toSorted(([left], [right]) => slots[left].servingIndex - slots[right].servingIndex || left - right).map(([index, itemIdentifier]) => ({
     standard: slots[index].standard,
     itemIdentifier
   }));
@@ -11602,6 +11615,9 @@ function isAssessmentScore(value) {
 function isAssessmentStandardRef(value) {
   return isRecord(value) && typeof value.framework === "string" && value.framework.length > 0 && typeof value.identifier === "string" && value.identifier.length > 0;
 }
+function isAssessmentReviewStandard(value) {
+  return isRecord(value) && isAssessmentStandardRef(value) && (value.requireBothQuestions === undefined || typeof value.requireBothQuestions === "boolean");
+}
 function isReviewFulfillment(value) {
   if (!isRecord(value) || value.status !== "complete" && value.status !== "partial" || !Number.isInteger(value.requestedItemCount) || !Number.isInteger(value.selectedItemCount) || !Array.isArray(value.shortages)) {
     return false;
@@ -11676,7 +11692,7 @@ function isRoutedDiagnosticAttemptMetadata(value, itemSubmissions, responseVersi
   });
 }
 function isReviewAttemptMetadata(value) {
-  return isRecord(value) && typeof value.requestFingerprint === "string" && typeof value.bankRevision === "string" && Array.isArray(value.standards) && value.standards.every(isAssessmentStandardRef) && Number.isInteger(value.candidateItemsPerStandard) && (value.requireBothQuestions === undefined || typeof value.requireBothQuestions === "boolean") && Array.isArray(value.selections) && value.selections.every((selection) => isRecord(selection) && isAssessmentStandardRef(selection.standard) && typeof selection.itemIdentifier === "string") && isReviewFulfillment(value.fulfillment);
+  return isRecord(value) && typeof value.requestFingerprint === "string" && typeof value.bankRevision === "string" && Array.isArray(value.standards) && value.standards.every(isAssessmentReviewStandard) && Number.isInteger(value.candidateItemsPerStandard) && value.requireBothQuestions === undefined && Array.isArray(value.selections) && value.selections.every((selection) => isRecord(selection) && isAssessmentStandardRef(selection.standard) && typeof selection.itemIdentifier === "string") && isReviewFulfillment(value.fulfillment);
 }
 function isOptionalInteger(value) {
   return value === undefined || Number.isInteger(value);
@@ -12374,8 +12390,8 @@ var init_assessment_runtime2 = __esm(() => {
     }),
     StartAssessmentBaseSchema.extend({
       purpose: exports_external.literal("review"),
-      requireBothQuestions: exports_external.boolean().optional(),
-      standards: exports_external.array(AssessmentStandardRefSchema2).min(1).max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standards),
+      requireBothQuestions: exports_external.never().optional(),
+      standards: exports_external.array(AssessmentStandardRefSchema2.and(exports_external.object({ requireBothQuestions: exports_external.boolean().optional() }))).min(1).max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.standards),
       candidateItemsPerStandard: exports_external.number().int().positive().max(TIMEBACK_ASSESSMENT_REVIEW_REQUEST_LIMITS.candidateItemsPerStandard).optional()
     }),
     StartAssessmentBaseSchema.extend({
@@ -100345,7 +100361,6 @@ function buildConventionalAssessmentSnapshot(input) {
       purpose: metadata2.purpose,
       standards: [...metadata2.review.standards],
       candidateItemsPerStandard: metadata2.review.candidateItemsPerStandard,
-      ...metadata2.review.requireBothQuestions ? { requireBothQuestions: true } : {},
       selections: [...metadata2.review.selections],
       fulfillment: metadata2.review.fulfillment
     };
@@ -102817,13 +102832,11 @@ function buildPreparedAssessmentMetadata(plan, timestamp6, testName) {
       review: {
         requestFingerprint: reviewRequestFingerprint({
           standards: plan.review.standards,
-          candidateItemsPerStandard: plan.review.candidateItemsPerStandard,
-          requireBothQuestions: plan.review.requireBothQuestions
+          candidateItemsPerStandard: plan.review.candidateItemsPerStandard
         }, DEFAULT_REVIEW_SELECTION_POLICY),
         bankRevision: plan.review.bankRevision,
         standards: plan.review.standards,
         candidateItemsPerStandard: plan.review.candidateItemsPerStandard,
-        ...plan.review.requireBothQuestions ? { requireBothQuestions: true } : {},
         selections: plan.review.selections,
         fulfillment: plan.review.fulfillment
       }
@@ -104006,7 +104019,6 @@ var init_timeback_assessment_runtime_service = __esm(async () => {
           bankRevision: catalog.bank.bankRevision,
           standards: [...normalized.standards],
           candidateItemsPerStandard: normalized.candidateItemsPerStandard,
-          ...normalized.requireBothQuestions ? { requireBothQuestions: true } : {},
           selections: [...selected.selections],
           fulfillment: selected.fulfillment
         }
@@ -104278,7 +104290,6 @@ var init_timeback_assessment_runtime_service = __esm(async () => {
             bankRevision: source.bank.bankRevision,
             standards: [...normalizedRequest.standards],
             candidateItemsPerStandard: normalizedRequest.candidateItemsPerStandard,
-            ...normalizedRequest.requireBothQuestions ? { requireBothQuestions: true } : {},
             selections: [...selected.selections],
             fulfillment: selected.fulfillment
           }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sandbox",
-    "version": "0.10.1-beta.2",
+    "version": "0.10.1-beta.3",
     "description": "Local development server for Playcademy game development",
     "type": "module",
     "exports": {