wpd-codec 3.5.1 → 3.5.3

package/dist/stream/style.cjs

@@ -29,8 +29,7 @@ const SYSTEM_STYLE_NUMBER_OFFSET = 2;
 const SYSTEM_STYLE_NONE = 255;
 function readSystemStyleNumber(nonDeletable) {
 	const value = nonDeletable[SYSTEM_STYLE_NUMBER_OFFSET];
-	if (value === void 0 || value === SYSTEM_STYLE_NONE) return;
-	return value;
+	return value === SYSTEM_STYLE_NONE ? void 0 : value;
 }
 const FIRST_HEADING_LEVEL_STYLE = 68;
 const LAST_HEADING_LEVEL_STYLE = 75;
@@ -73,17 +72,20 @@ const PACKET_TYPE_NORMAL_STYLE = 48;
 const PID_COUNT_OFFSET = 0;
 const TEXT_BLOCK_HEADER_SIZE = 18;
 function readStyleBeginBlock(packet) {
-	if (packet.length < 2) return;
-	const afterPids = 2 + require_bytes_view.uint16At(packet, PID_COUNT_OFFSET) * 2;
-	if (afterPids + TEXT_BLOCK_HEADER_SIZE > packet.length) return;
-	const relativeOffset = require_bytes_view.uint32At(packet, afterPids + 2);
-	const paragraphTextSize = require_bytes_view.uint32At(packet, afterPids + 6);
-	const beginningStyleTextSize = require_bytes_view.uint32At(packet, afterPids + 10);
-	if (beginningStyleTextSize === 0) return;
-	const start = relativeOffset + paragraphTextSize;
-	const end = start + beginningStyleTextSize;
-	if (start < 0 || end > packet.length) return;
-	return packet.subarray(start, end);
+	try {
+		const afterPids = 2 + require_bytes_view.uint16At(packet, PID_COUNT_OFFSET) * 2;
+		if (afterPids + TEXT_BLOCK_HEADER_SIZE > packet.length) return;
+		const relativeOffset = require_bytes_view.uint32At(packet, afterPids + 2);
+		const paragraphTextSize = require_bytes_view.uint32At(packet, afterPids + 6);
+		const beginningStyleTextSize = require_bytes_view.uint32At(packet, afterPids + 10);
+		if (beginningStyleTextSize === 0) return;
+		const start = relativeOffset + paragraphTextSize;
+		const end = start + beginningStyleTextSize;
+		if (end > packet.length) return;
+		return packet.subarray(start, end);
+	} catch {
+		return;
+	}
 }
 //#endregion
 exports.DISPLAY_NUMBER_GROUP = DISPLAY_NUMBER_GROUP;

package/dist/stream/style.js

@@ -28,8 +28,7 @@ const SYSTEM_STYLE_NUMBER_OFFSET = 2;
 const SYSTEM_STYLE_NONE = 255;
 function readSystemStyleNumber(nonDeletable) {
 	const value = nonDeletable[SYSTEM_STYLE_NUMBER_OFFSET];
-	if (value === void 0 || value === SYSTEM_STYLE_NONE) return;
-	return value;
+	return value === SYSTEM_STYLE_NONE ? void 0 : value;
 }
 const FIRST_HEADING_LEVEL_STYLE = 68;
 const LAST_HEADING_LEVEL_STYLE = 75;
