npm - @pie-players/pie-assessment-toolkit - Versions diffs - 0.3.47 → 0.3.48 - Mend

@pie-players/pie-assessment-toolkit 0.3.47 → 0.3.48

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.

Files changed (86) hide show

package/dist/attempt/AssessmentSession.js CHANGED Viewed

@@ -14,7 +14,8 @@ export function loadAssessmentSession(storage, assessmentAttemptSessionIdentifie
         const parsed = JSON.parse(raw);
         if (!parsed || parsed.version !== ASSESSMENT_SESSION_VERSION)
             return null;
-        if (parsed.assessmentAttemptSessionIdentifier !== assessmentAttemptSessionIdentifier) {
+        if (parsed.assessmentAttemptSessionIdentifier !==
+            assessmentAttemptSessionIdentifier) {
             return null;
         }
         return parsed;

package/dist/attempt/AssessmentSession.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AssessmentSession.js","sourceRoot":"","sources":["../../src/attempt/AssessmentSession.ts"],"names":[],"mappings":"AAiCA,MAAM,0BAA0B,GAAG,CAAU,CAAC;AAC9C,MAAM,cAAc,GAAG,4BAA4B,CAAC;AAEpD,SAAS,MAAM;IACd,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC7C,kCAA0C;IAE1C,OAAO,GAAG,cAAc,GAAG,kCAAkC,EAAE,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,OAAoB,EACpB,kCAA0C;IAE1C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAC1B,8BAA8B,CAAC,kCAAkC,CAAC,CAClE,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsB,CAAC;QACpD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,0BAA0B;YAAE,OAAO,IAAI,CAAC;QAC1E,IACC,MAAM,CAAC,kCAAkC,~~KAAK,~~kCAAkC,~~EAC/E~~,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,OAAoB,EACpB,OAA0B;IAE1B,MAAM,OAAO,GAAsB;QAClC,GAAG,OAAO;QACV,SAAS,EAAE,MAAM,EAAE;KACnB,CAAC;IACF,OAAO,CAAC,OAAO,CACd,8BAA8B,CAAC,OAAO,CAAC,kCAAkC,CAAC,EAC1E,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAK1C;IACA,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;IAC3B,MAAM,wBAAwB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAC5D,OAAO;QACN,OAAO,EAAE,0BAA0B;QACnC,kCAAkC,EAAE,IAAI,CAAC,kCAAkC;QAC3E,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,SAAS;QACT,SAAS,EAAE,SAAS;QACpB,eAAe,EAAE;YAChB,mBAAmB,EAAE,CAAC;YACtB,yBAAyB,EAAE,wBAAwB;gBAClD,CAAC,CAAC,CAAC,wBAAwB,CAAC;gBAC5B,CAAC,CAAC,EAAE;YACL,wBAAwB,EAAE,wBAAwB;SAClD;QACD,WAAW,EAAE;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC3C;QACD,eAAe,EAAE,EAAE;KACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CACnC,OAA0B,EAC1B,IAGC;IAED,IAAI,CAAC,IAAI,CAAC,iBAAiB;QAAE,OAAO,OAAO,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO;QACN,GAAG,OAAO;QACV,SAAS;QACT,eAAe,EAAE;YAChB,GAAG,OAAO,CAAC,eAAe;YAC1B,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;gBACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,SAAS;gBACT,OAAO,EAAE,IAAI,CAAC,cAAc;aAC5B;SACD;KACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,OAA0B,EAC1B,IAGC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,~~CAAC~~,OAAO,CAAC,eAAe,CAAC,yBAAyB,IAAI,EAAE,~~CAAC~~,CAAC;~~IACjF~~,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,eAAe,EAAE;YAChB,GAAG,OAAO,CAAC,eAAe;YAC1B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;YACvD,yBAAyB,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAC9C;KACD,CAAC;AACH,CAAC","sourcesContent":["import type { SectionControllerSessionState } from \"../services/section-controller-types.js\";\nimport type { StorageLike } from \"./TestSession.js\";\n\nexport interface AssessmentSessionNavigationState {\n\tcurrentSectionIndex: number;\n\tvisitedSectionIdentifiers: string[];\n\tcurrentSectionIdentifier?: string;\n}\n\nexport interface AssessmentSessionRealization {\n\tseed: string;\n\tsectionIdentifiers: string[];\n}\n\nexport interface AssessmentSectionSessionState {\n\tsectionIdentifier: string;\n\tupdatedAt: string;\n\tsession: SectionControllerSessionState \| null;\n}\n\nexport interface AssessmentSession {\n\tversion: 1;\n\tassessmentAttemptSessionIdentifier: string;\n\tassessmentId: string;\n\tstartedAt: string;\n\tupdatedAt: string;\n\tcompletedAt?: string;\n\tnavigationState: AssessmentSessionNavigationState;\n\trealization: AssessmentSessionRealization;\n\tsectionSessions: Record<string, AssessmentSectionSessionState>;\n\tcontextVariables?: Record<string, unknown>;\n}\n\nconst ASSESSMENT_SESSION_VERSION = 1 as const;\nconst STORAGE_PREFIX = \"pie:assessment-session:v1:\";\n\nfunction nowIso(): string {\n\treturn new Date().toISOString();\n}\n\nexport function getAssessmentSessionStorageKey(\n\tassessmentAttemptSessionIdentifier: string,\n): string {\n\treturn `${STORAGE_PREFIX}${assessmentAttemptSessionIdentifier}`;\n}\n\nexport function loadAssessmentSession(\n\tstorage: StorageLike,\n\tassessmentAttemptSessionIdentifier: string,\n): AssessmentSession \| null {\n\tconst raw = storage.getItem(\n\t\tgetAssessmentSessionStorageKey(assessmentAttemptSessionIdentifier),\n\t);\n\tif (!raw) return null;\n\ttry {\n\t\tconst parsed = JSON.parse(raw) as AssessmentSession;\n\t\tif (!parsed \|\| parsed.version !== ASSESSMENT_SESSION_VERSION) return null;\n\t\tif (\n\t\t\tparsed.assessmentAttemptSessionIdentifier ~~!== assessmentAttemptSessionIdentifier~~\n\t\t) {\n\t\t\treturn null;\n\t\t}\n\t\treturn parsed;\n\t} catch {\n\t\treturn null;\n\t}\n}\n\nexport function saveAssessmentSession(\n\tstorage: StorageLike,\n\tsession: AssessmentSession,\n): void {\n\tconst updated: AssessmentSession = {\n\t\t...session,\n\t\tupdatedAt: nowIso(),\n\t};\n\tstorage.setItem(\n\t\tgetAssessmentSessionStorageKey(session.assessmentAttemptSessionIdentifier),\n\t\tJSON.stringify(updated),\n\t);\n}\n\nexport function createNewAssessmentSession(args: {\n\tassessmentAttemptSessionIdentifier: string;\n\tassessmentId: string;\n\tseed: string;\n\tsectionIdentifiers: string[];\n}): AssessmentSession {\n\tconst startedAt = nowIso();\n\tconst initialSectionIdentifier = args.sectionIdentifiers[0];\n\treturn {\n\t\tversion: ASSESSMENT_SESSION_VERSION,\n\t\tassessmentAttemptSessionIdentifier: args.assessmentAttemptSessionIdentifier,\n\t\tassessmentId: args.assessmentId,\n\t\tstartedAt,\n\t\tupdatedAt: startedAt,\n\t\tnavigationState: {\n\t\t\tcurrentSectionIndex: 0,\n\t\t\tvisitedSectionIdentifiers: initialSectionIdentifier\n\t\t\t\t? [initialSectionIdentifier]\n\t\t\t\t: [],\n\t\t\tcurrentSectionIdentifier: initialSectionIdentifier,\n\t\t},\n\t\trealization: {\n\t\t\tseed: args.seed,\n\t\t\tsectionIdentifiers: args.sectionIdentifiers,\n\t\t},\n\t\tsectionSessions: {},\n\t};\n}\n\nexport function upsertSectionSession(\n\tsession: AssessmentSession,\n\targs: {\n\t\tsectionIdentifier: string;\n\t\tsectionSession: SectionControllerSessionState \| null;\n\t},\n): AssessmentSession {\n\tif (!args.sectionIdentifier) return session;\n\tconst updatedAt = nowIso();\n\treturn {\n\t\t...session,\n\t\tupdatedAt,\n\t\tsectionSessions: {\n\t\t\t...session.sectionSessions,\n\t\t\t[args.sectionIdentifier]: {\n\t\t\t\tsectionIdentifier: args.sectionIdentifier,\n\t\t\t\tupdatedAt,\n\t\t\t\tsession: args.sectionSession,\n\t\t\t},\n\t\t},\n\t};\n}\n\nexport function setCurrentSectionPosition(\n\tsession: AssessmentSession,\n\targs: {\n\t\tcurrentSectionIndex: number;\n\t\tcurrentSectionIdentifier?: string;\n\t},\n): AssessmentSession {\n\tconst visited = new Set(~~session~~.navigationState.visitedSectionIdentifiers \|\| []);\n\tif (args.currentSectionIdentifier) {\n\t\tvisited.add(args.currentSectionIdentifier);\n\t}\n\treturn {\n\t\t...session,\n\t\tnavigationState: {\n\t\t\t...session.navigationState,\n\t\t\tcurrentSectionIndex: args.currentSectionIndex,\n\t\t\tcurrentSectionIdentifier: args.currentSectionIdentifier,\n\t\t\tvisitedSectionIdentifiers: Array.from(visited),\n\t\t},\n\t};\n}\n"]}
1	+ {"version":3,"file":"AssessmentSession.js","sourceRoot":"","sources":["../../src/attempt/AssessmentSession.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SectionControllerSessionState } from \"../services/section-controller-types.js\";\nimport type { StorageLike } from \"./TestSession.js\";\n\nexport interface AssessmentSessionNavigationState {\n\tcurrentSectionIndex: number;\n\tvisitedSectionIdentifiers: string[];\n\tcurrentSectionIdentifier?: string;\n}\n\nexport interface AssessmentSessionRealization {\n\tseed: string;\n\tsectionIdentifiers: string[];\n}\n\nexport interface AssessmentSectionSessionState {\n\tsectionIdentifier: string;\n\tupdatedAt: string;\n\tsession: SectionControllerSessionState \| null;\n}\n\nexport interface AssessmentSession {\n\tversion: 1;\n\tassessmentAttemptSessionIdentifier: string;\n\tassessmentId: string;\n\tstartedAt: string;\n\tupdatedAt: string;\n\tcompletedAt?: string;\n\tnavigationState: AssessmentSessionNavigationState;\n\trealization: AssessmentSessionRealization;\n\tsectionSessions: Record<string, AssessmentSectionSessionState>;\n\tcontextVariables?: Record<string, unknown>;\n}\n\nconst ASSESSMENT_SESSION_VERSION = 1 as const;\nconst STORAGE_PREFIX = \"pie:assessment-session:v1:\";\n\nfunction nowIso(): string {\n\treturn new Date().toISOString();\n}\n\nexport function getAssessmentSessionStorageKey(\n\tassessmentAttemptSessionIdentifier: string,\n): string {\n\treturn `${STORAGE_PREFIX}${assessmentAttemptSessionIdentifier}`;\n}\n\nexport function loadAssessmentSession(\n\tstorage: StorageLike,\n\tassessmentAttemptSessionIdentifier: string,\n): AssessmentSession \| null {\n\tconst raw = storage.getItem(\n\t\tgetAssessmentSessionStorageKey(assessmentAttemptSessionIdentifier),\n\t);\n\tif (!raw) return null;\n\ttry {\n\t\tconst parsed = JSON.parse(raw) as AssessmentSession;\n\t\tif (!parsed \|\| parsed.version !== ASSESSMENT_SESSION_VERSION) return null;\n\t\tif (\n\t\t\tparsed.assessmentAttemptSessionIdentifier !==\n\t\t\tassessmentAttemptSessionIdentifier\n\t\t) {\n\t\t\treturn null;\n\t\t}\n\t\treturn parsed;\n\t} catch {\n\t\treturn null;\n\t}\n}\n\nexport function saveAssessmentSession(\n\tstorage: StorageLike,\n\tsession: AssessmentSession,\n): void {\n\tconst updated: AssessmentSession = {\n\t\t...session,\n\t\tupdatedAt: nowIso(),\n\t};\n\tstorage.setItem(\n\t\tgetAssessmentSessionStorageKey(session.assessmentAttemptSessionIdentifier),\n\t\tJSON.stringify(updated),\n\t);\n}\n\nexport function createNewAssessmentSession(args: {\n\tassessmentAttemptSessionIdentifier: string;\n\tassessmentId: string;\n\tseed: string;\n\tsectionIdentifiers: string[];\n}): AssessmentSession {\n\tconst startedAt = nowIso();\n\tconst initialSectionIdentifier = args.sectionIdentifiers[0];\n\treturn {\n\t\tversion: ASSESSMENT_SESSION_VERSION,\n\t\tassessmentAttemptSessionIdentifier: args.assessmentAttemptSessionIdentifier,\n\t\tassessmentId: args.assessmentId,\n\t\tstartedAt,\n\t\tupdatedAt: startedAt,\n\t\tnavigationState: {\n\t\t\tcurrentSectionIndex: 0,\n\t\t\tvisitedSectionIdentifiers: initialSectionIdentifier\n\t\t\t\t? [initialSectionIdentifier]\n\t\t\t\t: [],\n\t\t\tcurrentSectionIdentifier: initialSectionIdentifier,\n\t\t},\n\t\trealization: {\n\t\t\tseed: args.seed,\n\t\t\tsectionIdentifiers: args.sectionIdentifiers,\n\t\t},\n\t\tsectionSessions: {},\n\t};\n}\n\nexport function upsertSectionSession(\n\tsession: AssessmentSession,\n\targs: {\n\t\tsectionIdentifier: string;\n\t\tsectionSession: SectionControllerSessionState \| null;\n\t},\n): AssessmentSession {\n\tif (!args.sectionIdentifier) return session;\n\tconst updatedAt = nowIso();\n\treturn {\n\t\t...session,\n\t\tupdatedAt,\n\t\tsectionSessions: {\n\t\t\t...session.sectionSessions,\n\t\t\t[args.sectionIdentifier]: {\n\t\t\t\tsectionIdentifier: args.sectionIdentifier,\n\t\t\t\tupdatedAt,\n\t\t\t\tsession: args.sectionSession,\n\t\t\t},\n\t\t},\n\t};\n}\n\nexport function setCurrentSectionPosition(\n\tsession: AssessmentSession,\n\targs: {\n\t\tcurrentSectionIndex: number;\n\t\tcurrentSectionIdentifier?: string;\n\t},\n): AssessmentSession {\n\tconst visited = new Set(\n\t\tsession.navigationState.visitedSectionIdentifiers \|\| [],\n\t);\n\tif (args.currentSectionIdentifier) {\n\t\tvisited.add(args.currentSectionIdentifier);\n\t}\n\treturn {\n\t\t...session,\n\t\tnavigationState: {\n\t\t\t...session.navigationState,\n\t\t\tcurrentSectionIndex: args.currentSectionIndex,\n\t\t\tcurrentSectionIdentifier: args.currentSectionIdentifier,\n\t\t\tvisitedSectionIdentifiers: Array.from(visited),\n\t\t},\n\t};\n}\n"]}

