@cronn/element-snapshot 0.19.2 → 0.21.0

package/dist/browser-lib.iife.js

@@ -15,6 +15,10 @@
 		if (value === null || !supportedValues.has(value)) return;
 		return value;
 	}
+	function booleanOrEnumAttribute(value, supportedStringValues) {
+		if (value === "true" || value === "false") return booleanAttribute(value);
+		return enumAttribute(value, supportedStringValues);
+	}
 	function resolveElementReference(element, attributeName) {
 		const referenceId = element.getAttribute(attributeName);
 		if (referenceId === null) return null;
@@ -140,9 +144,6 @@
 		"grid",
 		"rowgroup",
 		"row",
-		"rowheader",
-		"cell",
-		"gridcell",
 		"alert",
 		"menu",
 		"tablist",
@@ -304,11 +305,20 @@
 	function resolveTableHeaderCellRole(element) {
 		if (!(element instanceof HTMLTableCellElement)) return;
 		switch (element.scope) {
-			case "col": return "columnheader";
-			case "row": return "rowheader";
-			default: return;
+			case "col":
+			case "colgroup": return "columnheader";
+			case "row":
+			case "rowgroup": return "rowheader";
+			default: return resolveTableHeaderCellRoleFromContext(element);
 		}
 	}
+	function resolveTableHeaderCellRoleFromContext(element) {
+		const row = element.closest("tr");
+		if (row === null) return;
+		const nextElementSibling = getNextElementSibling(element);
+		if (row.rowIndex === 0 && (nextElementSibling === null || resolveElementRole(nextElementSibling) === "columnheader")) return "columnheader";
+		if (element.cellIndex === 0 && nextElementSibling !== null && resolveElementRole(nextElementSibling) === "cell") return "rowheader";
+	}
 	function isWithinTableOrGrid(element) {
 		return isWithinTable(element) || isWithinGrid(element);
 	}
@@ -444,11 +454,7 @@
 	}
 	//#endregion
 	//#region src/browser/button.ts
-	const PRESSED_VALUES = new Set([
-		"true",
-		"mixed",
-		"false"
-	]);
+	const pressedValues = new Set(["mixed"]);
 	function snapshotButton(element) {
 		return {
 			role: "button",
@@ -456,16 +462,11 @@
 			attributes: {
 				...disableableAttributes(element),
 				expanded: booleanAttribute(element.ariaExpanded),
-				pressed: resolvePressedAttribute(element)
+				pressed: booleanOrEnumAttribute(element.ariaPressed, pressedValues)
 			},
 			children: snapshotChildren(element)
 		};
 	}
-	function resolvePressedAttribute(element) {
-		const pressed = enumAttribute(element.ariaPressed, PRESSED_VALUES);
-		if (pressed === "mixed") return pressed;
-		return booleanAttribute(pressed === "true");
-	}
 	//#endregion
 	//#region src/browser/description.ts
 	function discribableAttributes(element) {
@@ -637,6 +638,7 @@
 	}
 	//#endregion
 	//#region src/browser/link.ts
+	const currentValues = new Set(["page", "step"]);
 	function snapshotLink(element) {
 		return {
 			role: "link",
@@ -646,7 +648,10 @@
 		};
 	}
 	function linkAttributes(element) {
-		return { url: stringAttribute(element.getAttribute("href")) };
+		return {
+			url: stringAttribute(element.getAttribute("href")),
+			current: booleanOrEnumAttribute(element.ariaCurrent, currentValues)
+		};
 	}
 	//#endregion
 	//#region src/browser/list.ts