@@ -72,17 +71,20 @@ const PACKET_TYPE_NORMAL_STYLE = 48;
 const PID_COUNT_OFFSET = 0;
 const TEXT_BLOCK_HEADER_SIZE = 18;
 function readStyleBeginBlock(packet) {
-	if (packet.length < 2) return;
-	const afterPids = 2 + uint16At(packet, PID_COUNT_OFFSET) * 2;
-	if (afterPids + TEXT_BLOCK_HEADER_SIZE > packet.length) return;
-	const relativeOffset = uint32At(packet, afterPids + 2);
-	const paragraphTextSize = uint32At(packet, afterPids + 6);
-	const beginningStyleTextSize = uint32At(packet, afterPids + 10);
-	if (beginningStyleTextSize === 0) return;
-	const start = relativeOffset + paragraphTextSize;
-	const end = start + beginningStyleTextSize;
-	if (start < 0 || end > packet.length) return;
-	return packet.subarray(start, end);
+	try {
+		const afterPids = 2 + uint16At(packet, PID_COUNT_OFFSET) * 2;
+		if (afterPids + TEXT_BLOCK_HEADER_SIZE > packet.length) return;
+		const relativeOffset = uint32At(packet, afterPids + 2);
+		const paragraphTextSize = uint32At(packet, afterPids + 6);
+		const beginningStyleTextSize = uint32At(packet, afterPids + 10);
+		if (beginningStyleTextSize === 0) return;
+		const start = relativeOffset + paragraphTextSize;
+		const end = start + beginningStyleTextSize;
+		if (end > packet.length) return;
+		return packet.subarray(start, end);
+	} catch {
+		return;
+	}
 }
 //#endregion
 export { DISPLAY_NUMBER_GROUP, PACKET_TYPE_NORMAL_STYLE, STYLE_GROUP, isParagraphNumberDisplayOff, isParagraphNumberDisplayOn, isStyleScopeCloser, isStyleScopeOpener, readDisplayNumberLevel, readStyleBeginBlock, readSystemStyleNumber, styleSemanticsFor };

package/dist/stream/table.cjs

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_errors = require("../errors.cjs");
 const require_bytes_view = require("../bytes/view.cjs");
 const require_stream_units = require("./units.cjs");
 //#region src/stream/table.ts
@@ -45,31 +44,39 @@ function readEmbeddedSubfunctions(nonDeletable) {
 		truncated: true
 	};
 	const subfunctions = [];
