@zip.js/zip.js 2.21.0 → 2.22.0

package/index-native.cjs

@@ -219,6 +219,7 @@ const ERR_INVALID_FUNCTION_OPTION = "Invalid option (must be a function)";
 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";
 
@@ -229,6 +230,13 @@ function checkFunctionOption(value) {
 	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);
@@ -324,7 +332,6 @@ const DEFAULT_CONFIGURATION = {
 	workerStartupTimeout: 5000,
 	useWebWorkers: true,
 	useCompressionStream: true,
-	transferStreams: true,
 	CompressionStream: typeof CompressionStream != UNDEFINED_TYPE && CompressionStream,
 	DecompressionStream: typeof DecompressionStream != UNDEFINED_TYPE && DecompressionStream
 };
@@ -338,8 +345,7 @@ const URI_PROPERTY_NAMES = [
 ];
 const BOOLEAN_PROPERTY_NAMES = [
 	"useCompressionStream",
-	"useWebWorkers",
-	"transferStreams"
+	"useWebWorkers"
 ];
 const NUMBER_PROPERTY_NAMES = [
 	"chunkSize",
@@ -4841,7 +4847,7 @@ class ZipReader {
 	constructor(reader, options = {}) {
 		Object.assign(this, {
 			reader: new GenericReader(reader),
-			options,
+			options: options || {},
 			readRanges: { indexes: new Set(), sortedRanges: [], pendingRanges: [] },
 			entriesMissingZip64ExtraField: new WeakSet()
 		});
@@ -6861,6 +6867,7 @@ function watchPromiseError(zipWriter, promise) {
 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));
 	}
@@ -6877,15 +6884,19 @@ async function appendZipEntries(zipWriter, reader, options = {}) {
 			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 => {
@@ -6955,7 +6966,7 @@ async function appendZipEntries(zipWriter, reader, options = {}) {
 				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,
@@ -6972,8 +6983,7 @@ async function appendZipEntries(zipWriter, reader, options = {}) {
 				rawCentralExtraField: EMPTY_UINT8_ARRAY,
 				headerArray,
 				headerView
-			});
-			fileEntries.set(entry.filename, entry);
+			}));
 		});
 	} catch (error) {
 		appendedFilenames.forEach(filename => filenames.delete(filename));
@@ -6987,6 +6997,11 @@ async function appendZipEntries(zipWriter, reader, options = {}) {
 	}
 }
 
+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);
@@ -9229,7 +9244,7 @@ function formatSupported(StreamClass, format) {
  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.
@@ -9758,7 +9773,6 @@ const DUPLICATES_KEEP_FIRST = "keep-first";
 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)";
@@ -10684,9 +10698,7 @@ function getDeterminedSize(child, passThrough) {
 }
 
 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);