@pie-element/ebsr 14.2.2-next.0 → 14.2.2-next.10

package/dist/controller/index.js

@@ -1,7 +1,6 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/get.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEmpty.js";
-import n from "./defaults.js";
-import { isResponseCorrect as r } from "./utils.js";
+import e from "./defaults.js";
+import { isResponseCorrect as t } from "./utils.js";
+import { get as n, isEmpty as r } from "@pie-element/shared-lodash";
 import { getShuffledChoices as i, lockChoices as a, partialScoring as o } from "@pie-element/shared-controller-utils";
 import s from "@pie-lib/translator";
 //#region src/controller/index.ts
@@ -15,7 +14,7 @@ var { translator: c } = s, l = (e, t, n) => (r) => {
 		e === "default" ? i.feedback = n[r.correct ? "correct" : "incorrect"] : e === "custom" && (i.feedback = r.feedback.value);
 	}
 	return i;
-}, u = (e, t, n, i) => {
+}, u = (e, n, r, i) => {
 	let a = Object.assign({
 		correct: "Correct",
 		incorrect: "Incorrect"
@@ -25,31 +24,31 @@ var { translator: c } = s, l = (e, t, n) => (r) => {
 		choices: o,
 		disabled: i.mode !== "gather",
 		complete: { min: e.choices.filter((e) => e.correct).length },
-		responseCorrect: i.mode === "evaluate" ? r(e, t, n) : void 0
+		responseCorrect: i.mode === "evaluate" ? t(e, n, r) : void 0
 	};
 }, d = (e, t) => ({
 	...t,
 	...e,
 	choicesLayout: e.choicesLayout || e.verticalMode === !1 && "horizontal" || "vertical"
-}), f = ({ partA: e = {}, partB: t = {}, language: r, ...i }) => ({
-	...n,
+}), f = ({ partA: t = {}, partB: n = {}, language: r, ...i }) => ({
+	...e,
 	...i,
-	partA: d(e, {
-		...n.partA,
+	partA: d(t, {
+		...e.partA,
 		language: r
 	}),
-	partB: d(t, {
-		...n.partB,
+	partB: d(n, {
+		...e.partB,
 		language: r
 	})
 });
-async function p(n, r, o, s) {
-	let l = f(n), d = u(l.partA, "partA", r, o), p = u(l.partB, "partB", r, o), m = {}, h = (e) => (t, n, r) => new Promise((t) => {
+async function p(e, t, o, s) {
+	let l = f(e), d = u(l.partA, "partA", t, o), p = u(l.partB, "partB", t, o), m = {}, h = (e) => (t, n, r) => new Promise((t) => {
 		m[e] = r.shuffledValues, t();
-	}), g = e(r, "value.partA"), _ = a(l.partA, g, o), { choices: v } = d || {}, { choices: y } = p || {};
-	!_ && v && v.length && (d.choices = await i(v, { shuffledValues: (r.shuffledValues || {}).partA }, h("partA"), "value"));
-	let b = e(r, "value.partB");
-	if (!a(l.partB, b, o) && y && y.length && (p.choices = await i(y, { shuffledValues: (r.shuffledValues || {}).partB }, h("partB"), "value")), t(m) || s && typeof s == "function" && s(r.id, r.element, { shuffledValues: m }).catch((e) => {
+	}), g = n(t, "value.partA"), _ = a(l.partA, g, o), { choices: v } = d || {}, { choices: y } = p || {};
+	!_ && v && v.length && (d.choices = await i(v, { shuffledValues: (t.shuffledValues || {}).partA }, h("partA"), "value"));
+	let b = n(t, "value.partB");
+	if (!a(l.partB, b, o) && y && y.length && (p.choices = await i(y, { shuffledValues: (t.shuffledValues || {}).partB }, h("partB"), "value")), r(m) || s && typeof s == "function" && s(t.id, t.element, { shuffledValues: m }).catch((e) => {
 		console.error("update session failed", e);
 	}), l.partLabels) {
 		let e = l.language;
@@ -71,10 +70,10 @@ async function p(n, r, o, s) {
 		});
 	});
 }
-var m = (e = {}) => new Promise((t) => {
-	t({
-		...n,
-		...e
+var m = (t = {}) => new Promise((n) => {
+	n({
+		...e,
+		...t
 	});
 }), h = (e) => e.correct === !0, g = (e, t, n, r) => {
 	let { choices: i = [] } = e && e[n] || {}, a = i.length, { value: o } = t || {}, s = (e) => !!(o || []).find((t) => t === e.value), c = (e) => h(e) && !s(e), l = (e) => !h(e) && s(e), u = i.reduce((e, t) => c(t) || l(t) ? e - 1 : e, i.length);
@@ -165,16 +164,16 @@ var y = (e) => {
 			id: "1"
 		});
 	} else n(null);
-}), x = (e) => (e || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, ""), S = (e = {}, n = {}) => {
-	let { choices: r } = e, { minAnswerChoices: i = 2, maxAnswerChoices: a } = n, o = [...r || []].reverse(), s = {}, c = {}, l = {}, u = !1;
-	["teacherInstructions", "prompt"].forEach((t) => {
-		n[t]?.required && !x(e[t]) && (s[t] = "This field is required.");
-	}), o.forEach((e, t) => {
+}), x = (e) => (e || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, ""), S = (e = {}, t = {}) => {
+	let { choices: n } = e, { minAnswerChoices: i = 2, maxAnswerChoices: a } = t, o = [...n || []].reverse(), s = {}, c = {}, l = {}, u = !1;
+	["teacherInstructions", "prompt"].forEach((n) => {
+		t[n]?.required && !x(e[n]) && (s[n] = "This field is required.");
+	}), o.forEach((e, n) => {
 		let { correct: r, value: i, label: a, rationale: s } = e;
-		r && (u = !0), x(a) ? o.slice(t + 1).some((e) => e.label === a) && (c[i] = "Content should be unique.") : c[i] = "Content should not be empty.", n.rationale?.required && !x(s) && (l[i] = "This field is required.");
+		r && (u = !0), x(a) ? o.slice(n + 1).some((e) => e.label === a) && (c[i] = "Content should be unique.") : c[i] = "Content should not be empty.", t.rationale?.required && !x(s) && (l[i] = "This field is required.");
 	});
-	let d = (r || []).length;
-	return d < i ? s.answerChoices = `There should be at least ${i} choices defined.` : d > a && (s.answerChoices = `No more than ${a} choices should be defined.`), u || (s.correctResponse = "No correct response defined."), t(c) || (s.choices = c), t(l) || (s.rationale = l), s;
+	let d = (n || []).length;
+	return d < i ? s.answerChoices = `There should be at least ${i} choices defined.` : d > a && (s.answerChoices = `No more than ${a} choices should be defined.`), u || (s.correctResponse = "No correct response defined."), r(c) || (s.choices = c), r(l) || (s.rationale = l), s;
 }, C = (e = {}, t = {}) => {
 	let { partA: n, partB: r } = e || {}, { partA: i, partB: a } = t || {};
 	return {

package/dist/controller/utils.d.ts

@@ -7,4 +7,4 @@
  * To make changes, edit the upstream JavaScript file and run sync again.
  */
 export declare const getCorrectResponse: (choices: any) => any;
-export declare const isResponseCorrect: (question: any, key: any, session: any) => any;
+export declare const isResponseCorrect: (question: any, key: any, session: any) => boolean;

package/dist/controller/utils.js

@@ -1,8 +1,8 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEqual.js";
+import { isEqual as e } from "@pie-element/shared-lodash";
 //#region src/controller/utils.ts
 var t = (e) => e && e.filter((e) => e.correct).map((e) => e.value).sort(), n = (n, r, i) => {
 	let a = t(n.choices);
 	return i && i.value ? e((i.value[r].value || []).sort(), a) : !1;
 };
 //#endregion
-export { n as isResponseCorrect };
+export { t as getCorrectResponse, n as isResponseCorrect };

package/dist/delivery/index.js

@@ -1,15 +1,16 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/get.js";
+import { EBSR_MULTIPLE_CHOICE_TAG as e } from "../private-tags.js";
 import { SessionChangedEvent as t } from "@pie-element/shared-player-events";
 import n from "@pie-element/multiple-choice";
-import r from "debug";
+import { get as r } from "@pie-element/shared-lodash";
+import i from "debug";
 //#region src/delivery/index.tsx
-var i = t.TYPE, a = "ebsr-multiple-choice", o = r("pie-elements:ebsr"), s = class extends n {};
-customElements.get(a) || customElements.define(a, s);
-var c = (e) => Array.isArray(e) && e.length > 0, l = (t) => {
-	let n = e(t, "value.partA.value"), r = e(t, "value.partB.value");
-	return c(n) && c(r);
+var a = t.TYPE, o = e, s = i("pie-elements:ebsr"), c = class extends n {};
+customElements.get(o) || customElements.define(o, c);
+var l = (e) => Array.isArray(e) && e.length > 0, u = (e) => {
+	let t = r(e, "value.partA.value"), n = r(e, "value.partB.value");
+	return l(t) && l(n);
 };
-function u(e) {
+function d(e) {
 	let t = e.closest("pie-player") || e.closest("pie-item-player");
 	if (!t) return {
 		baseHeadingLevel: void 0,
@@ -21,10 +22,10 @@ function u(e) {
 	}, r = n("baseHeadingLevel", "base-heading-level", "baseheadinglevel"), i = parseInt(r, 10), a = Number.isFinite(i) && i >= 1 && i <= 6 ? i : void 0, o = n("includeSrHeading", "include-sr-heading", "includesrheading");
 	return {
 		baseHeadingLevel: a,
-		includeSrHeading: o == null ? !0 : o !== !1 && o !== "false"
+		includeSrHeading: o == null || o !== !1 && o !== "false"
 	};
 }
-var d = class extends HTMLElement {
+var f = class extends HTMLElement {
 	constructor() {
 		super(), this._model = {}, this._session = {};
 	}
@@ -38,12 +39,12 @@ var d = class extends HTMLElement {
 		}
 	};
 	set model(e) {
-		this._model = e, customElements.whenDefined(a).then(() => {
+		this._model = e, customElements.whenDefined(o).then(() => {
 			this.setPartModel(this.partA, "partA"), this.setPartModel(this.partB, "partB");
 		});
 	}
 	set session(e) {
-		this._session = e, customElements.whenDefined(a).then(() => {
+		this._session = e, customElements.whenDefined(o).then(() => {
 			this.setPartSession(this.partA, "partA"), this.setPartSession(this.partB, "partB");
 		});
 	}
@@ -58,7 +59,7 @@ var d = class extends HTMLElement {
 				mode: n,
 				keyMode: this._model[t].choicePrefix
 			};
-			let { includeSrHeading: r, baseHeadingLevel: i } = u(this);
+			let { includeSrHeading: r, baseHeadingLevel: i } = d(this);
 			e.includeSrHeading = r, e.baseHeadingLevel = i;
 		}
 	}
@@ -72,21 +73,21 @@ var d = class extends HTMLElement {
 		this._session.value = {
 			...this._session.value,
 			[n]: e
-		}, o("[onSessionChanged] session: ", this._session);
-		let r = l(this._session);
+		}, s("[onSessionChanged] session: ", this._session);
+		let r = u(this._session);
 		this.dispatchEvent(new t(this.tagName.toLowerCase(), r));
 	}
 	get partA() {
-		return this.querySelector(`${a}#a`);
+		return this.querySelector(`${o}#a`);
 	}
 	get partB() {
-		return this.querySelector(`${a}#b`);
+		return this.querySelector(`${o}#b`);
 	}
 	connectedCallback() {
-		this._render(), this._initPlayerObserver(), this.addEventListener(i, this.onSessionUpdated);
+		this._render(), this._initPlayerObserver(), this.addEventListener(a, this.onSessionUpdated);
 	}
 	disconnectedCallback() {
-		this._disconnectPlayerObserver(), this.removeEventListener(i, this.onSessionUpdated);
+		this._disconnectPlayerObserver(), this.removeEventListener(a, this.onSessionUpdated);
 	}
 	_initPlayerObserver() {
 		let e = this.closest("pie-player") || this.closest("pie-item-player");
@@ -107,7 +108,7 @@ var d = class extends HTMLElement {
 	}
 	_render() {
 		this.ariaLabel = "Two-Part Question", this.role = "region";
-		let { baseHeadingLevel: e, includeSrHeading: t } = u(this), n = e ? `h${Math.min(6, e)}` : "h2", r = t ? `<${n} class="srOnly">Two-Part Question</${n}>` : "";
+		let { baseHeadingLevel: e, includeSrHeading: t } = d(this), n = e ? `h${Math.min(6, e)}` : "h2", r = t ? `<${n} class="srOnly">Two-Part Question</${n}>` : "";
 		this.innerHTML = `
       <style>
         .srOnly {
@@ -123,10 +124,10 @@ var d = class extends HTMLElement {
       ${this._model?.extraCSSRules?.rules}
       </style>
         ${r}
-        <${a} id="a"></${a}>
-        <${a} id="b"></${a}>
-    `, customElements.get(a) && (this.setPartModel(this.partA, "partA"), this.setPartModel(this.partB, "partB"), this.setPartSession(this.partA, "partA"), this.setPartSession(this.partB, "partB"));
+        <${o} id="a"></${o}>
+        <${o} id="b"></${o}>
+    `, customElements.get(o) && (this.setPartModel(this.partA, "partA"), this.setPartModel(this.partB, "partB"), this.setPartSession(this.partA, "partA"), this.setPartSession(this.partB, "partB"));
 	}
 };
 //#endregion
-export { d as default, l as isSessionComplete };
+export { f as default, u as isSessionComplete };