@@ -718,22 +723,54 @@
 	//#endregion
 	//#region src/browser/table.ts
 	function snapshotColumnHeader(element) {
+		const cell = snapshotCell("columnheader", element);
 		return {
 			role: "columnheader",
+			name: cell.name,
+			attributes: {
+				...cell.attributes,
+				sort: enumAttribute(element.ariaSort, SORT_TYPES)
+			},
+			children: cell.children
+		};
+	}
+	function snapshotCellWithRole(role) {
+		return (element) => snapshotCell(role, element);
+	}
+	function snapshotCell(role, element) {
+		return {
+			role,
 			name: resolveAccessibleName(element),
-			attributes: { sort: enumAttribute(element.ariaSort, SORT_TYPES) },
+			attributes: cellAttributes(element),
 			children: snapshotChildren(element)
 		};
 	}
+	function cellAttributes(element) {
+		if (element instanceof HTMLTableCellElement) return {
+			colSpan: resolveSpan(element.colSpan),
+			rowSpan: resolveSpan(element.rowSpan)
+		};
+		return {
+			colSpan: resolveSpan(element.ariaColSpan),
+			rowSpan: resolveSpan(element.ariaRowSpan)
+		};
+	}
+	function resolveSpan(value) {
+		if (typeof value === "string") value = numericAttribute(value) ?? null;
+		if (value === null || value === 1) return;
+		return value;
+	}
 	//#endregion
 	//#region src/browser/element.ts
 	const ROLE_SNAPSHOTS = {
 		alertdialog: snapshotDialogWithRole("alertdialog"),
 		button: snapshotButton,
+		cell: snapshotCellWithRole("cell"),
 		checkbox: snapshotInput,
 		columnheader: snapshotColumnHeader,
 		combobox: snapshotCombobox,
 		dialog: snapshotDialogWithRole("dialog"),
+		gridcell: snapshotCellWithRole("gridcell"),
 		group: snapshotGroup,
 		heading: snapshotHeading,
 		img: snapshotImage,
@@ -744,6 +781,7 @@
 		radio: snapshotInput,
 		radiogroup: snapshotRadioGroup,
 		region: snapshotRegion,
+		rowheader: snapshotCellWithRole("rowheader"),
 		searchbox: snapshotInput,
 		separator: snapshotSeparator,
 		slider: snapshotInput,
@@ -796,6 +834,12 @@
 		const cssStyles = window.getComputedStyle(element);
 		return cssStyles.display === "none" || cssStyles.visibility === "hidden" || cssStyles.visibility === "collapse";
 	}
+	function getNextElementSibling(element) {
+		const nextElementSibling = element.nextElementSibling;
+		if (nextElementSibling === null) return null;
+		if (!isSupportedElement(nextElementSibling)) return getNextElementSibling(nextElementSibling);
+		return nextElementSibling;
+	}
 	//#endregion
 	//#region src/browser-lib.ts
 	window.snapshotElement = snapshotElement;

package/dist/index.d.mts

@@ -43,7 +43,7 @@ type PressedValue = true | "mixed";
 type SetValues<TSet> = TSet extends Set<infer TValue> ? TValue : never;
 //#endregion
 //#region src/types/elements/container.d.ts
-declare const CONTAINER_ROLES: Set<"paragraph" | "list" | "listitem" | "listbox" | "article" | "banner" | "complementary" | "contentinfo" | "form" | "main" | "navigation" | "search" | "descriptionlist" | "term" | "definition" | "table" | "grid" | "rowgroup" | "row" | "rowheader" | "cell" | "gridcell" | "alert" | "menu" | "tablist" | "tabpanel" | "label">;
+declare const CONTAINER_ROLES: Set<"paragraph" | "list" | "listitem" | "listbox" | "article" | "banner" | "complementary" | "contentinfo" | "form" | "main" | "navigation" | "search" | "descriptionlist" | "term" | "definition" | "table" | "grid" | "rowgroup" | "row" | "alert" | "menu" | "tablist" | "tabpanel" | "label">;
 interface ContainerSnapshot extends GenericElementSnapshot<ContainerRole> {}
 type ContainerRole = SetValues<typeof CONTAINER_ROLES>;
 interface RegionSnapshot extends GenericElementSnapshot<"region"> {}
