@lernapps/app-templates 0.2.1 → 0.3.1

package/dist/{load-RosvaPZf.mjs → load--ovXqbNE.mjs}

@@ -1,15 +1,15 @@
 import { a as isLanguage, c as textLanguages, i as inLanguage, o as languageListProblems, r as LANGUAGES } from "./html-mffkHGHh.mjs";
-import { n as renderMaterial } from "./blocks-CxtCPAa5.mjs";
-import { a as inspect, c as renderMarkdown, i as formulaProblems, l as renderWithFormulas, o as plain, r as FORMULA, s as renderInline, u as renderFormula } from "./check-CteIFN96.mjs";
-import { n as checkMaterial } from "./validate-Bxy9NfB8.mjs";
+import { n as renderMaterial } from "./blocks-D4SSGKuL.mjs";
+import { a as inspect, c as renderMarkdown, i as formulaProblems, l as renderWithFormulas, o as plain, r as FORMULA, s as renderInline, u as renderFormula } from "./check-BxZOZPic.mjs";
+import { n as checkMaterial } from "./validate-CfFykN0M.mjs";
 import { _ as questionIn, a as renderQuestion, b as rightAnswer, i as questionMessagesIn, n as answerText, o as renderSolution, u as isCorrect, v as questionTexts } from "./render-GS1Htlu8.mjs";
-import { _ as verdict, g as schemasById, h as knownProperties, i as addressProblem, m as question_v1_schema_default, s as questionDetails, t as QUESTION_BRANCH, u as questionSchemas } from "./validate-BDwL7Su3.mjs";
+import { _ as verdict, g as schemasById, h as knownProperties, i as addressProblem, m as question_v1_schema_default, s as questionDetails, t as QUESTION_BRANCH, u as questionSchemas } from "./validate-j3GjVhNF.mjs";
 import { t as appName } from "./appname-Bh23cUuz.mjs";
 import { r as languageRoot } from "./pages-9RaaomoO.mjs";
-import { $ as parse, A as answerFor, B as label, D as generate, E as compiled, F as questionFor, G as taskText, I as taskKey, J as tokenize, K as templateProblems, L as answerLabel, M as exampleGiving, O as holds, P as pairValues, Q as evaluate, R as fill, T as StarvedError, W as stepsOf, X as kindOf, Y as unusedVariables, Z as ExpressionError, _ as termId, a as assessments, d as parseRef, et as same, g as isExercise, h as allBlocks, k as values, nt as Fraction, o as drawsTasks, q as templatesIn, s as exerciseOf, t as ASSESSMENT, tt as variables, w as message$1, z as hintOf } from "./assessment-Dy359O1O.mjs";
+import { $ as writtenTemplates, A as items, B as chemPlaceholdersIn, D as compiled, E as StarvedError, H as hintOf, I as pairValues, J as taskText, L as questionFor, M as answerFor, O as generate, P as exampleGiving, Q as unusedVariables, R as taskKey, T as message$1, U as label, V as fill, X as templatesIn, Y as templateProblems, Z as tokenize, a as assessments, at as variables, d as parseRef, et as kindOf, g as isExercise, h as allBlocks, it as same, j as values, k as holds, nt as evaluate, o as drawsTasks, ot as Fraction, q as stepsOf, rt as parse, s as exerciseOf, t as ASSESSMENT, tt as ExpressionError, v as termId, z as answerLabel } from "./assessment-DaKsXUdj.mjs";
 import { a as RESERVED_PARAMS, l as distinctSeeds, o as SEED_TRIES } from "./tasks-DADUYy52.mjs";
 import { a as parse$1, i as nodes, o as readSfc, r as line, s as sfc, t as codeChecker } from "./vue-code-BkJjW_I_.mjs";
-import { a as lineOf, c as schemaProblems, i as isObject, n as Texts, o as pathText, r as get, s as readYaml, t as Problems } from "./content-DO6oEJxj.mjs";
+import { a as lineOf, c as schemaProblems, i as isObject, n as Texts, o as pathText, r as get, s as readYaml, t as Problems } from "./content-CAL0Nz1a.mjs";
 import "node:module";
 import { Ajv2020 } from "ajv/dist/2020.js";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
@@ -14738,16 +14738,67 @@ function formulaAlternative(text, lang) {
 	return formulas.map((formula) => speakFormula(formula[1] ?? "", lang)).join(" ");
 }
 // runtime/explainer/exercises.ts
