@pptx-studio/validate 0.3.0 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @pptx-studio/validate
 
+## 0.4.0
+
+### Minor Changes
+
+- 7d2c88e: A table cell's fill, borders and text now come from its style the way PowerPoint draws them.
+  `tablePartsAt` names the parts that reach a grid position, and `TABLE_PART_ORDER` is the order they
+  compose in. `tableCellFill`, `tableBackground` and `tableEdgeLine` resolve one property each and
+  name where it came from: a part, `tblBg`, `a:tcPr`, `a:tblPr` or the default grid. Merged cells and
+  the owner of every edge segment follow what PowerPoint drew. `tableTextLayer` gives the style's
+  bold, italic, faces and colour as run properties for the text cascade. `DEFAULT_GRID_LINE` is the 1-pt black line a table with no
+  built-in style draws. `TextContext.cell` puts a cell's list style and its style's text layer into
+  the text cascade, and `Origin` gains `cell` and `tableStyle`. A position or edge a table does not
+  have throws the new `MODEL_TABLE_POSITION`.
+
+  validate adds `V034`, a warning on a table cell that writes a border PowerPoint draws from the cell
+  across the edge instead, where that cell writes none or a different one.
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -306,6 +306,13 @@ export declare const RULES: readonly [{
   readonly evidence: "both";
   readonly title: "a table style id is a braced GUID, and the table-style part is one PowerPoint keeps";
   readonly why: string;
+}, {
+  readonly id: "V034";
+  readonly category: "required";
+  readonly severity: "warning";
+  readonly evidence: "measured";
+  readonly title: "a border a cell writes is the one PowerPoint draws on that edge";
+  readonly why: string;
 }];
 type RuleId = (typeof RULES)[number]['id'];
 export declare function ruleById(id: string): Rule | undefined;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/errors.ts","../src/rules/rules.ts","../src/report/location.ts","../src/report/report.ts","../src/context.ts","../src/validate.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/errors.ts","../src/rules/rules.ts","../src/report/location.ts","../src/report/report.ts","../src/context.ts","../src/validate.ts"],"mappings":"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"}

package/dist/index.js

@@ -311,6 +311,14 @@ const RULES = [
 		evidence: "both",
 		title: "a table style id is a braced GUID, and the table-style part is one PowerPoint keeps",
 		why: "`ST_Guid` is a GUID in braces, `CT_TableStyleList/@def` and `CT_TableStyle/@styleId` are required, `b` and `i` are `ST_OnOffStyleType` and a border or fill must hold one. C8 measured each as a repair prompt: an id without braces or with padding, a `tblPr` naming its style twice, a part whose root is not `a:tblStyleLst`, a list without `@def`, a style without `@styleId`, `b=\"yes\"`, an edge with neither `a:ln` nor `a:lnRef`, and an empty `a:fill`. PowerPoint writes the all-zero GUID for the id and empties the part."
+	},
+	{
+		id: "V034",
+		category: "required",
+		severity: "warning",
+		evidence: "measured",
+		title: "a border a cell writes is the one PowerPoint draws on that edge",
+		why: "A grid edge belongs to two cells, and each may write a line for it. C9 drew direct borders, on plain and merged cells, under seven built-ins and the default grid: PowerPoint draws an edge from the cell above or to the left - its `a:lnB` or `a:lnR`, or the style where it writes none - where that cell, merged or not, has its anchor level with the edge. Otherwise the cell below or to the right draws its own `a:lnT` or `a:lnL` where its anchor is level with the edge, and elsewhere the cell above or to the left keeps it. When PowerPoint sets a border itself it writes every side alike. The deck opens without a word, which is why this is a warning: the file says one border and PowerPoint draws another."
 	}
 ];
 const BY_ID = new Map(RULES.map((rule) => [rule.id, rule]));
@@ -1178,8 +1186,8 @@ function forEachElement$1(ctx, visit) {
 //#endregion
 //#region src/rules/required.ts
 /**
-* `V013` … `V017`, `V030`, `V031` and `V033`: children and attributes that are not optional.
-* Each is a `minOccurs` or a type the schema states, reported on the element that lacks it.
+* `V013` … `V017`, `V030`, `V031`, `V033` and `V034`: children and attributes that are not optional,
+* and tables PowerPoint reads otherwise than they say.
 */
 /** The twelve attributes of `CT_ColorMapping`. All required, no defaults. */
 const CLR_MAP_ATTRIBUTES = [
@@ -1453,6 +1461,104 @@ function v030TableGrid(ctx) {
 		});
 	});
 }
