@pie-players/pie-assessment-toolkit 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/context/assessment-toolkit-context.d.ts

@@ -73,6 +73,14 @@ export interface AssessmentToolkitRuntimeContext {
      * an interface in another.
      */
     contentLanguage?: string;
+    /**
+     * The content language the item and passage players stamp on content that
+     * declares none: {@link contentLanguage} when the host names one, else
+     * `auto` (`lang=""` with `dir="auto"`) when the host sets an interface
+     * locale, else unset, which leaves undeclared content inheriting the page's
+     * language and direction. See `defaultContentLanguage`.
+     */
+    contentLanguageDefault?: string;
     /**
      * Reports a failure that keeps the section's content from loading as the
      * section controller's `section-error`, with source `section-runtime`.

package/dist/runtime/content-language.d.ts

@@ -1,10 +1,21 @@
 /** The content language when neither the markup nor the host names one. */
 export declare const DEFAULT_CONTENT_LANGUAGE = "en-US";
 /**
- * The nearest non-empty `lang` attribute at or above `node`, climbing through
- * shadow hosts, and ending after `boundary` when one is given.
+ * The nearest `lang` attribute at or above `node`, climbing through shadow
+ * hosts, and ending after `boundary` when one is given. An empty `lang` names
+ * the language unknown and ends the climb with no language, as it ends the
+ * browser's own inheritance: the players stamp it on content that declares
+ * none, so the interface's `lang` above never reads as the content's.
  */
 export declare const findLangAttribute: (node: Node | null | undefined, boundary?: Element | null) => string | undefined;
+/**
+ * The language the content `root` holds is declared in: the `lang` its
+ * outermost `lang`-carrying descendants share, or undefined when they disagree,
+ * one is empty, or there are none. The players stamp `lang` on the content root
+ * they render, below the shell a whole-item read targets, so this is how such
+ * a read finds the language an item declared through `env.locale`.
+ */
+export declare const findHeldContentLanguage: (root: Element) => string | undefined;
 export interface ContentLanguageOptions {
     /**
      * Where the `lang` climb ends, inclusive. Defaults to the nearest shell scope

package/dist/runtime/content-language.js

@@ -3,8 +3,11 @@ import { findShellScopeHost } from "./content-region.js";
 /** The content language when neither the markup nor the host names one. */
 export const DEFAULT_CONTENT_LANGUAGE = "en-US";
 /**
- * The nearest non-empty `lang` attribute at or above `node`, climbing through
- * shadow hosts, and ending after `boundary` when one is given.
+ * The nearest `lang` attribute at or above `node`, climbing through shadow
+ * hosts, and ending after `boundary` when one is given. An empty `lang` names
+ * the language unknown and ends the climb with no language, as it ends the
+ * browser's own inheritance: the players stamp it on content that declares
+ * none, so the interface's `lang` above never reads as the content's.
  */
 export const findLangAttribute = (node, boundary) => {
     let current = !node
@@ -13,15 +16,38 @@ export const findLangAttribute = (node, boundary) => {
             ? node
             : composedParentElement(node);
     while (current) {
-        const lang = current.getAttribute("lang")?.trim();
-        if (lang)
-            return lang;
+        const lang = current.getAttribute("lang");
+        if (lang !== null)
+            return lang.trim() || undefined;
         if (boundary && current === boundary)
             return undefined;
         current = composedParentElement(current);
     }
     return undefined;
 };
+/**
+ * The language the content `root` holds is declared in: the `lang` its
+ * outermost `lang`-carrying descendants share, or undefined when they disagree,
+ * one is empty, or there are none. The players stamp `lang` on the content root
+ * they render, below the shell a whole-item read targets, so this is how such
+ * a read finds the language an item declared through `env.locale`.
+ */
+export const findHeldContentLanguage = (root) => {
+    let language;
+    for (const element of root.querySelectorAll("[lang]")) {
+        const outer = element.parentElement?.closest("[lang]");
+        if (outer && outer !== root && root.contains(outer))
+            continue;
+        const lang = element.getAttribute("lang")?.trim();
+        if (!lang)
+            return undefined;
+        if (language === undefined)
+            language = lang;
+        else if (language.toLowerCase() !== lang.toLowerCase())
+            return undefined;
+    }
+    return language;
+};
 /**
  * The language the content at `target` is named as being in: the nearest `lang`
  * between it and its shell scope host, else the host's `content-language` input.

package/dist/services/AccessibilityCatalogResolver.js

@@ -1,4 +1,4 @@
-import { languageTagLookupSequence, normalizeLanguageTag, } from "@pie-players/pie-players-shared/i18n/language-tags";
+import { languageTagScriptLookupSequence, languageTagScriptsMatch, normalizeLanguageTag, } from "@pie-players/pie-players-shared/i18n/language-tags";
 import { catalogOwnerContextFor, collectOwnerCatalogRegistrations, } from "./catalog-owner.js";
 import { sanitizeSsmlString } from "./SSMLExtractor.js";
 /**
@@ -538,14 +538,18 @@ export class AccessibilityCatalogResolver {
         // Language rungs, most specific first: the requested language, then the
         // default language, then any.
         //
-        // Each requested tag expands into its RFC 4647 lookup sequence over
+        // Each requested tag expands into its script-aware lookup sequence over
         // normalized tags, so `es-MX` tries `es-mx` and then `es` before falling
         // through to the default, and a POSIX `es_ES` card (what the Learnosity
-        // transform emits) matches an `es-ES` request on its own rung.
+        // transform emits) matches an `es-ES` request on its own rung. A shorter
+        // card serves only in the request's script: `zh-TW` tries `zh-hant`, and
+        // passes a bare `zh` card by, which is Simplified.
         const languageRungs = [];
         const pushLookupRungs = (tag) => {
-            for (const step of languageTagLookupSequence(tag)) {
-                languageRungs.push((card) => normalizeLanguageTag(card.language) === step);
+            const exact = normalizeLanguageTag(tag);
+            for (const step of languageTagScriptLookupSequence(tag)) {
+                languageRungs.push((card) => normalizeLanguageTag(card.language) === step &&
+                    (step === exact || languageTagScriptsMatch(tag, card.language)));
             }
         };
         if (language) {

package/dist/services/TTSService.d.ts

@@ -199,9 +199,10 @@ export declare class TTSService {
     private getTextProcessingOptions;
     /**
      * The language a read of `node` is in. Its content language is the nearest
-     * `lang` between it and its shell, else the language the speak names, else a
-     * pinned `lang_id`. Its locale is that content language, else the host's
-     * configured locale, else en-US.
+     * `lang` between it and its shell, else for an element the `lang` the content
+     * roots it holds share, else the language the speak names, else a pinned
+     * `lang_id`. Its locale is that content language, else the host's configured
+     * locale, else en-US.
      */
     private resolveReadLanguage;
     /**

package/dist/services/TTSService.js

@@ -20,7 +20,7 @@
 import { applyMediaFragment, enforceMediaFragment, } from "@pie-players/pie-players-shared/media";
 import { createPieLogger, isTtsDebugEnabled, } from "@pie-players/pie-players-shared/pie";
 import { resolveSpokenAudioMedia, } from "./spoken-audio-cards.js";
-import { DEFAULT_CONTENT_LANGUAGE, findContentLanguage, findLangAttribute, } from "../runtime/content-language.js";
+import { DEFAULT_CONTENT_LANGUAGE, findContentLanguage, findHeldContentLanguage, findLangAttribute, } from "../runtime/content-language.js";
 import { isSsmlDocument } from "./tts/ssml/spoken-text.js";
 import { composedContains, composedParentElement, flatQuerySelectorAll, flatTextContent, flatTreeChildNodes, flatTreeParentElement, flatTreeTextNodes, rangeHoldsTextPosition, rangeIntersectsComposedNode, } from "./tts/flat-tree.js";
 import { collectRangeTextForSpeech, collectVisibleTextAndMap, isElementHiddenForTTS, isNodeExcludedFromSpeech, isNodeSuppressedForTTS, normalizeTextForSpeech, rangeHoldsSpeakableElement, textInRange, } from "./tts/text-processing.js";
@@ -688,12 +688,15 @@ export class TTSService {
     }
     /**
      * The language a read of `node` is in. Its content language is the nearest
-     * `lang` between it and its shell, else the language the speak names, else a
-     * pinned `lang_id`. Its locale is that content language, else the host's
-     * configured locale, else en-US.
+     * `lang` between it and its shell, else for an element the `lang` the content
+     * roots it holds share, else the language the speak names, else a pinned
+     * `lang_id`. Its locale is that content language, else the host's configured
+     * locale, else en-US.
      */
     resolveReadLanguage(node, named) {
-        const contentLanguage = findContentLanguage(node, { contentLanguage: named }) ??
+        const contentLanguage = findContentLanguage(node) ??
+            (node.nodeType === 1 ? findHeldContentLanguage(node) : undefined) ??
+            (named?.trim() || undefined) ??
             optionalString(this.providerOptions().lang_id);
         return {
             contentLanguage,

package/dist/services/tts/math-control-names.d.ts

@@ -16,6 +16,8 @@ export interface MathControlNamesOptions {
  * that speech in the name of the control around it, among the control's other
  * text. English reads ClearSpeak, other languages MathSpeak, in the language of
  * the content. The label replaces the elements' own; it stays when SRE cannot
- * speak the math. Returns the function that stops observing.
+ * speak the math. Math in a control named by `aria-labelledby` from elements
+ * that do not hold it gets no label, as the elements' renderer gives it none.
+ * Returns the function that stops observing.
  */
 export declare function observeMathControlNames(root: Element, options?: MathControlNamesOptions): () => void;

package/dist/services/tts/math-control-names.js

@@ -44,6 +44,41 @@ const fractionStyle = (math) => Array.from(math.getElementsByTagName("mfrac")).e
     ? "Fraction_Over"
     : "Fraction_General";
 const isEnglish = (language) => !language || language.toLowerCase().split("-")[0] === "en";
+/** The element a control names: the control a `label` labels, or the control itself. */
+const namedElement = (control) => {
+    if (control.localName !== "label")
+        return control;
+    const label = control;
+    if (label.control)
+        return label.control;
+    const forId = label.getAttribute("for");
+    const root = label.getRootNode();
+    return ((forId ? root.getElementById?.(forId) : null) ??
+        label.querySelector("input, select, textarea, button"));
+};
+/**
+ * Whether the control's name leaves `container` out: the control is named by
+ * `aria-labelledby` from elements that do not hold the math. multiple-choice
+ * names a choice holding math that way, from its key and a note ("A. Pick the
+ * answer below"), so the screen reader reads the MathML in the content, where
+ * the student can explore it and a braille display shows it as math. A label
+ * there would be read in browse mode instead. Ids that resolve to nothing say
+ * nothing about the name, so they leave the math labelled.
+ */
+const isNamedFromElsewhere = (control, container) => {
+    const named = namedElement(control);
+    const ids = named
+        ?.getAttribute("aria-labelledby")
+        ?.split(/\s+/)
+        .filter(Boolean);
+    if (!named || !ids?.length)
+        return false;
+    const root = named.getRootNode();
+    const labels = ids
+        .map((id) => root.getElementById?.(id) ?? null)
+        .filter((element) => element !== null);
+    return (labels.length > 0 && !labels.some((element) => element.contains(container)));
+};
 /**
  * Labels each typeset expression inside a control under `root`, open shadow
  * roots included, with SRE's speech, as MathJax adds it and again whenever
@@ -51,7 +86,9 @@ const isEnglish = (language) => !language || language.toLowerCase().split("-")[0
  * that speech in the name of the control around it, among the control's other
  * text. English reads ClearSpeak, other languages MathSpeak, in the language of
  * the content. The label replaces the elements' own; it stays when SRE cannot
- * speak the math. Returns the function that stops observing.
+ * speak the math. Math in a control named by `aria-labelledby` from elements
+ * that do not hold it gets no label, as the elements' renderer gives it none.
+ * Returns the function that stops observing.
  */
 export function observeMathControlNames(root, options = {}) {
     if (typeof MutationObserver === "undefined")
@@ -70,7 +107,8 @@ export function observeMathControlNames(root, options = {}) {
         return result.usedMathSpeech ? result.speechText : null;
     };
     const name = (container) => {
-        if (!flatTreeClosest(container, CONTROLS))
+        const control = flatTreeClosest(container, CONTROLS);
+        if (!control || isNamedFromElsewhere(control, container))
             return;
         const math = flatQuerySelector(container, "math");
         const mathml = math && canonicalizeMathML(math.outerHTML);
@@ -88,6 +126,8 @@ export function observeMathControlNames(root, options = {}) {
         void pending.then((label) => {
             if (stopped || !label || !container.isConnected)
                 return;
+            if (isNamedFromElsewhere(control, container))
+                return;
             if (container.getAttribute("aria-label") !== label) {
                 container.setAttribute("aria-label", label);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pie-players/pie-assessment-toolkit",
-	"version": "1.0.0-beta.6",
+	"version": "1.0.0-beta.7",
 	"type": "module",
 	"description": "PIE assessment toolkit: composable services + reference implementation for assessment players and tool coordination",
 	"license": "MIT",
@@ -69,16 +69,16 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@pie-players/pie-calculator": "1.0.0-beta.6",
-		"@pie-players/pie-context": "1.0.0-beta.6",
-		"@pie-players/pie-players-shared": "1.0.0-beta.6",
-		"@pie-players/pie-tts": "1.0.0-beta.6",
+		"@pie-players/pie-calculator": "1.0.0-beta.7",
+		"@pie-players/pie-context": "1.0.0-beta.7",
+		"@pie-players/pie-players-shared": "1.0.0-beta.7",
+		"@pie-players/pie-tts": "1.0.0-beta.7",
 		"speech-rule-engine": "5.0.0-rc.4"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.5.15",
-		"@happy-dom/global-registrator": "^20.14.5",
-		"@pie-players/tts-client-server": "1.0.0-beta.6",
+		"@biomejs/biome": "^2.6.2",
+		"@happy-dom/global-registrator": "^21.0.4",
+		"@pie-players/tts-client-server": "1.0.0-beta.7",
 		"svelte": "^5.57.2",
 		"svelte-check": "^4.7.6",
 		"typescript": "^5.9.3"