@conformetry/languages 0.0.5 → 0.0.7

package/dist/src/index.js

@@ -1,14 +1,14 @@
 import { Injectable as e, Module as t } from "@nestjs/common";
-import { ConfigurationModule as n, ConfigurationService as r } from "@conformetry/configuration";
-import i from "node:fs";
-import a from "node:path";
-import { parse as o } from "jsonc-parser";
-import { toString as s } from "mdast-util-to-string";
-import { remark as c } from "remark";
-import l from "remark-gfm";
-import { spawnSync as ee } from "node:child_process";
-import { fileURLToPath as te } from "node:url";
-import { ScriptKind as u, ScriptTarget as ne, SyntaxKind as d, createSourceFile as re, forEachChild as ie, getLeadingCommentRanges as ae, isBigIntLiteral as f, isCallExpression as p, isDecorator as m, isExportDeclaration as oe, isExpressionStatement as se, isIdentifier as h, isImportDeclaration as ce, isNoSubstitutionTemplateLiteral as le, isNumericLiteral as g, isPrivateIdentifier as ue, isPropertyAccessExpression as de, isStringLiteral as _ } from "typescript";
+import { ConfigurationModule as n, ConfigurationService as r, capturePlaceholderValues as i } from "@conformetry/configuration";
+import a from "node:fs";
+import o from "node:path";
+import { parse as s } from "jsonc-parser";
+import { toString as c } from "mdast-util-to-string";
+import { remark as l } from "remark";
+import ee from "remark-gfm";
+import { spawnSync as te } from "node:child_process";
+import { fileURLToPath as ne } from "node:url";
+import { ScriptKind as u, ScriptTarget as re, SyntaxKind as d, createSourceFile as ie, forEachChild as ae, getLeadingCommentRanges as f, isBigIntLiteral as p, isCallExpression as m, isDecorator as h, isExportDeclaration as oe, isExpressionStatement as se, isIdentifier as g, isImportDeclaration as ce, isNoSubstitutionTemplateLiteral as le, isNumericLiteral as _, isPrivateIdentifier as ue, isPropertyAccessExpression as de, isStringLiteral as v } from "typescript";
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/differences/differences.constants.ts
 var fe = [
 	"javascript",
@@ -17,21 +17,22 @@ var fe = [
 	"python",
 	"text",
 	"typescript"
-], v = [
+], y = [
 	"code",
 	"comment",
 	"directory",
 	"file",
-	"instance"
+	"instance",
+	"placeholder"
 ];
 //#endregion
 //#region \0@oxc-project+runtime@0.151.0/helpers/esm/decorateMetadata.js
-function y(e, t) {
+function b(e, t) {
 	if (typeof Reflect == "object" && typeof Reflect.metadata == "function") return Reflect.metadata(e, t);
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.151.0/helpers/esm/decorate.js
-function b(e, t, n, r) {
+function x(e, t, n, r) {
 	var i = arguments.length, a = i < 3 ? t : r === null ? r = Object.getOwnPropertyDescriptor(t, n) : r, o;
 	if (typeof Reflect == "object" && typeof Reflect.decorate == "function") a = Reflect.decorate(e, t, n, r);
 	else for (var s = e.length - 1; s >= 0; s--) (o = e[s]) && (a = (i < 3 ? o(a) : i > 3 ? o(t, n, a) : o(t, n)) || a);
@@ -39,7 +40,7 @@ function b(e, t, n, r) {
 }
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/differences/differences.service.ts
-var x = class {
+var S = class {
 	constructor() {}
 	buildMissingDirectoryDifference(e) {
 		return {
@@ -56,62 +57,62 @@ var x = class {
 		};
 	}
 	resolveDifferenceType(e) {
-		return v.find((t) => t === e) ?? "code";
+		return y.find((t) => t === e) ?? "code";
 	}
 	resolveErrorLanguage(e) {
 		return fe.find((t) => t === e);
 	}
 };
-x = b([e(), y("design:paramtypes", [])], x);
+S = x([e(), b("design:paramtypes", [])], S);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/differences/differences.module.ts
-var S = class {};
-S = b([t({
+var C = class {};
+C = x([t({
 	controllers: [],
-	exports: [x],
+	exports: [S],
 	imports: [],
-	providers: [x]
-})], S);
+	providers: [S]
+})], C);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/files/files.service.ts
-var C = class {
+var w = class {
 	configurationService;
 	errorsService;
 	constructor(e, t) {
 		this.configurationService = e, this.errorsService = t;
 	}
 	buildMissingDifference(e) {
-		let t = a.dirname(e.instanceFilePath);
-		return i.existsSync(t) ? {
+		let t = o.dirname(e.instanceFilePath);
+		return a.existsSync(t) ? {
 			...this.errorsService.buildMissingFileDifference(e),
 			weight: 1
 		} : {
 			...this.errorsService.buildMissingDirectoryDifference({
 				instanceDirectoryPath: t,
-				templateDirectoryPath: a.dirname(e.templateFilePath)
+				templateDirectoryPath: o.dirname(e.templateFilePath)
 			}),
 			weight: e.expectedFileCount
 		};
 	}
 	countExpectedFiles(e) {
-		return e.expectedFiles.filter((t) => a.dirname(t.instanceFilePath) === e.parentDirectoryPath).length;
+		return e.expectedFiles.filter((t) => o.dirname(t.instanceFilePath) === e.parentDirectoryPath).length;
 	}
 	checkInstanceFiles(e) {
 		let t = this.configurationService.resolveInstanceFiles(e.instances), n = /* @__PURE__ */ new Set(), r = [];
 		for (let e of t) {
-			if (i.existsSync(e.instanceFilePath)) continue;
-			let o = a.dirname(e.instanceFilePath);
-			if (n.has(o)) continue;
+			if (a.existsSync(e.instanceFilePath)) continue;
+			let i = o.dirname(e.instanceFilePath);
+			if (n.has(i)) continue;
 			let s = this.buildMissingDifference({
 				expectedFileCount: this.countExpectedFiles({
 					expectedFiles: t,
-					parentDirectoryPath: o
+					parentDirectoryPath: i
 				}),
 				...e
 			});
-			s.differenceType === "directory" && n.add(o), r.push({
+			s.differenceType === "directory" && n.add(i), r.push({
 				differences: [s],
-				filename: a.basename(e.instanceFilePath),
+				filename: o.basename(e.instanceFilePath),
 				instanceFilePath: e.instanceFilePath,
 				templateFilePath: e.templateFilePath,
 				totalWeight: s.weight
@@ -123,19 +124,19 @@ var C = class {
 		};
 	}
 };
-C = b([e(), y("design:paramtypes", [r === void 0 ? Object : r, x === void 0 ? Object : x])], C);
+w = x([e(), b("design:paramtypes", [r === void 0 ? Object : r, S === void 0 ? Object : S])], w);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/files/files.module.ts
-var w = class {};
-w = b([t({
+var T = class {};
+T = x([t({
 	controllers: [],
-	exports: [C],
-	imports: [n, S],
-	providers: [C]
-})], w);
+	exports: [w],
+	imports: [n, C],
+	providers: [w]
+})], T);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/scoring/scoring.constants.ts
-var T = 1, E = 1, pe = 1, D = class {
+var E = 1, pe = 1, me = 1, D = class {
 	constructor() {}
 	calculateScore(e) {
 		if (e.totalWeight <= 0) return 1;
@@ -146,7 +147,7 @@ var T = 1, E = 1, pe = 1, D = class {
 		return e.reduce((e, t) => e + (t.weight ?? 1), 0);
 	}
 };
-D = b([e(), y("design:paramtypes", [])], D);
+D = x([e(), b("design:paramtypes", [])], D);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/json/json-comparison.service.ts
 var O = class {
@@ -167,8 +168,18 @@ var O = class {
 			weight: e.weight
 		};
 	}
+	captureString(e) {
+		if (typeof e.templateValue == "string" && typeof e.instanceValue == "string") return i({
+			instanceText: e.instanceValue,
+			templateText: e.templateValue
+		});
+	}
 	combine(e) {
 		return e.reduce((e, t) => ({
+			captures: {
+				...t.captures,
+				...e.captures
+			},
 			differences: [...e.differences, ...t.differences],
 			totalWeight: e.totalWeight + t.totalWeight
 		}), {
@@ -178,20 +189,28 @@ var O = class {
 	}
 	compareArrayItem(e) {
 		let t = this.formatPath(e.pathSegments), n = this.countNodes(e.templateItem);
-		return this.isJsonPrimitive(e.templateItem) ? e.instanceArray.includes(e.templateItem) ? {
-			differences: [],
-			totalWeight: n
-		} : {
-			differences: [this.buildError({
-				expected: JSON.stringify(e.templateItem),
-				fix: `Add ${JSON.stringify(e.templateItem)} to the array at "${t}".`,
-				language: e.language,
-				message: `Missing required array value ${JSON.stringify(e.templateItem)} at "${t}"`,
-				pathValue: t,
-				weight: n
-			})],
-			totalWeight: n
-		} : e.instanceArray.length === 0 ? {
+		if (this.isJsonPrimitive(e.templateItem)) {
+			let { templateItem: r } = e, i = e.instanceArray.includes(r) ? {} : e.instanceArray.map((e) => this.captureString({
+				instanceValue: e,
+				templateValue: r
+			})).find((e) => e !== void 0);
+			return i === void 0 ? {
+				differences: [this.buildError({
+					expected: JSON.stringify(e.templateItem),
+					fix: `Add ${JSON.stringify(e.templateItem)} to the array at "${t}".`,
+					language: e.language,
+					message: `Missing required array value ${JSON.stringify(e.templateItem)} at "${t}"`,
+					pathValue: t,
+					weight: n
+				})],
+				totalWeight: n
+			} : {
+				captures: i,
+				differences: [],
+				totalWeight: n
+			};
+		}
+		return e.instanceArray.length === 0 ? {
 			differences: [this.buildError({
 				fix: `Add the required entry to the array at "${t}".`,
 				language: e.language,
@@ -273,37 +292,38 @@ var O = class {
 			pathSegments: t,
 			templateObject: e.templateValue
 		}));
-		let n = this.countNodes(e.templateValue);
-		if (e.templateValue === e.instanceValue) return {
+		let n = this.countNodes(e.templateValue), r = e.templateValue === e.instanceValue ? {} : this.captureString(e);
+		if (r !== void 0) return {
+			captures: r,
 			differences: [],
 			totalWeight: n
 		};
-		let r = this.formatPath(t);
+		let i = this.formatPath(t);
 		return {
 			differences: [this.buildError({
 				actual: JSON.stringify(e.instanceValue),
 				expected: JSON.stringify(e.templateValue),
-				fix: `Set "${r}" to ${JSON.stringify(e.templateValue)}.`,
+				fix: `Set "${i}" to ${JSON.stringify(e.templateValue)}.`,
 				language: e.language,
-				message: `Expected ${JSON.stringify(e.templateValue)} at "${r}" but found ${JSON.stringify(e.instanceValue)}`,
-				pathValue: r,
+				message: `Expected ${JSON.stringify(e.templateValue)} at "${i}" but found ${JSON.stringify(e.instanceValue)}`,
+				pathValue: i,
 				weight: n
 			})],
 			totalWeight: n
 		};
 	}
 };
-O = b([e(), y("design:paramtypes", [D === void 0 ? Object : D])], O);
+O = x([e(), b("design:paramtypes", [D === void 0 ? Object : D])], O);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/scoring/scoring.module.ts
 var k = class {};
-k = b([t({
+k = x([t({
 	controllers: [],
 	exports: [D],
 	imports: [],
 	providers: [D]
 })], k);
-var me = {
+var he = {
 	description: "Checks JSON and JSONC structural conformance",
 	fileExtensions: [".json", ".jsonc"],
 	name: "json"
@@ -312,20 +332,20 @@ var me = {
 	constructor(e) {
 		this.jsonComparisonService = e;
 	}
-	descriptor = me;
+	descriptor = he;
 	validateDocument(e) {
 		return this.jsonComparisonService.compare({
-			instanceValue: o(e.instance),
+			instanceValue: s(e.instance),
 			language: "json",
-			templateValue: o(e.renderedTemplate)
+			templateValue: s(e.renderedTemplate)
 		});
 	}
 };
-A = b([e(), y("design:paramtypes", [O === void 0 ? Object : O])], A);
+A = x([e(), b("design:paramtypes", [O === void 0 ? Object : O])], A);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/json/json.module.ts
 var j = class {};
-j = b([t({
+j = x([t({
 	controllers: [],
 	exports: [O, A],
 	imports: [k],
@@ -368,14 +388,14 @@ var M = class {
 		};
 	}
 	parseNotebook(e) {
-		let t = o(e);
+		let t = s(e);
 		if (typeof t != "object" || !t) return { cells: [] };
 		let n = t.cells;
 		return Array.isArray(n) ? { cells: n.filter((e) => typeof e == "object" && !!e) } : { cells: [] };
 	}
 };
-M = b([e(), y("design:paramtypes", [])], M);
-var he = {
+M = x([e(), b("design:paramtypes", [])], M);
+var ge = {
 	description: "Checks markdown structural conformance using mdast",
 	fileExtensions: [".md"],
 	name: "markdown"
@@ -410,6 +430,15 @@ var he = {
 	sameField(e, t) {
 		return (e ?? "") === (t ?? "");
 	}
+	capture(e) {
+		let { instanceNode: t, templateNode: n } = e;
+		if (n.type !== t.type) return;
+		let r = this.matchersByType[n.type];
+		return (r === void 0 ? this.readText(n) === this.readText(t) : r(n, t)) ? {} : n.depth === t.depth ? i({
+			instanceText: this.readText(t),
+			templateText: this.readText(n)
+		}) : void 0;
+	}
 	countSubtree(e) {
 		return P.has(e.type) ? 0 : this.readChildren(e).reduce((e, t) => e + this.countSubtree(t), 1);
 	}
@@ -417,19 +446,16 @@ var he = {
 		return e.filter((e) => typeof e == "object" && !!e && "type" in e);
 	}
 	matches(e) {
-		let { instanceNode: t, templateNode: n } = e;
-		if (n.type !== t.type) return !1;
-		let r = this.matchersByType[n.type];
-		return r === void 0 ? this.readText(n) === this.readText(t) : r(n, t);
+		return this.capture(e) !== void 0;
 	}
 	readChildren(e) {
 		return e.children ?? [];
 	}
 	readText(e) {
-		return s(e);
+		return c(e);
 	}
 };
-F = b([e(), y("design:paramtypes", [])], F);
+F = x([e(), b("design:paramtypes", [])], F);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/markdown/markdown-tree.service.ts
 var I = class {
@@ -447,6 +473,13 @@ var I = class {
 			weight: this.markdownNodesService.countSubtree(e.templateChild)
 		};
 	}
+	captureFirst(e) {
+		let [t] = e.candidates;
+		return t === void 0 ? {} : this.markdownNodesService.capture({
+			instanceNode: t,
+			templateNode: e.templateChild
+		}) ?? {};
+	}
 	compareContainer(e) {
 		let t = this.findCandidates(e);
 		if (t.length === 0) {
@@ -459,18 +492,29 @@ var I = class {
 		}
 		let n = this.markdownNodesService.readChildren(e.templateChild);
 		return n.length === 0 ? {
+			captures: this.captureFirst({
+				...e,
+				candidates: t
+			}),
 			differences: [],
 			lastMatchedNode: t.at(-1),
 			totalWeight: 1
-		} : t.map((e) => {
-			let t = this.compareChildren({
-				instanceChildren: this.markdownNodesService.readChildren(e),
+		} : t.map((t) => {
+			let r = this.compareChildren({
+				instanceChildren: this.markdownNodesService.readChildren(t),
 				templateChildren: n
 			});
 			return {
-				differences: t.differences,
-				lastMatchedNode: e,
-				totalWeight: t.totalWeight + 1
+				captures: {
+					...r.captures,
+					...this.captureFirst({
+						...e,
+						candidates: [t]
+					})
+				},
+				differences: r.differences,
+				lastMatchedNode: t,
+				totalWeight: r.totalWeight + 1
 			};
 		}).reduce((e, t) => this.scoringService.sumWeights(t.differences) < this.scoringService.sumWeights(e.differences) ? t : e);
 	}
@@ -481,39 +525,47 @@ var I = class {
 			lastMatchedNode: e.lastMatchedNode,
 			totalWeight: n
 		} : {
+			captures: this.captureFirst({
+				...e,
+				candidates: t
+			}),
 			differences: [],
 			lastMatchedNode: t.at(-1),
 			totalWeight: n
 		};
 	}
 	findCandidates(e) {
-		return e.instanceChildren.filter((t) => this.markdownNodesService.matches({
+		return e.instanceChildren.filter((t) => this.markdownNodesService.capture({
 			instanceNode: t,
 			templateNode: e.templateChild
-		}));
+		}) !== void 0);
 	}
 	compareChildren(e) {
-		let t = [], n, r = 0;
-		for (let i of e.templateChildren) {
-			if (P.has(i.type)) continue;
-			let a = N.has(i.type) ? this.compareContainer({
+		let t = {}, n = [], r, i = 0;
+		for (let a of e.templateChildren) {
+			if (P.has(a.type)) continue;
+			let o = N.has(a.type) ? this.compareContainer({
 				instanceChildren: e.instanceChildren,
-				lastMatchedNode: n,
-				templateChild: i
+				lastMatchedNode: r,
+				templateChild: a
 			}) : this.compareLeaf({
 				instanceChildren: e.instanceChildren,
-				lastMatchedNode: n,
-				templateChild: i
+				lastMatchedNode: r,
+				templateChild: a
 			});
-			t.push(...a.differences), n = a.lastMatchedNode, r += a.totalWeight;
+			t = {
+				...o.captures,
+				...t
+			}, n.push(...o.differences), r = o.lastMatchedNode, i += o.totalWeight;
 		}
 		return {
-			differences: t,
-			totalWeight: r
+			captures: t,
+			differences: n,
+			totalWeight: i
 		};
 	}
 };
-I = b([e(), y("design:paramtypes", [F === void 0 ? Object : F, D === void 0 ? Object : D])], I);
+I = x([e(), b("design:paramtypes", [F === void 0 ? Object : F, D === void 0 ? Object : D])], I);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/markdown/markdown.service.ts
 var L = class {
@@ -522,32 +574,33 @@ var L = class {
 	constructor(e, t) {
 		this.markdownNodesService = e, this.markdownTreeService = t;
 	}
-	processor = c().use(l);
-	descriptor = he;
+	processor = l().use(ee);
+	descriptor = ge;
 	validateDocument(e) {
 		let t = this.processor.parse(e.renderedTemplate), n = this.processor.parse(e.instance), r = this.markdownTreeService.compareChildren({
 			instanceChildren: this.markdownNodesService.filterNodes(n.children),
 			templateChildren: this.markdownNodesService.filterNodes(t.children)
-		});
+		}), i = r.differences.map((e) => ({
+			differenceType: "code",
+			expected: e.text,
+			fix: `Add the ${e.nodeType} "${e.text}" to the instance file.`,
+			...e.instanceLine === void 0 ? {} : { instanceLine: e.instanceLine },
+			language: "markdown",
+			message: `Missing markdown ${e.nodeType}: "${e.text}"`,
+			weight: e.weight
+		}));
 		return {
-			differences: r.differences.map((e) => ({
-				differenceType: "code",
-				expected: e.text,
-				fix: `Add the ${e.nodeType} "${e.text}" to the instance file.`,
-				...e.instanceLine === void 0 ? {} : { instanceLine: e.instanceLine },
-				language: "markdown",
-				message: `Missing markdown ${e.nodeType}: "${e.text}"`,
-				weight: e.weight
-			})),
+			...r.captures === void 0 ? {} : { captures: r.captures },
+			differences: i,
 			totalWeight: r.totalWeight
 		};
 	}
 };
-L = b([e(), y("design:paramtypes", [F === void 0 ? Object : F, I === void 0 ? Object : I])], L);
+L = x([e(), b("design:paramtypes", [F === void 0 ? Object : F, I === void 0 ? Object : I])], L);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/markdown/markdown.module.ts
 var R = class {};
-R = b([t({
+R = x([t({
 	controllers: [],
 	exports: [L],
 	imports: [k],
@@ -557,22 +610,22 @@ R = b([t({
 		I
 	]
 })], R);
-var ge = {
+var _e = {
 	description: "Checks Python structure and comments against templates",
 	fileExtensions: [".py"],
 	name: "python"
-}, z = "python3", _e = "python.bridge", ve = "Install Python 3 and ensure `python3` is on PATH; conformetry validates Python files through the interpreter's own ast module.", B = class {
+}, z = "python3", ve = "python.bridge", ye = "Install Python 3 and ensure `python3` is on PATH; conformetry validates Python files through the interpreter's own ast module.", B = class {
 	errorsService;
 	scoringService;
 	constructor(e, t) {
 		this.errorsService = e, this.scoringService = t;
 	}
-	pythonRootPath = a.resolve(a.dirname(te(import.meta.url)), "..", "..");
+	pythonRootPath = o.resolve(o.dirname(ne(import.meta.url)), "..", "..");
 	buildBridgeError(e) {
 		return {
 			differences: [{
 				differenceType: "code",
-				fix: ve,
+				fix: ye,
 				language: "python",
 				message: e
 			}],
@@ -615,7 +668,7 @@ var ge = {
 		};
 	}
 	validatePythonSource(e) {
-		let t = ee(z, ["-m", _e], {
+		let t = te(z, ["-m", ve], {
 			cwd: this.pythonRootPath,
 			encoding: "utf8",
 			env: {
@@ -637,7 +690,7 @@ var ge = {
 		}
 	}
 };
-B = b([e(), y("design:paramtypes", [x === void 0 ? Object : x, D === void 0 ? Object : D])], B);
+B = x([e(), b("design:paramtypes", [S === void 0 ? Object : S, D === void 0 ? Object : D])], B);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/python/python.service.ts
 var V = class {
@@ -645,7 +698,7 @@ var V = class {
 	constructor(e) {
 		this.pythonBridgeService = e;
 	}
-	descriptor = ge;
+	descriptor = _e;
 	validateDocument(e) {
 		return this.pythonBridgeService.validatePythonSource({
 			filename: e.filename,
@@ -654,21 +707,21 @@ var V = class {
 		});
 	}
 };
-V = b([e(), y("design:paramtypes", [B === void 0 ? Object : B])], V);
+V = x([e(), b("design:paramtypes", [B === void 0 ? Object : B])], V);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/python/python.module.ts
 var H = class {};
-H = b([t({
+H = x([t({
 	controllers: [],
 	exports: [B, V],
-	imports: [S, k],
+	imports: [C, k],
 	providers: [B, V]
 })], H);
-var ye = {
+var be = {
 	description: "Checks Jupyter notebook structure, markdown cells, and code cells",
 	fileExtensions: [".ipynb"],
 	name: "jupyter"
-}, be = [
+}, xe = [
 	"metadata",
 	"nbformat",
 	"nbformat_minor"
@@ -680,7 +733,7 @@ var ye = {
 	constructor(e, t, n, r) {
 		this.jsonComparisonService = e, this.jupyterNotebookService = t, this.markdownService = n, this.pythonBridgeService = r;
 	}
-	descriptor = ye;
+	descriptor = be;
 	attributeToCell(e) {
 		return e.differences.map((t) => ({
 			...t,
@@ -688,10 +741,10 @@ var ye = {
 		}));
 	}
 	readEnvelope(e) {
-		let t = o(e);
+		let t = s(e);
 		if (typeof t != "object" || !t || Array.isArray(t)) return {};
 		let n = {};
-		for (let e of be) {
+		for (let e of xe) {
 			let r = t[e];
 			r !== void 0 && (n[e] = r);
 		}
@@ -783,7 +836,7 @@ var ye = {
 		};
 	}
 };
-U = b([e(), y("design:paramtypes", [
+U = x([e(), b("design:paramtypes", [
 	O === void 0 ? Object : O,
 	M === void 0 ? Object : M,
 	L === void 0 ? Object : L,
@@ -792,7 +845,7 @@ U = b([e(), y("design:paramtypes", [
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/jupyter/jupyter.module.ts
 var W = class {};
-W = b([t({
+W = x([t({
 	controllers: [],
 	exports: [U],
 	imports: [
@@ -802,32 +855,57 @@ W = b([t({
 	],
 	providers: [M, U]
 })], W);
-var xe = {
+var Se = {
 	description: "Checks text files using duplicate-aware line conformance",
 	fileExtensions: [".txt"],
 	name: "text"
 }, G = class {
 	constructor() {}
-	descriptor = xe;
+	descriptor = Se;
+	captureLine(e) {
+		for (let [t, n] of e.remainingLines) {
+			let r = n === 0 ? void 0 : i({
+				instanceText: t,
+				templateText: e.line
+			});
+			if (r !== void 0) return e.remainingLines.set(t, n - 1), r;
+		}
+	}
 	countLines(e) {
 		let t = /* @__PURE__ */ new Map();
 		for (let n of e.split("\n")) t.set(n, (t.get(n) ?? 0) + 1);
 		return t;
 	}
 	findMissingLines(e) {
-		let t = this.countLines(e.instance), n = [];
-		for (let [r, i] of e.renderedTemplate.split("\n").entries()) {
-			let e = t.get(i) ?? 0;
-			e === 0 ? n.push({
-				line: i,
-				templateLine: r + 1
-			}) : t.set(i, e - 1);
+		let t = this.countLines(e.instance), n = [], r = {};
+		for (let [i, a] of e.renderedTemplate.split("\n").entries()) {
+			let e = t.get(a) ?? 0;
+			if (e > 0) {
+				t.set(a, e - 1);
+				continue;
+			}
+			let o = this.captureLine({
+				line: a,
+				remainingLines: t
+			});
+			o === void 0 ? n.push({
+				line: a,
+				templateLine: i + 1
+			}) : r = {
+				...o,
+				...r
+			};
 		}
-		return n;
+		return {
+			captures: r,
+			missingLines: n
+		};
 	}
 	validateDocument(e) {
+		let { captures: t, missingLines: n } = this.findMissingLines(e);
 		return {
-			differences: this.findMissingLines(e).map((e) => ({
+			captures: t,
+			differences: n.map((e) => ({
 				differenceType: "code",
 				expected: e.line,
 				fix: `Add the line \`${e.line}\` to the instance file.`,
@@ -839,26 +917,26 @@ var xe = {
 		};
 	}
 };
-G = b([e(), y("design:paramtypes", [])], G);
+G = x([e(), b("design:paramtypes", [])], G);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/text/text.module.ts
 var K = class {};
-K = b([t({
+K = x([t({
 	controllers: [],
 	exports: [G],
 	imports: [],
 	providers: [G]
 })], K);
-var Se = {
+var Ce = {
 	description: "Checks TypeScript AST structure and required comments",
 	fileExtensions: [".ts", ".tsx"],
 	name: "typescript"
-}, Ce = /\bTODO\b/u, q = class {
+}, we = /\bTODO\b/u, q = class {
 	constructor() {}
 	compareComments(e) {
 		let t = this.extractComments(e.instanceSourceFile), n = this.extractComments(e.templateSourceFile), r = [], i = 0;
 		for (let e of n) {
-			let n = Ce.test(e.text), a = t.slice(i).findIndex((t) => n || t.text === e.text);
+			let n = we.test(e.text), a = t.slice(i).findIndex((t) => n || t.text === e.text);
 			if (a === -1) {
 				r.push(e);
 				continue;
@@ -874,7 +952,7 @@ var Se = {
 		let t = /* @__PURE__ */ new Map(), n = (r) => {
 			let i = r.getChildren(e);
 			if (i.length === 0) {
-				for (let n of ae(e.text, r.getFullStart()) ?? []) t.set(n.pos, {
+				for (let n of f(e.text, r.getFullStart()) ?? []) t.set(n.pos, {
 					position: n.pos,
 					text: e.text.slice(n.pos, n.end).trim()
 				});
@@ -885,7 +963,7 @@ var Se = {
 		return n(e), [...t.values()].toSorted((e, t) => e.position - t.position);
 	}
 };
-q = b([e(), y("design:paramtypes", [])], q);
+q = x([e(), b("design:paramtypes", [])], q);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/typescript/typescript-nodes.service.ts
 var J = class {
@@ -893,49 +971,49 @@ var J = class {
 	buildDottedName(e) {
 		let t = [], n = e;
 		for (; de(n);) t.unshift(n.name.text), n = n.expression;
-		return h(n) ? (t.unshift(n.text), t.join(".")) : null;
+		return g(n) ? (t.unshift(n.text), t.join(".")) : null;
 	}
 	isNode(e) {
 		return typeof e == "object" && !!e && "kind" in e && typeof e.kind == "number";
 	}
 	readDecoratorKey(e) {
-		return this.buildDottedName(p(e.expression) ? e.expression.expression : e.expression);
+		return this.buildDottedName(m(e.expression) ? e.expression.expression : e.expression);
 	}
 	readExportKey(e) {
 		let { moduleSpecifier: t } = e;
-		return t === void 0 || !_(t) ? null : t.text;
+		return t === void 0 || !v(t) ? null : t.text;
 	}
 	readExpressionStatementKey(e) {
-		if (!p(e)) return null;
+		if (!m(e)) return null;
 		let t = this.buildDottedName(e.expression);
 		if (t === null) return null;
 		let n = e.arguments[0], r = n === void 0 ? void 0 : this.readLiteralKey(n);
 		return r === void 0 ? t : `${t}:${r}`;
 	}
 	readImportKey(e) {
-		return _(e.moduleSpecifier) ? e.moduleSpecifier.text : null;
+		return v(e.moduleSpecifier) ? e.moduleSpecifier.text : null;
 	}
 	readLiteralKey(e) {
-		if (h(e) || _(e) || g(e) || f(e) || le(e)) return e.text;
+		if (g(e) || v(e) || _(e) || p(e) || le(e)) return e.text;
 	}
 	readNamedKey(e) {
 		if (!("name" in e)) return null;
 		let t = e.name;
-		return this.isNode(t) && (h(t) || ue(t) || _(t) || g(t)) ? t.text : null;
+		return this.isNode(t) && (g(t) || ue(t) || v(t) || _(t)) ? t.text : null;
 	}
 	countSubtree(e) {
 		return this.readChildren(e).reduce((e, t) => e + this.countSubtree(t), 1);
 	}
 	readChildren(e) {
 		let t = [];
-		return ie(e, (e) => {
+		return ae(e, (e) => {
 			e.kind !== d.EndOfFileToken && t.push(e);
 		}), t;
 	}
 	readKey(e) {
 		if (ce(e)) return this.readImportKey(e);
 		if (oe(e)) return this.readExportKey(e);
-		if (m(e)) return this.readDecoratorKey(e);
+		if (h(e)) return this.readDecoratorKey(e);
 		if (se(e)) {
 			let t = this.readExpressionStatementKey(e.expression);
 			if (t !== null) return t;
@@ -946,7 +1024,7 @@ var J = class {
 		return d[e.kind];
 	}
 };
-J = b([e(), y("design:paramtypes", [])], J);
+J = x([e(), b("design:paramtypes", [])], J);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/typescript/typescript-tree.service.ts
 var Y = class {
@@ -965,13 +1043,35 @@ var Y = class {
 		};
 	}
 	compareBestCandidate(e) {
-		return e.candidates.map((t) => this.compareTree({
-			instanceNode: t,
-			templateNode: e.templateChild
-		})).reduce((e, t) => this.scoringService.sumWeights(t.differences) < this.scoringService.sumWeights(e.differences) ? t : e);
+		return e.candidates.map((t) => {
+			let n = this.compareTree({
+				instanceNode: t.node,
+				templateNode: e.templateChild
+			});
+			return {
+				...n,
+				captures: {
+					...n.captures,
+					...t.captures
+				}
+			};
+		}).reduce((e, t) => this.scoringService.sumWeights(t.differences) < this.scoringService.sumWeights(e.differences) ? t : e);
 	}
 	compareChild(e) {
-		let t = this.typeScriptNodesService.readKey(e.templateChild), n = t === null ? e.instanceChildren.filter((t) => t.kind === e.templateChild.kind) : e.instanceChildren.filter((e) => this.typeScriptNodesService.readKey(e) === t);
+		let t = this.typeScriptNodesService.readKey(e.templateChild), n = e.instanceChildren.flatMap((n) => {
+			let r = t === null ? this.matchKind({
+				instanceChild: n,
+				templateChild: e.templateChild
+			}) : this.matchKey({
+				instanceChild: n,
+				nodeKey: t,
+				templateChild: e.templateChild
+			});
+			return r === void 0 ? [] : [{
+				captures: r,
+				node: n
+			}];
+		});
 		if (n.length === 0) {
 			let n = this.buildError({
 				instanceNode: e.instanceNode,
@@ -988,6 +1088,17 @@ var Y = class {
 			templateChild: e.templateChild
 		});
 	}
+	matchKey(e) {
+		let t = this.typeScriptNodesService.readKey(e.instanceChild);
+		if (t === e.nodeKey) return {};
+		if (t !== null && e.instanceChild.kind === e.templateChild.kind) return i({
+			instanceText: t,
+			templateText: e.nodeKey
+		});
+	}
+	matchKind(e) {
+		return e.instanceChild.kind === e.templateChild.kind ? {} : void 0;
+	}
 	compareTree(e) {
 		let t = this.typeScriptNodesService.readChildren(e.instanceNode);
 		return this.typeScriptNodesService.readChildren(e.templateNode).map((n) => this.compareChild({
@@ -995,6 +1106,10 @@ var Y = class {
 			instanceNode: e.instanceNode,
 			templateChild: n
 		})).reduce((e, t) => ({
+			captures: {
+				...t.captures,
+				...e.captures
+			},
 			differences: [...e.differences, ...t.differences],
 			totalWeight: e.totalWeight + t.totalWeight
 		}), {
@@ -1003,7 +1118,7 @@ var Y = class {
 		});
 	}
 };
-Y = b([e(), y("design:paramtypes", [D === void 0 ? Object : D, J === void 0 ? Object : J])], Y);
+Y = x([e(), b("design:paramtypes", [D === void 0 ? Object : D, J === void 0 ? Object : J])], Y);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/typescript/typescript.service.ts
 var X = class {
@@ -1012,9 +1127,9 @@ var X = class {
 	constructor(e, t) {
 		this.typeScriptCommentsService = e, this.typeScriptTreeService = t;
 	}
-	descriptor = Se;
+	descriptor = Ce;
 	parseSourceFile(e) {
-		return re(e.filename, e.content, ne.Latest, !0, e.filename.endsWith(".tsx") ? u.TSX : u.TS);
+		return ie(e.filename, e.content, re.Latest, !0, e.filename.endsWith(".tsx") ? u.TSX : u.TS);
 	}
 	readLocation(e) {
 		if (e.position === void 0 || e.position < 0) return;
@@ -1051,32 +1166,33 @@ var X = class {
 		let t = this.typeScriptTreeService.compareTree({
 			instanceNode: e.instanceSourceFile,
 			templateNode: e.templateSourceFile
+		}), n = t.differences.map((t) => {
+			let n = t.nodeKey === void 0 ? t.kindLabel : `${t.kindLabel} "${t.nodeKey}"`, r = this.readLocation({
+				position: t.instancePosition,
+				sourceFile: e.instanceSourceFile
+			}), i = this.readLocation({
+				position: t.templatePosition,
+				sourceFile: e.templateSourceFile
+			});
+			return {
+				differenceType: "code",
+				fix: `Add the missing ${n} to the instance file. See the template for the expected structure.`,
+				...r === void 0 ? {} : {
+					instanceColumn: r.column,
+					instanceLine: r.line
+				},
+				language: "typescript",
+				message: `Missing ${n}`,
+				...i === void 0 ? {} : {
+					templateColumn: i.column,
+					templateLine: i.line
+				},
+				weight: t.weight
+			};
 		});
 		return {
-			differences: t.differences.map((t) => {
-				let n = t.nodeKey === void 0 ? t.kindLabel : `${t.kindLabel} "${t.nodeKey}"`, r = this.readLocation({
-					position: t.instancePosition,
-					sourceFile: e.instanceSourceFile
-				}), i = this.readLocation({
-					position: t.templatePosition,
-					sourceFile: e.templateSourceFile
-				});
-				return {
-					differenceType: "code",
-					fix: `Add the missing ${n} to the instance file. See the template for the expected structure.`,
-					...r === void 0 ? {} : {
-						instanceColumn: r.column,
-						instanceLine: r.line
-					},
-					language: "typescript",
-					message: `Missing ${n}`,
-					...i === void 0 ? {} : {
-						templateColumn: i.column,
-						templateLine: i.line
-					},
-					weight: t.weight
-				};
-			}),
+			...t.captures === void 0 ? {} : { captures: t.captures },
+			differences: n,
 			totalWeight: t.totalWeight
 		};
 	}
@@ -1092,16 +1208,17 @@ var X = class {
 			})
 		}, n = this.validateStructure(t), r = this.validateComments(t);
 		return {
+			...n.captures === void 0 ? {} : { captures: n.captures },
 			differences: [...n.differences, ...r.differences],
 			totalWeight: n.totalWeight + r.totalWeight
 		};
 	}
 };
-X = b([e(), y("design:paramtypes", [q === void 0 ? Object : q, Y === void 0 ? Object : Y])], X);
+X = x([e(), b("design:paramtypes", [q === void 0 ? Object : q, Y === void 0 ? Object : Y])], X);
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/typescript/typescript.module.ts
 var Z = class {};
-Z = b([t({
+Z = x([t({
 	controllers: [],
 	exports: [X],
 	imports: [k],
@@ -1148,7 +1265,7 @@ var Q = class {
 		return r.length === 0 ? t : [...t, this.widenFallback(r)];
 	}
 };
-Q = b([e(), y("design:paramtypes", [
+Q = x([e(), b("design:paramtypes", [
 	A === void 0 ? Object : A,
 	U === void 0 ? Object : U,
 	L === void 0 ? Object : L,
@@ -1159,7 +1276,7 @@ Q = b([e(), y("design:paramtypes", [
 //#endregion
 //#region packages/ic-suite/conformetry/conformetry-languages/src/modules/languages/languages.module.ts
 var $ = class {};
-$ = b([t({
+$ = x([t({
 	controllers: [],
 	exports: [
 		j,
@@ -1181,4 +1298,4 @@ $ = b([t({
 	providers: [Q]
 })], $);
 //#endregion
-export { T as DEFAULT_ERROR_WEIGHT, S as DifferencesModule, x as DifferencesService, E as EMPTY_TEMPLATE_SCORE, w as FilesModule, C as FilesService, O as JsonComparisonService, j as JsonModule, A as JsonService, W as JupyterModule, M as JupyterNotebookService, U as JupyterService, $ as LanguagesModule, Q as LanguagesService, R as MarkdownModule, F as MarkdownNodesService, L as MarkdownService, I as MarkdownTreeService, pe as PERFECT_SCORE, B as PythonBridgeService, H as PythonModule, V as PythonService, k as ScoringModule, D as ScoringService, K as TextModule, G as TextService, q as TypescriptCommentsService, Z as TypescriptModule, J as TypescriptNodesService, X as TypescriptService, Y as TypescriptTreeService };
+export { E as DEFAULT_ERROR_WEIGHT, C as DifferencesModule, S as DifferencesService, pe as EMPTY_TEMPLATE_SCORE, T as FilesModule, w as FilesService, O as JsonComparisonService, j as JsonModule, A as JsonService, W as JupyterModule, M as JupyterNotebookService, U as JupyterService, $ as LanguagesModule, Q as LanguagesService, R as MarkdownModule, F as MarkdownNodesService, L as MarkdownService, I as MarkdownTreeService, me as PERFECT_SCORE, B as PythonBridgeService, H as PythonModule, V as PythonService, k as ScoringModule, D as ScoringService, K as TextModule, G as TextService, q as TypescriptCommentsService, Z as TypescriptModule, J as TypescriptNodesService, X as TypescriptService, Y as TypescriptTreeService };