Move packaging task generator out from verdafile

snapshot-src/index.js

@@ -56,7 +56,7 @@ function cbAmendLigsetSamplerContents(element, p) {
 	else element.style.fontFeatureSettings = `'calt' off, '${p.tag}' ${p.rank}`;
 
 	const groupSet = new Set(p.ligSets);
-	for (const row of auxData.ligation.samples) {
+	for (const row of auxData.ligationSamples) {
 		const line = document.createElement("div");
 		element.appendChild(line);
 		for (let m = 0; m < row.length; m++) {
@@ -116,14 +116,7 @@ function captureElement(options, callback) {
 }
 
 window.onload = function () {
-	const snapshotTasks = [
+	const snapshotTasks = [...auxData.readmeSnapshotTasks, ...packagingTasks];
-		{ el: "#languages", name: "languages" },
-		{ el: "#charvars", name: "charvars" },
-		{ el: "#matrix", name: "matrix" },
-		{ el: "#previews", name: "preview-all" },
-		{ el: "#weights", name: "weights" },
-		...packagingTasks
-	];
 	let current = 0;
 	const step = function () {
 		const doit = function () {

utility/generate-snapshot-page/index.js

@@ -33,9 +33,37 @@ async function main() {
 		}
 	});
 	await fs.writeFile(outputPath, html);
+
+	let readmeSnapshotTasks = [
+		{ el: "#languages", name: "languages" },
+		{ el: "#charvars", name: "charvars" },
+		{ el: "#matrix", name: "matrix" },
+		{ el: "#previews", name: "preview-all" },
+		{ el: "#weights", name: "weights" }
+	];
+	for (const ls of ligationData.nonMergeSets) {
+		readmeSnapshotTasks.push({
+			el: "#ligation-sampler",
+			applyClass: "iosevka",
+			applyFeature: `'${ls.tag}' ${ls.rank}`,
+			name: `ligset-${ls.tag}-${ls.rank}`,
+			applyCallback: `cbAmendLigsetSamplerContents`,
+			applyCallbackArgs: ls
+		});
+	}
+	for (const ss of variationData.composites) {
+		readmeSnapshotTasks.push({
+			el: "#stylistic-set-sampler",
+			applyClass: "iosevka",
+			applyFeature: `'${ss.tag}' ${ss.rank}`,
+			name: `stylistic-set-${ss.tag}-${ss.rank}`,
+			applyCallback: `cbAmendStylisticSetContents`,
+			applyCallbackArgs: ss
+		});
+	}
 	await fs.writeJson(
 		outputDataPath,
-		{ ...variationData, ligation: ligationData },
+		{ readmeSnapshotTasks, ligationSamples: ligationData.samples },
 		{ spaces: "  " }
 	);
 }

verdafile.js

@@ -737,7 +737,7 @@ const SampleImagesPre = task(`sample-images:pre`, async target => {
 });
 
 const PackageSnapshotConfig = computed(`package-snapshot-config`, async target => {
-	const [plan, sh] = await target.need(BuildPlans, SnapShotHtml);
+	const [plan] = await target.need(BuildPlans);
 	const cfg = [];
 	for (const key in plan.buildPlans) {
 		const p = plan.buildPlans[key];
@@ -749,28 +749,6 @@ const PackageSnapshotConfig = computed(`package-snapshot-config`, async target =
 			name: key
 		});
 	}
-
-	const de = JSON.parse(fs.readFileSync(`${sh.dir}/${sh.name}.data.json`));
-	for (const ls of de.ligation.nonMergeSets) {
-		cfg.push({
-			el: "#ligation-sampler",
-			applyClass: "iosevka",
-			applyFeature: `'${ls.tag}' ${ls.rank}`,
-			name: `ligset-${ls.tag}-${ls.rank}`,
-			applyCallback: `cbAmendLigsetSamplerContents`,
-			applyCallbackArgs: ls
-		});
-	}
-	for (const ss of de.composites) {
-		cfg.push({
-			el: "#stylistic-set-sampler",
-			applyClass: "iosevka",
-			applyFeature: `'${ss.tag}' ${ss.rank}`,
-			name: `stylistic-set-${ss.tag}-${ss.rank}`,
-			applyCallback: `cbAmendStylisticSetContents`,
-			applyCallbackArgs: ss
-		});
-	}
 	return cfg;
 });
 const SnapShotJson = file(`${SNAPSHOT_TMP}/packaging-tasks.json`, async (target, out) => {
@@ -818,14 +796,11 @@ const ScreenShot = file.make(
 );
 
 const SampleImages = task(`sample-images`, async target => {
-	const [cfg] = await target.need(PackageSnapshotConfig, TakeSampleImages);
+	const [cfgP, sh] = await target.need(PackageSnapshotConfig, SnapShotHtml, TakeSampleImages);
+	const de = JSON.parse(fs.readFileSync(`${sh.dir}/${sh.name}.data.json`));
 	await target.need(
-		ScreenShot("charvars"),
+		cfgP.map(opt => ScreenShot(opt.name)),
-		ScreenShot("languages"),
+		de.readmeSnapshotTasks.map(opt => ScreenShot(opt.name))
-		ScreenShot("matrix"),
-		ScreenShot("preview-all"),
-		ScreenShot("weights"),
-		cfg.map(opt => ScreenShot(opt.name))
 	);
 });