doc-codec 2.7.2 → 2.8.1

package/README.md

@@ -345,7 +345,7 @@ The writer is verified the opposite way: `src/write.test.ts` reads every documen
 
 A `describe("writeDocContent multiple sections")` block (`ExaDev/documents.js#971`) covers two and three sections each round-tripping their own distinct page size and margins independently, and a non-final section whose own last block is a table still closing on a genuine paragraph mark before its end-of-section character, rather than landing on the table's own row-ending mark. A `describe("writeDocContent inline pictures")` block covers a PNG and a JPEG image round-tripping their own raw bytes/format/size, a paragraph's own text splitting around an inline picture into separate blocks, more than one picture landing at distinct offsets in the same `"Data"` stream, an unwritable format (`svg`) throwing `DocUnsupportedError`, and no `"Data"` stream at all being written for a picture-free document. Neither of these two write-side additions has yet been checked against a real, independent [MS-DOC] implementation the way [Tables](#tables) and [Numbering definitions](#numbering-definitions) have -- that is the next thing worth doing here, mirroring how each of those was itself first verified by this package's own round trip alone.
 
-There is no real-world conformance corpus on the read side, and the write side inherits the same gap for the same reason: the tests prove this package matches the published specification, which is not the same as proving it matches what Word itself reads or writes between 1997 and 2007. Anyone extending this package should treat a corpus as the next thing worth building.
+A real-producer corpus layer exists: `pnpm test:corpus` runs the gitignored `test/corpus/` suite against LibreOffice-produced Word 97 documents generated by `scripts/generate-corpus.mjs` (flat-ODT and packaged-ODT sources spanning paragraphs, runs, headings, lists, tables with merges, images, and sections, converted headlessly through Writer's own export filter). That corpus already paid for itself once: it exposed that the reader's inline-picture locator assumed Word's OfficeArt wrapper nesting, which LibreOffice does not follow, and the locator now validates blip candidates by their payload file signatures instead. What a LibreOffice-produced corpus does not prove remains stated plainly: it is a real application's Word 97 spelling, not Word 1997-2007's own.
 
 ## Specification
 

package/dist/pictures.cjs

@@ -51,14 +51,14 @@ function readInlinePicture(dataStream, picLocation) {
 		const cchPicName = require_bytes.readUint8(dataStream, cursor);
 		cursor += 1 + cchPicName;
 	}
-	const shapeHeader = readRecordHeader(dataStream, cursor);
-	cursor += RECORD_HEADER_SIZE + shapeHeader.recLen;
-	const blipHeader = readRecordHeader(dataStream, cursor);
+	const found = findBlipRecord(dataStream, cursor);
+	if (found === void 0) return;
+	const { header: blipHeader, offset: blipOffset } = found;
 	const format = blipFormat(blipHeader.recType);
 	if (format === void 0) return void 0;
 	const uidBytes = ONE_UID_INSTANCES.has(blipHeader.recInstance) ? 16 : TWO_UID_INSTANCES.has(blipHeader.recInstance) ? 32 : void 0;
 	if (uidBytes === void 0) return void 0;
-	const blipDataStart = cursor + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
+	const blipDataStart = blipOffset + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
 	const blipDataLength = blipHeader.recLen - uidBytes - BLIP_TAG_SIZE;
 	const blipBytes = require_bytes.slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream");
 	return {
@@ -76,5 +76,32 @@ function blipFormat(recType) {
 		default: return;
 	}
 }
+const PNG_SIGNATURE = [
+	137,
+	80,
+	78,
+	71
+];
+const JPEG_SIGNATURE = [255, 216];
+function payloadHasSignature(data, start, signature) {
+	for (const [i, byte] of signature.entries()) if (data[start + i] !== byte) return false;
+	return true;
+}
+/** Scans forward from `from` for a validated blip record (see readInlinePicture's own locating note) -- every candidate header of a blip type must also carry a known rgbUid instance count, a length inside the stream, and payload bytes starting with its format's own file signature. */
+function findBlipRecord(data, from) {
+	for (let at = from; at + RECORD_HEADER_SIZE <= data.length; at++) {
+		const header = readRecordHeader(data, at);
+		const format = blipFormat(header.recType);
+		if (format === void 0) continue;
+		const uidBytes = ONE_UID_INSTANCES.has(header.recInstance) ? 16 : TWO_UID_INSTANCES.has(header.recInstance) ? 32 : void 0;
+		if (uidBytes === void 0) continue;
+		const payloadStart = at + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
+		const signature = format === "png" ? PNG_SIGNATURE : JPEG_SIGNATURE;
+		if (header.recLen > uidBytes + BLIP_TAG_SIZE && payloadStart + signature.length <= data.length && payloadHasSignature(data, payloadStart, signature)) return {
+			header,
+			offset: at
+		};
+	}
+}
 //#endregion
 exports.readInlinePicture = readInlinePicture;

package/dist/pictures.js

@@ -50,14 +50,14 @@ function readInlinePicture(dataStream, picLocation) {
 		const cchPicName = readUint8(dataStream, cursor);
 		cursor += 1 + cchPicName;
 	}
-	const shapeHeader = readRecordHeader(dataStream, cursor);
-	cursor += RECORD_HEADER_SIZE + shapeHeader.recLen;
-	const blipHeader = readRecordHeader(dataStream, cursor);
+	const found = findBlipRecord(dataStream, cursor);
+	if (found === void 0) return;
+	const { header: blipHeader, offset: blipOffset } = found;
 	const format = blipFormat(blipHeader.recType);
 	if (format === void 0) return void 0;
 	const uidBytes = ONE_UID_INSTANCES.has(blipHeader.recInstance) ? 16 : TWO_UID_INSTANCES.has(blipHeader.recInstance) ? 32 : void 0;
 	if (uidBytes === void 0) return void 0;
-	const blipDataStart = cursor + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
+	const blipDataStart = blipOffset + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
 	const blipDataLength = blipHeader.recLen - uidBytes - BLIP_TAG_SIZE;
 	const blipBytes = slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream");
 	return {
@@ -75,5 +75,32 @@ function blipFormat(recType) {
 		default: return;
 	}
 }
+const PNG_SIGNATURE = [
+	137,
+	80,
+	78,
+	71
+];
+const JPEG_SIGNATURE = [255, 216];
+function payloadHasSignature(data, start, signature) {
+	for (const [i, byte] of signature.entries()) if (data[start + i] !== byte) return false;
+	return true;
+}
+/** Scans forward from `from` for a validated blip record (see readInlinePicture's own locating note) -- every candidate header of a blip type must also carry a known rgbUid instance count, a length inside the stream, and payload bytes starting with its format's own file signature. */
+function findBlipRecord(data, from) {
+	for (let at = from; at + RECORD_HEADER_SIZE <= data.length; at++) {
+		const header = readRecordHeader(data, at);
+		const format = blipFormat(header.recType);
+		if (format === void 0) continue;
+		const uidBytes = ONE_UID_INSTANCES.has(header.recInstance) ? 16 : TWO_UID_INSTANCES.has(header.recInstance) ? 32 : void 0;
+		if (uidBytes === void 0) continue;
+		const payloadStart = at + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
+		const signature = format === "png" ? PNG_SIGNATURE : JPEG_SIGNATURE;
+		if (header.recLen > uidBytes + BLIP_TAG_SIZE && payloadStart + signature.length <= data.length && payloadHasSignature(data, payloadStart, signature)) return {
+			header,
+			offset: at
+		};
+	}
+}
 //#endregion
 export { readInlinePicture };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doc-codec",
-  "version": "2.7.2",
+  "version": "2.8.1",
   "description": "A hand-written reader for the Word Binary File Format ([MS-DOC], .doc) against the shared document-schema.js content pivot: FIB parsing, piece-table text reconstruction, and CHPX/PAPX formatting exceptions.",
   "type": "module",
   "repository": {
@@ -65,7 +65,9 @@
     "_test:workers": "vitest run --config vitest.workers.config.ts",
     "test:smoke": "turbo run _test:smoke",
     "_test:smoke": "vitest run --project smoke",
-    "prepare": "husky"
+    "prepare": "husky",
+    "test:corpus": "turbo run _test:corpus",
+    "_test:corpus": "vitest run --project corpus"
   },
   "keywords": [
     "doc",
@@ -78,8 +80,8 @@
   "license": "MIT",
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "1.10.2",
-    "document-schema.js": "7.6.0"
+    "archive-codec": "1.10.3",
+    "document-schema.js": "7.6.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",