ava 8.0.0 → 8.0.1

package/lib/snapshot-manager.js

@@ -6,7 +6,9 @@ import path from 'node:path';
 import {fileURLToPath} from 'node:url';
 import zlib from 'node:zlib';
 
-import cbor from 'cbor';
+import {decode as decodeCbor, encode as encodeCbor, TypeEncoderMap} from 'cbor2';
+import {writeArray, writeUint8Array} from 'cbor2/encoder';
+import {sortLengthFirstDeterministic} from 'cbor2/sorts';
 import concordance from 'concordance';
 import indentString from 'indent-string';
 import memoize from 'memoize';
@@ -92,7 +94,7 @@ function formatEntry(snapshot, index) {
 	} = snapshot;
 
 	const description = data
-		? concordance.formatDescriptor(concordance.deserialize(data), concordanceOptions)
+		? concordance.formatDescriptor(concordance.deserialize(Buffer.from(data.buffer, data.byteOffset, data.byteLength)), concordanceOptions)
 		: '<No Data>';
 
 	const blockquote = label.split(/\n/).map(line => '> ' + line).join('\n');
@@ -180,10 +182,36 @@ function sortBlocks(blocksByTitle, blockIndices) {
 	});
 }
 
-async function encodeSnapshots(snapshotData) {
-	const encoded = await cbor.encodeAsync(snapshotData, {
-		omitUndefinedProperties: true,
-		canonical: true,
+function normalizeBeforeEncoding(value) {
+	if (Array.isArray(value)) {
+		return value.map(v => normalizeBeforeEncoding(v));
+	}
+
+	// FIXME: The decode code path unexpectedly returns Buffers not Uint8Arrays.
+	if (Buffer.isBuffer(value)) {
+		return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+	}
+
+	if (value !== null && typeof value === 'object' && !(value instanceof Uint8Array)) {
+		return Object.fromEntries(Object.entries(value)
+			.filter(([, v]) => v !== undefined)
+			.map(([k, v]) => [k, normalizeBeforeEncoding(v)]));
+	}
+
+	return value;
+}
+
+// FIXME: This seems to be a bug in cbor2, ignoreGlobalTags shouldn't break (Uint8)Array encoding.
+const types = new TypeEncoderMap();
+types.registerEncoder(Array, writeArray);
+types.registerEncoder(Uint8Array, writeUint8Array);
+
+function encodeSnapshots(snapshotData) {
+	const encoded = encodeCbor(normalizeBeforeEncoding(snapshotData), {
+		ignoreGlobalTags: true,
+		rejectUndefined: true,
+		sortKeys: sortLengthFirstDeterministic,
+		types,
 	});
 	const compressed = zlib.gzipSync(encoded);
 	compressed[9] = 0x03; // Override the GZip header containing the OS to always be Linux
@@ -233,7 +261,9 @@ function decodeSnapshots(buffer, snapPath) {
 	}
 
 	const decompressed = zlib.gunzipSync(compressed);
-	return cbor.decode(decompressed);
+	return decodeCbor(decompressed, {
+		ignoreGlobalTags: true,
+	});
 }
 
 class Manager {
@@ -282,7 +312,7 @@ class Manager {
 			return {pass: true};
 		}
 
-		const actual = concordance.deserialize(data, concordanceOptions);
+		const actual = concordance.deserialize(Buffer.from(data.buffer, data.byteOffset, data.byteLength), concordanceOptions);
 		const expected = concordance.describe(options.expected, concordanceOptions);
 		const pass = concordance.compareDescriptors(actual, expected);
 
@@ -311,7 +341,8 @@ class Manager {
 	deferRecord(options) {
 		const {expected, belongsTo, label, index} = options;
 		const descriptor = concordance.describe(expected, concordanceOptions);
-		const data = concordance.serialize(descriptor);
+		const buffer = concordance.serialize(descriptor);
+		const data = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
 
 		return () => { // Must be called in order!
 			this.hasChanges = true;
@@ -369,7 +400,7 @@ class Manager {
 			blocks: sortBlocks(this.newBlocksByTitle, this.blockIndices).map(([title, block]) => ({title, ...block})),
 		};
 
-		const buffer = await encodeSnapshots(snapshots);
+		const buffer = encodeSnapshots(snapshots);
 		const reportBuffer = generateReport(relFile, snapFile, snapshots);
 
 		await fs.promises.mkdir(dir, {recursive: true});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "8.0.0",
+	"version": "8.0.1",
 	"description": "Node.js test runner that lets you develop with confidence.",
 	"license": "MIT",
 	"repository": {
@@ -27,7 +27,7 @@
 	},
 	"type": "module",
 	"engines": {
-		"node": "^22.20 || ^24.12 || >=25"
+		"node": "^22.20 || ^24.12 || >=26"
 	},
 	"scripts": {
 		"test": "./scripts/test.sh"
@@ -81,7 +81,7 @@
 		"arrgv": "^1.0.2",
 		"arrify": "^3.0.0",
 		"callsites": "^4.2.0",
-		"cbor": "^10.0.12",
+		"cbor2": "^2.3.0",
 		"chalk": "^5.6.2",
 		"chunkd": "^2.0.1",
 		"ci-info": "^4.4.0",
@@ -119,16 +119,16 @@
 		"@ava/test": "github:avajs/test",
 		"@ava/typescript": "^7.0.0",
 		"@sindresorhus/tsconfig": "^8.1.0",
-		"@types/node": "^24.12.2",
+		"@types/node": "^24.12.4",
 		"ansi-escapes": "^7.3.0",
 		"c8": "^11.0.0",
 		"execa": "^9.6.1",
-		"expect": "^30.3.0",
-		"sinon": "^21.0.3",
-		"tap": "^21.6.3",
+		"expect": "^30.4.1",
+		"sinon": "^22.0.0",
+		"tap": "^21.7.4",
 		"tempy": "^3.2.0",
 		"tsd": "^0.33.0",
-		"typescript": "~6.0.2",
+		"typescript": "~6.0.3",
 		"xo": "^2.0.2",
 		"zen-observable": "^0.10.0"
 	},
@@ -149,7 +149,7 @@
 		}
 	},
 	"volta": {
-		"node": "24.14.0",
-		"npm": "11.11.0"
+		"node": "24.15.0",
+		"npm": "11.14.1"
 	}
 }