-/** The templates of a generated exercise in each of `languages`; links inside them through `resolve`. */
-function templatesOf(spec, languages, resolve = (href) => href) {
+/** A value of a placeholder in \ce{{{…}}} whose formula does not parse; the check reports its message as it is. */
+var ChemError = class extends Error {};
+/**
+* The chemical formula of each value of the placeholders in \ce{{{…}}} of an exercise's templates in `lang`, as
+* MathML without <math>, by the value as the learner reads it: each value of the list the placeholder's root is
+* drawn from (oneOf, or pick: 1 from a list or a data file), set by mhchem as \ce{value}. Throws a ChemError for a
+* value that does not parse.
+*/
+function chemFormulas(spec, data, lang) {
+	const formulas = {};
+	const paths = new Set(writtenTemplates(spec).filter((written) => written.lang === void 0 || written.lang === lang).flatMap((written) => chemPlaceholdersIn(written.text)));
+	for (const path of paths) {
+		const root = path.split(".")[0] ?? "";
+		const arbitrary = spec.given[root];
+		if (arbitrary === void 0) continue;
+		const source = arbitrary.oneOf ?? (arbitrary.pick === 1 ? arbitrary.from : void 0);
+		if (source === void 0) continue;
+		let candidates;
+		try {
+			candidates = items(source, data);
+		} catch {
+			continue;
+		}
+		for (const candidate of candidates) {
+			let text;
+			try {
+				text = label(evaluate(parse(path), { [root]: candidate }), lang);
+			} catch {
+				continue;
+			}
+			if (text in formulas) continue;
+			try {
+				let depth = 0;
+				for (const char of text) if (char === "{") depth++;
+				else if (char === "}" && --depth < 0) break;
+				if (depth !== 0) throw new Error("its braces are not balanced");
+				const math = renderFormula(`\\ce{${text}}`, false);
+				formulas[text] = /^<math[^>]*>([\s\S]*)<\/math>$/.exec(math)?.[1] ?? math;
+			} catch (error) {
+				const reason = (error instanceof Error ? error.message : String(error)).split("\n")[0]?.trim() ?? "";
+				throw new ChemError(`\\ce{{{${path}}}}: the value "${text}" is no chemical formula mhchem can set (${reason}); write it in mhchem's notation, e.g. 2H2 + O2 -> 2H2O`);
+			}
+		}
+	}
+	return formulas;
+}
+/**
+* The templates of a generated exercise in each of `languages`, with the formulas of the values in \ce{{{…}}} drawn
+* from `data`; links inside them through `resolve`.
+*/
+function templatesOf(spec, languages, data, resolve = (href) => href) {
 	const templates = {};
 	for (const lang of languages) {
 		const inline = (text) => renderInline(tokenize(inLanguage(text, lang)), resolve);
+		const chem = chemFormulas(spec, data, lang);
 		templates[lang] = {
 			task: inline(spec.task.text),
 			steps: (spec.steps ?? []).map(inline),
 			hint: spec.hint === void 0 ? void 0 : inline(spec.hint),
-			messages: (spec.mistakes ?? []).map((mistake) => tokenize(inLanguage(mistake.message, lang)))
+			messages: (spec.mistakes ?? []).map((mistake) => tokenize(inLanguage(mistake.message, lang))),
+			...Object.keys(chem).length === 0 ? {} : { chem }
 		};
 	}
 	return templates;
@@ -14765,7 +14816,7 @@ const seedCache = /* @__PURE__ */ new WeakMap();
 function taskSeeds(spec, data) {
 	let seeds = seedCache.get(spec);
 	if (seeds === void 0) {
-		const templates = templatesOf(spec, ["de"]);
+		const templates = templatesOf(spec, ["de"], data);
 		seeds = distinctSeeds((seed) => {
 			try {
 				return taskKey(spec, generate(spec, seed, data), "de", templates);
@@ -14844,7 +14895,7 @@ function generatedData(spec, lang, all, resolve) {
 		kind: "generated",
 		lang,
 		spec: shipped,
-		templates: templatesOf(spec, [lang], resolve),
+		templates: templatesOf(spec, [lang], data, resolve),
 		data,
 		seeds: taskSeeds(spec, data),
 		texts: {
@@ -14907,8 +14958,8 @@ function openTaskExercise(block, lang, resolve, storage) {
 	].filter((part) => part !== "").join("\n");
 }
 function generatedExercise(spec, lang, all, resolve) {
-	const templates = templatesOf(spec, [lang], resolve);
 	const data = dataOf(spec, all);
+	const templates = templatesOf(spec, [lang], data, resolve);
 	const solution = questionMessagesIn(lang).solution;
 	const worked = workedTasks(spec, data, templates, lang).map((item) => [
 		`<li class="explainer-worked-task">`,
@@ -15736,7 +15787,7 @@ var explainer_v1_schema_default = {
 			"type": "object"
 		},
 		"expression": {
-			"description": "An expression of the expression language, e.g. \"G * p / 100\": numbers (exact fractions), + - * /, parentheses, == != < <= > >=, and, or, not, strings in quotes, record fields (e.year), list index (xs[0]), lists ([1, 2]), and the functions round(x, n), decimals, map(xs, field), sortBy(xs, field), reverse. It may use the variables of given.",
+			"description": "An expression of the expression language, e.g. \"G * p / 100\": numbers (exact fractions), + - * /, parentheses, == != < <= > >=, and, or, not, strings in quotes, record fields (e.year), list index (xs[0]), lists ([1, 2]), and the functions round(x, n), decimals, map(xs, field), sortBy(xs, field), reverse, sqrt(x), pow(x, n), sin(x), cos(x), tan(x), asin(x), acos(x), atan(x). Angles are in degrees: sin(30) is 1/2. Round a result that is not rational (sqrt(2)) with round(x, n). It may use the variables of given.",
 			"type": "string",
 			"minLength": 1,
 			"pattern": "\\S"
@@ -15854,7 +15905,7 @@ var explainer_v1_schema_default = {
 			}
 		},
 		"generated": {
-			"description": "An exercise drawn from a seed, property-based: given draws the values, where filters them, task is the text with placeholders ({{G}}, {{e.name}}; {{answer}} in the steps), answer is an expression with its comparator, mistakes are typical wrong answers each with a message saying what went wrong, hint and steps help. A placeholder is always two braces around a declared name or its field, nothing else inside, in prose and in formulas alike ($\\frac{{{W}}}{{{G}}}$); an index is no field, so {{opts[0].x}} is no placeholder and the build reports it: draw the record on its own (given: { e: { pick: 1, from: { data: name } } }) and write {{e.x}}; one brace is never a placeholder, so in a formula G and {G} are the letter. The build checks that every placeholder names a variable of given (or answer), that no text has double braces around anything but a name or its field, that no prose has a placeholder with one brace or spaces inside, and that every variable of given is used in a placeholder or in an expression of the answer or mistakes; then it checks it over 200 fixed seeds: where holds in at least 1 of 10 draws; the answer is defined, in its format and passes its comparator; no mistake equals it; the task is the same each time and keeps no placeholder. Its tasks are numbered: the build walks the seeds 1, 2, 3, … and numbers only the distinct tasks, Aufgabe Nr. 1 to N (N at most 67; fewer when the exercise has fewer distinct tasks, noted in the build output). The number is what the page shows, what a learner names to a tutor, and what the address carries: ?seed=<n>#<id> opens task number n (a number above N wraps around). Without JavaScript the page shows the tasks 1, 2 and 3 as worked tasks with their solution; with JavaScript a live task of a random number, Neue Aufgabe, which moves to the next number (after N back to 1) and writes it into the address, and the deep link: a wrong answer gets the message of the mistake it matches (else a line to look again, with the hint above) and may be tried again; the solution and the steps show after the right answer or Lösung zeigen.",
+			"description": "An exercise drawn from a seed, property-based: given draws the values, where filters them, task is the text with placeholders ({{G}}, {{e.name}}; {{answer}} in the steps), answer is an expression with its comparator, mistakes are typical wrong answers each with a message saying what went wrong, hint and steps help. A placeholder is always two braces around a declared name or its field, nothing else inside, in prose and in formulas alike ($\\frac{{{W}}}{{{G}}}$); an index is no field, so {{opts[0].x}} is no placeholder and the build reports it: draw the record on its own (given: { e: { pick: 1, from: { data: name } } }) and write {{e.x}}; one brace is never a placeholder, so in a formula G and {G} are the letter. A chemical formula from a record is $\\ce{{{r.gl}}}$: the whole formula in one field (gl: \"2H2 + O2 -> 2H2O\"), r drawn with pick: 1 or oneOf; a placeholder inside a longer \\ce or in \\pu is not possible. The build checks that every placeholder names a variable of given (or answer), that no text has double braces around anything but a name or its field, that no prose has a placeholder with one brace or spaces inside, and that every variable of given is used in a placeholder or in an expression of the answer or mistakes; then it checks it over 200 fixed seeds: where holds in at least 1 of 10 draws; the answer is defined, in its format and passes its comparator; no mistake equals it; the task is the same each time and keeps no placeholder. Its tasks are numbered: the build walks the seeds 1, 2, 3, … and numbers only the distinct tasks, Aufgabe Nr. 1 to N (N at most 67; fewer when the exercise has fewer distinct tasks, noted in the build output). The number is what the page shows, what a learner names to a tutor, and what the address carries: ?seed=<n>#<id> opens task number n (a number above N wraps around). Without JavaScript the page shows the tasks 1, 2 and 3 as worked tasks with their solution; with JavaScript a live task of a random number, Neue Aufgabe, which moves to the next number (after N back to 1) and writes it into the address, and the deep link: a wrong answer gets the message of the mistake it matches (else a line to look again, with the hint above) and may be tried again; the solution and the steps show after the right answer or Lösung zeigen.",
 			"required": [
 				"id",
 				"given",
@@ -16096,10 +16147,125 @@ var explainer_v1_schema_default = {
 		}
 	}
 };
+// runtime/explainer/explainer.v2.schema.json
+var explainer_v2_schema_default = {
+	$schema: "https://json-schema.org/draft/2020-12/schema",
+	$id: "urn:lernapps:schema:explainer.v2",
+	title: "Content of a lernapps explainer, format 2",
+	description: "Format 2 of an explainer's content, as YAML in src/: src/app.yaml, src/<chapter>/chapter.yaml, src/<chapter>/<page>.yaml and src/data/<name>.yaml. It is format 1 (explainer.v1.schema.json) plus the app's place on the learning map: format: 2 and strand in src/app.yaml, and on each page the competencies it practises, or recap on a page that repeats a competency from elsewhere. An app.yaml without format is format 1.",
+	allOf: [
+		{
+			"if": {
+				"type": "object",
+				"required": ["chapters"],
+				"properties": { "chapters": {} }
+			},
+			"then": { "$ref": "#/$defs/app" }
+		},
+		{
+			"if": {
+				"type": "object",
+				"required": ["pages"],
+				"properties": { "pages": {} }
+			},
+			"then": { "$ref": "#/$defs/chapter" }
+		},
+		{
+			"if": {
+				"type": "object",
+				"required": ["blocks"],
+				"properties": { "blocks": {} }
+			},
+			"then": { "$ref": "#/$defs/page" }
+		},
+		{
+			"if": { "type": "array" },
+			"then": { "$ref": "#/$defs/data" }
+		}
+	],
+	$defs: {
+		"id": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/id" },
+		"strand": {
+			"description": "The one strand (Strang) of the learning map the app belongs to, <subject>/<strand>, e.g. mathematik/stochastik; or none if it belongs to none (then it is not on the map).",
+			"type": "string",
+			"pattern": "^(none|[a-z0-9]+(-[a-z0-9]+)*/[a-z0-9]+(-[a-z0-9]+)*)$"
+		},
+		"competency": {
+			"description": "A competency of the learning map, <subject>/<competency>, e.g. physik/gewichtskraft-berechnen.",
+			"type": "string",
+			"pattern": "^[a-z0-9]+(-[a-z0-9]+)*/[a-z0-9]+(-[a-z0-9]+)*$"
+		},
+		"app": {
+			"description": "src/app.yaml in format 2: format: 2 and strand, everything else as in format 1.",
+			"type": "object",
+			"additionalProperties": false,
+			"required": [
+				"format",
+				"strand",
+				"title",
+				"intro",
+				"languages",
+				"chapters"
+			],
+			"properties": {
+				"format": {
+					"description": "Always 2. Without it, the content is format 1 (explainer.v1.schema.json).",
+					"const": 2
+				},
+				"strand": { "$ref": "#/$defs/strand" },
+				"title": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/title" },
+				"intro": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/intro" },
+				"languages": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/languages" },
+				"chapters": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/chapters" },
+				"sources": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/sources" },
+				"tutor": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/tutor" },
+				"scope": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/app/properties/scope" }
+			}
+		},
+		"chapter": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/chapter" },
+		"page": {
+			"description": "src/<chapter>/<page>.yaml in format 2: a page as in format 1, plus competencies, or recap on a recap page.",
+			"type": "object",
+			"additionalProperties": false,
+			"required": ["title", "blocks"],
+			"properties": {
+				"title": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/page/properties/title" },
+				"description": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/page/properties/description" },
+				"competencies": {
+					"description": "The competencies (Bausteine) the page practises, ids of the subject of the app's strand; as a rule one. Required when the app has a strand; leave it out with strand: none and on a recap page. The catalog checks the ids when it lists the app.",
+					"type": "array",
+					"minItems": 1,
+					"uniqueItems": true,
+					"items": { "$ref": "#/$defs/id" }
+				},
+				"recap": {
+					"description": "Makes the page a recap page: it repeats a competency that the app's competencies require but the app does not practise, e.g. physik/gewichtskraft-berechnen. Use it instead of competencies, also with strand: none. A recap page has descriptive blocks only, no exercise; the link to the competency on the learning map is added for you.",
+					"$ref": "#/$defs/competency"
+				},
+				"blocks": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/page/properties/blocks" },
+				"scope": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/page/properties/scope" }
+			},
+			"not": {
+				"required": ["competencies", "recap"],
+				"properties": {
+					"competencies": {},
+					"recap": {}
+				}
+			}
+		},
+		"data": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/data" },
+		"event": { "$ref": "urn:lernapps:schema:explainer.v1#/$defs/event" }
+	}
+};
 // runtime/explainer/schema.ts
 const SCHEMA_ID = explainer_v1_schema_default.$id;
-/** Where an app finds the schema of its content, for the message that names it. */
-const SCHEMA_FILE = "node_modules/@lernapps/app-templates/runtime/explainer/explainer.v1.schema.json";
+const SCHEMA_ID_V2 = explainer_v2_schema_default.$id;
+/** Where an app finds the schema of its content, by format, for the message that names it. */
+const SCHEMA_FILES = {
+	1: "node_modules/@lernapps/app-templates/runtime/explainer/explainer.v1.schema.json",
+	2: "node_modules/@lernapps/app-templates/runtime/explainer/explainer.v2.schema.json"
+};
+SCHEMA_FILES[1];
 const ajv = new Ajv2020({
 	allErrors: true,
 	strict: true,
@@ -16107,9 +16273,10 @@ const ajv = new Ajv2020({
 });
 for (const each of questionSchemas) ajv.addSchema(each);
 ajv.addSchema(explainer_v1_schema_default);
-const validator = (name) => {
-	const validate = ajv.getSchema(`${SCHEMA_ID}#/$defs/${name}`);
-	if (validate === void 0) throw new Error(`the schema has no $defs/${name}`);
+ajv.addSchema(explainer_v2_schema_default);
+const validator = (name, id = SCHEMA_ID) => {
+	const validate = ajv.getSchema(`${id}#/$defs/${name}`);
+	if (validate === void 0) throw new Error(`the schema ${id} has no $defs/${name}`);
 	return validate;
 };
 const validators = {
@@ -16119,6 +16286,23 @@ const validators = {
 	data: validator("data"),
 	event: validator("event")
 };
+/** The validators of format 2: its own app and page; chapters, data files and events are those of format 1. */
+const validatorsV2 = {
+	...validators,
+	app: validator("app", SCHEMA_ID_V2),
+	page: validator("page", SCHEMA_ID_V2)
+};
+/** The format of the app `app` (src/app.yaml as read): 2 when it names any format, which its schema then checks. */
+const formatOf = (app) => isObject(app) && app["format"] !== void 0 ? 2 : 1;
+/** The fields of format 2, which format 1 does not know. */
+const FORMAT_2_FIELDS = /* @__PURE__ */ new Set([
+	"format",
+	"strand",
+	"competencies",
+	"recap"
+]);
+/** The fields of format 2 on a page. */
+const PAGE_FIELDS = /* @__PURE__ */ new Set(["competencies", "recap"]);
 const schemas = schemasById(...questionSchemas, explainer_v1_schema_default);
 const BLOCK_DEFINITIONS = {
 	text: "textBlock",
@@ -16147,6 +16331,7 @@ const questionFields = (type) => {
 /** What `required` names as missing, with why it is needed. */
 function missing(property, object) {
 	const type = isObject(object) ? object["type"] : void 0;
+	if (property === "strand") return "strand is missing; name the strand of the learning map the app stays in, <subject>/<strand> (e.g. mathematik/stochastik), or none when the app is on no strand";
 	if (property === "origin") return "origin is missing; a quote names who said or wrote it, where and when";
 	if ((property === "licence" || property === "source") && type === "quote") return `${property} is missing; a quote names its source and its licence`;
 	if (property === "licence" || property === "source") return `${property} is missing; a bundled image names its source and its licence`;
@@ -16163,7 +16348,35 @@ const describe = (error, path, value) => {
 				...lang === void 0 ? {} : { lang }
 			};
 		}
+		case "not":
+			if (path.length !== 0 || !isObject(value) || !("recap" in value) || !("competencies" in value)) return void 0;
+			return {
+				path: ["recap"],
+				message: "a page has competencies or recap, never both: a page practises competencies of the app's strand, a recap page only repeats a competency the app does not practise; remove one of them"
+			};
+		case "const":
+			if (path.length !== 1 || path[0] !== "format") return void 0;
+			return { message: `${String(value)} is not a format; write format: 2, or leave format out for format 1` };
+		case "uniqueItems":
+			if (path.at(-1) !== "competencies") return void 0;
+			return { message: "names a competency twice; name each competency once" };
+		case "additionalProperties": {
+			const property = String(error.params["additionalProperty"]);
+			if (path.length !== 0 || !FORMAT_2_FIELDS.has(property) || !isObject(value)) return void 0;
+			if (PAGE_FIELDS.has(property) && "blocks" in value) return {
+				path: [property],
+				message: `${property} is a field of format 2; add format: 2 and the app's strand to src/app.yaml, or remove it`
+			};
+			if (!PAGE_FIELDS.has(property) && "chapters" in value) return {
+				path: [property],
+				message: `${property} is a field of format 2; add format: 2 to src/app.yaml, with the app's strand`
+			};
+			return;
+		}
 		case "pattern":
+			if (path.length === 1 && path[0] === "strand") return { message: `${String(value)} is no strand; write <subject>/<strand> with the ids of the learning map, e.g. mathematik/stochastik, or none` };
+			if (path.length === 1 && path[0] === "recap") return { message: `${String(value)} is no competency of the learning map; write <subject>/<competency> with the ids of the learning map, e.g. physik/gewichtskraft-berechnen` };
+			if (path.at(-2) === "competencies") return { message: `${String(value)} is no competency id; use the competency's id in the learning map: lower-case letters, digits and hyphens, e.g. laplace` };
 			if (path.at(-2) === "exercises" && path[0] === "selfAssessment") return { message: `${String(value)} is no exercise's address; write /<chapter>/<page>/#<exercise>` };
 			if (path.at(-1) !== "youtube") return void 0;
 			return { message: `${String(value)} is no YouTube id; give the 11 characters after watch?v= in the video's address, e.g. rkLmLaFHodo` };
@@ -16186,8 +16399,8 @@ const describe = (error, path, value) => {
 			};
 	}
 };
-function validate(yaml, kind, problems) {
-	const check = validators[kind];
+function validate(yaml, kind, problems, format = 1) {
+	const check = (format === 2 ? validatorsV2 : validators)[kind];
 	if (check(yaml.value)) return true;
 	const before = problems.lines.length;
 	schemaProblems(yaml, check.errors ?? [], problems, describe);
@@ -16604,8 +16817,12 @@ function checkGenerated(check, block, at) {
 	for (const [name, file] of check.dataFiles) records[name] = file.value;
 	let templates;
 	try {
-		templates = templatesOf(block, texts.languages);
+		templates = templatesOf(block, texts.languages, dataOf(block, records));
 	} catch (error) {
+		if (error instanceof ChemError) {
+			problems.at(yaml, at, error.message);
+			return;
+		}
 		const reason = (error instanceof Error ? error.message : String(error)).split("\n")[0] ?? "";
 		problems.at(yaml, at, `a formula with its placeholders filled in does not parse (${reason.trim()}); check its braces: a placeholder is {{G}}, a letter is G`);
 		return;
@@ -16708,11 +16925,11 @@ const IMAGE = /^[a-z0-9]+(-[a-z0-9]+)*\.(svg|png|jpg|webp)$/;
 /** The content could not be read: one problem per line in `problems`. */
 var ContentError = class extends Error {
 	problems;
-	constructor(problems) {
+	constructor(problems, format = 1) {
 		super([
 			`the explainer's content in src/ is not valid (${RULE_URL}):`,
 			...problems.map((problem) => `  - ${problem}`),
-			`Fix the content as its schema says: ${SCHEMA_FILE}`
+			`Fix the content as its schema says: ${SCHEMA_FILES[format]}`
 		].join("\n"));
 		this.problems = problems;
 	}
@@ -16767,6 +16984,10 @@ function checkAssessment(yaml, assessment, chapters, chapter, components, proble
 				problems.at(yaml, path, `${ref} names no page of the app; write /<chapter>/<page>/#<exercise>`);
 				return;
 			}
+			if (page.recap !== void 0) {
+				problems.at(yaml, path, `${ref} is on a recap page, which has no exercise and is left out of the self-assessment; choose an exercise of a page of the app's own competencies`);
+				return;
+			}
 			const exercise = exerciseOf(components, page, parts.exercise);
 			if (twice && exercise !== void 0 && !drawsTasks(exercise)) {
 				problems.at(yaml, path, `${ref} is listed twice, and a question shows the same task each time; list it once (a generated exercise or an exercise component may be listed again: each listing draws a task of its own)`);
@@ -16778,13 +16999,27 @@ function checkAssessment(yaml, assessment, chapters, chapter, components, proble
 		});
 	});
 }
+/** Each block of `blocks` and the blocks inside them, with its path in the page's file. */
+function* blockPaths(blocks, path) {
+	for (const [index, block] of blocks.entries()) {
+		yield [block, [...path, index]];
+		if (block.type === "section" || block.type === "example" || block.type === "note") yield* blockPaths(block.blocks, [
+			...path,
+			index,
+			"blocks"
+		]);
+	}
+}
 /** The problems of the content in `root`/src, and the content when there are none. */
 function check(root, seeds = 200) {
 	const problems = new Problems();
 	const src = join(root, "src");
 	if (!existsSync(join(src, "app.yaml"))) {
 		problems.file("src/app.yaml", "is missing: the app's title, intro, languages and the order of its chapters belong there");
-		return { problems: problems.lines };
+		return {
+			problems: problems.lines,
+			format: 1
+		};
 	}
 	const chapterIds = [];
 	const dataFiles = /* @__PURE__ */ new Map();
@@ -16811,11 +17046,18 @@ function check(root, seeds = 200) {
 	const components = existsSync(join(src, "components")) ? readComponents(root) : void 0;
 	for (const problem of components?.problems ?? []) problems.add(problem);
 	const appYaml = readYaml(root, "src/app.yaml", problems);
-	if (appYaml === void 0 || !validate(appYaml, "app", problems)) return { problems: problems.lines };
+	const format = formatOf(appYaml?.value);
+	if (appYaml === void 0 || !validate(appYaml, "app", problems, format)) return {
+		problems: problems.lines,
+		format
+	};
 	const app = appYaml.value;
 	const languageList = languageListProblems(app.languages, LANGUAGES);
 	for (const problem of languageList) problems.at(appYaml, ["languages", Math.max(app.languages.lastIndexOf(problem.lang), 0)], problem.message);
-	if (languageList.length > 0) return { problems: problems.lines };
+	if (languageList.length > 0) return {
+		problems: problems.lines,
+		format
+	};
 	const texts = new Texts(app.languages, problems);
 	texts.check(appYaml, ["title"], "plain");
 	texts.check(appYaml, ["intro"], "markdown");
@@ -16885,11 +17127,13 @@ function check(root, seeds = 200) {
 		for (const pageId of pagesOk ? chapter.pages : pageIds) {
 			const file = `src/${chapterId}/${pageId}.yaml`;
 			const yaml = readYaml(root, file, problems);
-			if (yaml === void 0 || !validate(yaml, "page", problems)) {
+			if (yaml === void 0 || !validate(yaml, "page", problems, format)) {
 				complete = false;
 				continue;
 			}
 			const page = yaml.value;
+			if (app.strand === "none" && page.competencies !== void 0) problems.at(yaml, ["competencies"], "competencies is not allowed: src/app.yaml has strand: none, so the app is on no strand; remove it, or name the app's strand in src/app.yaml");
+			else if (app.strand !== void 0 && app.strand !== "none" && page.competencies === void 0 && page.recap === void 0) problems.at(yaml, [], `competencies is missing; src/app.yaml names the strand ${app.strand}, so each page names the competencies of its subject that it practises, e.g. competencies: [laplace]; a page that only repeats a competency the app does not practise says recap: <subject>/<competency> instead`);
 			texts.check(yaml, ["title"], "plain");
 			texts.check(yaml, ["description"], "plain");
 			const pageAnchors = /* @__PURE__ */ new Set();
@@ -16909,7 +17153,12 @@ function check(root, seeds = 200) {
 				uses,
 				dataUsed
 			}, page.blocks, ["blocks"], 0);
-			if (![...allBlocks(page.blocks)].some(isExercise)) problems.at(yaml, ["blocks"], "the page has no exercise; give it a section with an exercise: one of the question types, or generated");
+			if (page.recap !== void 0) for (const [block, path] of blockPaths(page.blocks, ["blocks"])) {
+				const component = uses.find((use) => use.block === block && use.component.exercise);
+				if (!isExercise(block) && component === void 0) continue;
+				problems.at(yaml, path, `${component === void 0 ? `the exercise ${block.type}` : `the exercise component ${component.component.name}`} is not allowed on a recap page: it repeats ${page.recap} with descriptive blocks only, and the apps of that competency's strand practise it; remove the exercise, or make it a page of the app's own competencies`);
+			}
+			else if (![...allBlocks(page.blocks)].some(isExercise)) problems.at(yaml, ["blocks"], "the page has no exercise; give it a section with an exercise: one of the question types, or generated");
 			for (const [id, path] of exercises) {
 				if (pageAnchors.has(id)) problems.at(yaml, [...path, "id"], `${id} is also the anchor of a section of this page; give the exercise its own id`);
 				pageAnchors.add(id);
@@ -16950,7 +17199,10 @@ function check(root, seeds = 200) {
 	}
 	for (const chapter of chapters) for (const page of chapter.pages) if (app.scope !== void 0 && page.scope === void 0) problems.file(page.file, "has no scope; src/app.yaml has one, so each page says in scope: what it teaches, in your own words from the material");
 	else if (app.scope === void 0 && page.scope !== void 0) problems.file(page.file, "has a scope, but src/app.yaml has none; add scope: { out: [...] } to src/app.yaml, what does not belong to the scope");
-	if (problems.lines.length > 0) return { problems: problems.lines };
+	if (problems.lines.length > 0) return {
+		problems: problems.lines,
+		format
+	};
 	const data = {};
 	for (const [id, yaml] of dataFiles) data[id] = yaml.value;
 	return {
@@ -16962,15 +17214,16 @@ function check(root, seeds = 200) {
 			components: uses,
 			storage: appName(root, "explainer")
 		},
-		problems: []
+		problems: [],
+		format
 	};
 }
 /**
 * The content in `root`/src, its generated exercises tested over `seeds` seeds (0: not at all, for a reader of content
 * the build has checked); throws a ContentError with every problem when it is not valid. */
 function loadSite(root, seeds = 200) {
-	const { site, problems } = check(root, seeds);
-	if (site === void 0) throw new ContentError(problems);
+	const { site, problems, format } = check(root, seeds);
+	if (site === void 0) throw new ContentError(problems, format);
 	return site;
 }
 export { exampleProblems$1 as _, routes as a, exerciseData as c, templatesOf as d, workedTasks as f, describedProblems as g, TABLE_CONTRACT as h, hiddenChapter as i, renderExercise as l, SIZE_BUDGET as m, loadSite as n, terms as o, formulaAlternative as p, contentPages as r, dataOf as s, ContentError as t, taskSeeds as u, propertyProblems as v, propsIn as y };

package/dist/questions.mjs

@@ -1,5 +1,5 @@
 import { C as wrongAnswer, S as shuffled, T as de_default, _ as questionIn, a as renderQuestion, b as rightAnswer, c as hash, d as materialPairs, f as missesRight, g as questionId, h as questionAddresses, i as questionMessagesIn, l as isComplete, m as parseNumber, n as answerText, o as renderSolution, p as mixed, s as QUESTION_TYPES, t as QUESTION_MESSAGES, u as isCorrect, v as questionTexts, w as wrongReasons, x as rightEntries, y as random } from "./render-GS1Htlu8.mjs";
-import { c as questionSchema, l as questionSchemaProblems, n as QUESTION_REF, p as validateQuestion, r as QUESTION_SCHEMA_ID, s as questionDetails, u as questionSchemas } from "./validate-BDwL7Su3.mjs";
+import { c as questionSchema, l as questionSchemaProblems, n as QUESTION_REF, p as validateQuestion, r as QUESTION_SCHEMA_ID, s as questionDetails, u as questionSchemas } from "./validate-j3GjVhNF.mjs";
 // runtime/shared/questions/index.ts
 /** The texts of a question for learners in German, by their key (messages/de.json); questionMessagesIn(lang) for another. */
 const messages = de_default;

package/dist/quiz-e2e.mjs

@@ -1,7 +1,7 @@
 import { C as wrongAnswer, b as rightAnswer, g as questionId } from "./render-GS1Htlu8.mjs";
 import { i as expectMaterial, n as expectBackground, o as question, r as expectFeedbackInView, t as answerQuestion } from "./e2e-CU0n_unV.mjs";
 import { n as quizLanguages, t as quizIn } from "./quiz-DnW-xtCh.mjs";
-import { n as messagesIn, t as QUIZ_MESSAGES } from "./render-DqHOJyHK.mjs";
+import { n as messagesIn, t as QUIZ_MESSAGES } from "./render-mYtzN1DV.mjs";
 import { expect, test } from "playwright/test";
 import { readFileSync } from "node:fs";
 // runtime/quiz/e2e.ts

package/dist/quiz-plugin.mjs

@@ -1,12 +1,12 @@
 import { c as textLanguages, o as languageListProblems, r as LANGUAGES, t as escape } from "./html-mffkHGHh.mjs";
 import { r as materialImages } from "./block-BK_ohsH1.mjs";
-import "./blocks-CxtCPAa5.mjs";
-import { a as duplicates, d as readable, f as schemaMessages, o as inQuestion, p as validateQuestion, u as questionSchemas } from "./validate-BDwL7Su3.mjs";
+import "./blocks-D4SSGKuL.mjs";
+import { a as duplicates, d as readable, f as schemaMessages, o as inQuestion, p as validateQuestion, u as questionSchemas } from "./validate-j3GjVhNF.mjs";
 import { n as quizLanguages, t as quizIn } from "./quiz-DnW-xtCh.mjs";
 import { t as appName } from "./appname-Bh23cUuz.mjs";
 import { n as isSizeless, t as imageType } from "./image-CspJVfyQ.mjs";
 import { c as withLanguage, i as notFoundPage, n as fromDepth, r as languageRoot } from "./pages-9RaaomoO.mjs";
-import { r as renderQuiz } from "./render-DqHOJyHK.mjs";
+import { r as renderQuiz } from "./render-mYtzN1DV.mjs";
 import { Ajv2020 } from "ajv/dist/2020.js";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{render-D5kwkNt1.mjs → render-D3LsJY04.mjs}

@@ -1,7 +1,7 @@
 import { i as inLanguage, l as textsIn, o as languageListProblems, r as LANGUAGES } from "./html-mffkHGHh.mjs";
-import { c as renderMarkdown, o as plain } from "./check-CteIFN96.mjs";
+import { c as renderMarkdown, o as plain } from "./check-BxZOZPic.mjs";
 import { a as pageFooter, o as pageHeader, r as languageRoot, s as relative, t as alternateLinks } from "./pages-9RaaomoO.mjs";
-import { c as schemaProblems, n as Texts, s as readYaml, t as Problems } from "./content-DO6oEJxj.mjs";
+import { c as schemaProblems, n as Texts, s as readYaml, t as Problems } from "./content-CAL0Nz1a.mjs";
 import { Ajv2020 } from "ajv/dist/2020.js";
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";

package/dist/{render-DqHOJyHK.mjs → render-mYtzN1DV.mjs}

@@ -1,5 +1,5 @@
 import { l as textsIn, s as localeOf, t as escape } from "./html-mffkHGHh.mjs";
-import { n as renderMaterial } from "./blocks-CxtCPAa5.mjs";
+import { n as renderMaterial } from "./blocks-D4SSGKuL.mjs";
 import { a as renderQuestion, g as questionId, o as renderSolution, r as external, t as QUESTION_MESSAGES } from "./render-GS1Htlu8.mjs";
 import { a as de_default, i as en_default, r as solutionId } from "./quiz-DnW-xtCh.mjs";
 import { a as pageFooter, o as pageHeader, r as languageRoot, s as relative, t as alternateLinks } from "./pages-9RaaomoO.mjs";

package/dist/{result-D_mmCVwN.mjs → result-DphIWHDF.mjs}

@@ -1,5 +1,5 @@
 import { x as rightEntries } from "./render-GS1Htlu8.mjs";
-import { w as message } from "./assessment-Dy359O1O.mjs";
+import { T as message } from "./assessment-DaKsXUdj.mjs";
 // runtime/explainer/result.ts
 const key = (id, n) => n === void 0 ? id : `${id}=${n}`;
 /**

package/dist/{validate-Bxy9NfB8.mjs → validate-CfFykN0M.mjs}

@@ -1,6 +1,6 @@
 import { i as inLanguage } from "./html-mffkHGHh.mjs";
 import { n as markerOf } from "./block-BK_ohsH1.mjs";
-import { t as checkText } from "./check-CteIFN96.mjs";
+import { t as checkText } from "./check-BxZOZPic.mjs";
 // runtime/shared/blocks/validate.ts
 /** The definition of each type of block in the schema of the blocks (blocks.v1.schema.json). */
 const MATERIAL_DEFINITIONS = {

package/dist/{validate-BDwL7Su3.mjs → validate-j3GjVhNF.mjs}

@@ -1,5 +1,5 @@
 import { c as textLanguages } from "./html-mffkHGHh.mjs";
-import { n as checkMaterial, t as MATERIAL_DEFINITIONS } from "./validate-Bxy9NfB8.mjs";
+import { n as checkMaterial, t as MATERIAL_DEFINITIONS } from "./validate-CfFykN0M.mjs";
 import { _ as questionIn, h as questionAddresses, l as isComplete, m as parseNumber, u as isCorrect, v as questionTexts, x as rightEntries } from "./render-GS1Htlu8.mjs";
 import { Ajv2020 } from "ajv/dist/2020.js";
 // runtime/shared/examples.ts
@@ -298,7 +298,7 @@ var blocks_v1_schema_default = {
 			"type": "object"
 		},
 		"latex": {
-			"description": "One formula in the LaTeX subset of the formula command list: \\frac, \\cdot, \\times, \\div, \\%, \\text, ^, _, \\sqrt, \\approx, \\pm, \\le, \\ge, \\neq, \\, (thin space), parentheses and braces; \\ce{…} for chemical equations and \\pu{…} for units (mhchem). Written without the $ signs. A map by language only when it has \\text{…} that differs by language.",
+			"description": "One formula in the LaTeX subset of the formula command list: \\frac, \\cdot, \\times, \\div, \\%, \\text, ^, _, \\sqrt, \\approx, \\pm, \\le, \\ge, \\neq, \\, (thin space), \\  (space), \\quad, \\qquad, \\Rightarrow, \\Leftrightarrow, \\left( … \\right), parentheses and braces; \\sin, \\cos, \\tan, \\arcsin, \\arccos, \\arctan (or \\sin^{-1}), \\circ for degrees (30^\\circ); the Greek letters \\alpha to \\omega (also \\varepsilon, \\vartheta, \\varphi) and the capitals \\Gamma, \\Delta, \\Theta, \\Lambda, \\Xi, \\Pi, \\Sigma, \\Phi, \\Psi, \\Omega; \\ce{…} for chemical equations and \\pu{…} for units (mhchem). The build names any other command and lists these. Written without the $ signs. A map by language only when it has \\text{…} that differs by language.",
 			"$ref": "urn:lernapps:schema:text.v1#/$defs/text"
 		},
 		"table": {

package/explainer/README.md

@@ -11,7 +11,8 @@ Chapters of pages that explain a topic, with exercises on every page. Every page
   videos directly from then on. The catalog entry of an app with a video says `fitness.thirdParty: on-click`.
 - Exercises of the six question types, with feedback, hints and typical mistakes; a question can show content (`material`: the figures, tables, quotes and code of the page's blocks) between its text and its answers.
 - Generated exercises: each task draws new numbers or records, up to 67 numbered tasks per exercise, with typical
-  mistakes, a hint and the way to the solution. The build tests them over fixed seeds.
+  mistakes, a hint and the way to the solution, also with roots, powers and trigonometry, and with chemical formulas
+  from a data file. The build tests them over fixed seeds.
 - Vue components for what no block can show or check, such as reading a scale, labelling a figure or dragging into
   place; an exercise component draws its own tasks. A component needs its logic module, a test and a text for readers
   without JavaScript. An exercise component also declares its exercise for the tutor (`template`, `params`,
@@ -41,7 +42,7 @@ Chapters of pages that explain a topic, with exercises on every page. Every page
 - No timer, no game.
 - At most two section levels in a page.
 - An exercise component does not count as a page's required exercise: each page also needs a question or a generated
-  exercise.
+  exercise. A recap page has none at all.
 - Stores nothing but the learner's choice of AI tutor, if they make it, the choice to load videos directly, and the
   last result of each self-assessment they do.
 - A self-assessment needs JavaScript (without it, it is not offered).
@@ -50,5 +51,8 @@ Chapters of pages that explain a topic, with exercises on every page. Every page
 ## What the app supplies
 
 - The content as YAML in `src/`: the app, a folder per chapter with its pages, data files and images
-  ([schema](../runtime/explainer/explainer.v1.schema.json)); Vue components in `src/components/` where
+  ([schema](../runtime/explainer/explainer.v2.schema.json), format 2); Vue components in `src/components/` where
   no block fits.
+- Its place on the catalog's learning map (format 2): the app's strand, and the competencies each page practises. A
+  recap page repeats a competency from elsewhere that the app needs, without exercises. Format 1
+  ([schema](../runtime/explainer/explainer.v1.schema.json)) stays valid, without a place on the map.