+/** Two elements alike but for their own names: the same attributes and the same children. */
+function sameMarkup(a, b) {
+	const attrs = (e) => [...e.attributes].map((x) => `${x.qname}=${x.value}`).sort().join(" ");
+	const ka = childElements(a);
+	const kb = childElements(b);
+	return attrs(a) === attrs(b) && textContent(a).trim() === textContent(b).trim() && ka.length === kb.length && ka.every((child, i) => child.qname === kb[i]?.qname && sameMarkup(child, kb[i]));
+}
+/** Whether a line draws nothing: an `a:noFill`, or no fill at all (C9). */
+function drawsNothing(line) {
+	const fills = childElements(line).filter((c) => [
+		"noFill",
+		"solidFill",
+		"gradFill",
+		"pattFill"
+	].includes(c.local));
+	return fills.length === 0 || fills.some((c) => c.local === "noFill");
+}
+/** Two lines that draw alike: both draw nothing, or they are the same markup. */
+function alike(a, b) {
+	return drawsNothing(a) && drawsNothing(b) || sameMarkup(a, b);
+}
+/** A cell's own `a:tcPr` line, by its local name. */
+function lineOf(cell, local) {
+	const tcPr = childElements(cell).find((child) => child.local === "tcPr");
+	return tcPr === void 0 ? void 0 : childElements(tcPr).find((child) => child.local === local);
+}
+/** The grid position across segment `k` of a cell's `side`, the cell anchored at (r, c). */
+function acrossOf(side, r, c, owner, k) {
+	if (side === "lnT") return [r - 1, c + k];
+	if (side === "lnL") return [r + k, c - 1];
+	if (side === "lnB") return [r + owner.rows, c + k];
+	return [r + k, c + owner.cols];
+}
+/** Each side a cell writes, the side facing it across the edge, and how a segment of it is named. */
+const SIDES = [
+	{
+		side: "lnT",
+		facing: "lnB",
+		across: "cols",
+		after: true,
+		where: "above column"
+	},
+	{
+		side: "lnL",
+		facing: "lnR",
+		across: "rows",
+		after: true,
+		where: "left of row"
+	},
+	{
+		side: "lnB",
+		facing: "lnT",
+		across: "cols",
+		after: false,
+		where: "below column"
+	},
+	{
+		side: "lnR",
+		facing: "lnL",
+		across: "rows",
+		after: false,
+		where: "right of row"
+	}
+];
+/**
+* A border a cell writes that PowerPoint draws from the cell across the edge: the cell before owns a
+* segment where its anchor is level with it, else the cell after where its is, else the cell before
+* (C9, ADR 0064). PowerPoint's own writer writes every side alike, so this never fires on its output.
+*/
+function v034TableBorders(ctx) {
+	forEachElement(ctx, (part, element) => {
+		if (element.local !== "tbl" || namespaceOf(element) !== NS.a) return;
+		const tblGrid = childElements(element).find((child) => child.local === "tblGrid");
+		const cols = tblGrid === void 0 ? 0 : childElements(tblGrid).filter((c) => c.local === "gridCol").length;
+		const cells = childElements(element).filter((child) => child.local === "tr").map((row) => childElements(row).filter((child) => child.local === "tc"));
+		const grid = owners(cells, cols);
+		for (const [r, line] of cells.entries()) for (const [c, cell] of line.entries()) {
+			const owner = grid[r]?.[c];
+			if (owner?.row !== r || owner.col !== c) continue;
+			for (const s of SIDES) {
+				const written = lineOf(cell, s.side);
+				if (written === void 0) continue;
+				const reach = s.across === "cols" ? owner.cols : owner.rows;
+				for (let k = 0; k < reach; k++) {
+					const [nr, nc] = acrossOf(s.side, r, c, owner, k);
+					const other = grid[nr]?.[nc];
+					if (other === null || other === void 0) continue;
+					const otherLevel = s.across === "cols" ? other.col === nc : other.row === nr;
+					if (!(s.after ? otherLevel || k > 0 : k > 0 && otherLevel)) continue;
+					const drawn = lineOf(cells[other.row][other.col], s.facing);
+					if (drawn !== void 0 && alike(drawn, written)) continue;
+					ctx.add("V034", elementLocation(part, written), `cell (${String(r + 1)}, ${String(c + 1)}) writes <a:${s.side}>, but ${s.where} ${String((s.across === "cols" ? nc : nr) + 1)} PowerPoint draws the <a:${s.facing}> of cell (${String(other.row + 1)}, ${String(other.col + 1)}), which writes ${drawn === void 0 ? "none" : "a different one"} - measured in C9.`);
+					break;
+				}
+			}
+		}
+	});
+}
 /**
 * Presentation-family parts only.
 *
@@ -2305,7 +2411,8 @@ const IMPLEMENTATIONS = {
 	V030: v030TableGrid,
 	V031: v031TableAttributes,
 	V032: v032TableStyleIds,
-	V033: v033TableStyles
+	V033: v033TableStyles,
+	V034: v034TableBorders
 };
 /** Rules that cannot run without the archive bytes. See `Context.archive`. */
 const ARCHIVE_RULES = ["V003"];