@zip.js/zip.js 2.21.0 → 2.22.0

package/dist/zip-fs.js

@@ -225,6 +225,7 @@
 	const ERR_INVALID_SIGNAL = "Invalid signal (must be an AbortSignal instance)";
 	const ERR_INVALID_PASSWORD_TYPE = "Invalid password (password must be a string, rawPassword must be a Uint8Array)";
 	const ERR_INVALID_PASS_THROUGH_VALUE = "Invalid passThrough option (must be a boolean or 'compressed')";
+	const ERR_INVALID_READER_OPTIONS = "Invalid readerOptions (must be an object)";
 	const ERR_ABORTED = "The operation was aborted";
 	const ABORT_ERROR_NAME$1 = "AbortError";
 
@@ -235,6 +236,13 @@
 		return value;
 	}
 
+	function checkReaderOptionsObject(readerOptions) {
+		if (readerOptions && (typeof readerOptions != OBJECT_TYPE || Array.isArray(readerOptions))) {
+			throw new Error(ERR_INVALID_READER_OPTIONS);
+		}
+		return readerOptions;
+	}
+
 	function checkSignalOption(signal) {
 		if (signal && (typeof signal.addEventListener != FUNCTION_TYPE || typeof signal.aborted != BOOLEAN_TYPE)) {
 			throw new Error(ERR_INVALID_SIGNAL);
@@ -330,7 +338,6 @@
 		workerStartupTimeout: 5000,
 		useWebWorkers: true,
 		useCompressionStream: true,
-		transferStreams: true,
 		CompressionStream: typeof CompressionStream != UNDEFINED_TYPE && CompressionStream,
 		DecompressionStream: typeof DecompressionStream != UNDEFINED_TYPE && DecompressionStream
 	};
@@ -344,8 +351,7 @@
 	];
 	const BOOLEAN_PROPERTY_NAMES = [
 		"useCompressionStream",
-		"useWebWorkers",
-		"transferStreams"
+		"useWebWorkers"
 	];
 	const NUMBER_PROPERTY_NAMES = [
 		"chunkSize",
@@ -4855,7 +4861,7 @@
 		constructor(reader, options = {}) {
 			Object.assign(this, {
 				reader: new GenericReader(reader),
-				options,
+				options: options || {},
 				readRanges: { indexes: new Set(), sortedRanges: [], pendingRanges: [] },
 				entriesMissingZip64ExtraField: new WeakSet()
 			});
@@ -6875,6 +6881,7 @@
 	async function appendZipEntries(zipWriter, reader, options = {}) {
 		const { pendingAddFileCalls, filenames, fileEntries } = zipWriter;
 		const filter = checkFunctionOption(options.filter);
+		const readerOptions = checkReaderOptionsObject(options.readerOptions);
 		while (pendingAddFileCalls.size) {
 			await Promise.allSettled(Array.from(pendingAddFileCalls));
 		}
@@ -6891,15 +6898,19 @@
 				await initStream(reader);
 			}
 			const { ZipReader, getEntryDataDescriptorLength } = await Promise.resolve().then(function () { return zipReader; });
-			const zipReader$1 = new ZipReader(reader);
-			const entries = await zipReader$1.getEntries();
+			const zipReader$1 = new ZipReader(reader, readerOptions);
 			const keptEntries = [];
-			for (const entry of entries) {
-				if (!filter || await filter(entry)) {
-					keptEntries.push(entry);
+			let entries;
+			try {
+				entries = await zipReader$1.getEntries();
+				for (const entry of entries) {
+					if (!filter || await filter(entry, getExistingEntry(fileEntries, entry.filename))) {
+						keptEntries.push(entry);
+					}
 				}
+			} finally {
+				await zipReader$1.close();
 			}
-			await zipReader$1.close();
 			await initStream(zipWriter.writer);
 			const { directoryOffset, entriesMissingZip64ExtraField } = zipReader$1;
 			keptEntries.forEach(entry => {
@@ -6969,7 +6980,7 @@
 					setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 				}
 				const { offset, diskNumberStart } = entryPositions.get(entry);
-				Object.assign(entry, {
+				fileEntries.set(entry.filename, Object.assign({}, entry, {
 					zip64Enabled: true,
 					zip64UncompressedSize,
 					zip64CompressedSize,
@@ -6986,8 +6997,7 @@
 					rawCentralExtraField: EMPTY_UINT8_ARRAY,
 					headerArray,
 					headerView
-				});
-				fileEntries.set(entry.filename, entry);
+				}));
 			});
 		} catch (error) {
 			appendedFilenames.forEach(filename => filenames.delete(filename));
@@ -7001,6 +7011,11 @@
 		}
 	}
 
+	function getExistingEntry(fileEntries, filename) {
+		const fileEntry = fileEntries.get(filename);
+		return fileEntry ? new Entry(fileEntry) : UNDEFINED_VALUE;
+	}
+
 	async function prependZipEntries(zipWriter, reader) {
 		if (zipWriter.filenames.size) {
 			throw new Error(ERR_ZIP_NOT_EMPTY);
@@ -9243,7 +9258,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.21.0";
+	const VERSION = "2.22.0";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -10318,7 +10333,6 @@
 	const DUPLICATES_KEEP_LAST = "keep-last";
 	const DUPLICATES_VALUES = new Set([DUPLICATES_THROW, DUPLICATES_KEEP_FIRST, DUPLICATES_KEEP_LAST]);
 	const ERR_INVALID_PASS_THROUGH = "Invalid passThrough option (use readerOptions.passThrough or set uncompressedSize for each entry)";
-	const ERR_INVALID_READER_OPTIONS = "Invalid readerOptions (must be an object)";
 	const ERR_UNSUPPORTED_PASS_THROUGH_VALUE = "The 'compressed' passThrough option is only supported by Entry#getData() and ZipWriter#add()";
 	const ERR_INVALID_PASSWORDS = "Invalid passwords option (must be an array of strings)";
 	const ERR_INVALID_REQUEST_PASSWORD = "Invalid requestPassword option (must be a function returning a string or undefined)";
@@ -11244,9 +11258,7 @@
 	}
 
 	function checkReaderOptions(readerOptions) {
-		if (readerOptions && (typeof readerOptions != OBJECT_TYPE || Array.isArray(readerOptions))) {
-			throw new Error(ERR_INVALID_READER_OPTIONS);
-		}
+		checkReaderOptionsObject(readerOptions);
 		if (readerOptions) {
 			checkPassThroughValue(readerOptions.passThrough);
 			checkPasswordCandidatesOptions(readerOptions);