-	while (cursor < nonDeletable.length) {
-		const code = nonDeletable[cursor];
-		if (code === void 0) break;
-		if (code === DONT_END_PARAGRAPH_STYLE_SUBFUNCTION) {
+	try {
+		for (;;) {
+			const code = nonDeletable[cursor];
+			if (code === void 0) break;
+			if (code === DONT_END_PARAGRAPH_STYLE_SUBFUNCTION) {
+				subfunctions.push({
+					code,
+					data: /* @__PURE__ */ new Uint8Array(0)
+				});
+				cursor += 1;
+				continue;
+			}
+			const formulaLength = code === 129 ? require_bytes_view.uint16At(nonDeletable, cursor + 1) : void 0;
+			const size = formulaLength === void 0 ? EMBEDDED_SUBFUNCTION_SIZES.get(code) : formulaLength + CELL_FORMULA_FRAMING_SIZE;
+			if (size === void 0) return {
+				subfunctions,
+				truncated: true
+			};
+			if (nonDeletable[cursor + size - 1] !== code) return {
+				subfunctions,
+				truncated: true
+			};
 			subfunctions.push({
 				code,
-				data: /* @__PURE__ */ new Uint8Array(0)
+				data: formulaLength === void 0 ? nonDeletable.subarray(cursor + 1, cursor + size - 1) : nonDeletable.subarray(cursor + 3, cursor + 3 + formulaLength)
 			});
-			cursor += 1;
-			continue;
+			cursor += size;
 		}
-		const size = code === 129 ? cursor + 3 <= nonDeletable.length ? require_bytes_view.uint16At(nonDeletable, cursor + 1) + CELL_FORMULA_FRAMING_SIZE : void 0 : EMBEDDED_SUBFUNCTION_SIZES.get(code);
-		if (size === void 0 || cursor + size > nonDeletable.length) return {
+	} catch {
+		return {
 			subfunctions,
 			truncated: true
 		};
-		if (nonDeletable[cursor + size - 1] !== code) return {
-			subfunctions,
-			truncated: true
-		};
-		subfunctions.push({
-			code,
-			data: nonDeletable.subarray(cursor + 1, cursor + size - 1)
-		});
-		cursor += size;
 	}
 	return {
 		subfunctions,
@@ -149,24 +156,31 @@ const PERCENT_STEPS = [
 	[90, "percent90"],
 	[95, "percent95"]
 ];
-function nearestPercentType(percent) {
-	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - percent) < Math.abs(best[0] - percent) ? step : best)[1];
+const PATTERN_TYPE_BY_SHADE = Array.from({ length: 256 }, (_, shade) => {
+	const foregroundCoveragePercent = 100 - shade / COLOR_COMPONENT_MAX * 100;
+	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - foregroundCoveragePercent) < Math.abs(best[0] - foregroundCoveragePercent) ? step : best)[1];
+});
+function nearestPercentType(shade) {
+	const patternType = PATTERN_TYPE_BY_SHADE[shade];
+	if (patternType === void 0) throw new RangeError(`Shade byte ${String(shade)} is outside the 0-255 range a fill's own shading byte can ever hold.`);
+	return patternType;
 }
 function colorAt(data, offset) {
-	const r = data[offset];
-	const g = data[offset + 1];
-	const b = data[offset + 2];
-	if (r === void 0 || g === void 0 || b === void 0) return;
 	return {
-		r: r / COLOR_COMPONENT_MAX,
-		g: g / COLOR_COMPONENT_MAX,
-		b: b / COLOR_COMPONENT_MAX
+		r: require_bytes_view.byteAt(data, offset) / COLOR_COMPONENT_MAX,
+		g: require_bytes_view.byteAt(data, offset + 1) / COLOR_COMPONENT_MAX,
+		b: require_bytes_view.byteAt(data, offset + 2) / COLOR_COMPONENT_MAX
 	};
 }
 function readCellFill(data) {
-	const background = colorAt(data, RGBS_SIZE);
-	if (background === void 0) return;
-	const backgroundShade = data[7];
+	let background;
+	let backgroundShade;
+	try {
+		background = colorAt(data, RGBS_SIZE);
+		backgroundShade = data[7];
+	} catch {
+		return;
+	}
 	if (backgroundShade === void 0 || backgroundShade === FULL_SHADE) return {
 		fill: {
 			kind: "solid",
@@ -175,11 +189,10 @@ function readCellFill(data) {
 		blended: false
 	};
 	const foreground = colorAt(data, 0);
-	if (foreground === void 0) throw new require_errors.WpdFormatError("Cell fill has a readable background colour but an unreadable foreground colour, which the RGBS pair's own contiguous layout should make impossible.");
 	return {
 		fill: {
 			kind: "pattern",
-			patternType: nearestPercentType(100 - backgroundShade / COLOR_COMPONENT_MAX * 100),
+			patternType: nearestPercentType(backgroundShade),
 			foregroundColor: foreground,
 			backgroundColor: background
 		},
@@ -196,6 +209,7 @@ exports.CHARACTER_TABLE_COLUMN = CHARACTER_TABLE_COLUMN;
 exports.CHARACTER_TABLE_DEFINITION = CHARACTER_TABLE_DEFINITION;
 exports.ROW_INFORMATION_SUBFUNCTION = ROW_INFORMATION_SUBFUNCTION;
 exports.findEmbeddedSubfunction = findEmbeddedSubfunction;
+exports.nearestPercentType = nearestPercentType;
 exports.readCellFill = readCellFill;
 exports.readCellInformation = readCellInformation;
 exports.readCellSpanning = readCellSpanning;

package/dist/stream/table.d.cts

@@ -1,4 +1,4 @@
-import { Alignment, ContentCellFill } from "document-schema.js";
+import { Alignment, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/stream/table.d.ts
 declare const CHARACTER_TABLE_DEFINITION = 42;
 declare const CHARACTER_DEFINE_TABLE_END = 43;
@@ -35,10 +35,11 @@ interface WpdCellSpanning {
   readonly coveredFromAbove: boolean;
 }
 declare function readCellSpanning(data: Uint8Array): WpdCellSpanning | undefined;
+declare function nearestPercentType(shade: number): ContentCellPatternType;
 interface WpdCellFill {
   readonly fill: ContentCellFill;
   readonly blended: boolean;
 }
 declare function readCellFill(data: Uint8Array): WpdCellFill | undefined;
 //#endregion
-export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, WpdCellFill, WpdCellInformation, WpdCellSpanning, WpdEmbeddedSubfunction, WpdEmbeddedSubfunctions, WpdRowInformation, findEmbeddedSubfunction, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };
+export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, WpdCellFill, WpdCellInformation, WpdCellSpanning, WpdEmbeddedSubfunction, WpdEmbeddedSubfunctions, WpdRowInformation, findEmbeddedSubfunction, nearestPercentType, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };

package/dist/stream/table.d.ts

@@ -1,4 +1,4 @@
-import { Alignment, ContentCellFill } from "document-schema.js";
+import { Alignment, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/stream/table.d.ts
 declare const CHARACTER_TABLE_DEFINITION = 42;
 declare const CHARACTER_DEFINE_TABLE_END = 43;
@@ -35,10 +35,11 @@ interface WpdCellSpanning {
   readonly coveredFromAbove: boolean;
 }
 declare function readCellSpanning(data: Uint8Array): WpdCellSpanning | undefined;
+declare function nearestPercentType(shade: number): ContentCellPatternType;
 interface WpdCellFill {
   readonly fill: ContentCellFill;
   readonly blended: boolean;
 }
 declare function readCellFill(data: Uint8Array): WpdCellFill | undefined;
 //#endregion
-export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, WpdCellFill, WpdCellInformation, WpdCellSpanning, WpdEmbeddedSubfunction, WpdEmbeddedSubfunctions, WpdRowInformation, findEmbeddedSubfunction, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };
+export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, WpdCellFill, WpdCellInformation, WpdCellSpanning, WpdEmbeddedSubfunction, WpdEmbeddedSubfunctions, WpdRowInformation, findEmbeddedSubfunction, nearestPercentType, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };

package/dist/stream/table.js

@@ -1,5 +1,4 @@
-import { WpdFormatError } from "../errors.js";
-import { uint16At } from "../bytes/view.js";
+import { byteAt, uint16At } from "../bytes/view.js";
 import { pointsFromWpu } from "./units.js";
 //#region src/stream/table.ts
 const CHARACTER_TABLE_DEFINITION = 42;
@@ -44,31 +43,39 @@ function readEmbeddedSubfunctions(nonDeletable) {
 		truncated: true
 	};
 	const subfunctions = [];
-	while (cursor < nonDeletable.length) {
-		const code = nonDeletable[cursor];
-		if (code === void 0) break;
-		if (code === DONT_END_PARAGRAPH_STYLE_SUBFUNCTION) {
+	try {
+		for (;;) {
+			const code = nonDeletable[cursor];
+			if (code === void 0) break;
+			if (code === DONT_END_PARAGRAPH_STYLE_SUBFUNCTION) {
+				subfunctions.push({
+					code,
+					data: /* @__PURE__ */ new Uint8Array(0)
+				});
+				cursor += 1;
+				continue;
+			}
+			const formulaLength = code === 129 ? uint16At(nonDeletable, cursor + 1) : void 0;
+			const size = formulaLength === void 0 ? EMBEDDED_SUBFUNCTION_SIZES.get(code) : formulaLength + CELL_FORMULA_FRAMING_SIZE;
+			if (size === void 0) return {
+				subfunctions,
+				truncated: true
+			};
+			if (nonDeletable[cursor + size - 1] !== code) return {
+				subfunctions,
+				truncated: true
+			};
 			subfunctions.push({
 				code,
-				data: /* @__PURE__ */ new Uint8Array(0)
+				data: formulaLength === void 0 ? nonDeletable.subarray(cursor + 1, cursor + size - 1) : nonDeletable.subarray(cursor + 3, cursor + 3 + formulaLength)
 			});
-			cursor += 1;
-			continue;
+			cursor += size;
 		}
-		const size = code === 129 ? cursor + 3 <= nonDeletable.length ? uint16At(nonDeletable, cursor + 1) + CELL_FORMULA_FRAMING_SIZE : void 0 : EMBEDDED_SUBFUNCTION_SIZES.get(code);
-		if (size === void 0 || cursor + size > nonDeletable.length) return {
+	} catch {
+		return {
 			subfunctions,
 			truncated: true
 		};
-		if (nonDeletable[cursor + size - 1] !== code) return {
-			subfunctions,
-			truncated: true
-		};
-		subfunctions.push({
-			code,
-			data: nonDeletable.subarray(cursor + 1, cursor + size - 1)
-		});
-		cursor += size;
 	}
 	return {
 		subfunctions,
@@ -148,24 +155,31 @@ const PERCENT_STEPS = [
 	[90, "percent90"],
 	[95, "percent95"]
 ];
-function nearestPercentType(percent) {
-	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - percent) < Math.abs(best[0] - percent) ? step : best)[1];
+const PATTERN_TYPE_BY_SHADE = Array.from({ length: 256 }, (_, shade) => {
+	const foregroundCoveragePercent = 100 - shade / COLOR_COMPONENT_MAX * 100;
+	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - foregroundCoveragePercent) < Math.abs(best[0] - foregroundCoveragePercent) ? step : best)[1];
+});
+function nearestPercentType(shade) {
+	const patternType = PATTERN_TYPE_BY_SHADE[shade];
+	if (patternType === void 0) throw new RangeError(`Shade byte ${String(shade)} is outside the 0-255 range a fill's own shading byte can ever hold.`);
+	return patternType;
 }
 function colorAt(data, offset) {
-	const r = data[offset];
-	const g = data[offset + 1];
-	const b = data[offset + 2];
-	if (r === void 0 || g === void 0 || b === void 0) return;
 	return {
-		r: r / COLOR_COMPONENT_MAX,
-		g: g / COLOR_COMPONENT_MAX,
-		b: b / COLOR_COMPONENT_MAX
+		r: byteAt(data, offset) / COLOR_COMPONENT_MAX,
+		g: byteAt(data, offset + 1) / COLOR_COMPONENT_MAX,
+		b: byteAt(data, offset + 2) / COLOR_COMPONENT_MAX
 	};
 }
 function readCellFill(data) {
-	const background = colorAt(data, RGBS_SIZE);
-	if (background === void 0) return;
-	const backgroundShade = data[7];
+	let background;
+	let backgroundShade;
+	try {
+		background = colorAt(data, RGBS_SIZE);
+		backgroundShade = data[7];
+	} catch {
+		return;
+	}
 	if (backgroundShade === void 0 || backgroundShade === FULL_SHADE) return {
 		fill: {
 			kind: "solid",
@@ -174,11 +188,10 @@ function readCellFill(data) {
 		blended: false
 	};
 	const foreground = colorAt(data, 0);
-	if (foreground === void 0) throw new WpdFormatError("Cell fill has a readable background colour but an unreadable foreground colour, which the RGBS pair's own contiguous layout should make impossible.");
 	return {
 		fill: {
 			kind: "pattern",
-			patternType: nearestPercentType(100 - backgroundShade / COLOR_COMPONENT_MAX * 100),
+			patternType: nearestPercentType(backgroundShade),
 			foregroundColor: foreground,
 			backgroundColor: background
 		},
@@ -186,4 +199,4 @@ function readCellFill(data) {
 	};
 }
 //#endregion
-export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, findEmbeddedSubfunction, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };
+export { CELL_FILL_COLORS_SUBFUNCTION, CELL_FORMULA_SUBFUNCTION, CELL_INFORMATION_SUBFUNCTION, CELL_SPANNING_SUBFUNCTION, CHARACTER_DEFINE_TABLE_END, CHARACTER_TABLE_COLUMN, CHARACTER_TABLE_DEFINITION, ROW_INFORMATION_SUBFUNCTION, findEmbeddedSubfunction, nearestPercentType, readCellFill, readCellInformation, readCellSpanning, readEmbeddedSubfunctions, readRowInformation, readTableColumnWidthPt };

package/dist/stream/wpg.cjs

@@ -111,24 +111,20 @@ function coordinateAt(bytes, offset, doublePrecision) {
 	if (!doublePrecision) return require_bytes_view.int16At(bytes, offset);
 	return require_bytes_view.uint32At(bytes, offset) / 65536;
 }
-function readCharacterization(bytes, cursor, recordEnd) {
-	if (cursor + 2 > recordEnd) return;
-	const flags = require_bytes_view.uint16At(bytes, cursor);
-	if ((flags & 31) !== 0) return {
-		flags,
-		geometryAt: -1
-	};
-	let geometryAt = cursor + 2;
-	if ((flags & FLAG_EDIT_LOCK) !== 0) geometryAt += 4;
-	if ((flags & FLAG_OBJECT_ID) !== 0) {
-		if (geometryAt + 2 > recordEnd) return;
-		geometryAt += (require_bytes_view.uint16At(bytes, geometryAt) & 32768) !== 0 ? 4 : 2;
+function readCharacterization(bytes, cursor) {
+	try {
+		const flags = require_bytes_view.uint16At(bytes, cursor);
+		if ((flags & 31) !== 0) return;
+		let geometryAt = cursor + 2;
+		if ((flags & FLAG_EDIT_LOCK) !== 0) geometryAt += 4;
+		if ((flags & FLAG_OBJECT_ID) !== 0) geometryAt += (require_bytes_view.uint16At(bytes, geometryAt) & 32768) !== 0 ? 4 : 2;
+		return {
+			flags,
+			geometryAt
+		};
+	} catch {
+		return;
 	}
-	if (geometryAt > recordEnd) return;
-	return {
-		flags,
-		geometryAt
-	};
 }
 function xToPt(geometry, x) {
 	return x / geometry.xPpi * POINTS_PER_INCH;
@@ -200,10 +196,6 @@ function decodeWpgGraphic(bytes, options) {
 		reason: "encrypted"
 	};
 	const recordStart = require_bytes_view.uint32At(bytes, start + 4);
-	if (recordStart < start + WPG_PREFIX_HEAD_SIZE || recordStart >= bytes.length) return {
-		status: "refused",
-		reason: "malformed"
-	};
 	const state = {
 		penColor: { ...WPG_DEFAULT_BLACK },
 		penWidthUnits: 0,
@@ -218,9 +210,13 @@ function decodeWpgGraphic(bytes, options) {
 	let pendingTextBlockFrame;
 	let cursor = start + recordStart;
 	const recordName = (type) => RECORD_NAMES.get(type) ?? `record type 0x${type.toString(16)}`;
-	while (cursor < bytes.length) {
-		if (cursor + 2 > bytes.length) break;
-		const type = require_bytes_view.byteAt(bytes, cursor + 1);
+	for (;;) {
+		let type;
+		try {
+			type = require_bytes_view.byteAt(bytes, cursor + 1);
+		} catch {
+			break;
+		}
 		let after = cursor + 2;
 		const extension = readCountField(bytes, after);
 		if (extension === void 0) break;
@@ -328,10 +324,10 @@ function decodeWpgGraphic(bytes, options) {
 			}
 			if (type !== RECORD_TEXT_BLOCK) pendingTextBlockFrame = void 0;
 		}
-		while (groups.length > 0 && groups[groups.length - 1]?.remaining === 0) groups.pop();
+		while (groups[groups.length - 1]?.remaining === 0) groups.pop();
 		if (extension.value > 0) groups.push({
 			remaining: extension.value,
-			membersWalk: !swallowed && (type === RECORD_GROUP || type === RECORD_TEXT_BLOCK && pendingTextBlockFrame !== void 0)
+			membersWalk: !swallowed && (type === RECORD_GROUP || pendingTextBlockFrame !== void 0)
 		});
 		cursor = recordEnd;
 	}
@@ -356,8 +352,8 @@ function swallowedByOpenGroup(groups) {
 }
 function readTextBlockFrame(data, geometry) {
 	if (geometry === void 0) return;
-	const characterization = readCharacterization(data, 0, data.length);
-	if (characterization === void 0 || characterization.geometryAt < 0 || characterization.geometryAt + geometry.coordinateSize * 4 > data.length) return;
+	const characterization = readCharacterization(data, 0);
+	if (characterization === void 0 || characterization.geometryAt + geometry.coordinateSize * 4 > data.length) return;
 	const at = characterization.geometryAt;
 	return frameFromCorners(geometry, coordinateAt(data, at, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize * 2, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize * 3, geometry.doublePrecision));
 }
@@ -374,8 +370,8 @@ function frameFromCorners(geometry, x1, y1, x2, y2) {
 	};
 }
 function readPrimitiveVector(type, data, geometry, state) {
-	const characterization = readCharacterization(data, 0, data.length);
-	if (characterization === void 0 || characterization.geometryAt < 0) return;
+	const characterization = readCharacterization(data, 0);
+	if (characterization === void 0) return;
 	const { flags, geometryAt } = characterization;
 	const stroke = (flags & FLAG_FRAME) !== 0 ? strokeOf(geometry, state) : void 0;
 	switch (type) {
@@ -386,17 +382,19 @@ function readPrimitiveVector(type, data, geometry, state) {
 	}
 }
 function readPolyline(data, geometry, flags, geometryAt, stroke, state) {
-	if (geometryAt + 2 > data.length) return;
-	const count = require_bytes_view.uint16At(data, geometryAt);
-	let at = geometryAt + 2;
 	const points = [];
-	for (let index = 0; index < count; index += 1) {
-		if (at + geometry.coordinateSize * 2 > data.length) return;
-		points.push({
-			xPt: xToPt(geometry, coordinateAt(data, at, geometry.doublePrecision)),
-			yPt: yToPt(geometry, coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision))
-		});
-		at += geometry.coordinateSize * 2;
+	try {
+		const count = require_bytes_view.uint16At(data, geometryAt);
+		let at = geometryAt + 2;
+		for (let index = 0; index < count; index += 1) {
+			points.push({
+				xPt: xToPt(geometry, coordinateAt(data, at, geometry.doublePrecision)),
+				yPt: yToPt(geometry, coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision))
+			});
+			at += geometry.coordinateSize * 2;
+		}
+	} catch {
+		return;
 	}
 	const firstPoint = points[0];
 	if (firstPoint === void 0) return;

package/dist/stream/wpg.js

@@ -110,24 +110,20 @@ function coordinateAt(bytes, offset, doublePrecision) {
 	if (!doublePrecision) return int16At(bytes, offset);
 	return uint32At(bytes, offset) / 65536;
 }
-function readCharacterization(bytes, cursor, recordEnd) {
-	if (cursor + 2 > recordEnd) return;
-	const flags = uint16At(bytes, cursor);
-	if ((flags & 31) !== 0) return {
-		flags,
-		geometryAt: -1
-	};
-	let geometryAt = cursor + 2;
-	if ((flags & FLAG_EDIT_LOCK) !== 0) geometryAt += 4;
-	if ((flags & FLAG_OBJECT_ID) !== 0) {
-		if (geometryAt + 2 > recordEnd) return;
-		geometryAt += (uint16At(bytes, geometryAt) & 32768) !== 0 ? 4 : 2;
+function readCharacterization(bytes, cursor) {
+	try {
+		const flags = uint16At(bytes, cursor);
+		if ((flags & 31) !== 0) return;
+		let geometryAt = cursor + 2;
+		if ((flags & FLAG_EDIT_LOCK) !== 0) geometryAt += 4;
+		if ((flags & FLAG_OBJECT_ID) !== 0) geometryAt += (uint16At(bytes, geometryAt) & 32768) !== 0 ? 4 : 2;
+		return {
+			flags,
+			geometryAt
+		};
+	} catch {
+		return;
 	}
-	if (geometryAt > recordEnd) return;
-	return {
-		flags,
-		geometryAt
-	};
 }
 function xToPt(geometry, x) {
 	return x / geometry.xPpi * POINTS_PER_INCH;
@@ -199,10 +195,6 @@ function decodeWpgGraphic(bytes, options) {
 		reason: "encrypted"
 	};
 	const recordStart = uint32At(bytes, start + 4);
-	if (recordStart < start + WPG_PREFIX_HEAD_SIZE || recordStart >= bytes.length) return {
-		status: "refused",
-		reason: "malformed"
-	};
 	const state = {
 		penColor: { ...WPG_DEFAULT_BLACK },
 		penWidthUnits: 0,
@@ -217,9 +209,13 @@ function decodeWpgGraphic(bytes, options) {
 	let pendingTextBlockFrame;
 	let cursor = start + recordStart;
 	const recordName = (type) => RECORD_NAMES.get(type) ?? `record type 0x${type.toString(16)}`;
-	while (cursor < bytes.length) {
-		if (cursor + 2 > bytes.length) break;
-		const type = byteAt(bytes, cursor + 1);
+	for (;;) {
+		let type;
+		try {
+			type = byteAt(bytes, cursor + 1);
+		} catch {
+			break;
+		}
 		let after = cursor + 2;
 		const extension = readCountField(bytes, after);
 		if (extension === void 0) break;
@@ -327,10 +323,10 @@ function decodeWpgGraphic(bytes, options) {
 			}
 			if (type !== RECORD_TEXT_BLOCK) pendingTextBlockFrame = void 0;
 		}
-		while (groups.length > 0 && groups[groups.length - 1]?.remaining === 0) groups.pop();
+		while (groups[groups.length - 1]?.remaining === 0) groups.pop();
 		if (extension.value > 0) groups.push({
 			remaining: extension.value,
-			membersWalk: !swallowed && (type === RECORD_GROUP || type === RECORD_TEXT_BLOCK && pendingTextBlockFrame !== void 0)
+			membersWalk: !swallowed && (type === RECORD_GROUP || pendingTextBlockFrame !== void 0)
 		});
 		cursor = recordEnd;
 	}
@@ -355,8 +351,8 @@ function swallowedByOpenGroup(groups) {
 }
 function readTextBlockFrame(data, geometry) {
 	if (geometry === void 0) return;
-	const characterization = readCharacterization(data, 0, data.length);
-	if (characterization === void 0 || characterization.geometryAt < 0 || characterization.geometryAt + geometry.coordinateSize * 4 > data.length) return;
+	const characterization = readCharacterization(data, 0);
+	if (characterization === void 0 || characterization.geometryAt + geometry.coordinateSize * 4 > data.length) return;
 	const at = characterization.geometryAt;
 	return frameFromCorners(geometry, coordinateAt(data, at, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize * 2, geometry.doublePrecision), coordinateAt(data, at + geometry.coordinateSize * 3, geometry.doublePrecision));
 }
@@ -373,8 +369,8 @@ function frameFromCorners(geometry, x1, y1, x2, y2) {
 	};
 }
 function readPrimitiveVector(type, data, geometry, state) {
-	const characterization = readCharacterization(data, 0, data.length);
-	if (characterization === void 0 || characterization.geometryAt < 0) return;
+	const characterization = readCharacterization(data, 0);
+	if (characterization === void 0) return;
 	const { flags, geometryAt } = characterization;
 	const stroke = (flags & FLAG_FRAME) !== 0 ? strokeOf(geometry, state) : void 0;
 	switch (type) {
@@ -385,17 +381,19 @@ function readPrimitiveVector(type, data, geometry, state) {
 	}
 }
 function readPolyline(data, geometry, flags, geometryAt, stroke, state) {
-	if (geometryAt + 2 > data.length) return;
-	const count = uint16At(data, geometryAt);
-	let at = geometryAt + 2;
 	const points = [];
-	for (let index = 0; index < count; index += 1) {
-		if (at + geometry.coordinateSize * 2 > data.length) return;
-		points.push({
-			xPt: xToPt(geometry, coordinateAt(data, at, geometry.doublePrecision)),
-			yPt: yToPt(geometry, coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision))
-		});
-		at += geometry.coordinateSize * 2;
+	try {
+		const count = uint16At(data, geometryAt);
+		let at = geometryAt + 2;
+		for (let index = 0; index < count; index += 1) {
+			points.push({
+				xPt: xToPt(geometry, coordinateAt(data, at, geometry.doublePrecision)),
+				yPt: yToPt(geometry, coordinateAt(data, at + geometry.coordinateSize, geometry.doublePrecision))
+			});
+			at += geometry.coordinateSize * 2;
+		}
+	} catch {
+		return;
 	}
 	const firstPoint = points[0];
 	if (firstPoint === void 0) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wpd-codec",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "description": "Hand-written read-only WordPerfect 6.x-X6 (.wpd) reader over document-schema.js's ContentDocument",
   "type": "module",
   "repository": {
@@ -80,8 +80,8 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "1.11.1",
-    "document-schema.js": "7.11.1",
+    "archive-codec": "1.11.2",
+    "document-schema.js": "7.11.2",
     "zod": "4.4.3"
   },
   "devDependencies": {