package/dist/attempt/adapters/activity-to-test-attempt-session.js CHANGED Viewed

@@ -2,10 +2,7 @@ function nowIso() {
     return new Date().toISOString();
 }
 function getItemIdentifier(itemRef) {
-    return (itemRef.identifier ||
-        itemRef.item?.identifier ||
-        itemRef.item?.id ||
-        null);
+    return (itemRef.identifier || itemRef.item?.identifier || itemRef.item?.id || null);
 }
 function resolveItemIdentifiers(args) {
     const refs = args.itemRefs || args.activityDefinition?.assessmentItemRefs || [];
@@ -39,7 +36,8 @@ function mapItemSessions(itemIdentifiers, backendItemSessions) {
         if (!rawSession)
             return acc;
         const pieSessionId = typeof rawSession.id === "string" ? rawSession.id : undefined;
-        const attemptCount = typeof rawSession.attemptCount === "number" && rawSession.attemptCount > 0
+        const attemptCount = typeof rawSession.attemptCount === "number" &&
+            rawSession.attemptCount > 0
             ? rawSession.attemptCount
             : pieSessionId
                 ? 1
@@ -47,8 +45,12 @@ function mapItemSessions(itemIdentifiers, backendItemSessions) {
         const isCompleted = typeof rawSession.isCompleted === "boolean"
             ? rawSession.isCompleted
             : Boolean(rawSession.complete);
-        const startedAt = typeof rawSession.startedAt === "string" ? rawSession.startedAt : undefined;
-        const updatedAt = typeof rawSession.updatedAt === "string" ? rawSession.updatedAt : undefined;
+        const startedAt = typeof rawSession.startedAt === "string"
+            ? rawSession.startedAt
+            : undefined;
+        const updatedAt = typeof rawSession.updatedAt === "string"
+            ? rawSession.updatedAt
+            : undefined;
         const completedAt = typeof rawSession.completedAt === "string"
             ? rawSession.completedAt
             : undefined;
@@ -128,7 +130,9 @@ export function buildActivitySessionItemUpdate(testAttemptSession, itemIdentifie
             visitedItemIdentifiers: [
                 ...testAttemptSession.navigationState.visitedItemIdentifiers,
             ],
-            itemSessions: itemSession?.session ? { [itemIdentifier]: itemSession.session } : {},
+            itemSessions: itemSession?.session
+                ? { [itemIdentifier]: itemSession.session }
+                : {},
         },
     };
 }

package/dist/attempt/adapters/activity-to-test-attempt-session.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"activity-to-test-attempt-session.js","sourceRoot":"","sources":["../../../src/attempt/adapters/activity-to-test-attempt-session.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n\tTestAttemptItemSession,\n\tTestAttemptSession,\n} from \"../TestSession.js\";\n\nexport interface PieBackendActivityItemRef {\n\tidentifier?: string;\n\titem?: {\n\t\tid?: string;\n\t\tidentifier?: string;\n\t};\n}\n\nexport interface PieBackendActivityDefinition {\n\tid?: string;\n\tidentifier?: string;\n\tassessmentId?: string;\n\tassessmentItemRefs?: PieBackendActivityItemRef[];\n}\n\nexport interface PieBackendActivitySession {\n\tid?: string;\n\tactivitySessionId?: string;\n\tstartedAt?: string;\n\tupdatedAt?: string;\n\tcompletedAt?: string;\n\tcurrentItemIndex?: number;\n\tcurrentSectionIdentifier?: string;\n\tvisitedItemIdentifiers?: string[];\n\titemSessions?: Record<string, unknown>;\n}\n\nexport interface MapActivityToTestAttemptSessionArgs {\n\tactivityDefinition?: PieBackendActivityDefinition \| null;\n\tactivitySession?: PieBackendActivitySession \| null;\n\titemRefs?: PieBackendActivityItemRef[];\n\titemSessionsByItemIdentifier?: Record<string, unknown>;\n\tassessmentId?: string;\n\ttestAttemptSessionIdentifier?: string;\n}\n\nexport interface ActivitySessionPatchPayload {\n\tactivitySession: {\n\t\tid: string;\n\t\tstartedAt?: string;\n\t\tupdatedAt?: string;\n\t\tcompletedAt?: string;\n\t\tcurrentItemIndex: number;\n\t\tcurrentSectionIdentifier?: string;\n\t\tvisitedItemIdentifiers: string[];\n\t\titemSessions: Record<string, unknown>;\n\t};\n}\n\nfunction nowIso(): string {\n\treturn new Date().toISOString();\n}\n\nfunction getItemIdentifier(itemRef: PieBackendActivityItemRef): string \| null {\n\treturn (\n\t\titemRef.identifier \|\|\n\t\titemRef.item?.identifier \|\|\n\t\titemRef.item?.id \|\|\n\t\tnull\n\t);\n}\n\nfunction resolveItemIdentifiers(args: MapActivityToTestAttemptSessionArgs): string[] {\n\tconst refs = args.itemRefs \|\| args.activityDefinition?.assessmentItemRefs \|\| [];\n\tconst identifiers = refs\n\t\t.map((itemRef) => getItemIdentifier(itemRef))\n\t\t.filter((itemIdentifier): itemIdentifier is string => !!itemIdentifier);\n\treturn Array.from(new Set(identifiers));\n}\n\nfunction resolveAssessmentId(args: MapActivityToTestAttemptSessionArgs): string {\n\treturn (\n\t\targs.assessmentId \|\|\n\t\targs.activityDefinition?.assessmentId \|\|\n\t\targs.activityDefinition?.identifier \|\|\n\t\targs.activityDefinition?.id \|\|\n\t\t\"unknown-assessment\"\n\t);\n}\n\nfunction resolveTestAttemptSessionIdentifier(\n\targs: MapActivityToTestAttemptSessionArgs,\n\tassessmentId: string,\n): string {\n\treturn (\n\t\targs.testAttemptSessionIdentifier \|\|\n\t\targs.activitySession?.activitySessionId \|\|\n\t\targs.activitySession?.id \|\|\n\t\t`tas_${assessmentId}`\n\t);\n}\n\nfunction resolveBackendItemSessions(\n\targs: MapActivityToTestAttemptSessionArgs,\n): Record<string, unknown> {\n\treturn {\n\t\t...(args.activitySession?.itemSessions \|\| {}),\n\t\t...(args.itemSessionsByItemIdentifier \|\| {}),\n\t};\n}\n\nfunction mapItemSessions(\n\titemIdentifiers: string[],\n\tbackendItemSessions: Record<string, unknown>,\n): Record<string, TestAttemptItemSession> {\n\treturn itemIdentifiers.reduce<Record<string, TestAttemptItemSession>>(\n\t\t(acc, itemIdentifier) => {\n\t\t\tconst rawSession = backendItemSessions[itemIdentifier] as\n\t\t\t\t\| Record<string, unknown>\n\t\t\t\t\| undefined;\n\t\t\tif (!rawSession) return acc;\n\n\t\t\tconst pieSessionId =\n\t\t\t\ttypeof rawSession.id === \"string\" ? rawSession.id : undefined;\n\t\t\tconst attemptCount =\n\t\t\t\ttypeof rawSession.attemptCount === \"number\" && rawSession.attemptCount > 0\n\t\t\t\t\t? rawSession.attemptCount\n\t\t\t\t\t: pieSessionId\n\t\t\t\t\t\t? 1\n\t\t\t\t\t\t: 0;\n\t\t\tconst isCompleted =\n\t\t\t\ttypeof rawSession.isCompleted === \"boolean\"\n\t\t\t\t\t? rawSession.isCompleted\n\t\t\t\t\t: Boolean(rawSession.complete);\n\t\t\tconst startedAt =\n\t\t\t\ttypeof rawSession.startedAt === \"string\" ? rawSession.startedAt : undefined;\n\t\t\tconst updatedAt =\n\t\t\t\ttypeof rawSession.updatedAt === \"string\" ? rawSession.updatedAt : undefined;\n\t\t\tconst completedAt =\n\t\t\t\ttypeof rawSession.completedAt === \"string\"\n\t\t\t\t\t? rawSession.completedAt\n\t\t\t\t\t: undefined;\n\n\t\t\tacc[itemIdentifier] = {\n\t\t\t\titemIdentifier,\n\t\t\t\tpieSessionId,\n\t\t\t\tattemptCount,\n\t\t\t\tisCompleted,\n\t\t\t\tstartedAt,\n\t\t\t\tupdatedAt,\n\t\t\t\tcompletedAt,\n\t\t\t\tsession: rawSession,\n\t\t\t};\n\t\t\treturn acc;\n\t\t},\n\t\t{},\n\t);\n}\n\nexport function mapActivityToTestAttemptSession(\n\targs: MapActivityToTestAttemptSessionArgs,\n): TestAttemptSession {\n\tconst assessmentId = resolveAssessmentId(args);\n\tconst itemIdentifiers = resolveItemIdentifiers(args);\n\tconst testAttemptSessionIdentifier = resolveTestAttemptSessionIdentifier(\n\t\targs,\n\t\tassessmentId,\n\t);\n\tconst backendItemSessions = resolveBackendItemSessions(args);\n\tconst now = nowIso();\n\tconst startedAt = args.activitySession?.startedAt \|\| now;\n\tconst updatedAt = args.activitySession?.updatedAt \|\| startedAt;\n\n\treturn {\n\t\tversion: 1,\n\t\ttestAttemptSessionIdentifier,\n\t\tassessmentId,\n\t\tstartedAt,\n\t\tupdatedAt,\n\t\tcompletedAt: args.activitySession?.completedAt,\n\t\tnavigationState: {\n\t\t\tcurrentItemIndex: args.activitySession?.currentItemIndex ?? -1,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...(args.activitySession?.visitedItemIdentifiers \|\| []),\n\t\t\t],\n\t\t\tcurrentSectionIdentifier: args.activitySession?.currentSectionIdentifier,\n\t\t},\n\t\trealization: {\n\t\t\tseed: testAttemptSessionIdentifier,\n\t\t\titemIdentifiers,\n\t\t},\n\t\titemSessions: mapItemSessions(itemIdentifiers, backendItemSessions),\n\t};\n}\n\nexport function toItemSessionsRecord(\n\ttestAttemptSession: TestAttemptSession,\n): Record<string, unknown> {\n\treturn Object.entries(testAttemptSession.itemSessions).reduce<\n\t\tRecord<string, unknown>\n\t>((acc, [itemIdentifier, itemSession]) => {\n\t\tif (itemSession.session) {\n\t\t\tacc[itemIdentifier] = itemSession.session;\n\t\t}\n\t\treturn acc;\n\t}, {});\n}\n\nexport function buildActivitySessionPatchFromTestAttemptSession(\n\ttestAttemptSession: TestAttemptSession,\n): ActivitySessionPatchPayload {\n\treturn {\n\t\tactivitySession: {\n\t\t\tid: testAttemptSession.testAttemptSessionIdentifier,\n\t\t\tstartedAt: testAttemptSession.startedAt,\n\t\t\tupdatedAt: testAttemptSession.updatedAt,\n\t\t\tcompletedAt: testAttemptSession.completedAt,\n\t\t\tcurrentItemIndex: testAttemptSession.navigationState.currentItemIndex,\n\t\t\tcurrentSectionIdentifier:\n\t\t\t\ttestAttemptSession.navigationState.currentSectionIdentifier,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...testAttemptSession.navigationState.visitedItemIdentifiers,\n\t\t\t],\n\t\t\titemSessions: toItemSessionsRecord(testAttemptSession),\n\t\t},\n\t};\n}\n\nexport function buildActivitySessionItemUpdate(\n\ttestAttemptSession: TestAttemptSession,\n\titemIdentifier: string,\n): ActivitySessionPatchPayload {\n\tconst itemSession = testAttemptSession.itemSessions[itemIdentifier];\n\treturn {\n\t\tactivitySession: {\n\t\t\tid: testAttemptSession.testAttemptSessionIdentifier,\n\t\t\tcurrentItemIndex: testAttemptSession.navigationState.currentItemIndex,\n\t\t\tcurrentSectionIdentifier:\n\t\t\t\ttestAttemptSession.navigationState.currentSectionIdentifier,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...testAttemptSession.navigationState.visitedItemIdentifiers,\n\t\t\t],\n\t\t\titemSessions: itemSession?.session ? { [itemIdentifier]: itemSession.session } : {},\n\t\t},\n\t};\n}\n"]}
1	+ {"version":3,"file":"activity-to-test-attempt-session.js","sourceRoot":"","sources":["../../../src/attempt/adapters/activity-to-test-attempt-session.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n\tTestAttemptItemSession,\n\tTestAttemptSession,\n} from \"../TestSession.js\";\n\nexport interface PieBackendActivityItemRef {\n\tidentifier?: string;\n\titem?: {\n\t\tid?: string;\n\t\tidentifier?: string;\n\t};\n}\n\nexport interface PieBackendActivityDefinition {\n\tid?: string;\n\tidentifier?: string;\n\tassessmentId?: string;\n\tassessmentItemRefs?: PieBackendActivityItemRef[];\n}\n\nexport interface PieBackendActivitySession {\n\tid?: string;\n\tactivitySessionId?: string;\n\tstartedAt?: string;\n\tupdatedAt?: string;\n\tcompletedAt?: string;\n\tcurrentItemIndex?: number;\n\tcurrentSectionIdentifier?: string;\n\tvisitedItemIdentifiers?: string[];\n\titemSessions?: Record<string, unknown>;\n}\n\nexport interface MapActivityToTestAttemptSessionArgs {\n\tactivityDefinition?: PieBackendActivityDefinition \| null;\n\tactivitySession?: PieBackendActivitySession \| null;\n\titemRefs?: PieBackendActivityItemRef[];\n\titemSessionsByItemIdentifier?: Record<string, unknown>;\n\tassessmentId?: string;\n\ttestAttemptSessionIdentifier?: string;\n}\n\nexport interface ActivitySessionPatchPayload {\n\tactivitySession: {\n\t\tid: string;\n\t\tstartedAt?: string;\n\t\tupdatedAt?: string;\n\t\tcompletedAt?: string;\n\t\tcurrentItemIndex: number;\n\t\tcurrentSectionIdentifier?: string;\n\t\tvisitedItemIdentifiers: string[];\n\t\titemSessions: Record<string, unknown>;\n\t};\n}\n\nfunction nowIso(): string {\n\treturn new Date().toISOString();\n}\n\nfunction getItemIdentifier(itemRef: PieBackendActivityItemRef): string \| null {\n\treturn (\n\t\titemRef.identifier \|\| itemRef.item?.identifier \|\| itemRef.item?.id \|\| null\n\t);\n}\n\nfunction resolveItemIdentifiers(\n\targs: MapActivityToTestAttemptSessionArgs,\n): string[] {\n\tconst refs =\n\t\targs.itemRefs \|\| args.activityDefinition?.assessmentItemRefs \|\| [];\n\tconst identifiers = refs\n\t\t.map((itemRef) => getItemIdentifier(itemRef))\n\t\t.filter((itemIdentifier): itemIdentifier is string => !!itemIdentifier);\n\treturn Array.from(new Set(identifiers));\n}\n\nfunction resolveAssessmentId(\n\targs: MapActivityToTestAttemptSessionArgs,\n): string {\n\treturn (\n\t\targs.assessmentId \|\|\n\t\targs.activityDefinition?.assessmentId \|\|\n\t\targs.activityDefinition?.identifier \|\|\n\t\targs.activityDefinition?.id \|\|\n\t\t\"unknown-assessment\"\n\t);\n}\n\nfunction resolveTestAttemptSessionIdentifier(\n\targs: MapActivityToTestAttemptSessionArgs,\n\tassessmentId: string,\n): string {\n\treturn (\n\t\targs.testAttemptSessionIdentifier \|\|\n\t\targs.activitySession?.activitySessionId \|\|\n\t\targs.activitySession?.id \|\|\n\t\t`tas_${assessmentId}`\n\t);\n}\n\nfunction resolveBackendItemSessions(\n\targs: MapActivityToTestAttemptSessionArgs,\n): Record<string, unknown> {\n\treturn {\n\t\t...(args.activitySession?.itemSessions \|\| {}),\n\t\t...(args.itemSessionsByItemIdentifier \|\| {}),\n\t};\n}\n\nfunction mapItemSessions(\n\titemIdentifiers: string[],\n\tbackendItemSessions: Record<string, unknown>,\n): Record<string, TestAttemptItemSession> {\n\treturn itemIdentifiers.reduce<Record<string, TestAttemptItemSession>>(\n\t\t(acc, itemIdentifier) => {\n\t\t\tconst rawSession = backendItemSessions[itemIdentifier] as\n\t\t\t\t\| Record<string, unknown>\n\t\t\t\t\| undefined;\n\t\t\tif (!rawSession) return acc;\n\n\t\t\tconst pieSessionId =\n\t\t\t\ttypeof rawSession.id === \"string\" ? rawSession.id : undefined;\n\t\t\tconst attemptCount =\n\t\t\t\ttypeof rawSession.attemptCount === \"number\" &&\n\t\t\t\trawSession.attemptCount > 0\n\t\t\t\t\t? rawSession.attemptCount\n\t\t\t\t\t: pieSessionId\n\t\t\t\t\t\t? 1\n\t\t\t\t\t\t: 0;\n\t\t\tconst isCompleted =\n\t\t\t\ttypeof rawSession.isCompleted === \"boolean\"\n\t\t\t\t\t? rawSession.isCompleted\n\t\t\t\t\t: Boolean(rawSession.complete);\n\t\t\tconst startedAt =\n\t\t\t\ttypeof rawSession.startedAt === \"string\"\n\t\t\t\t\t? rawSession.startedAt\n\t\t\t\t\t: undefined;\n\t\t\tconst updatedAt =\n\t\t\t\ttypeof rawSession.updatedAt === \"string\"\n\t\t\t\t\t? rawSession.updatedAt\n\t\t\t\t\t: undefined;\n\t\t\tconst completedAt =\n\t\t\t\ttypeof rawSession.completedAt === \"string\"\n\t\t\t\t\t? rawSession.completedAt\n\t\t\t\t\t: undefined;\n\n\t\t\tacc[itemIdentifier] = {\n\t\t\t\titemIdentifier,\n\t\t\t\tpieSessionId,\n\t\t\t\tattemptCount,\n\t\t\t\tisCompleted,\n\t\t\t\tstartedAt,\n\t\t\t\tupdatedAt,\n\t\t\t\tcompletedAt,\n\t\t\t\tsession: rawSession,\n\t\t\t};\n\t\t\treturn acc;\n\t\t},\n\t\t{},\n\t);\n}\n\nexport function mapActivityToTestAttemptSession(\n\targs: MapActivityToTestAttemptSessionArgs,\n): TestAttemptSession {\n\tconst assessmentId = resolveAssessmentId(args);\n\tconst itemIdentifiers = resolveItemIdentifiers(args);\n\tconst testAttemptSessionIdentifier = resolveTestAttemptSessionIdentifier(\n\t\targs,\n\t\tassessmentId,\n\t);\n\tconst backendItemSessions = resolveBackendItemSessions(args);\n\tconst now = nowIso();\n\tconst startedAt = args.activitySession?.startedAt \|\| now;\n\tconst updatedAt = args.activitySession?.updatedAt \|\| startedAt;\n\n\treturn {\n\t\tversion: 1,\n\t\ttestAttemptSessionIdentifier,\n\t\tassessmentId,\n\t\tstartedAt,\n\t\tupdatedAt,\n\t\tcompletedAt: args.activitySession?.completedAt,\n\t\tnavigationState: {\n\t\t\tcurrentItemIndex: args.activitySession?.currentItemIndex ?? -1,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...(args.activitySession?.visitedItemIdentifiers \|\| []),\n\t\t\t],\n\t\t\tcurrentSectionIdentifier: args.activitySession?.currentSectionIdentifier,\n\t\t},\n\t\trealization: {\n\t\t\tseed: testAttemptSessionIdentifier,\n\t\t\titemIdentifiers,\n\t\t},\n\t\titemSessions: mapItemSessions(itemIdentifiers, backendItemSessions),\n\t};\n}\n\nexport function toItemSessionsRecord(\n\ttestAttemptSession: TestAttemptSession,\n): Record<string, unknown> {\n\treturn Object.entries(testAttemptSession.itemSessions).reduce<\n\t\tRecord<string, unknown>\n\t>((acc, [itemIdentifier, itemSession]) => {\n\t\tif (itemSession.session) {\n\t\t\tacc[itemIdentifier] = itemSession.session;\n\t\t}\n\t\treturn acc;\n\t}, {});\n}\n\nexport function buildActivitySessionPatchFromTestAttemptSession(\n\ttestAttemptSession: TestAttemptSession,\n): ActivitySessionPatchPayload {\n\treturn {\n\t\tactivitySession: {\n\t\t\tid: testAttemptSession.testAttemptSessionIdentifier,\n\t\t\tstartedAt: testAttemptSession.startedAt,\n\t\t\tupdatedAt: testAttemptSession.updatedAt,\n\t\t\tcompletedAt: testAttemptSession.completedAt,\n\t\t\tcurrentItemIndex: testAttemptSession.navigationState.currentItemIndex,\n\t\t\tcurrentSectionIdentifier:\n\t\t\t\ttestAttemptSession.navigationState.currentSectionIdentifier,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...testAttemptSession.navigationState.visitedItemIdentifiers,\n\t\t\t],\n\t\t\titemSessions: toItemSessionsRecord(testAttemptSession),\n\t\t},\n\t};\n}\n\nexport function buildActivitySessionItemUpdate(\n\ttestAttemptSession: TestAttemptSession,\n\titemIdentifier: string,\n): ActivitySessionPatchPayload {\n\tconst itemSession = testAttemptSession.itemSessions[itemIdentifier];\n\treturn {\n\t\tactivitySession: {\n\t\t\tid: testAttemptSession.testAttemptSessionIdentifier,\n\t\t\tcurrentItemIndex: testAttemptSession.navigationState.currentItemIndex,\n\t\t\tcurrentSectionIdentifier:\n\t\t\t\ttestAttemptSession.navigationState.currentSectionIdentifier,\n\t\t\tvisitedItemIdentifiers: [\n\t\t\t\t...testAttemptSession.navigationState.visitedItemIdentifiers,\n\t\t\t],\n\t\t\titemSessions: itemSession?.session\n\t\t\t\t? { [itemIdentifier]: itemSession.session }\n\t\t\t\t: {},\n\t\t},\n\t};\n}\n"]}

