@pie-element/placement-ordering 14.1.2-next.0 → 14.1.2-next.2

package/dist/controller/index.js

@@ -1,44 +1,39 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isArray.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/every.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/map.js";
-import r from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEmpty.js";
-import i from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEqual.js";
-import a from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/reduce.js";
-import { flattenCorrect as o, getAllCorrectResponses as s, score as c } from "./scoring.js";
-import l from "./defaults.js";
+import { flattenCorrect as e, getAllCorrectResponses as t, score as n } from "./scoring.js";
+import r from "./defaults.js";
+import { every as i, isArray as a, isEmpty as o, isEqual as s, map as c, reduce as l } from "@pie-element/shared-lodash";
 import u from "debug";
 import d from "@pie-lib/translator";
 import { getFeedbackForCorrectness as f } from "@pie-element/shared-feedback";
 import { partialScoring as p } from "@pie-element/shared-controller-utils";
 //#region src/controller/index.ts
-var m = u("@pie-element:placement-ordering:controller"), { translator: h } = d, g = () => /* @__PURE__ */ Error("Question is missing required array: correctResponse"), _ = (e, t, n) => {
-	let r = [], a = t?.value || [];
+var m = u("@pie-element:placement-ordering:controller"), { translator: h } = d, g = () => /* @__PURE__ */ Error("Question is missing required array: correctResponse"), _ = (e, r, i) => {
+	let a = [], o = r?.value || [];
 	e?.correctResponse;
-	let o = e?.placementArea === !0;
-	if (!a.length) return o ? r.push("Student did not place any tiles in the target area.") : r.push("Student did not reorder any tiles."), r.push("Final score: 0."), r;
-	let l = s(e), u = {
+	let c = e?.placementArea === !0;
+	if (!o.length) return c ? a.push("Student did not place any tiles in the target area.") : a.push("Student did not reorder any tiles."), a.push("Final score: 0."), a;
+	let l = t(e), u = {
 		score: 0,
 		response: []
 	};
 	l.forEach((e) => {
 		let t = 0;
-		a.forEach((n, r) => {
+		o.forEach((n, r) => {
 			e[r] === n && t++;
 		}), t > u.score && (u = {
 			score: t,
 			response: e
 		});
 	});
-	let d = u.score, f = a.length - d;
-	d > 0 && r.push(`${d} tile(s) placed in the correct order.`), f > 0 && r.push(`${f} tile(s) placed in an incorrect order.`), l.some((e) => i(e, a));
-	let m = p.enabled(e, n || {});
-	m ? (r.push("Score calculated using partial scoring."), r.push("Each tile placed in the correct position contributes to the score.")) : (r.push("Score calculated using all-or-nothing scoring."), o ? r.push("Student must place all tiles in the correct positions within the target area to receive full credit.") : r.push("Student must arrange all tiles in the correct order to receive full credit."));
-	let h = c(e, t), g = m ? h : +(h === 1);
-	return r.push(`Final score: ${g}.`), r;
+	let d = u.score, f = o.length - d;
+	d > 0 && a.push(`${d} tile(s) placed in the correct order.`), f > 0 && a.push(`${f} tile(s) placed in an incorrect order.`), l.some((e) => s(e, o));
+	let m = p.enabled(e, i || {});
+	m ? (a.push("Score calculated using partial scoring."), a.push("Each tile placed in the correct position contributes to the score.")) : (a.push("Score calculated using all-or-nothing scoring."), c ? a.push("Student must place all tiles in the correct positions within the target area to receive full credit.") : a.push("Student must arrange all tiles in the correct order to receive full credit."));
+	let h = n(e, r), g = m ? h : +(h === 1);
+	return a.push(`Final score: ${g}.`), a;
 };
-function v(e, t, n) {
+function v(e, t, r) {
 	return new Promise((i, a) => {
-		if (!t || r(t)) {
+		if (!t || o(t)) {
 			i({
 				score: 0,
 				empty: !0,
@@ -46,12 +41,12 @@ function v(e, t, n) {
 			});
 			return;
 		}
-		if (!e || !e.correctResponse || r(e.correctResponse)) a(g());
+		if (!e || !e.correctResponse || o(e.correctResponse)) a(g());
 		else try {
-			let r = c(e, t);
+			let a = n(e, t);
 			i({
-				score: p.enabled(e, n || {}) ? r : +(r === 1),
-				logTrace: _(e, t, n)
+				score: p.enabled(e, r || {}) ? a : +(a === 1),
+				logTrace: _(e, t, r)
 			});
 		} catch (e) {
 			a(e);
@@ -61,13 +56,13 @@ function v(e, t, n) {
 function y(e = {}) {
 	return new Promise((t) => {
 		t({
-			...l,
+			...r,
 			...e
 		});
 	});
 }
 var b = (e) => ({
-	...l,
+	...r,
 	rationaleEnabled: !0,
 	feedbackEnabled: !1,
 	promptEnabled: !0,
@@ -75,9 +70,9 @@ var b = (e) => ({
 	studentInstructionsEnabled: !0,
 	...e
 });
-async function x(r, l, u) {
+async function x(r, o, u) {
 	let d = b(r), g = {};
-	if (r.alternateResponses && t(r.alternateResponses, e) && (m("Deprecated structure of alternateResponses is in use"), console.error("Deprecated structure of alternateResponses is in use")), g.env = u, g.extraCSSRules = d.extraCSSRules, g.outcomes = [], g.completeLength = (d.correctResponse || []).length, g.choices = (d.choices || []).filter((e) => e.label), g.note = d.note, g.showNote = d.alternateResponses && d.alternateResponses.length > 0, g.language = d.language, m("[model] removing tileSize for the moment."), g.prompt = d.promptEnabled ? d.prompt : null, g.config = {
+	if (r.alternateResponses && i(r.alternateResponses, a) && (m("Deprecated structure of alternateResponses is in use"), console.error("Deprecated structure of alternateResponses is in use")), g.env = u, g.extraCSSRules = d.extraCSSRules, g.outcomes = [], g.completeLength = (d.correctResponse || []).length, g.choices = (d.choices || []).filter((e) => e.label), g.note = d.note, g.showNote = d.alternateResponses && d.alternateResponses.length > 0, g.language = d.language, m("[model] removing tileSize for the moment."), g.prompt = d.promptEnabled ? d.prompt : null, g.config = {
 		orientation: d.orientation || "vertical",
 		includeTargets: d.placementArea,
 		choiceLabelEnabled: d.choiceLabelEnabled,
@@ -86,43 +81,43 @@ async function x(r, l, u) {
 		showOrdering: d.numberedGuides,
 		allowSameChoiceInTargets: !d.removeTilesAfterPlacing
 	}, g.disabled = u.mode !== "gather", g.note ||= h.t("common:commonCorrectAnswerWithAlternates", { lng: d.language }), u.role === "instructor" && (u.mode === "view" || u.mode === "evaluate") ? (g.rationale = d.rationaleEnabled ? d.rationale : null, g.teacherInstructions = d.teacherInstructionsEnabled ? d.teacherInstructions : null) : (g.rationale = null, g.teacherInstructions = null), u.mode === "evaluate") {
-		let e = l && l.value || [], t = s(d), m = t.reduce((t, n) => {
-			let r = a(e, (e, t, r) => e + (Array.isArray(n) && n[r] === t ? 1 : 0), 0);
-			return r > t.score ? {
-				arr: n,
-				score: r
-			} : t;
+		let i = o && o.value || [], a = t(d), m = a.reduce((e, t) => {
+			let n = l(i, (e, n, r) => e + (Array.isArray(t) && t[r] === n ? 1 : 0), 0);
+			return n > e.score ? {
+				arr: t,
+				score: n
+			} : e;
 		}, {
 			arr: [],
 			score: 0
 		});
-		g.outcomes = n(e, (e, t) => ({
+		g.outcomes = c(i, (e, t) => ({
 			id: e,
 			outcome: m.arr[t] === e ? "correct" : "incorrect"
 		}));
-		let h = t.some((t) => i(t, e)), _ = c(r, l), v = _ === 1, y = !v && p.enabled(d, u || {}) && _ !== 0;
-		return g.correctness = v ? "correct" : y ? "partial" : "incorrect", h || (g.correctResponse = o(d)), d.feedback || (d.feedbackEnabled = !1), g.feedback = d.feedbackEnabled ? await f(g.correctness, d.feedback) : void 0, g;
+		let h = a.some((e) => s(e, i)), _ = n(r, o), v = _ === 1, y = !v && p.enabled(d, u || {}) && _ !== 0;
+		return g.correctness = v ? "correct" : y ? "partial" : "incorrect", h || (g.correctResponse = e(d)), d.feedback || (d.feedbackEnabled = !1), g.feedback = d.feedbackEnabled ? await f(g.correctness, d.feedback) : void 0, g;
 	} else return g;
 }
-var S = (e, t) => new Promise((n) => {
-	t.mode !== "evaluate" && t.role === "instructor" ? n({
+var S = (t, n) => new Promise((r) => {
+	n.mode !== "evaluate" && n.role === "instructor" ? r({
 		id: "1",
-		value: o(e)
-	}) : n(null);
+		value: e(t)
+	}) : r(null);
 }), C = (e) => (e || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, ""), w = (e = {}, t = {}) => {
-	let { choices: n, correctResponse: a } = e, o = {};
+	let { choices: n, correctResponse: r } = e, i = {};
 	[
 		"teacherInstructions",
 		"prompt",
 		"rationale"
 	].forEach((n) => {
-		t[n]?.required && !C(e[n]) && (o[n] = "This field is required.");
+		t[n]?.required && !C(e[n]) && (i[n] = "This field is required.");
 	});
-	let s = [...n || []].reverse(), c = {};
-	return s.forEach((e, t) => {
+	let a = [...n || []].reverse(), c = {};
+	return a.forEach((e, t) => {
 		let { id: n, label: r } = e;
-		C(r) ? s.slice(t + 1).some((e) => e.label === r) && (c[n] = "Content should be unique.") : c[n] = "Content should not be empty.";
-	}), i((n || []).map((e) => e.id), (a || []).map((e) => e.id || e)) && (o.orderError = "The correct ordering should not be identical to the initial ordering."), r(c) || (o.choicesErrors = c), o;
+		C(r) ? a.slice(t + 1).some((e) => e.label === r) && (c[n] = "Content should be unique.") : c[n] = "Content should not be empty.";
+	}), s((n || []).map((e) => e.id), (r || []).map((e) => e.id || e)) && (i.orderError = "The correct ordering should not be identical to the initial ordering."), o(c) || (i.choicesErrors = c), i;
 };
 //#endregion
 export { S as createCorrectResponseSession, y as createDefaultModel, _ as getLogTrace, x as model, b as normalize, v as outcome, g as questionError, w as validate };

package/dist/controller/scoring.js

@@ -1,6 +1,4 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/differenceWith.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEqual.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/uniq.js";
+import { differenceWith as e, isEqual as t, uniq as n } from "@pie-element/shared-lodash";
 import r from "debug";
 import { combination as i } from "js-combinatorics";
 //#region src/controller/scoring.ts

package/dist/delivery/index.js

@@ -1,14 +1,14 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/compact.js";
-import t from "./main.js";
-import n from "react";
-import { createRoot as r } from "react-dom/client";
+import e from "./main.js";
+import t from "react";
+import { createRoot as n } from "react-dom/client";
+import { compact as r } from "@pie-element/shared-lodash";
 import i from "debug";
 import { renderMath as a } from "@pie-element/shared-math-rendering-mathjax";
 import { SessionChangedEvent as o } from "@pie-element/shared-player-events";
 //#region src/delivery/index.ts
-var s = i("pie-elements:placement-ordering"), c = ({ model: t, session: n }) => {
-	let { config: r } = t, i = (n && e(n.value) || []).length === t.choices.length;
-	return r.includeTargets || i;
+var s = i("pie-elements:placement-ordering"), c = ({ model: e, session: t }) => {
+	let { config: n } = e, i = (t && r(t.value) || []).length === e.choices.length;
+	return n.includeTargets || i;
 }, l = class extends HTMLElement {
 	constructor() {
 		super(), this._root = null, this._mathObserver = null, this._mathRenderPending = !1;
@@ -32,7 +32,7 @@ var s = i("pie-elements:placement-ordering"), c = ({ model: t, session: n }) =>
 	_disconnectMathObserver() {
 		this._mathObserver &&= (this._mathObserver.disconnect(), null);
 	}
-	isComplete = (t) => t && e(t).length === this._model.completeLength;
+	isComplete = (e) => e && r(e).length === this._model.completeLength;
 	sessionChange = (e) => {
 		this._session.value = e.value, this.render(), this.dispatchEvent(new o(this.tagName.toLowerCase(), this._session && this.isComplete(this._session.value)));
 	};
@@ -51,12 +51,12 @@ var s = i("pie-elements:placement-ordering"), c = ({ model: t, session: n }) =>
 	render() {
 		if (this._model && this._session) {
 			s("[render] session: ", this._session.value), s("[render] model: ", this._model), this._initMathObserver();
-			let e = n.createElement(t, {
+			let r = t.createElement(e, {
 				model: this._model,
 				session: this._session,
 				onSessionChange: this.sessionChange
 			});
-			this._root ||= r(this), this._root.render(e);
+			this._root ||= n(this), this._root.render(r);
 		}
 	}
 	connectedCallback() {

package/dist/delivery/ordering.js

@@ -1,7 +1,4 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/assign.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/cloneDeep.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/map.js";
-import r from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEmpty.js";
+import { assign as e, cloneDeep as t, isEmpty as n, map as r } from "@pie-element/shared-lodash";
 import i from "debug";
 //#region src/delivery/ordering.ts
 var a = i("pie-elements:placement-ordering:ordering"), o = (e, t, n) => {
@@ -65,7 +62,7 @@ function u(e, t, n, r) {
 	}, []);
 }
 function d(t, i, a, o) {
-	return o = e({ includeTargets: !0 }, o), a ||= [], i = !i || r(i) ? o.includeTargets ? Array(t.length) : n(t, (e) => e.id) : i, {
+	return o = e({ includeTargets: !0 }, o), a ||= [], i = !i || n(i) ? o.includeTargets ? Array(t.length) : r(t, (e) => e.id) : i, {
 		choices: t,
 		response: i,
 		opts: o,

package/dist/delivery/placement-ordering.js

@@ -1,10 +1,8 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/difference.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEqual.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/uniqueId.js";
-import { HorizontalTiler as r, VerticalTiler as i } from "./tiler.js";
-import { buildState as a, reducer as o } from "./ordering.js";
-import { haveSameValuesButDifferentOrder as s } from "./utils.js";
-import c from "react";
+import { HorizontalTiler as e, VerticalTiler as t } from "./tiler.js";
+import { buildState as n, reducer as r } from "./ordering.js";
+import { haveSameValuesButDifferentOrder as i } from "./utils.js";
+import a from "react";
+import { difference as o, isEqual as s, uniqueId as c } from "@pie-element/shared-lodash";
 import l from "debug";
 import { renderMath as u } from "@pie-element/shared-math-rendering-mathjax";
 import d from "prop-types";
@@ -49,18 +47,18 @@ W.propTypes = {
 	onDropChoice: d.func,
 	onRemoveChoice: d.func
 };
-var G = class extends c.Component {
+var G = class extends a.Component {
 	static propTypes = {
 		onSessionChange: d.func.isRequired,
 		model: d.object.isRequired,
 		session: d.oneOfType([d.array.isRequired, d.object.isRequired])
 	};
 	constructor(e) {
-		super(e), this.instanceId = n();
-		let { value: t, needsReset: r } = this.validateSession(e);
+		super(e), this.instanceId = c();
+		let { value: t, needsReset: n } = this.validateSession(e);
 		this.state = { showingCorrect: !1 };
-		let { model: i } = e || {}, { env: a } = i || {}, { mode: o } = a || {};
-		r && o === "gather" && this.props.onSessionChange({
+		let { model: r } = e || {}, { env: i } = r || {}, { mode: a } = i || {};
+		n && a === "gather" && this.props.onSessionChange({
 			...e.session,
 			value: t
 		});
@@ -69,16 +67,16 @@ var G = class extends c.Component {
 	componentDidUpdate() {
 		u(f.findDOMNode(this));
 	}
-	validateSession = ({ model: n, session: r }, i = !1) => {
-		let { config: a, choices: o } = n || {}, { includeTargets: s } = a || {}, c = o.map((e) => e.id), { value: l } = r || {}, u;
-		if (s) l && l.length !== c.length && (u = !0, l = l.length < c.length ? l.concat(Array(c.length - l.length)) : l.filter((e) => c.includes(e)));
+	validateSession = ({ model: e, session: t }, n = !1) => {
+		let { config: r, choices: i } = e || {}, { includeTargets: a } = r || {}, c = i.map((e) => e.id), { value: l } = t || {}, u;
+		if (a) l && l.length !== c.length && (u = !0, l = l.length < c.length ? l.concat(Array(c.length - l.length)) : l.filter((e) => c.includes(e)));
 		else {
-			if (!l || !l.length || i) l = c;
+			if (!l || !l.length || n) l = c;
 			else {
-				let t = e(c, l), n = e(l, c);
-				(t.length || n.length) && (l = c);
+				let e = o(c, l), t = o(l, c);
+				(e.length || t.length) && (l = c);
 			}
-			u = !t(r.value, l);
+			u = !s(t.value, l);
 		}
 		return u && console.warn("This session is not valid anymore. It will be reset."), {
 			value: l,
@@ -86,49 +84,49 @@ var G = class extends c.Component {
 		};
 	};
 	UNSAFE_componentWillReceiveProps(e) {
-		let { model: t = {} } = e || {}, { model: n = {} } = this.props || {}, { correctResponse: r, config: i, choices: a = [], env: o } = t, { includeTargets: c } = i || {}, l = {}, u = n.language && n.language !== t.language, d = n.note && n.note === L.t("common:commonCorrectAnswerWithAlternates", { lng: n.language });
+		let { model: t = {} } = e || {}, { model: n = {} } = this.props || {}, { correctResponse: r, config: a, choices: o = [], env: s } = t, { includeTargets: c } = a || {}, l = {}, u = n.language && n.language !== t.language, d = n.note && n.note === L.t("common:commonCorrectAnswerWithAlternates", { lng: n.language });
 		u && d && (n.note = L.t("common:commonCorrectAnswerWithAlternates", { lng: t.language })), r || (l.showingCorrect = !1);
-		let f = s(a, n.choices), { value: p, needsReset: m } = this.validateSession(e, f), h = {
+		let f = i(o, n.choices), { value: p, needsReset: m } = this.validateSession(e, f), h = {
 			...e.session,
 			value: p
 		}, g = n.config?.includeTargets !== c;
 		c && g && (m = !0, delete h.value), this.setState(l, () => {
-			let { mode: e } = o || {};
+			let { mode: e } = s || {};
 			m && e === "gather" && this.props.onSessionChange(h);
 		});
 	}
 	onDropChoice = (e, t, n) => {
-		let { onSessionChange: r, session: i } = this.props, a = n.tiles.find((e) => e.id === t.id && e.type === t.type && e.index === t.index), s = e;
-		R("[onDropChoice] ", a, s);
-		let c = o({
+		let { onSessionChange: i, session: a } = this.props, o = n.tiles.find((e) => e.id === t.id && e.type === t.type && e.index === t.index), s = e;
+		R("[onDropChoice] ", o, s);
+		let c = r({
 			type: "move",
-			from: a,
+			from: o,
 			to: s
 		}, n);
-		r(Object.assign({}, i, { value: c.response }));
+		i(Object.assign({}, a, { value: c.response }));
 	};
 	onRemoveChoice = (e, t) => {
-		let { onSessionChange: n, session: r } = this.props;
+		let { onSessionChange: n, session: i } = this.props;
 		R("[onRemoveChoice]", e);
-		let i = o({
+		let a = r({
 			type: "remove",
 			target: e
 		}, t);
-		n(Object.assign({}, r, { value: i.response }));
+		n(Object.assign({}, i, { value: a.response }));
 	};
 	createOrdering = () => {
-		let { model: e, session: t } = this.props, { showingCorrect: n } = this.state, { includeTargets: r } = e.config || {
+		let { model: e, session: t } = this.props, { showingCorrect: r } = this.state, { includeTargets: i } = e.config || {
 			orientation: "vertical",
 			includeTargets: !0
 		};
-		return n ? a(e.choices, e.correctResponse, e.correctResponse.map((e) => ({
+		return r ? n(e.choices, e.correctResponse, e.correctResponse.map((e) => ({
 			id: e,
 			outcome: "correct"
 		})), {
-			includeTargets: r,
+			includeTargets: i,
 			allowSameChoiceInTargets: e.config.allowSameChoiceInTargets
-		}) : a(e.choices, t.value, e.outcomes, {
-			includeTargets: r,
+		}) : n(e.choices, t.value, e.outcomes, {
+			includeTargets: i,
 			allowSameChoiceInTargets: e.config.allowSameChoiceInTargets
 		});
 	};
@@ -147,10 +145,10 @@ var G = class extends c.Component {
 		}
 	};
 	render() {
-		let { model: e } = this.props, { correctResponse: t, correctness: n, extraCSSRules: a, prompt: o, rationale: s, feedback: c, config: l, note: u, showNote: d, env: f, disabled: p, teacherInstructions: h, language: g } = e, _ = t && t.length > 0, { showingCorrect: v } = this.state, y = l || {
+		let { model: n } = this.props, { correctResponse: r, correctness: i, extraCSSRules: a, prompt: o, rationale: s, feedback: c, config: l, note: u, showNote: d, env: f, disabled: p, teacherInstructions: h, language: g } = n, _ = r && r.length > 0, { showingCorrect: v } = this.state, y = l || {
 			orientation: "vertical",
 			includeTargets: !0
-		}, { orientation: T, includeTargets: E } = y, O = T === "vertical", k = this.createOrdering(), { mode: N, role: P } = f || {}, F = O ? i : r, I = (v || N === "view" && P === "instructor") && d && u, L = s && (S(s) || x(s)), R = h && (S(h) || x(h)), G = {
+		}, { orientation: T, includeTargets: E } = y, O = T === "vertical", k = this.createOrdering(), { mode: N, role: P } = f || {}, F = O ? t : e, I = (v || N === "view" && P === "instructor") && d && u, L = s && (S(s) || x(s)), R = h && (S(h) || x(h)), G = {
 			color: b.text(),
 			backgroundColor: b.background(),
 			display: "flex",
@@ -191,7 +189,7 @@ var G = class extends c.Component {
 						addGuide: y.showOrdering,
 						tileSize: y.tileSize,
 						includeTargets: E,
-						choiceLabelEnabled: e.config && e.config.choiceLabelEnabled
+						choiceLabelEnabled: n.config && n.config.choiceLabelEnabled
 					}),
 					I && /* @__PURE__ */ C(V, { dangerouslySetInnerHTML: { __html: u } }),
 					L && /* @__PURE__ */ C(U, {
@@ -203,7 +201,7 @@ var G = class extends c.Component {
 						children: /* @__PURE__ */ C(j, { prompt: s })
 					}),
 					!v && /* @__PURE__ */ C(M, {
-						correctness: n,
+						correctness: i,
 						feedback: c
 					})
 				]