@@ -92,7 +92,9 @@ interface OptionAttributes extends SelectableAttributes, DisableableAttributes {
 interface LinkSnapshot extends GenericElementSnapshot<"link", LinkAttributes> {}
 interface LinkAttributes {
   url?: string;
+  current?: CurrentValue;
 }
+type CurrentValue = true | "page" | "step";
 //#endregion
 //#region src/types/elements/list.d.ts
 interface MenuItemSnapshot extends GenericElementSnapshot<"menuitem", MenuitemAttributes> {}
@@ -113,11 +115,17 @@ interface TabAttributes extends DisableableAttributes, SelectableAttributes {}
 //#endregion
 //#region src/types/elements/table.d.ts
 declare const SORT_TYPES: Set<"ascending" | "descending" | "other">;
-interface ColumnHeaderSnapshot extends GenericElementSnapshot<"columnheader", ColumnheaderAttributes> {}
-interface ColumnheaderAttributes {
+interface ColumnHeaderSnapshot extends GenericElementSnapshot<"columnheader", ColumnHeaderAttributes> {}
+interface ColumnHeaderAttributes extends CellAttributes {
   sort?: SortType;
 }
 type SortType = SetValues<typeof SORT_TYPES>;
+interface CellSnapshot extends GenericElementSnapshot<CellRole, CellAttributes> {}
+type CellRole = "columnheader" | "rowheader" | "cell" | "gridcell";
+interface CellAttributes {
+  colSpan?: number;
+  rowSpan?: number;
+}
 //#endregion
 //#region src/types/elements/text.d.ts
 interface TextSnapshot {
@@ -127,7 +135,7 @@ interface TextSnapshot {
 //#endregion
 //#region src/types/role.d.ts
 type TextRole = "text";
-type ElementRole = "button" | "columnheader" | "group" | "heading" | "img" | "link" | "menuitem" | "option" | "progressbar" | "radiogroup" | "region" | "separator" | "tab" | ContainerRole | DialogRole | InputRole;
+type ElementRole = "button" | "group" | "heading" | "img" | "link" | "menuitem" | "option" | "progressbar" | "radiogroup" | "region" | "separator" | "tab" | CellRole | ContainerRole | DialogRole | InputRole;
 //#endregion
 //#region src/types/snapshot.d.ts
 type NodeRole = ElementRole | TextRole;
@@ -141,7 +149,7 @@ interface GenericElementSnapshot<TRole extends NodeRole = NodeRole, TAttributes
   attributes: TAttributes;
   children: Array<NodeSnapshot>;
 }
-type ElementSnapshot = ButtonSnapshot | ColumnHeaderSnapshot | ComboboxSnapshot | ContainerSnapshot | DialogSnapshot | GroupSnapshot | HeadingSnapshot | ImageSnapshot | InputSnapshot | LinkSnapshot | OptionSnapshot | ProgressbarSnapshot | RegionSnapshot | TabSnapshot | MenuItemSnapshot | RadioGroupSnapshot | SeparatorSnapshot;
+type ElementSnapshot = ButtonSnapshot | CellSnapshot | ColumnHeaderSnapshot | ComboboxSnapshot | ContainerSnapshot | DialogSnapshot | GroupSnapshot | HeadingSnapshot | ImageSnapshot | InputSnapshot | LinkSnapshot | OptionSnapshot | ProgressbarSnapshot | RegionSnapshot | TabSnapshot | MenuItemSnapshot | RadioGroupSnapshot | SeparatorSnapshot;
 //#endregion
 //#region src/utils/filter.d.ts
 type FilterPredicate = (snapshot: NodeSnapshot) => boolean;
@@ -262,4 +270,4 @@ declare function excludeRole<TRole extends NodeRole>(role: TRole | Array<TRole>)
  */
 declare function getTextContent(snapshots: Array<NodeSnapshot>): string;
 //#endregion
-export { type ButtonSnapshot, type ColumnHeaderSnapshot, type ComboboxSnapshot, type ContainerSnapshot, type DialogSnapshot, type ElementRole, type ElementSnapshot, type ElementSnapshotMatchers, type GroupSnapshot, type HeadingSnapshot, type ImageSnapshot, type InputSnapshot, type LinkSnapshot, type MarkdownTableSnapshotOptions, type MatchMarkdownTableSnapshotFileOptions, type MatchSemanticSnapshotFileOptions, type MenuItemSnapshot, type NodeRole, type NodeSnapshot, type OptionSnapshot, type ProgressbarSnapshot, type RadioGroupSnapshot, type RegionSnapshot, type SemanticSnapshotOptions, type SeparatorSnapshot, type SnapshotByRole, type TabSnapshot, type TextSnapshot, defineElementSnapshotMatchers, excludeRole, filter, filterByRole, getTextContent, includeRole, markdownTableSnapshot, rawSnapshot, semanticSnapshot };
+export { type ButtonSnapshot, type CellSnapshot, type ColumnHeaderSnapshot, type ComboboxSnapshot, type ContainerSnapshot, type DialogSnapshot, type ElementRole, type ElementSnapshot, type ElementSnapshotMatchers, type GroupSnapshot, type HeadingSnapshot, type ImageSnapshot, type InputSnapshot, type LinkSnapshot, type MarkdownTableSnapshotOptions, type MatchMarkdownTableSnapshotFileOptions, type MatchSemanticSnapshotFileOptions, type MenuItemSnapshot, type NodeRole, type NodeSnapshot, type OptionSnapshot, type ProgressbarSnapshot, type RadioGroupSnapshot, type RegionSnapshot, type SemanticSnapshotOptions, type SeparatorSnapshot, type SnapshotByRole, type TabSnapshot, type TextSnapshot, defineElementSnapshotMatchers, excludeRole, filter, filterByRole, getTextContent, includeRole, markdownTableSnapshot, rawSnapshot, semanticSnapshot };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cronn/element-snapshot",
-  "version": "0.19.2",
+  "version": "0.21.0",
   "description": "Element snapshots for Playwright",
   "homepage": "https://cronn.github.io/file-snapshots/playwright/element-snapshots/",
   "bugs": {
@@ -27,27 +27,27 @@
   "dependencies": {
     "package-directory": "8.2.0",
     "@cronn/lib-file-snapshots": "1.2.0",
-    "@cronn/playwright-file-snapshots": "2.1.0"
+    "@cronn/playwright-file-snapshots": "2.2.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/core": "0.18.2",
+    "@arethetypeswrong/core": "0.18.3",
     "@playwright/test": "1.60.0",
     "@types/node": "24.12.4",
-    "@typescript/native-preview": "7.0.0-dev.20260518.1",
-    "@vitest/coverage-v8": "4.1.6",
-    "eslint": "10.4.0",
+    "@typescript/native-preview": "7.0.0-dev.20260527.2",
+    "@vitest/coverage-v8": "4.1.7",
+    "eslint": "10.4.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-check-file": "3.3.1",
     "eslint-plugin-unused-imports": "4.4.1",
     "publint": "0.3.21",
     "rimraf": "6.1.3",
-    "tsdown": "0.22.0",
-    "typescript-eslint": "8.59.4",
-    "vitest": "4.1.6",
+    "tsdown": "0.22.1",
+    "typescript-eslint": "8.60.0",
+    "vitest": "4.1.7",
     "node": "runtime:>=24.14.1 <25",
-    "@cronn/shared-configs": "0.0.0",
     "@cronn/test-utils": "0.0.0",
-    "@cronn/vitest-file-snapshots": "2.1.0"
+    "@cronn/vitest-file-snapshots": "2.1.1",
+    "@cronn/shared-configs": "0.0.0"
   },
   "peerDependencies": {
     "@playwright/test": "^1.55"
@@ -55,7 +55,7 @@
   "devEngines": {
     "packageManager": {
       "name": "pnpm",
-      "version": "11.3.0",
+      "version": "11.5.2",
       "onFail": "download"
     },
     "runtime": {