package/dist/components/ItemToolBar.custom-element.js CHANGED Viewed

@@ -6223,6 +6223,39 @@ var segmentSentences = (text2, options) => {
 };
 // dist/services/tts/browser-provider.js
+var normalizeLanguageCode = (value) => String(value || "").trim().toLowerCase();
+var browserLanguage = () => {
+  const navigatorLanguage = typeof navigator !== "undefined" ? navigator.language || navigator.languages?.[0] : "";
+  return normalizeLanguageCode(navigatorLanguage || "en-US");
+};
+var findBrowserVoice = (voices, preferredName) => {
+  if (preferredName) {
+    const explicit = voices.find((voice) => voice.name === preferredName);
+    if (explicit)
+      return explicit;
+  }
+  const language = browserLanguage();
+  const languagePrefix = language.split("-")[0] || "en";
+  const matchesLanguage = (voice) => {
+    const voiceLanguage = normalizeLanguageCode(voice.lang);
+    return voiceLanguage === language || voiceLanguage.startsWith(`${languagePrefix}-`);
+  };
+  const ranked = [
+    (voice) => voice.localService && matchesLanguage(voice),
+    (voice) => voice.default && matchesLanguage(voice),
+    (voice) => matchesLanguage(voice),
+    (voice) => voice.localService,
+    (voice) => voice.default
+  ];
+  for (const predicate of ranked) {
+    const voice = voices.find(predicate);
+    if (voice)
+      return voice;
+  }
+  return voices[0] || null;
+};
+var shouldAssignBrowserVoice = (voice) => !voice.default;
 class BrowserTTSProvider {
   providerId = "browser";
   providerName = "Browser Speech Synthesis";
@@ -6377,24 +6410,28 @@ class BrowserTTSProviderImpl {
         resolve(false);
         return;
       }
-      this.utterance = new SpeechSynthesisUtterance(chunkText);
-      if (this.config?.voice) {
-        const voices = speechSynthesis.getVoices();
-        const voice = voices.find((v) => v.name === this.config.voice);
-        if (voice)
-          this.utterance.voice = voice;
-      }
+      const utterance = new SpeechSynthesisUtterance(chunkText);
+      this.utterance = utterance;
+      const voice = findBrowserVoice(speechSynthesis.getVoices(), this.config?.voice);
+      if (voice && shouldAssignBrowserVoice(voice))
+        utterance.voice = voice;
       if (this.config?.rate)
-        this.utterance.rate = this.config.rate;
+        utterance.rate = this.config.rate;
       if (this.config?.pitch)
-        this.utterance.pitch = this.config.pitch;
-      this.utterance.onstart = () => {
+        utterance.pitch = this.config.pitch;
+      const clearOwnedUtterance = () => {
+        if (this.utterance === utterance) {
+          this.utterance = null;
+        }
+      };
+      utterance.onstart = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPlaying = true;
         this._isPaused = false;
       };
-      this.utterance.onend = () => {
+      utterance.onend = () => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -6403,7 +6440,8 @@ class BrowserTTSProviderImpl {
         this._isPaused = false;
         resolve(true);
       };
-      this.utterance.onerror = (event2) => {
+      utterance.onerror = (event2) => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -6416,17 +6454,17 @@ class BrowserTTSProviderImpl {
         }
         reject(new Error(`Speech synthesis error: ${event2.error}`));
       };
-      this.utterance.onpause = () => {
+      utterance.onpause = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = true;
       };
-      this.utterance.onresume = () => {
+      utterance.onresume = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = false;
       };
-      this.utterance.onboundary = (event2) => {
+      utterance.onboundary = (event2) => {
         if (runId !== this.speakRunId)
           return;
         console.log("[BrowserProvider] Boundary event:", event2.name, "charIndex:", event2.charIndex, "charLength:", event2.charLength);
@@ -6444,7 +6482,7 @@ class BrowserTTSProviderImpl {
         console.log("[BrowserProvider] Calling onWordBoundary with word:", word, "at position:", absoluteBoundaryStart);
         this.onWordBoundary(word, absoluteBoundaryStart, wordLength);
       };
-      speechSynthesis.speak(this.utterance);
+      speechSynthesis.speak(utterance);
     });
   }
   pause() {
@@ -6459,9 +6497,10 @@ class BrowserTTSProviderImpl {
   }
   stop() {
     this.speakRunId += 1;
-    if (this._isPlaying) {
+    if (this._isPlaying || this.utterance) {
       speechSynthesis.cancel();
     }
+    this.utterance = null;
     this._isPlaying = false;
     this._isPaused = false;
   }

package/dist/components/PieAssessmentToolkit.custom-element.js CHANGED Viewed

@@ -39,7 +39,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 // ../../node_modules/.bun/speech-rule-engine@5.0.0-rc.1/node_modules/speech-rule-engine/lib/sre.js
 var require_sre = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/pie-players/pie-players/node_modules/.bun/speech-rule-engine@5.0.0-rc.1/node_modules/speech-rule-engine/lib";
+  var __dirname = "/Users/eelco.hillenius/dev/prj/pie/pie-players/node_modules/.bun/speech-rule-engine@5.0.0-rc.1/node_modules/speech-rule-engine/lib";
   (function(t, e) {
     typeof exports == "object" && typeof module == "object" ? module.exports = e() : typeof define == "function" && define.amd ? define([], e) : typeof exports == "object" ? exports.SRE = e() : t.SRE = e();
   })(exports, () => (() => {
@@ -18080,6 +18080,39 @@ var segmentSentences = (text2, options) => {
 };
 // dist/services/tts/browser-provider.js
+var normalizeLanguageCode = (value) => String(value || "").trim().toLowerCase();
+var browserLanguage = () => {
+  const navigatorLanguage = typeof navigator !== "undefined" ? navigator.language || navigator.languages?.[0] : "";
+  return normalizeLanguageCode(navigatorLanguage || "en-US");
+};
+var findBrowserVoice = (voices, preferredName) => {
+  if (preferredName) {
+    const explicit = voices.find((voice) => voice.name === preferredName);
+    if (explicit)
+      return explicit;
+  }
+  const language = browserLanguage();
+  const languagePrefix = language.split("-")[0] || "en";
+  const matchesLanguage = (voice) => {
+    const voiceLanguage = normalizeLanguageCode(voice.lang);
+    return voiceLanguage === language || voiceLanguage.startsWith(`${languagePrefix}-`);
+  };
+  const ranked = [
+    (voice) => voice.localService && matchesLanguage(voice),
+    (voice) => voice.default && matchesLanguage(voice),
+    (voice) => matchesLanguage(voice),
+    (voice) => voice.localService,
+    (voice) => voice.default
+  ];
+  for (const predicate of ranked) {
+    const voice = voices.find(predicate);
+    if (voice)
+      return voice;
+  }
+  return voices[0] || null;
+};
+var shouldAssignBrowserVoice = (voice) => !voice.default;
 class BrowserTTSProvider {
   providerId = "browser";
   providerName = "Browser Speech Synthesis";
@@ -18234,24 +18267,28 @@ class BrowserTTSProviderImpl {
         resolve(false);
         return;
       }
-      this.utterance = new SpeechSynthesisUtterance(chunkText);
-      if (this.config?.voice) {
-        const voices = speechSynthesis.getVoices();
-        const voice = voices.find((v) => v.name === this.config.voice);
-        if (voice)
-          this.utterance.voice = voice;
-      }
+      const utterance = new SpeechSynthesisUtterance(chunkText);
+      this.utterance = utterance;
+      const voice = findBrowserVoice(speechSynthesis.getVoices(), this.config?.voice);
+      if (voice && shouldAssignBrowserVoice(voice))
+        utterance.voice = voice;
       if (this.config?.rate)
-        this.utterance.rate = this.config.rate;
+        utterance.rate = this.config.rate;
       if (this.config?.pitch)
-        this.utterance.pitch = this.config.pitch;
-      this.utterance.onstart = () => {
+        utterance.pitch = this.config.pitch;
+      const clearOwnedUtterance = () => {
+        if (this.utterance === utterance) {
+          this.utterance = null;
+        }
+      };
+      utterance.onstart = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPlaying = true;
         this._isPaused = false;
       };
-      this.utterance.onend = () => {
+      utterance.onend = () => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -18260,7 +18297,8 @@ class BrowserTTSProviderImpl {
         this._isPaused = false;
         resolve(true);
       };
-      this.utterance.onerror = (event2) => {
+      utterance.onerror = (event2) => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -18273,17 +18311,17 @@ class BrowserTTSProviderImpl {
         }
         reject(new Error(`Speech synthesis error: ${event2.error}`));
       };
-      this.utterance.onpause = () => {
+      utterance.onpause = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = true;
       };
-      this.utterance.onresume = () => {
+      utterance.onresume = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = false;
       };
-      this.utterance.onboundary = (event2) => {
+      utterance.onboundary = (event2) => {
         if (runId !== this.speakRunId)
           return;
         console.log("[BrowserProvider] Boundary event:", event2.name, "charIndex:", event2.charIndex, "charLength:", event2.charLength);
@@ -18301,7 +18339,7 @@ class BrowserTTSProviderImpl {
         console.log("[BrowserProvider] Calling onWordBoundary with word:", word, "at position:", absoluteBoundaryStart);
         this.onWordBoundary(word, absoluteBoundaryStart, wordLength);
       };
-      speechSynthesis.speak(this.utterance);
+      speechSynthesis.speak(utterance);
     });
   }
   pause() {
@@ -18316,9 +18354,10 @@ class BrowserTTSProviderImpl {
   }
   stop() {
     this.speakRunId += 1;
-    if (this._isPlaying) {
+    if (this._isPlaying || this.utterance) {
       speechSynthesis.cancel();
     }
+    this.utterance = null;
     this._isPlaying = false;
     this._isPaused = false;
   }
@@ -21831,7 +21870,10 @@ var resolvePlainBoundaryOffset = (alignment, position, safeLength) => {
   const token = findTokenAtOffset(alignment.spokenTokens, position);
   if (!token)
     return null;
-  return { start: position, length: Math.min(safeLength, token.end - position) };
+  return {
+    start: position,
+    length: Math.min(safeLength, token.end - position)
+  };
 };
 var resolveSpokenBoundaryOffset = (alignment, position, length = 1, boundaryWord) => {
   if (alignment.boundaryOffsetMode === "unsupported" || !Number.isFinite(position)) {
@@ -22861,7 +22903,11 @@ var collectMathAware = (root, options) => {
   const flushTextChunk = () => {
     const text2 = normalizeTextForSpeech(acc.chars.slice(textChunkStart, acc.chars.length).join(""));
     if (text2) {
-      chunks.push({ type: "text", text: text2, sourceElement: textChunkSourceElement });
+      chunks.push({
+        type: "text",
+        text: text2,
+        sourceElement: textChunkSourceElement
+      });
     }
     textChunkStart = acc.chars.length;
     textChunkSourceElement = undefined;
@@ -26896,27 +26942,36 @@ class ToolkitCoordinator {
       return;
     await new Promise((resolve) => {
       let settled2 = false;
+      const canUseEventTarget = typeof synth.addEventListener === "function" && typeof synth.removeEventListener === "function";
+      const canUseHandler = !canUseEventTarget && "onvoiceschanged" in synth;
+      const previousHandler = canUseHandler ? synth.onvoiceschanged : null;
+      let assignedHandler = false;
       const finish = () => {
         if (settled2)
           return;
         settled2 = true;
-        resolve();
-      };
-      const timeoutId = window.setTimeout(() => {
-        synth.removeEventListener("voiceschanged", onVoicesChanged);
-        finish();
-      }, timeoutMs);
-      const onVoicesChanged = () => {
         window.clearTimeout(timeoutId);
-        if (typeof synth.removeEventListener === "function" && typeof synth.addEventListener === "function") {
+        if (canUseEventTarget) {
           synth.removeEventListener("voiceschanged", onVoicesChanged);
+        } else if (assignedHandler && synth.onvoiceschanged === onVoicesChanged) {
+          synth.onvoiceschanged = previousHandler;
+        }
+        resolve();
+      };
+      const onVoicesChanged = (event2) => {
+        if (!canUseEventTarget && typeof previousHandler === "function" && event2) {
+          previousHandler.call(synth, event2);
         }
         finish();
       };
-      if (typeof synth.addEventListener === "function" && typeof synth.removeEventListener === "function") {
+      const timeoutId = window.setTimeout(finish, timeoutMs);
+      if (canUseEventTarget) {
         synth.addEventListener("voiceschanged", onVoicesChanged, {
           once: true
         });
+      } else if (canUseHandler) {
+        synth.onvoiceschanged = onVoicesChanged;
+        assignedHandler = true;
       }
     });
     const voicesAfterWait = synth.getVoices();

package/dist/components/SectionToolBar.custom-element.js CHANGED Viewed

@@ -10415,6 +10415,38 @@ var segmentSentences = (text2, options) => {
   }
   return parsed.length > 0 ? parsed : [{ text: text2, offset: 0 }];
 };
+var normalizeLanguageCode = (value) => String(value || "").trim().toLowerCase();
+var browserLanguage = () => {
+  const navigatorLanguage = typeof navigator !== "undefined" ? navigator.language || navigator.languages?.[0] : "";
+  return normalizeLanguageCode(navigatorLanguage || "en-US");
+};
+var findBrowserVoice = (voices, preferredName) => {
+  if (preferredName) {
+    const explicit = voices.find((voice) => voice.name === preferredName);
+    if (explicit)
+      return explicit;
+  }
+  const language = browserLanguage();
+  const languagePrefix = language.split("-")[0] || "en";
+  const matchesLanguage = (voice) => {
+    const voiceLanguage = normalizeLanguageCode(voice.lang);
+    return voiceLanguage === language || voiceLanguage.startsWith(`${languagePrefix}-`);
+  };
+  const ranked = [
+    (voice) => voice.localService && matchesLanguage(voice),
+    (voice) => voice.default && matchesLanguage(voice),
+    (voice) => matchesLanguage(voice),
+    (voice) => voice.localService,
+    (voice) => voice.default
+  ];
+  for (const predicate of ranked) {
+    const voice = voices.find(predicate);
+    if (voice)
+      return voice;
+  }
+  return voices[0] || null;
+};
+var shouldAssignBrowserVoice = (voice) => !voice.default;
 class BrowserTTSProvider {
   providerId = "browser";
@@ -10570,24 +10602,28 @@ class BrowserTTSProviderImpl {
         resolve(false);
         return;
       }
-      this.utterance = new SpeechSynthesisUtterance(chunkText);
-      if (this.config?.voice) {
-        const voices = speechSynthesis.getVoices();
-        const voice = voices.find((v) => v.name === this.config.voice);
-        if (voice)
-          this.utterance.voice = voice;
-      }
+      const utterance = new SpeechSynthesisUtterance(chunkText);
+      this.utterance = utterance;
+      const voice = findBrowserVoice(speechSynthesis.getVoices(), this.config?.voice);
+      if (voice && shouldAssignBrowserVoice(voice))
+        utterance.voice = voice;
       if (this.config?.rate)
-        this.utterance.rate = this.config.rate;
+        utterance.rate = this.config.rate;
       if (this.config?.pitch)
-        this.utterance.pitch = this.config.pitch;
-      this.utterance.onstart = () => {
+        utterance.pitch = this.config.pitch;
+      const clearOwnedUtterance = () => {
+        if (this.utterance === utterance) {
+          this.utterance = null;
+        }
+      };
+      utterance.onstart = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPlaying = true;
         this._isPaused = false;
       };
-      this.utterance.onend = () => {
+      utterance.onend = () => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -10596,7 +10632,8 @@ class BrowserTTSProviderImpl {
         this._isPaused = false;
         resolve(true);
       };
-      this.utterance.onerror = (event2) => {
+      utterance.onerror = (event2) => {
+        clearOwnedUtterance();
         if (runId !== this.speakRunId) {
           resolve(false);
           return;
@@ -10609,17 +10646,17 @@ class BrowserTTSProviderImpl {
         }
         reject(new Error(`Speech synthesis error: ${event2.error}`));
       };
-      this.utterance.onpause = () => {
+      utterance.onpause = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = true;
       };
-      this.utterance.onresume = () => {
+      utterance.onresume = () => {
         if (runId !== this.speakRunId)
           return;
         this._isPaused = false;
       };
-      this.utterance.onboundary = (event2) => {
+      utterance.onboundary = (event2) => {
         if (runId !== this.speakRunId)
           return;
         console.log("[BrowserProvider] Boundary event:", event2.name, "charIndex:", event2.charIndex, "charLength:", event2.charLength);
@@ -10637,7 +10674,7 @@ class BrowserTTSProviderImpl {
         console.log("[BrowserProvider] Calling onWordBoundary with word:", word, "at position:", absoluteBoundaryStart);
         this.onWordBoundary(word, absoluteBoundaryStart, wordLength);
       };
-      speechSynthesis.speak(this.utterance);
+      speechSynthesis.speak(utterance);
     });
   }
   pause() {
@@ -10652,9 +10689,10 @@ class BrowserTTSProviderImpl {
   }
   stop() {
     this.speakRunId += 1;
-    if (this._isPlaying) {
+    if (this._isPlaying || this.utterance) {
       speechSynthesis.cancel();
     }
+    this.utterance = null;
     this._isPlaying = false;
     this._isPaused = false;
   }

package/dist/index.d.ts CHANGED Viewed

@@ -43,7 +43,7 @@ export { ToolkitCoordinator } from "./services/ToolkitCoordinator.js";
 export type { CanonicalToolsConfig, ToolPlacementConfig, ToolPlacementLevel, ToolPolicyConfig, ToolProvidersConfig, } from "./services/tools-config-normalizer.js";
 export type { FrameworkErrorKind, FrameworkErrorModel, FrameworkErrorSeverity, } from "./services/framework-error.js";
 export { formatFrameworkErrorForConsole, frameworkErrorFromToolConfigDiagnostics, frameworkErrorFromUnknown, toFrameworkErrorModel, } from "./services/framework-error.js";
-export type { FrameworkErrorListener, } from "./services/framework-error-bus.js";
+export type { FrameworkErrorListener } from "./services/framework-error-bus.js";
 export type { ToolConfigDiagnostic, ToolConfigDiagnosticSeverity, ToolConfigStrictness, ToolConfigValidationOptions, ToolConfigValidationResult, } from "./services/tool-config-validation.js";
 export type { ToolbarButtonItem, ToolbarItem, ToolbarItemBase, ToolbarLinkItem, } from "./services/toolbar-items.js";
 export { isExternalIconUrl, isInlineSvgIcon, isToolbarLinkItem, isValidToolbarItemShape, } from "./services/toolbar-items.js";