@zip.js/zip.js 2.21.0 → 2.22.0

package/lib/core/configuration.js

@@ -63,7 +63,6 @@ const DEFAULT_CONFIGURATION = {
 	workerStartupTimeout: 5000,
 	useWebWorkers: true,
 	useCompressionStream: true,
-	transferStreams: true,
 	CompressionStream: typeof CompressionStream != UNDEFINED_TYPE && CompressionStream,
 	DecompressionStream: typeof DecompressionStream != UNDEFINED_TYPE && DecompressionStream
 };
@@ -77,8 +76,7 @@ const URI_PROPERTY_NAMES = [
 ];
 const BOOLEAN_PROPERTY_NAMES = [
 	"useCompressionStream",
-	"useWebWorkers",
-	"transferStreams"
+	"useWebWorkers"
 ];
 const NUMBER_PROPERTY_NAMES = [
 	"chunkSize",

package/lib/core/options.js

@@ -32,6 +32,7 @@ import {
 	BOOLEAN_TYPE,
 	FUNCTION_TYPE,
 	STRING_TYPE,
+	OBJECT_TYPE,
 	UNDEFINED_VALUE
 } from "./constants.js";
 
@@ -91,6 +92,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 = "AbortError";
 
@@ -150,9 +152,11 @@ export {
 	ERR_INVALID_SIGNAL,
 	ERR_INVALID_PASSWORD_TYPE,
 	ERR_INVALID_PASS_THROUGH_VALUE,
+	ERR_INVALID_READER_OPTIONS,
 	ERR_ABORTED,
 	ABORT_ERROR_NAME,
 	checkFunctionOption,
+	checkReaderOptionsObject,
 	checkSignalOption,
 	throwIfAborted,
 	checkPasswordOption,
@@ -169,6 +173,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);

package/lib/core/version.js

@@ -26,6 +26,6 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const VERSION = "2.21.0";
+const VERSION = "2.22.0";
 
 export { VERSION };

package/lib/core/zip-fs.js

@@ -60,12 +60,11 @@ import {
 import {
 	Entry
 } from "./zip-entry.js";
-import { checkSignalOption, throwIfAborted, checkPassThroughOption, PASS_THROUGH_COMPRESSED } from "./options.js";
+import { checkSignalOption, throwIfAborted, checkPassThroughOption, checkReaderOptionsObject, PASS_THROUGH_COMPRESSED, ERR_INVALID_READER_OPTIONS } from "./options.js";
 import { ProgressWatcherStream, callHandler } from "./codec-worker.js";
 import {
 	UNDEFINED_VALUE,
 	FUNCTION_TYPE,
-	OBJECT_TYPE,
 	STRING_TYPE
 } from "./constants.js";
 import { toExactUint8Array } from "./util/array.js";
@@ -85,7 +84,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)";
@@ -1012,9 +1010,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);

package/lib/core/zip-reader.js

@@ -257,7 +257,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()
 		});

package/lib/core/zip-writer.js

@@ -243,6 +243,7 @@ import {
 	TEXT_TYPE_COMMENT,
 	ERR_INVALID_PASSWORD_TYPE,
 	checkFunctionOption,
+	checkReaderOptionsObject,
 	checkSignalOption,
 	throwIfAborted,
 	checkPasswordOption,
@@ -510,6 +511,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));
 	}
@@ -526,15 +528,19 @@ async function appendZipEntries(zipWriter, reader, options = {}) {
 			await initStream(reader);
 		}
 		const { ZipReader, getEntryDataDescriptorLength } = await import("./zip-reader.js");
-		const zipReader = new ZipReader(reader);
-		const entries = await zipReader.getEntries();
+		const zipReader = 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.getEntries();
+			for (const entry of entries) {
+				if (!filter || await filter(entry, getExistingEntry(fileEntries, entry.filename))) {
+					keptEntries.push(entry);
+				}
 			}
+		} finally {
+			await zipReader.close();
 		}
-		await zipReader.close();
 		await initStream(zipWriter.writer);
 		const { directoryOffset, entriesMissingZip64ExtraField } = zipReader;
 		keptEntries.forEach(entry => {
@@ -604,7 +610,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,
@@ -621,8 +627,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));
@@ -636,6 +641,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);

package/lib/zip-core-base.js

@@ -60,6 +60,7 @@ export {
 } from "./core/io.js";
 export {
 	ERR_INVALID_FUNCTION_OPTION,
+	ERR_INVALID_READER_OPTIONS,
 	ERR_INVALID_SIGNAL,
 	ERR_INVALID_PASS_THROUGH_VALUE,
 	ERR_ABORTED

package/package.json

@@ -3,7 +3,7 @@
   "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "type": "module",
   "keywords": [
     "zip",