@zip.js/zip.js 2.8.53 → 2.8.55

package/dist/zip-fs-core.js

@@ -44,6 +44,7 @@
 
 	const LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
 	const SPLIT_ZIP_FILE_SIGNATURE = 0x08074b50;
+	const TEMPORARY_SPLIT_ZIP_FILE_SIGNATURE = 0x30304b50;
 	const DATA_DESCRIPTOR_RECORD_SIGNATURE = SPLIT_ZIP_FILE_SIGNATURE;
 	const ARCHIVE_EXTRA_DATA_SIGNATURE = 0x08064b50;
 	const DIGITAL_SIGNATURE_RECORD_SIGNATURE = 0x05054b50;
@@ -60,6 +61,7 @@
 	const DATA_DESCRIPTOR_RECORD_LENGTH = 12;
 	const DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH = 20;
 	const DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH = 4;
+	const SPLIT_ZIP_FILE_SIGNATURE_LENGTH = 4;
 
 	const EXTRAFIELD_TYPE_ZIP64 = 0x0001;
 	const EXTRAFIELD_TYPE_AES = 0x9901;
@@ -82,6 +84,7 @@
 	const BITFLAG_DATA_DESCRIPTOR = 0b1000;
 	const BITFLAG_STRONG_ENCRYPTION = 0b1000000;
 	const BITFLAG_LANG_ENCODING_FLAG = 0b100000000000;
+	const BITFLAG_MASKED_LOCAL_HEADERS = 0b10000000000000;
 	const FILE_ATTR_MSDOS_DIR_MASK = 0b10000;
 	const FILE_ATTR_MSDOS_READONLY_MASK = 0x01;
 	const FILE_ATTR_MSDOS_HIDDEN_MASK = 0x02;
@@ -111,6 +114,8 @@
 	const HEADER_OFFSET_SIGNATURE = 10;
 	const HEADER_OFFSET_COMPRESSED_SIZE = 14;
 	const HEADER_OFFSET_UNCOMPRESSED_SIZE = 18;
+	const HEADER_OFFSET_FILENAME_LENGTH = 22;
+	const HEADER_OFFSET_EXTRAFIELD_LENGTH = 24;
 	const LOCAL_HEADER_COMMON_OFFSET = 4;
 
 	const MAX_DATE = new Date(2107, 11, 31, 23, 59, 58);
@@ -123,9 +128,116 @@
 	const OBJECT_TYPE = "object";
 	const STRING_TYPE = "string";
 	const NUMBER_TYPE = "number";
+	const BOOLEAN_TYPE = "boolean";
 
 	const EMPTY_UINT8_ARRAY = new Uint8Array();
 
+	/*
+	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
+
+	 Redistribution and use in source and binary forms, with or without
+	 modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+	 this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright 
+	 notice, this list of conditions and the following disclaimer in 
+	 the documentation and/or other materials provided with the distribution.
+
+	 3. The names of the authors may not be used to endorse or promote products
+	 derived from this software without specific prior written permission.
+
+	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+
+	const OPTION_FILENAME_ENCODING = "filenameEncoding";
+	const OPTION_COMMENT_ENCODING = "commentEncoding";
+	const OPTION_DECODE_TEXT = "decodeText";
+	const OPTION_EXTRACT_PREPENDED_DATA = "extractPrependedData";
+	const OPTION_EXTRACT_APPENDED_DATA = "extractAppendedData";
+	const OPTION_PASSWORD = "password";
+	const OPTION_RAW_PASSWORD = "rawPassword";
+	const OPTION_PASS_THROUGH = "passThrough";
+	const OPTION_SIGNAL = "signal";
+	const OPTION_CHECK_PASSWORD_ONLY = "checkPasswordOnly";
+	const OPTION_CHECK_OVERLAPPING_ENTRY_ONLY = "checkOverlappingEntryOnly";
+	const OPTION_CHECK_OVERLAPPING_ENTRY = "checkOverlappingEntry";
+	const OPTION_CHECK_AMBIGUITY = "checkAmbiguity";
+	const OPTION_CHECK_LOCAL_DIRECTORY = "checkLocalDirectory";
+	const OPTION_CHECK_SIGNATURE = "checkSignature";
+	const OPTION_CHECK_CRC32 = "checkCrc32";
+	const OPTION_CHECK_AUTHENTICATION_CODE = "checkAuthenticationCode";
+	const OPTION_USE_WEB_WORKERS = "useWebWorkers";
+	const OPTION_USE_COMPRESSION_STREAM = "useCompressionStream";
+	const OPTION_TRANSFER_STREAMS = "transferStreams";
+	const OPTION_PREVENT_CLOSE = "preventClose";
+	const OPTION_ENCRYPTION_STRENGTH = "encryptionStrength";
+	const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
+	const OPTION_NTFS_TIMESTAMP = "ntfsTimestamp";
+	const OPTION_KEEP_ORDER = "keepOrder";
+	const OPTION_LEVEL = "level";
+	const OPTION_BUFFERED_WRITE = "bufferedWrite";
+	const OPTION_CREATE_TEMP_STREAM = "createTempStream";
+	const OPTION_DATA_DESCRIPTOR_SIGNATURE = "dataDescriptorSignature";
+	const OPTION_USE_UNICODE_FILE_NAMES = "useUnicodeFileNames";
+	const OPTION_DATA_DESCRIPTOR = "dataDescriptor";
+	const OPTION_SUPPORT_ZIP64_SPLIT_FILE = "supportZip64SplitFile";
+	const OPTION_ENCODE_TEXT = "encodeText";
+	const OPTION_OFFSET = "offset";
+	const OPTION_USDZ = "usdz";
+	const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
+	const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
+	const OPTION_STRICTNESS = "strictness";
+	const OPTION_FILENAME_VALIDATION = "filenameValidation";
+	const OPTION_NORMALIZE_FILENAME = "normalizeFilename";
+	const OPTION_MAX_APPENDED_DATA_SIZE = "maxAppendedDataSize";
+	const OPTION_DECRYPT_CENTRAL_DIRECTORY = "decryptCentralDirectory";
+	const OPTION_SIGN_CENTRAL_DIRECTORY = "signCentralDirectory";
+	const TEXT_TYPE_FILENAME = "filename";
+	const TEXT_TYPE_COMMENT = "comment";
+	const STRICTNESS_STRICT = "strict";
+	const STRICTNESS_BALANCED = "balanced";
+	const STRICTNESS_TOLERANT = "tolerant";
+
+	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)";
+
+	function checkFunctionOption(value) {
+		if (value && typeof value != FUNCTION_TYPE) {
+			throw new Error(ERR_INVALID_FUNCTION_OPTION);
+		}
+		return value;
+	}
+
+	function checkSignalOption(signal) {
+		if (signal && (typeof signal.addEventListener != FUNCTION_TYPE || typeof signal.aborted != BOOLEAN_TYPE)) {
+			throw new Error(ERR_INVALID_SIGNAL);
+		}
+		return signal || UNDEFINED_VALUE;
+	}
+
+	function checkPasswordOption(password, rawPassword) {
+		if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
+			throw new Error(ERR_INVALID_PASSWORD_TYPE);
+		}
+	}
+
+	function toNumber(value) {
+		return typeof value == STRING_TYPE && value.trim() ? Number(value) : value;
+	}
+
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -155,7 +267,9 @@
 	 */
 
 
+	const DEFAULT_CHUNK_SIZE$1 = 64 * 1024;
 	const MINIMUM_CHUNK_SIZE = 64;
+	const MINIMUM_PROPERTY_VALUE = 1;
 	let maxWorkers = 2;
 	try {
 		if (typeof navigator != UNDEFINED_TYPE && navigator.hardwareConcurrency) {
@@ -167,7 +281,7 @@
 	const DEFAULT_CONFIGURATION = {
 		workerURI: "./core/web-worker-wasm.js",
 		wasmURI: "./core/streams/zlib-wasm/zlib-streams.wasm",
-		chunkSize: 64 * 1024,
+		chunkSize: DEFAULT_CHUNK_SIZE$1,
 		maxWorkers,
 		terminateWorkerTimeout: 5000,
 		workerStarvationTimeout: 5000,
@@ -186,7 +300,12 @@
 	}
 
 	function getChunkSize(config) {
-		return Math.max(config.chunkSize, MINIMUM_CHUNK_SIZE);
+		return normalizeChunkSize(config.chunkSize);
+	}
+
+	function normalizeChunkSize(chunkSize) {
+		chunkSize = toNumber(chunkSize);
+		return Number.isInteger(chunkSize) && chunkSize >= MINIMUM_PROPERTY_VALUE ? Math.max(chunkSize, MINIMUM_CHUNK_SIZE) : DEFAULT_CHUNK_SIZE$1;
 	}
 
 	/*
@@ -320,6 +439,96 @@
 		});
 	}
 
+	/*
+	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
+
+	 Redistribution and use in source and binary forms, with or without
+	 modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+	 this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright 
+	 notice, this list of conditions and the following disclaimer in 
+	 the documentation and/or other materials provided with the distribution.
+
+	 3. The names of the authors may not be used to endorse or promote products
+	 derived from this software without specific prior written permission.
+
+	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+	/* global TextDecoder */
+
+	const CP437 = "\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split("");
+	const VALID_CP437 = CP437.length == 256;
+
+	function decodeCP437(stringValue) {
+		if (VALID_CP437) {
+			let result = "";
+			for (let indexCharacter = 0; indexCharacter < stringValue.length; indexCharacter++) {
+				result += CP437[stringValue[indexCharacter]];
+			}
+			return result;
+		} else {
+			return new TextDecoder().decode(stringValue);
+		}
+	}
+
+	/*
+	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
+
+	 Redistribution and use in source and binary forms, with or without
+	 modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+	 this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright 
+	 notice, this list of conditions and the following disclaimer in 
+	 the documentation and/or other materials provided with the distribution.
+
+	 3. The names of the authors may not be used to endorse or promote products
+	 derived from this software without specific prior written permission.
+
+	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+
+	function decodeText(value, encoding) {
+		return decode(value, encoding, true);
+	}
+
+	function decodeTextRemovingBOM(value, encoding) {
+		return decode(value, encoding, false);
+	}
+
+	function decode(value, encoding, ignoreBOM) {
+		if (encoding && encoding.trim().toLowerCase() == "cp437") {
+			return decodeCP437(value);
+		} else {
+			return new TextDecoder(encoding, { ignoreBOM }).decode(value);
+		}
+	}
+
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -392,6 +601,7 @@
 		createReadable({ offset = 0, size, chunkSize = getChunkSize(getConfiguration()) } = {}) {
 			const reader = this;
 			let chunkOffset = 0;
+			chunkSize = normalizeChunkSize(chunkSize);
 			return new ReadableStream({
 				async pull(controller) {
 					const dataSize = size === UNDEFINED_VALUE ? chunkSize : Math.min(chunkSize, size - chunkOffset);
@@ -399,7 +609,7 @@
 					if (data.length) {
 						controller.enqueue(data);
 					}
-					if ((chunkOffset + chunkSize >= size) || (size === UNDEFINED_VALUE && !data.length && dataSize)) {
+					if ((chunkOffset + chunkSize >= size) || (!data.length && dataSize)) {
 						controller.close();
 					} else {
 						chunkOffset += chunkSize;
@@ -479,31 +689,31 @@
 			Object.assign(this, {
 				contentType,
 				data: "data:" + (contentType || "") + ";base64,",
-				pending: []
+				pendingCharacters: ""
 			});
 		}
 
 		writeUint8Array(array) {
 			const writer = this;
 			let indexArray;
-			let dataString = writer.pending;
-			const delta = writer.pending.length;
-			writer.pending = "";
+			let dataString = writer.pendingCharacters;
+			const delta = writer.pendingCharacters.length;
+			writer.pendingCharacters = "";
 			for (indexArray = 0; indexArray < (Math.floor((delta + array.length) / 3) * 3) - delta; indexArray++) {
 				dataString += String.fromCharCode(array[indexArray]);
 			}
 			for (; indexArray < array.length; indexArray++) {
-				writer.pending += String.fromCharCode(array[indexArray]);
+				writer.pendingCharacters += String.fromCharCode(array[indexArray]);
 			}
 			if (dataString.length > 2) {
 				writer.data += btoa(dataString);
 			} else {
-				writer.pending = dataString + writer.pending;
+				writer.pendingCharacters = dataString + writer.pendingCharacters;
 			}
 		}
 
 		getData() {
-			return this.data + btoa(this.pending);
+			return this.data + btoa(this.pendingCharacters);
 		}
 	}
 
@@ -533,7 +743,7 @@
 		constructor(blob) {
 			super();
 			Object.assign(this, {
-				blob,
+				sourceBlob: blob,
 				size: blob.size
 			});
 			if (!blobSliceProbe) {
@@ -543,13 +753,13 @@
 
 		createReadable(options) {
 			const reader = this;
-			const { blob, size } = reader;
+			const { sourceBlob, size } = reader;
 			const { offset = 0, size: readSize = size - offset } = options || {};
 			if (!offset && readSize >= size) {
-				return toCompatibleReadable(blob.stream());
+				return toCompatibleReadable(sourceBlob.stream());
 			}
 			if (blobSliceReliable) {
-				return toCompatibleReadable(blob.slice(offset, offset + readSize).stream());
+				return toCompatibleReadable(sourceBlob.slice(offset, offset + readSize).stream());
 			}
 			return super.createReadable(options);
 		}
@@ -558,7 +768,7 @@
 			const reader = this;
 			const offsetEnd = offset + length;
 			const readsWholeBlob = !offset && offsetEnd >= reader.size;
-			const blob = readsWholeBlob ? reader.blob : reader.blob.slice(offset, offsetEnd);
+			const blob = readsWholeBlob ? reader.sourceBlob : reader.sourceBlob.slice(offset, offsetEnd);
 			let arrayBuffer = await blob.arrayBuffer();
 			const sliceIgnoredByBuggyImplementation = arrayBuffer.byteLength > length;
 			if (sliceIgnoredByBuggyImplementation) {
@@ -580,12 +790,12 @@
 				}
 			});
 			writer.contentType = contentType;
-			writer.blob = streamToBlob(transformStream.readable, contentType);
-			writer.blob.catch(() => { });
+			writer.blobPromise = streamToBlob(transformStream.readable, contentType);
+			writer.blobPromise.catch(() => { });
 		}
 
 		getData() {
-			return this.blob;
+			return this.blobPromise;
 		}
 	}
 
@@ -619,7 +829,7 @@
 	class TextWriter extends BlobWriter {
 
 		constructor(encoding) {
-			super(encoding);
+			super();
 			Object.assign(this, {
 				encoding,
 				utf8: !encoding || encoding.toLowerCase() == "utf-8"
@@ -635,14 +845,7 @@
 			if (blob.text && utf8) {
 				return blob.text();
 			} else {
-				const reader = new FileReader();
-				return new Promise((resolve, reject) => {
-					Object.assign(reader, {
-						onload: ({ target }) => resolve(target.result),
-						onerror: () => reject(reader.error)
-					});
-					reader.readAsText(blob, encoding);
-				});
+				return decodeTextRemovingBOM(new Uint8Array(await blob.arrayBuffer()), encoding);
 			}
 		}
 	}
@@ -1303,6 +1506,16 @@
 		return reader.readUint8Array(offset, size);
 	}
 
+	function createReadable(reader, options) {
+		if (reader.createReadable) {
+			return reader.createReadable(options);
+		} else if (reader.readUint8Array) {
+			return Reader.prototype.createReadable.call(reader, options);
+		} else {
+			return reader.readable;
+		}
+	}
+
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -2460,13 +2673,13 @@
 					const {
 						ctr,
 						hmac,
-						pending,
+						pendingInput,
 						ready
 					} = this;
 					if (hmac && ctr) {
 						await ready;
-						const chunkToDecrypt = subarray(pending, 0, pending.length - AUTHENTICATION_CODE_LENGTH);
-						const originalAuthenticationCode = subarray(pending, pending.length - AUTHENTICATION_CODE_LENGTH);
+						const chunkToDecrypt = subarray(pendingInput, 0, pendingInput.length - AUTHENTICATION_CODE_LENGTH);
+						const originalAuthenticationCode = subarray(pendingInput, pendingInput.length - AUTHENTICATION_CODE_LENGTH);
 						let decryptedChunkArray = EMPTY_UINT8_ARRAY;
 						if (chunkToDecrypt.length) {
 							const encryptedChunk = toBits(codecBytes, chunkToDecrypt);
@@ -2475,7 +2688,7 @@
 							decryptedChunkArray = fromBits(codecBytes, decryptedChunk);
 						}
 						const authenticationCode = subarray(fromBits(codecBytes, hmac.digest()), 0, AUTHENTICATION_CODE_LENGTH);
-						let invalidAuthenticationCode = pending.length < AUTHENTICATION_CODE_LENGTH ? 1 : 0;
+						let invalidAuthenticationCode = pendingInput.length < AUTHENTICATION_CODE_LENGTH ? 1 : 0;
 						for (let indexByte = 0; indexByte < AUTHENTICATION_CODE_LENGTH; indexByte++) {
 							invalidAuthenticationCode |= authenticationCode[indexByte] ^ originalAuthenticationCode[indexByte];
 						}
@@ -2519,14 +2732,14 @@
 					const {
 						ctr,
 						hmac,
-						pending,
+						pendingInput,
 						ready
 					} = this;
 					if (hmac && ctr) {
 						await ready;
 						let encryptedChunkArray = EMPTY_UINT8_ARRAY;
-						if (pending.length) {
-							const encryptedChunk = ctr.update(toBits(codecBytes, pending));
+						if (pendingInput.length) {
+							const encryptedChunk = ctr.update(toBits(codecBytes, pendingInput));
 							hmac.update(encryptedChunk);
 							encryptedChunkArray = fromBits(codecBytes, encryptedChunk);
 						}
@@ -2543,7 +2756,7 @@
 			ready: new Promise(resolve => aesCrypto.resolveReady = resolve),
 			password: encodePassword(password, rawPassword),
 			strength: encryptionStrength - 1,
-			pending: EMPTY_UINT8_ARRAY
+			pendingInput: EMPTY_UINT8_ARRAY
 		});
 	}
 
@@ -2551,10 +2764,10 @@
 		const {
 			ctr,
 			hmac,
-			pending
+			pendingInput
 		} = aesCrypto;
-		if (pending.length) {
-			input = concat(pending, input);
+		if (pendingInput.length) {
+			input = concat(pendingInput, input);
 		}
 		const inputLength = input.length - paddingEnd;
 		output = expand(output, paddingStart + (inputLength - (inputLength % BLOCK_LENGTH)));
@@ -2570,7 +2783,7 @@
 			}
 			output.set(fromBits(codecBytes, outputChunk), offset + paddingStart);
 		}
-		aesCrypto.pending = subarray(input, offset);
+		aesCrypto.pendingInput = subarray(input, offset);
 		return output;
 	}
 
@@ -3694,88 +3907,6 @@
 		}
 	}
 
-	/*
-	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
-
-	 Redistribution and use in source and binary forms, with or without
-	 modification, are permitted provided that the following conditions are met:
-
-	 1. Redistributions of source code must retain the above copyright notice,
-	 this list of conditions and the following disclaimer.
-
-	 2. Redistributions in binary form must reproduce the above copyright 
-	 notice, this list of conditions and the following disclaimer in 
-	 the documentation and/or other materials provided with the distribution.
-
-	 3. The names of the authors may not be used to endorse or promote products
-	 derived from this software without specific prior written permission.
-
-	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	 */
-
-	/* global TextDecoder */
-
-	const CP437 = "\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split("");
-	const VALID_CP437 = CP437.length == 256;
-
-	function decodeCP437(stringValue) {
-		if (VALID_CP437) {
-			let result = "";
-			for (let indexCharacter = 0; indexCharacter < stringValue.length; indexCharacter++) {
-				result += CP437[stringValue[indexCharacter]];
-			}
-			return result;
-		} else {
-			return new TextDecoder().decode(stringValue);
-		}
-	}
-
-	/*
-	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
-
-	 Redistribution and use in source and binary forms, with or without
-	 modification, are permitted provided that the following conditions are met:
-
-	 1. Redistributions of source code must retain the above copyright notice,
-	 this list of conditions and the following disclaimer.
-
-	 2. Redistributions in binary form must reproduce the above copyright 
-	 notice, this list of conditions and the following disclaimer in 
-	 the documentation and/or other materials provided with the distribution.
-
-	 3. The names of the authors may not be used to endorse or promote products
-	 derived from this software without specific prior written permission.
-
-	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	 */
-
-
-	function decodeText(value, encoding) {
-		if (encoding && encoding.trim().toLowerCase() == "cp437") {
-			return decodeCP437(value);
-		} else {
-			return new TextDecoder(encoding, { ignoreBOM: true }).decode(value);
-		}
-	}
-
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -3932,83 +4063,6 @@
 
 	}
 
-	/*
-	 Copyright (c) 2022 Gildas Lormeau. All rights reserved.
-
-	 Redistribution and use in source and binary forms, with or without
-	 modification, are permitted provided that the following conditions are met:
-
-	 1. Redistributions of source code must retain the above copyright notice,
-	 this list of conditions and the following disclaimer.
-
-	 2. Redistributions in binary form must reproduce the above copyright 
-	 notice, this list of conditions and the following disclaimer in 
-	 the documentation and/or other materials provided with the distribution.
-
-	 3. The names of the authors may not be used to endorse or promote products
-	 derived from this software without specific prior written permission.
-
-	 THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-	 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-	 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-	 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-	 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-	 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-	 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	 */
-
-	const OPTION_FILENAME_ENCODING = "filenameEncoding";
-	const OPTION_COMMENT_ENCODING = "commentEncoding";
-	const OPTION_DECODE_TEXT = "decodeText";
-	const OPTION_EXTRACT_PREPENDED_DATA = "extractPrependedData";
-	const OPTION_EXTRACT_APPENDED_DATA = "extractAppendedData";
-	const OPTION_PASSWORD = "password";
-	const OPTION_RAW_PASSWORD = "rawPassword";
-	const OPTION_PASS_THROUGH = "passThrough";
-	const OPTION_SIGNAL = "signal";
-	const OPTION_CHECK_PASSWORD_ONLY = "checkPasswordOnly";
-	const OPTION_CHECK_OVERLAPPING_ENTRY_ONLY = "checkOverlappingEntryOnly";
-	const OPTION_CHECK_OVERLAPPING_ENTRY = "checkOverlappingEntry";
-	const OPTION_CHECK_AMBIGUITY = "checkAmbiguity";
-	const OPTION_CHECK_LOCAL_DIRECTORY = "checkLocalDirectory";
-	const OPTION_CHECK_SIGNATURE = "checkSignature";
-	const OPTION_CHECK_CRC32 = "checkCrc32";
-	const OPTION_CHECK_AUTHENTICATION_CODE = "checkAuthenticationCode";
-	const OPTION_USE_WEB_WORKERS = "useWebWorkers";
-	const OPTION_USE_COMPRESSION_STREAM = "useCompressionStream";
-	const OPTION_TRANSFER_STREAMS = "transferStreams";
-	const OPTION_PREVENT_CLOSE = "preventClose";
-	const OPTION_ENCRYPTION_STRENGTH = "encryptionStrength";
-	const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
-	const OPTION_NTFS_TIMESTAMP = "ntfsTimestamp";
-	const OPTION_KEEP_ORDER = "keepOrder";
-	const OPTION_LEVEL = "level";
-	const OPTION_BUFFERED_WRITE = "bufferedWrite";
-	const OPTION_CREATE_TEMP_STREAM = "createTempStream";
-	const OPTION_DATA_DESCRIPTOR_SIGNATURE = "dataDescriptorSignature";
-	const OPTION_USE_UNICODE_FILE_NAMES = "useUnicodeFileNames";
-	const OPTION_DATA_DESCRIPTOR = "dataDescriptor";
-	const OPTION_SUPPORT_ZIP64_SPLIT_FILE = "supportZip64SplitFile";
-	const OPTION_ENCODE_TEXT = "encodeText";
-	const OPTION_OFFSET = "offset";
-	const OPTION_USDZ = "usdz";
-	const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
-	const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
-	const OPTION_STRICTNESS = "strictness";
-	const OPTION_FILENAME_VALIDATION = "filenameValidation";
-	const OPTION_NORMALIZE_FILENAME = "normalizeFilename";
-	const OPTION_MAX_APPENDED_DATA_SIZE = "maxAppendedDataSize";
-	const OPTION_DECRYPT_CENTRAL_DIRECTORY = "decryptCentralDirectory";
-	const OPTION_SIGN_CENTRAL_DIRECTORY = "signCentralDirectory";
-	const TEXT_TYPE_FILENAME = "filename";
-	const TEXT_TYPE_COMMENT = "comment";
-	const STRICTNESS_STRICT = "strict";
-	const STRICTNESS_BALANCED = "balanced";
-	const STRICTNESS_TOLERANT = "tolerant";
-
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
 
@@ -4049,6 +4103,7 @@
 	const ERR_UNSUPPORTED_COMPRESSION$1 = "Compression method not supported";
 	const ERR_SPLIT_ZIP_FILE = "Split zip file";
 	const ERR_OVERLAPPING_ENTRY = "Overlapping entry found";
+	const ERR_ENTRY_DATA_OUT_OF_BOUNDS = "Entry data out of bounds";
 	const ERR_AMBIGUOUS_ARCHIVE = "Ambiguous archive";
 	const ERR_ENCRYPTED_CENTRAL_DIRECTORY = "Encrypted central directory is not supported";
 	const ERR_UNSAFE_FILENAME = "Unsafe filename";
@@ -4069,7 +4124,7 @@
 	];
 	const ZIP64_EXTRACTION = {
 		[MAX_16_BITS]: {
-			getValue: getUint32,
+			getValue: getUint32$1,
 			bytes: 4
 		},
 		[MAX_32_BITS]: {
@@ -4078,6 +4133,7 @@
 		}
 	};
 	const MAX_END_OF_CENTRAL_DIR_PROBES = 64;
+	const MAX_DEFLATE_EXPANSION_RATIO = 1032;
 	const CENTRAL_DIRECTORY_UNREACHABLE = 0;
 	const CENTRAL_DIRECTORY_PLAUSIBLE = 1;
 	const CENTRAL_DIRECTORY_REACHABLE = 2;
@@ -4088,7 +4144,6 @@
 			Object.assign(this, {
 				reader: new GenericReader(reader),
 				options,
-				config: getConfiguration(),
 				readRanges: new Map()
 			});
 		}
@@ -4096,7 +4151,6 @@
 		async* getEntriesGenerator(options = {}) {
 			const zipReader = this;
 			let { reader } = zipReader;
-			const { config } = zipReader;
 			await initStream(reader);
 			if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
 				reader = new BlobReader(await streamToBlob(reader.readable));
@@ -4113,9 +4167,7 @@
 			const normalizeFilename = getOptionValue$1(zipReader, options, OPTION_NORMALIZE_FILENAME);
 			const { endOfDirectoryInfo, endOfDirectoryReachingEndCount } = await findEndOfCentralDirectory(reader, rejectAmbiguousEndOfDirectory, maxAppendedDataSize);
 			if (!endOfDirectoryInfo) {
-				const signatureArray = await readUint8Array(reader, 0, 4);
-				const signatureView = getDataView(signatureArray);
-				if (getUint32(signatureView) == SPLIT_ZIP_FILE_SIGNATURE) {
+				if (await startsWithSplitZipSignature$1(reader)) {
 					throw new Error(ERR_SPLIT_ZIP_FILE);
 				} else {
 					throw new Error(ERR_EOCDR_NOT_FOUND);
@@ -4125,22 +4177,23 @@
 				throwAmbiguousArchive("multiple end of central directory records");
 			}
 			const endOfDirectoryView = getDataView(endOfDirectoryInfo);
-			let directoryDataLength = getUint32(endOfDirectoryView, 12);
-			let directoryDataOffset = getUint32(endOfDirectoryView, 16);
+			let directoryDataLength = getUint32$1(endOfDirectoryView, 12);
+			let directoryDataOffset = getUint32$1(endOfDirectoryView, 16);
 			const commentOffset = endOfDirectoryInfo.offset;
-			const commentLength = getUint16(endOfDirectoryView, 20);
+			const commentLength = getUint16$1(endOfDirectoryView, 20);
 			const appendedDataOffset = commentOffset + END_OF_CENTRAL_DIR_LENGTH + commentLength;
 			if (reader.size - appendedDataOffset > maxAppendedDataSize) {
 				throwAmbiguousArchive("appended data");
 			}
-			let lastDiskNumber = getUint16(endOfDirectoryView, 4);
+			let lastDiskNumber = getUint16$1(endOfDirectoryView, 4);
 			const expectedLastDiskNumber = reader.lastDiskNumber || 0;
-			let diskNumber = getUint16(endOfDirectoryView, 6);
-			let filesLength = getUint16(endOfDirectoryView, 10);
+			let diskNumber = getUint16$1(endOfDirectoryView, 6);
+			let filesLength = getUint16$1(endOfDirectoryView, 10);
 			let prependedDataLength = 0;
 			let startOffset;
 			let zip64EndOfDirectory;
 			let zip64EndOfDirectoryVersion2;
+			let zip64EndOfDirectoryLength = ZIP64_END_OF_CENTRAL_DIR_LENGTH;
 			let directoryEncryptionInfo;
 			const requiresZip64 = directoryDataOffset == MAX_32_BITS || directoryDataLength == MAX_32_BITS || filesLength == MAX_16_BITS || diskNumber == MAX_16_BITS;
 			if (directoryDataOffset != MAX_32_BITS && diskNumber != MAX_16_BITS) {
@@ -4152,12 +4205,12 @@
 					EMPTY_UINT8_ARRAY;
 				const endOfDirectoryLocatorView = getDataView(endOfDirectoryLocatorArray);
 				if (endOfDirectoryLocatorArray.length == ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH &&
-					getUint32(endOfDirectoryLocatorView, 0) == ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE) {
-					directoryDataOffset = getDiskOffset$1(reader, getUint32(endOfDirectoryLocatorView, 4)) + getBigUint64(endOfDirectoryLocatorView, 8);
+					getUint32$1(endOfDirectoryLocatorView, 0) == ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE) {
+					directoryDataOffset = getDiskOffset$1(reader, getUint32$1(endOfDirectoryLocatorView, 4)) + getBigUint64(endOfDirectoryLocatorView, 8);
 					let endOfDirectoryArray = await readUint8Array(reader, directoryDataOffset, ZIP64_END_OF_CENTRAL_DIR_LENGTH);
 					let endOfDirectoryView = getDataView(endOfDirectoryArray);
 					const expectedDirectoryDataOffset = endOfDirectoryInfo.offset - ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH - ZIP64_END_OF_CENTRAL_DIR_LENGTH;
-					if ((endOfDirectoryArray.length < ZIP64_END_OF_CENTRAL_DIR_LENGTH || getUint32(endOfDirectoryView, 0) != ZIP64_END_OF_CENTRAL_DIR_SIGNATURE) &&
+					if ((endOfDirectoryArray.length < ZIP64_END_OF_CENTRAL_DIR_LENGTH || getUint32$1(endOfDirectoryView, 0) != ZIP64_END_OF_CENTRAL_DIR_SIGNATURE) &&
 						directoryDataOffset != expectedDirectoryDataOffset && expectedDirectoryDataOffset >= 0) {
 						const originalDirectoryDataOffset = directoryDataOffset;
 						directoryDataOffset = expectedDirectoryDataOffset;
@@ -4167,7 +4220,7 @@
 						endOfDirectoryArray = await readUint8Array(reader, directoryDataOffset, ZIP64_END_OF_CENTRAL_DIR_LENGTH);
 						endOfDirectoryView = getDataView(endOfDirectoryArray);
 					}
-					if (endOfDirectoryArray.length < ZIP64_END_OF_CENTRAL_DIR_LENGTH || getUint32(endOfDirectoryView, 0) != ZIP64_END_OF_CENTRAL_DIR_SIGNATURE) {
+					if (endOfDirectoryArray.length < ZIP64_END_OF_CENTRAL_DIR_LENGTH || getUint32$1(endOfDirectoryView, 0) != ZIP64_END_OF_CENTRAL_DIR_SIGNATURE) {
 						throw new Error(ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND);
 					}
 					zip64EndOfDirectory = true;
@@ -4177,18 +4230,19 @@
 							Number(getBigUint64(endOfDirectoryView, 4)) - (ZIP64_END_OF_CENTRAL_DIR_LENGTH - 12),
 							reader.size - directoryDataOffset - ZIP64_END_OF_CENTRAL_DIR_LENGTH);
 						if (extensibleDataLength > 0) {
+							zip64EndOfDirectoryLength += extensibleDataLength;
 							const rawExtensibleData = await readUint8Array(reader, directoryDataOffset + ZIP64_END_OF_CENTRAL_DIR_LENGTH, extensibleDataLength);
 							directoryEncryptionInfo = getDirectoryEncryptionInfo(rawExtensibleData);
 						}
 					}
 					if (lastDiskNumber == MAX_16_BITS) {
-						lastDiskNumber = getUint32(endOfDirectoryView, 16);
-					} else if (checkAmbiguity && lastDiskNumber != getUint32(endOfDirectoryView, 16)) {
+						lastDiskNumber = getUint32$1(endOfDirectoryView, 16);
+					} else if (checkAmbiguity && lastDiskNumber != getUint32$1(endOfDirectoryView, 16)) {
 						throwAmbiguousArchive("mismatched zip64 end of central directory record");
 					}
 					if (diskNumber == MAX_16_BITS) {
-						diskNumber = getUint32(endOfDirectoryView, 20);
-					} else if (checkAmbiguity && diskNumber != getUint32(endOfDirectoryView, 20)) {
+						diskNumber = getUint32$1(endOfDirectoryView, 20);
+					} else if (checkAmbiguity && diskNumber != getUint32$1(endOfDirectoryView, 20)) {
 						throwAmbiguousArchive("mismatched zip64 end of central directory record");
 					}
 					if (filesLength == MAX_16_BITS) {
@@ -4206,7 +4260,7 @@
 			}
 			let declaredDirectoryDataLength = directoryDataLength;
 			const centralDirectoryEndOffset = endOfDirectoryInfo.offset -
-				(zip64EndOfDirectory ? ZIP64_END_OF_CENTRAL_DIR_LENGTH + ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH : 0);
+				(zip64EndOfDirectory ? zip64EndOfDirectoryLength + ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH : 0);
 			if (directoryDataOffset >= reader.size) {
 				prependedDataLength = reader.size - directoryDataOffset - directoryDataLength - END_OF_CENTRAL_DIR_LENGTH;
 				directoryDataOffset = reader.size - directoryDataLength - END_OF_CENTRAL_DIR_LENGTH;
@@ -4226,11 +4280,13 @@
 				}
 				const expectedDirectoryDataOffset = centralDirectoryEndOffset - directoryDataLength;
 				if (directoryDataOffset != expectedDirectoryDataOffset && diskNumber == lastDiskNumber) {
-					const storedPointsAtDirectory = getUint32(directoryView, offset) == CENTRAL_FILE_HEADER_SIGNATURE;
+					const storedPointsAtDirectory = getUint32$1(directoryView, offset) == CENTRAL_FILE_HEADER_SIGNATURE ||
+						Boolean(directoryEncryptionInfo && directoryEncryptionInfo.compressedSize) ||
+						detectEncryptedCentralDirectory(directoryView);
 					let reconcile = !storedPointsAtDirectory;
 					if (!reconcile && expectedDirectoryDataOffset >= 0 && expectedDirectoryDataOffset + 4 <= reader.size) {
 						const expectedSignatureArray = await readUint8Array(reader, expectedDirectoryDataOffset, 4);
-						reconcile = getUint32(getDataView(expectedSignatureArray), 0) == CENTRAL_FILE_HEADER_SIGNATURE;
+						reconcile = getUint32$1(getDataView(expectedSignatureArray), 0) == CENTRAL_FILE_HEADER_SIGNATURE;
 					}
 					if (reconcile) {
 						const originalDirectoryDataOffset = directoryDataOffset;
@@ -4254,12 +4310,14 @@
 			}
 			zipReader.directoryOffset = directoryDataOffset;
 			zipReader.directoryLength = declaredDirectoryDataLength;
-			const decryptCentralDirectory = getOptionValue$1(zipReader, options, OPTION_DECRYPT_CENTRAL_DIRECTORY);
-			let decryptedDirectory;
+			const decryptCentralDirectory = getFunctionOptionValue$1(zipReader, options, OPTION_DECRYPT_CENTRAL_DIRECTORY);
+			let decryptedDirectory, dataAfterEncryptedDirectory;
 			if (decryptCentralDirectory && filesLength && directoryArray.length >= 4 &&
-				getUint32(directoryView, 0) != CENTRAL_FILE_HEADER_SIGNATURE &&
+				getUint32$1(directoryView, 0) != CENTRAL_FILE_HEADER_SIGNATURE &&
 				(zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
-				directoryArray = await decryptCentralDirectory(directoryArray, directoryEncryptionInfo);
+				const encryptedDirectoryDataLength = getEncryptedDirectoryDataLength(directoryEncryptionInfo, declaredDirectoryDataLength, directoryArray.length);
+				dataAfterEncryptedDirectory = directoryArray.subarray(encryptedDirectoryDataLength);
+				directoryArray = await decryptCentralDirectory(directoryArray.subarray(0, encryptedDirectoryDataLength), directoryEncryptionInfo);
 				directoryView = getDataView(directoryArray);
 				declaredDirectoryDataLength = directoryArray.length;
 				decryptedDirectory = true;
@@ -4270,8 +4328,8 @@
 			const filenames = checkAmbiguity ? new Set() : UNDEFINED_VALUE;
 			let duplicateFilename;
 			for (let indexFile = 0; indexFile < filesLength; indexFile++) {
-				const fileEntry = new ZipEntry$1(reader, config, zipReader.options);
-				if (offset + CENTRAL_FILE_HEADER_LENGTH > directoryArray.length || getUint32(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
+				const fileEntry = new ZipEntry$1(reader, zipReader.options);
+				if (offset + CENTRAL_FILE_HEADER_LENGTH > directoryArray.length || getUint32$1(directoryView, offset) != CENTRAL_FILE_HEADER_SIGNATURE) {
 					if (indexFile == 0 && !decryptedDirectory && (zip64EndOfDirectoryVersion2 || detectEncryptedCentralDirectory(directoryView))) {
 						throw new Error(ERR_ENCRYPTED_CENTRAL_DIRECTORY);
 					}
@@ -4282,16 +4340,16 @@
 				const filenameOffset = offset + CENTRAL_FILE_HEADER_LENGTH;
 				const extraFieldOffset = filenameOffset + fileEntry.filenameLength;
 				const commentOffset = extraFieldOffset + fileEntry.extraFieldLength;
-				const versionMadeBy = getUint16(directoryView, offset + 4);
+				const versionMadeBy = getUint16$1(directoryView, offset + 4);
 				const msDosCompatible = versionMadeBy >> 8 == 0;
 				const unixCompatible = versionMadeBy >> 8 == 3;
 				const rawFilename = directoryArray.subarray(filenameOffset, extraFieldOffset);
-				const commentLength = getUint16(directoryView, offset + 32);
+				const commentLength = getUint16$1(directoryView, offset + 32);
 				const endOffset = commentOffset + commentLength;
 				const rawComment = directoryArray.subarray(commentOffset, endOffset);
 				const filenameUTF8 = languageEncodingFlag;
 				const commentUTF8 = languageEncodingFlag;
-				const externalFileAttributes = getUint32(directoryView, offset + 38);
+				const externalFileAttributes = getUint32$1(directoryView, offset + 38);
 				const msdosAttributesRaw = externalFileAttributes & MAX_8_BITS;
 				const msdosAttributes = {
 					readOnly: Boolean(msdosAttributesRaw & FILE_ATTR_MSDOS_READONLY_MASK),
@@ -4300,8 +4358,8 @@
 					directory: Boolean(msdosAttributesRaw & FILE_ATTR_MSDOS_DIR_MASK),
 					archive: Boolean(msdosAttributesRaw & FILE_ATTR_MSDOS_ARCHIVE_MASK)
 				};
-				const offsetFileEntry = getUint32(directoryView, offset + 42);
-				const decode = getOptionValue$1(zipReader, options, OPTION_DECODE_TEXT) || decodeText;
+				const offsetFileEntry = getUint32$1(directoryView, offset + 42);
+				const decode = getFunctionOptionValue$1(zipReader, options, OPTION_DECODE_TEXT) || decodeText;
 				const rawFilenameEncoding = filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437;
 				const rawCommentEncoding = commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437;
 				let filename = decode(rawFilename, rawFilenameEncoding, TEXT_TYPE_FILENAME);
@@ -4325,6 +4383,7 @@
 				}
 				Object.assign(fileEntry, {
 					index: indexFile,
+					decryptedDirectory,
 					versionMadeBy,
 					msDosCompatible,
 					zip64: false,
@@ -4332,8 +4391,8 @@
 					uncompressedSize: 0,
 					commentLength,
 					offset: offsetFileEntry,
-					diskNumberStart: getUint16(directoryView, offset + 34),
-					internalFileAttributes: getUint16(directoryView, offset + 36),
+					diskNumberStart: getUint16$1(directoryView, offset + 34),
+					internalFileAttributes: getUint16$1(directoryView, offset + 36),
 					externalFileAttributes,
 					msdosAttributesRaw,
 					msdosAttributes,
@@ -4401,12 +4460,11 @@
 				yield entry;
 			}
 			let offsetAfterSignature = offset;
-			if (offset + 6 <= directoryArray.length && getUint32(directoryView, offset) == DIGITAL_SIGNATURE_RECORD_SIGNATURE) {
-				const signatureDataLength = getUint16(directoryView, offset + 4);
-				if (offset + 6 + signatureDataLength <= directoryArray.length) {
-					zipReader.digitalSignature = directoryArray.subarray(offset + 6, offset + 6 + signatureDataLength);
-					offsetAfterSignature = offset + 6 + signatureDataLength;
-				}
+			const digitalSignature = readDigitalSignature(directoryArray.subarray(offset)) ||
+				(decryptedDirectory ? readDigitalSignature(dataAfterEncryptedDirectory) : UNDEFINED_VALUE);
+			if (digitalSignature) {
+				zipReader.digitalSignature = digitalSignature;
+				offsetAfterSignature = offset + 6 + digitalSignature.length;
 			}
 			if (checkAmbiguity && offset != declaredDirectoryDataLength && offsetAfterSignature != declaredDirectoryDataLength) {
 				throwAmbiguousArchive("trailing central directory data");
@@ -4414,13 +4472,17 @@
 			if (duplicateFilename) {
 				throwAmbiguousArchive("duplicate filename");
 			}
-			if (checkAmbiguity && (prependedDataLength || (filesLength && startOffset > 0))) {
-				throwAmbiguousArchive("prepended data");
-			}
 			const extractPrependedData = getOptionValue$1(zipReader, options, OPTION_EXTRACT_PREPENDED_DATA);
 			const extractAppendedData = getOptionValue$1(zipReader, options, OPTION_EXTRACT_APPENDED_DATA);
+			const splitZipSignatureLength = (checkAmbiguity || extractPrependedData) && filesLength &&
+				startOffset == SPLIT_ZIP_FILE_SIGNATURE_LENGTH && await startsWithSplitZipMarker(reader) ? SPLIT_ZIP_FILE_SIGNATURE_LENGTH : 0;
+			if (checkAmbiguity && (prependedDataLength || (filesLength && startOffset > splitZipSignatureLength))) {
+				throwAmbiguousArchive("prepended data");
+			}
 			if (extractPrependedData) {
-				zipReader.prependedData = startOffset > 0 ? await readUint8Array(reader, 0, startOffset) : EMPTY_UINT8_ARRAY;
+				zipReader.prependedData = startOffset > splitZipSignatureLength ?
+					await readUint8Array(reader, splitZipSignatureLength, startOffset - splitZipSignatureLength) :
+					EMPTY_UINT8_ARRAY;
 			}
 			zipReader.comment = commentLength ? await readUint8Array(reader, commentOffset + END_OF_CENTRAL_DIR_LENGTH, commentLength) : EMPTY_UINT8_ARRAY;
 			if (extractAppendedData) {
@@ -4447,16 +4509,16 @@
 
 	let ZipEntry$1 = class ZipEntry {
 
-		constructor(reader, config, options) {
+		constructor(reader, options) {
 			Object.assign(this, {
 				reader,
-				config,
 				options
 			});
 		}
 
 		async getData(writer, fileEntry, readRanges, options = {}) {
 			const zipEntry = this;
+			const config = getConfiguration();
 			const {
 				reader,
 				index,
@@ -4465,7 +4527,6 @@
 				extraFieldAES,
 				extraFieldZip64,
 				compressionMethod,
-				config,
 				bitFlag,
 				rawBitFlag,
 				crc32,
@@ -4483,6 +4544,7 @@
 			let password = getOptionValue$1(zipEntry, options, OPTION_PASSWORD);
 			let rawPassword = getOptionValue$1(zipEntry, options, OPTION_RAW_PASSWORD);
 			const passThrough = getOptionValue$1(zipEntry, options, OPTION_PASS_THROUGH);
+			checkPasswordOption(password, rawPassword);
 			password = password && password.length && password;
 			rawPassword = rawPassword && rawPassword.length && rawPassword;
 			if (extraFieldAES) {
@@ -4490,7 +4552,7 @@
 					throw new Error(ERR_UNSUPPORTED_COMPRESSION$1);
 				}
 			}
-			if (dataArray.length < HEADER_SIZE || getUint32(dataView, 0) != LOCAL_FILE_HEADER_SIGNATURE) {
+			if (dataArray.length < HEADER_SIZE || getUint32$1(dataView, 0) != LOCAL_FILE_HEADER_SIGNATURE) {
 				throw new Error(ERR_LOCAL_FILE_HEADER_NOT_FOUND);
 			}
 			readCommonHeader(localDirectory, dataView, 4);
@@ -4552,9 +4614,12 @@
 				}
 			}
 			const dataOffset = localHeaderOffset + HEADER_SIZE + filenameLength + extraFieldLength;
+			if (dataOffset + compressedSize > reader.size) {
+				throw new Error(ERR_ENTRY_DATA_OUT_OF_BOUNDS);
+			}
 			const size = compressedSize;
 			const readable = toCompatibleReadable(reader.createReadable({ offset: dataOffset, size }));
-			const signal = getOptionValue$1(zipEntry, options, OPTION_SIGNAL);
+			const signal = checkSignalOption(getOptionValue$1(zipEntry, options, OPTION_SIGNAL));
 			const checkPasswordOnly = getOptionValue$1(zipEntry, options, OPTION_CHECK_PASSWORD_ONLY);
 			let checkOverlappingEntry = getOptionValue$1(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY);
 			const checkOverlappingEntryOnly = getOptionValue$1(zipEntry, options, OPTION_CHECK_OVERLAPPING_ENTRY_ONLY);
@@ -4562,6 +4627,8 @@
 				checkOverlappingEntry = true;
 			}
 			const { onstart, onprogress, onend } = options;
+			const compressed = compressionMethod != COMPRESSION_METHOD_STORE && !passThrough;
+			const outputSize = passThrough ? compressedSize : uncompressedSize;
 			const deflate64 = compressionMethod == COMPRESSION_METHOD_DEFLATE_64;
 			let useCompressionStream = getOptionValue$1(zipEntry, options, OPTION_USE_COMPRESSION_STREAM);
 			if (deflate64) {
@@ -4582,9 +4649,9 @@
 					checkCrc32,
 					checkAuthenticationCode: getOptionValue$1(zipEntry, options, OPTION_CHECK_AUTHENTICATION_CODE),
 					passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((crc32 >>> 24) & MAX_8_BITS)),
-					outputSize: passThrough ? compressedSize : uncompressedSize,
+					outputSize,
 					crc32,
-					compressed: compressionMethod != 0 && !passThrough,
+					compressed,
 					encrypted,
 					useWebWorkers: getOptionValue$1(zipEntry, options, OPTION_USE_WEB_WORKERS),
 					useCompressionStream,
@@ -4621,11 +4688,11 @@
 						writer = new WritableStream();
 					}
 					writer = new GenericWriter(writer);
-					await initStream(writer, passThrough ? compressedSize : uncompressedSize);
+					await initStream(writer, getDecodableOutputSize(outputSize, compressedSize, compressed));
 					({ writable } = writer);
-					const { outputSize } = await runWorker({ readable, writable }, workerOptions);
-					writer.size += outputSize;
-					if (outputSize != (passThrough ? compressedSize : uncompressedSize)) {
+					const { outputSize: writtenSize } = await runWorker({ readable, writable }, workerOptions);
+					writer.size += writtenSize;
+					if (writtenSize != outputSize) {
 						throw new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
 					}
 				}
@@ -4659,26 +4726,47 @@
 	function detectEncryptedCentralDirectory(directoryView) {
 		const maxOffset = Math.min(directoryView.byteLength, 1024) - 3;
 		for (let offset = 0; offset < maxOffset; offset++) {
-			if (getUint32(directoryView, offset) == ARCHIVE_EXTRA_DATA_SIGNATURE) {
+			if (getUint32$1(directoryView, offset) == ARCHIVE_EXTRA_DATA_SIGNATURE) {
 				return true;
 			}
 		}
 		return false;
 	}
 
+	function readDigitalSignature(signatureRecordArray) {
+		if (signatureRecordArray.length >= 6) {
+			const signatureRecordView = getDataView(signatureRecordArray);
+			if (getUint32$1(signatureRecordView, 0) == DIGITAL_SIGNATURE_RECORD_SIGNATURE) {
+				const signatureDataLength = getUint16$1(signatureRecordView, 4);
+				if (6 + signatureDataLength <= signatureRecordArray.length) {
+					return signatureRecordArray.subarray(6, 6 + signatureDataLength);
+				}
+			}
+		}
+	}
+
+	function getEncryptedDirectoryDataLength(directoryEncryptionInfo, declaredDirectoryDataLength, directoryDataLength) {
+		const encryptedDirectoryDataLength = directoryEncryptionInfo && directoryEncryptionInfo.compressedSize ?
+			directoryEncryptionInfo.compressedSize :
+			declaredDirectoryDataLength;
+		return encryptedDirectoryDataLength > 0 && encryptedDirectoryDataLength <= directoryDataLength ?
+			encryptedDirectoryDataLength :
+			directoryDataLength;
+	}
+
 	function getDirectoryEncryptionInfo(rawExtensibleData) {
 		const directoryEncryptionInfo = { rawExtensibleData };
 		if (rawExtensibleData.length >= 28) {
 			const extensibleDataView = getDataView(rawExtensibleData);
-			const hashDataLength = getUint16(extensibleDataView, 26);
+			const hashDataLength = getUint16$1(extensibleDataView, 26);
 			Object.assign(directoryEncryptionInfo, {
-				compressionMethod: getUint16(extensibleDataView, 0),
+				compressionMethod: getUint16$1(extensibleDataView, 0),
 				compressedSize: Number(getBigUint64(extensibleDataView, 2)),
 				uncompressedSize: Number(getBigUint64(extensibleDataView, 10)),
-				encryptionAlgorithm: getUint16(extensibleDataView, 18),
-				bitLength: getUint16(extensibleDataView, 20),
-				flags: getUint16(extensibleDataView, 22),
-				hashAlgorithm: getUint16(extensibleDataView, 24),
+				encryptionAlgorithm: getUint16$1(extensibleDataView, 18),
+				bitLength: getUint16$1(extensibleDataView, 20),
+				flags: getUint16$1(extensibleDataView, 22),
+				hashAlgorithm: getUint16$1(extensibleDataView, 24),
 				hashData: rawExtensibleData.subarray(28, 28 + hashDataLength)
 			});
 		}
@@ -4686,12 +4774,12 @@
 	}
 
 	function readCommonHeader(directory, dataView, offset) {
-		const rawBitFlag = directory.rawBitFlag = getUint16(dataView, offset + 2);
+		const rawBitFlag = directory.rawBitFlag = getUint16$1(dataView, offset + 2);
 		const encrypted = (rawBitFlag & BITFLAG_ENCRYPTED) == BITFLAG_ENCRYPTED;
-		const rawLastModDate = getUint32(dataView, offset + 6);
+		const rawLastModDate = getUint32$1(dataView, offset + 6);
 		Object.assign(directory, {
 			encrypted,
-			version: getUint16(dataView, offset),
+			version: getUint16$1(dataView, offset),
 			bitFlag: {
 				level: (rawBitFlag & BITFLAG_LEVEL) >> 1,
 				dataDescriptor: (rawBitFlag & BITFLAG_DATA_DESCRIPTOR) == BITFLAG_DATA_DESCRIPTOR,
@@ -4699,8 +4787,8 @@
 			},
 			rawLastModDate,
 			lastModDate: getDate(rawLastModDate),
-			filenameLength: getUint16(dataView, offset + 22),
-			extraFieldLength: getUint16(dataView, offset + 24)
+			filenameLength: getUint16$1(dataView, offset + 22),
+			extraFieldLength: getUint16$1(dataView, offset + 24)
 		});
 	}
 
@@ -4711,8 +4799,8 @@
 		let offsetExtraField = 0;
 		try {
 			while (offsetExtraField < rawExtraField.length) {
-				const type = getUint16(rawExtraFieldView, offsetExtraField);
-				const size = getUint16(rawExtraFieldView, offsetExtraField + 2);
+				const type = getUint16$1(rawExtraFieldView, offsetExtraField);
+				const size = getUint16$1(rawExtraFieldView, offsetExtraField + 2);
 				extraField.set(type, {
 					type,
 					data: rawExtraField.slice(offsetExtraField + 4, offsetExtraField + 4 + size)
@@ -4722,12 +4810,12 @@
 		} catch {
 			// ignored
 		}
-		const compressionMethod = getUint16(dataView, offset + 4);
+		const compressionMethod = getUint16$1(dataView, offset + 4);
 		Object.assign(directory, {
-			signature: getUint32(dataView, offset + HEADER_OFFSET_SIGNATURE),
-			crc32: getUint32(dataView, offset + HEADER_OFFSET_SIGNATURE),
-			compressedSize: getUint32(dataView, offset + HEADER_OFFSET_COMPRESSED_SIZE),
-			uncompressedSize: getUint32(dataView, offset + HEADER_OFFSET_UNCOMPRESSED_SIZE)
+			signature: getUint32$1(dataView, offset + HEADER_OFFSET_SIGNATURE),
+			crc32: getUint32$1(dataView, offset + HEADER_OFFSET_SIGNATURE),
+			compressedSize: getUint32$1(dataView, offset + HEADER_OFFSET_COMPRESSED_SIZE),
+			uncompressedSize: getUint32$1(dataView, offset + HEADER_OFFSET_UNCOMPRESSED_SIZE)
 		});
 		const extraFieldZip64 = extraField.get(EXTRAFIELD_TYPE_ZIP64);
 		if (extraFieldZip64) {
@@ -4816,11 +4904,11 @@
 		computedCrc32.append(fileEntry[rawPropertyName]);
 		const computedCrc32View = getDataView(new Uint8Array(4));
 		computedCrc32View.setUint32(0, computedCrc32.get(), true);
-		const nameCrc32 = getUint32(extraFieldView, 1);
+		const nameCrc32 = getUint32$1(extraFieldView, 1);
 		Object.assign(extraFieldUnicode, {
 			version: getUint8(extraFieldView, 0),
 			[propertyName]: decodeText(extraFieldUnicode.data.subarray(5)),
-			valid: !fileEntry.bitFlag.languageEncodingFlag && nameCrc32 == getUint32(computedCrc32View, 0)
+			valid: !fileEntry.bitFlag.languageEncodingFlag && nameCrc32 == getUint32$1(computedCrc32View, 0)
 		});
 		if (extraFieldUnicode.valid) {
 			directory[propertyName] = extraFieldUnicode[propertyName];
@@ -4836,7 +4924,7 @@
 			vendorId: getUint8(extraFieldView, 2),
 			strength,
 			originalCompressionMethod: compressionMethod,
-			compressionMethod: getUint16(extraFieldView, 5)
+			compressionMethod: getUint16$1(extraFieldView, 5)
 		});
 		directory.compressionMethod = extraFieldAES.compressionMethod;
 		if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1$1) {
@@ -4850,8 +4938,8 @@
 		let tag1Data;
 		try {
 			while (offsetExtraField < extraFieldNTFS.data.length && !tag1Data) {
-				const tagValue = getUint16(extraFieldView, offsetExtraField);
-				const attributeSize = getUint16(extraFieldView, offsetExtraField + 2);
+				const tagValue = getUint16$1(extraFieldView, offsetExtraField);
+				const attributeSize = getUint16$1(extraFieldView, offsetExtraField + 2);
 				if (tagValue == EXTRAFIELD_TYPE_NTFS_TAG1) {
 					tag1Data = extraFieldNTFS.data.slice(offsetExtraField + 4, offsetExtraField + 4 + attributeSize);
 				}
@@ -4884,12 +4972,12 @@
 			return;
 		}
 		const extraFieldView = getDataView(extraField.data);
-		const lastAccessDate = new Date((getUint32(extraFieldView, 0) | 0) * 1000);
-		const lastModDate = new Date((getUint32(extraFieldView, 4) | 0) * 1000);
+		const lastAccessDate = new Date((getUint32$1(extraFieldView, 0) | 0) * 1000);
+		const lastModDate = new Date((getUint32$1(extraFieldView, 4) | 0) * 1000);
 		const extraFieldData = { lastAccessDate, lastModDate };
 		if (extraField.data.length >= 12) {
-			extraFieldData.uid = getUint16(extraFieldView, 8);
-			extraFieldData.gid = getUint16(extraFieldView, 10);
+			extraFieldData.uid = getUint16$1(extraFieldView, 8);
+			extraFieldData.gid = getUint16$1(extraFieldView, 10);
 		}
 		Object.assign(extraField, extraFieldData);
 		Object.assign(directory, extraFieldData);
@@ -4909,8 +4997,8 @@
 				gid = unpackUnixId(extraField.data.subarray(offset, offset + gidSize));
 				Object.assign(extraField, { version, uid, gid });
 			} else if (extraField.data.length >= 4) {
-				uid = getUint16(view, 0);
-				gid = getUint16(view, 2);
+				uid = getUint16$1(view, 0);
+				gid = getUint16$1(view, 2);
 				Object.assign(extraField, { uid, gid });
 			}
 			if (uid !== UNDEFINED_VALUE) {
@@ -4960,7 +5048,7 @@
 		let offset = 1;
 		timeProperties.forEach((propertyName, indexProperty) => {
 			if (extraFieldExtendedTimestamp.data.length >= offset + 4) {
-				const time = getUint32(extraFieldView, offset);
+				const time = getUint32$1(extraFieldView, offset);
 				directory[propertyName] = extraFieldExtendedTimestamp[propertyName] = new Date((time | 0) * 1000);
 				const rawPropertyName = timeRawProperties[indexProperty];
 				extraFieldExtendedTimestamp[rawPropertyName] = time;
@@ -4994,7 +5082,7 @@
 			const dataDescriptorArray = await readUint8Array(reader, dataOffset + compressedSize, dataDescriptorLength + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH);
 			const dataDescriptorView = getDataView(dataDescriptorArray);
 			let signature = dataDescriptorArray.length == dataDescriptorLength + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH &&
-				getUint32(dataDescriptorView, 0) == DATA_DESCRIPTOR_RECORD_SIGNATURE;
+				getUint32$1(dataDescriptorView, 0) == DATA_DESCRIPTOR_RECORD_SIGNATURE;
 			if (signature) {
 				const signedDataDescriptor = readDataDescriptor(dataDescriptorView, DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH, extraFieldZip64);
 				const matchCrc32 = (fileEntry.encrypted && !fileEntry.zipCrypto) || signedDataDescriptor.crc32 == crc32;
@@ -5028,15 +5116,15 @@
 	}
 
 	function readDataDescriptor(dataDescriptorView, offset, extraFieldZip64) {
-		const crc32 = getUint32(dataDescriptorView, offset);
+		const crc32 = getUint32$1(dataDescriptorView, offset);
 		let compressedSize;
 		let uncompressedSize;
 		if (extraFieldZip64) {
 			compressedSize = getBigUint64(dataDescriptorView, offset + 4);
 			uncompressedSize = getBigUint64(dataDescriptorView, offset + 12);
 		} else {
-			compressedSize = getUint32(dataDescriptorView, offset + 4);
-			uncompressedSize = getUint32(dataDescriptorView, offset + 8);
+			compressedSize = getUint32$1(dataDescriptorView, offset + 4);
+			uncompressedSize = getUint32$1(dataDescriptorView, offset + 8);
 		}
 		return { crc32, compressedSize, uncompressedSize };
 	}
@@ -5045,10 +5133,28 @@
 		return reader.getDiskOffset ? reader.getDiskOffset(diskNumber) : 0;
 	}
 
+	async function startsWithSplitZipSignature$1(reader) {
+		return await getFirstSignature(reader) == SPLIT_ZIP_FILE_SIGNATURE;
+	}
+
+	async function startsWithSplitZipMarker(reader) {
+		const signature = await getFirstSignature(reader);
+		return signature == SPLIT_ZIP_FILE_SIGNATURE || signature == TEMPORARY_SPLIT_ZIP_FILE_SIGNATURE;
+	}
+
+	async function getFirstSignature(reader) {
+		const signatureArray = await readUint8Array(reader, 0, SPLIT_ZIP_FILE_SIGNATURE_LENGTH);
+		return getUint32$1(getDataView(signatureArray));
+	}
+
 	function isStrictnessValue(value) {
 		return value === STRICTNESS_STRICT || value === STRICTNESS_BALANCED || value === STRICTNESS_TOLERANT;
 	}
 
+	function getDecodableOutputSize(outputSize, compressedSize, compressed) {
+		return Math.min(outputSize, compressed ? compressedSize * MAX_DEFLATE_EXPANSION_RATIO : compressedSize);
+	}
+
 	function getStrictness(options, inheritedOptions) {
 		return resolveStrictness(options, resolveStrictness(inheritedOptions, STRICTNESS_BALANCED));
 	}
@@ -5111,7 +5217,7 @@
 
 	function getMaxAppendedDataSize(maxAppendedDataSize, strictness) {
 		if (maxAppendedDataSize !== UNDEFINED_VALUE) {
-			const size = toNumber$1(maxAppendedDataSize);
+			const size = toNumber(maxAppendedDataSize);
 			if (typeof size != NUMBER_TYPE || Number.isNaN(size) || size < 0) {
 				throw new Error(ERR_INVALID_MAX_APPENDED_DATA_SIZE);
 			}
@@ -5134,7 +5240,7 @@
 		let plausibleEndOfDirectoryInfo;
 		let endOfDirectoryReachingEndCount = 0;
 		for await (const [anchoredView, anchoredOffset, anchoredArray, indexByte, offset] of scanEndOfCentralDirectory(reader, anchoredLength)) {
-			const commentLength = getUint16(anchoredView, indexByte + 20);
+			const commentLength = getUint16$1(anchoredView, indexByte + 20);
 			if (offset + END_OF_CENTRAL_DIR_LENGTH + commentLength == size) {
 				const reachability = await getCentralDirectoryReachability(reader, anchoredView, anchoredOffset, indexByte, offset, size, remoteProbeBudget);
 				if (reachability == CENTRAL_DIRECTORY_REACHABLE) {
@@ -5185,7 +5291,7 @@
 		const scanArray = await readUint8Array(reader, scanOffset, scanLength);
 		const scanView = getDataView(scanArray);
 		for (let indexByte = scanArray.length - END_OF_CENTRAL_DIR_LENGTH; indexByte >= 0; indexByte--) {
-			if (getUint32(scanView, indexByte) == END_OF_CENTRAL_DIR_SIGNATURE) {
+			if (getUint32$1(scanView, indexByte) == END_OF_CENTRAL_DIR_SIGNATURE) {
 				yield [scanView, scanOffset, scanArray, indexByte, scanOffset + indexByte];
 			}
 		}
@@ -5196,9 +5302,9 @@
 	}
 
 	async function getCentralDirectoryReachability(reader, view, anchoredOffset, indexByte, offset, size, remoteProbeBudget) {
-		const filesLength = getUint16(view, indexByte + 10);
-		const directoryDataLength = getUint32(view, indexByte + 12);
-		const directoryDataOffset = getUint32(view, indexByte + 16);
+		const filesLength = getUint16$1(view, indexByte + 10);
+		const directoryDataLength = getUint32$1(view, indexByte + 12);
+		const directoryDataOffset = getUint32$1(view, indexByte + 16);
 		if (filesLength == MAX_16_BITS || directoryDataLength == MAX_32_BITS || directoryDataOffset == MAX_32_BITS) {
 			const locatorSignature = await readSignature(reader, view, anchoredOffset, offset - ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH, size, remoteProbeBudget);
 			return locatorSignature == ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE ? CENTRAL_DIRECTORY_REACHABLE : CENTRAL_DIRECTORY_UNREACHABLE;
@@ -5206,7 +5312,7 @@
 		if (!filesLength && !directoryDataLength) {
 			return CENTRAL_DIRECTORY_PLAUSIBLE;
 		}
-		const directoryDiskNumber = getUint16(view, indexByte + 6);
+		const directoryDiskNumber = getUint16$1(view, indexByte + 6);
 		for (const centralDirectoryOffset of [offset - directoryDataLength, getDiskOffset$1(reader, directoryDiskNumber) + directoryDataOffset]) {
 			if (await readSignature(reader, view, anchoredOffset, centralDirectoryOffset, size, remoteProbeBudget) == CENTRAL_FILE_HEADER_SIGNATURE) {
 				return CENTRAL_DIRECTORY_REACHABLE;
@@ -5220,19 +5326,21 @@
 			return UNDEFINED_VALUE;
 		}
 		if (signatureOffset >= anchoredOffset) {
-			return getUint32(view, signatureOffset - anchoredOffset);
+			return getUint32$1(view, signatureOffset - anchoredOffset);
 		}
 		if (remoteProbeBudget.count > 0) {
 			remoteProbeBudget.count--;
 			const signatureArray = await readUint8Array(reader, signatureOffset, 4);
-			return getUint32(getDataView(signatureArray), 0);
+			return getUint32$1(getDataView(signatureArray), 0);
 		}
 		return UNDEFINED_VALUE;
 	}
 
 	function validateLocalDirectory(zipEntry, localDirectory, rawLocalFilename, checkLocalFilename) {
 		const { rawFilename } = zipEntry;
-		if (checkLocalFilename &&
+		const maskedLocalDirectory = zipEntry.decryptedDirectory &&
+			(localDirectory.rawBitFlag & BITFLAG_MASKED_LOCAL_HEADERS) == BITFLAG_MASKED_LOCAL_HEADERS;
+		if (checkLocalFilename && !maskedLocalDirectory &&
 			(rawLocalFilename.length != rawFilename.length ||
 				rawLocalFilename.some((byteValue, indexByte) => byteValue != rawFilename[indexByte]))) {
 			throwAmbiguousArchive("mismatched local file header (filename)");
@@ -5243,7 +5351,7 @@
 		if (localDirectory.compressionMethod != zipEntry.compressionMethod) {
 			throwAmbiguousArchive("mismatched local file header (compression method)");
 		}
-		if (!localDirectory.bitFlag.dataDescriptor &&
+		if (!localDirectory.bitFlag.dataDescriptor && !maskedLocalDirectory &&
 			(localDirectory.crc32 || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
 			(localDirectory.crc32 != zipEntry.crc32 ||
 				localDirectory.compressedSize != zipEntry.compressedSize ||
@@ -5262,10 +5370,11 @@
 		return options[name] === UNDEFINED_VALUE ? zipReader.options[name] : options[name];
 	}
 
-	function toNumber$1(value) {
-		return typeof value == STRING_TYPE && value.trim() ? Number(value) : value;
+	function getFunctionOptionValue$1(zipReader, options, name) {
+		return checkFunctionOption(getOptionValue$1(zipReader, options, name));
 	}
 
+
 	function getDate(timeRaw) {
 		const date = (timeRaw & 0xffff0000) >> 16, time = timeRaw & MAX_16_BITS;
 		return new Date(1980 + ((date & 0xFE00) >> 9), ((date & 0x01E0) >> 5) - 1, date & 0x001F, (time & 0xF800) >> 11, (time & 0x07E0) >> 5, (time & 0x001F) * 2, 0);
@@ -5279,11 +5388,11 @@
 		return view.getUint8(offset);
 	}
 
-	function getUint16(view, offset) {
+	function getUint16$1(view, offset) {
 		return view.getUint16(offset, true);
 	}
 
-	function getUint32(view, offset) {
+	function getUint32$1(view, offset) {
 		return view.getUint32(offset, true);
 	}
 
@@ -5298,6 +5407,7 @@
 		ERR_CENTRAL_DIRECTORY_NOT_FOUND: ERR_CENTRAL_DIRECTORY_NOT_FOUND,
 		ERR_ENCRYPTED: ERR_ENCRYPTED,
 		ERR_ENCRYPTED_CENTRAL_DIRECTORY: ERR_ENCRYPTED_CENTRAL_DIRECTORY,
+		ERR_ENTRY_DATA_OUT_OF_BOUNDS: ERR_ENTRY_DATA_OUT_OF_BOUNDS,
 		ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND: ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND,
 		ERR_EOCDR_NOT_FOUND: ERR_EOCDR_NOT_FOUND,
 		ERR_EXTRAFIELD_ZIP64_NOT_FOUND: ERR_EXTRAFIELD_ZIP64_NOT_FOUND,
@@ -5352,12 +5462,16 @@
 	const ERR_INVALID_COMMENT = "Zip file comment exceeds 64KB";
 	const ERR_INVALID_COMMENT_TYPE = "Invalid zip file comment (must be a Uint8Array)";
 	const ERR_INVALID_ENTRY_COMMENT = "File entry comment exceeds 64KB";
+	const ERR_INVALID_ENTRY_COMMENT_TYPE = "Invalid file entry comment (must be a string)";
+	const ERR_INVALID_DATE = "Invalid date (must be a valid Date instance)";
 	const ERR_INVALID_ENTRY_NAME = "File entry name exceeds 64KB";
 	const ERR_INVALID_VERSION = "Version exceeds 65535";
 	const ERR_INVALID_ENCRYPTION_STRENGTH = "The strength must equal 1, 2, or 3";
 	const ERR_UNSUPPORTED_ENCRYPTION_USDZ = "Encryption is not supported in USDZ files";
 	const ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH = "Encryption is not supported when the 'passThrough' option is set";
-	const ERR_INVALID_EXTRAFIELD_TYPE = "Extra field type exceeds 65535";
+	const ERR_INVALID_EXTRAFIELD = "Invalid extra field (must be a Map)";
+	const ERR_INVALID_EXTRAFIELD_TYPE = "Invalid extra field type (must be integer 0..65535)";
+	const ERR_INVALID_EXTRAFIELD_DATA_TYPE = "Invalid extra field data (must be a Uint8Array)";
 	const ERR_INVALID_EXTRAFIELD_DATA = "Extra field data exceeds 64KB";
 	const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
 	const MIN_UNIX_TIME = -2147483648;
@@ -5366,6 +5480,7 @@
 	const MAX_NTFS_TIME = BigInt("0x7fffffffffffffff");
 	const ERR_UNSUPPORTED_FORMAT = "Zip64 is not supported (set the 'zip64' option to 'true')";
 	const ERR_UNDEFINED_UNCOMPRESSED_SIZE = "Undefined uncompressed size";
+	const ERR_UNDEFINED_COMPRESSION_METHOD = "Undefined compression method";
 	const ERR_UNDETERMINED_SIZE = "Undetermined size";
 	const ERR_UNDEFINED_READER = "Undefined reader";
 	const ERR_ZIP_NOT_EMPTY = "Zip file not empty";
@@ -5377,7 +5492,6 @@
 	const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be integer 0..255)";
 	const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
 	const ERR_INVALID_LEVEL = "Invalid level (must be integer 0..9)";
-	const ERR_INVALID_PASSWORD_TYPE = "Invalid password (password must be a string, rawPassword must be a Uint8Array)";
 	const ERR_INVALID_SIGNATURE_DATA = "Signature data exceeds 64KB";
 
 	const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
@@ -5402,8 +5516,7 @@
 				writer,
 				addSplitZipSignature,
 				options,
-				config: getConfiguration(),
-				files: new Map(),
+				fileEntries: new Map(),
 				filenames: new Set(),
 				offset: options[OPTION_OFFSET] === UNDEFINED_VALUE ? writer.size || writer.writable.size || 0 : options[OPTION_OFFSET],
 				initialOffset: options[OPTION_OFFSET] === UNDEFINED_VALUE ? 0 : options[OPTION_OFFSET] - (writer.size || writer.writable.size || 0),
@@ -5424,14 +5537,23 @@
 				await initStream(reader);
 			}
 			const { ZipReader } = await Promise.resolve().then(function () { return zipReader; });
-			const zipReader$1 = new ZipReader(reader.readable);
+			const zipReader$1 = new ZipReader(reader);
 			const entries = await zipReader$1.getEntries();
 			await zipReader$1.close();
 			await initStream(this.writer);
-			await reader.readable.pipeTo(this.writer.writable, { preventClose: true, preventAbort: true });
-			this.writer.size = this.offset = reader.size;
+			const { directoryOffset } = zipReader$1;
+			let splitZipSignatureLength = 0;
+			if (this.addSplitZipSignature) {
+				delete this.addSplitZipSignature;
+				if (!await startsWithSplitZipSignature(reader)) {
+					await writeData(this.writer, getSplitZipSignatureArray());
+					splitZipSignatureLength = SPLIT_ZIP_FILE_SIGNATURE_LENGTH;
+					this.offset += splitZipSignatureLength;
+				}
+			}
+			const entryPositions = await copyZipData(this, reader, entries, directoryOffset, splitZipSignatureLength);
 			this.filenames = new Set(entries.map(entry => entry.filename));
-			this.files = new Map(entries.map(entry => {
+			this.fileEntries = new Map(entries.map(entry => {
 				const {
 					version,
 					rawLastModDate,
@@ -5486,11 +5608,12 @@
 				if (crc32 !== UNDEFINED_VALUE) {
 					setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 				}
+				const { offset, diskNumberStart } = entryPositions.get(entry);
 				Object.assign(entry, {
 					zip64UncompressedSize,
 					zip64CompressedSize,
-					zip64Offset: zip64 && entry.offset >= MAX_32_BITS,
-					diskNumberStart: 0,
+					offset,
+					diskNumberStart,
 					zip64DiskNumberStart: false,
 					rawExtraFieldZip64,
 					rawExtraFieldAES,
@@ -5510,11 +5633,8 @@
 		async add(name = "", reader, options = {}) {
 			const zipWriter = this;
 			options = Object.assign({}, options);
-			const {
-				pendingAddFileCalls,
-				config
-			} = zipWriter;
-			if (workers < config.maxWorkers) {
+			const { pendingAddFileCalls } = zipWriter;
+			if (workers < getConfiguration().maxWorkers) {
 				workers++;
 			} else {
 				await new Promise(resolve => pendingEntries.push(resolve));
@@ -5551,16 +5671,16 @@
 		}
 
 		remove(entry) {
-			const { filenames, files } = this;
+			const { filenames, fileEntries } = this;
 			// deno-lint-ignore valid-typeof
 			if (typeof entry == STRING_TYPE) {
-				entry = files.get(entry);
+				entry = fileEntries.get(entry);
 			}
 			if (entry && entry.filename !== UNDEFINED_VALUE) {
 				const { filename } = entry;
-				if (filenames.has(filename) && files.has(filename)) {
+				if (filenames.has(filename) && fileEntries.has(filename)) {
 					filenames.delete(filename);
-					files.delete(filename);
+					fileEntries.delete(filename);
 					return true;
 				}
 			}
@@ -5595,12 +5715,12 @@
 		const metadataInfo = resolveMetadata(zipWriter, name, options);
 		const { comment } = metadataInfo;
 		const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
-		zipWriter.files.set(name, UNDEFINED_VALUE);
+		zipWriter.fileEntries.set(name, UNDEFINED_VALUE);
 		let fileEntry;
 		try {
 			const { resolvedOptions } = metadataInfo;
 			if (resolvedOptions.level != 0 && resolvedOptions.compressionMethod === UNDEFINED_VALUE &&
-				!resolvedOptions.passThrough && !(await supportsDeflate(zipWriter.config))) {
+				!resolvedOptions.passThrough && !(await supportsDeflate(getConfiguration()))) {
 				resolvedOptions.level = 0;
 			}
 			const sizesInfo = await resolveSizes(zipWriter, reader, metadataInfo, options);
@@ -5618,7 +5738,7 @@
 			const metadataSize = getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray);
 			fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo, metadataSize }, options);
 		} catch (error) {
-			zipWriter.files.delete(name);
+			zipWriter.fileEntries.delete(name);
 			throw error;
 		}
 		Object.assign(fileEntry, {
@@ -5662,9 +5782,9 @@
 		if (unixExtraFieldType === UNDEFINED_VALUE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 			unixExtraFieldType = INFOZIP_EXTRA_FIELD_TYPE$1;
 		}
-		let msdosAttributesRaw = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW);
+		let msdosAttributesRaw = getNumberOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW);
 		let msdosAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES);
-		const hasUnixMetadata = uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE || unixMode !== UNDEFINED_VALUE || unixExtraFieldType;
+		const hasUnixMetadata = uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE || unixMode !== UNDEFINED_VALUE || unixExtraFieldType || executable;
 		const hasMsDosProvided = msdosAttributesRaw !== UNDEFINED_VALUE || msdosAttributes !== UNDEFINED_VALUE;
 		if (hasUnixMetadata) {
 			msDosCompatible = false;
@@ -5673,10 +5793,10 @@
 			msDosCompatible = true;
 			versionMadeBy = (versionMadeBy & MAX_8_BITS);
 		}
-		if (msdosAttributesRaw !== UNDEFINED_VALUE && (msdosAttributesRaw < 0 || msdosAttributesRaw > MAX_8_BITS)) {
+		if (msdosAttributesRaw !== UNDEFINED_VALUE && (!Number.isInteger(msdosAttributesRaw) || msdosAttributesRaw < 0 || msdosAttributesRaw > MAX_8_BITS)) {
 			throw new Error(ERR_INVALID_MSDOS_ATTRIBUTES);
 		}
-		if (msdosAttributes && typeof msdosAttributes !== OBJECT_TYPE) {
+		if (msdosAttributes && (typeof msdosAttributes !== OBJECT_TYPE || Array.isArray(msdosAttributes))) {
 			throw new Error(ERR_INVALID_MSDOS_DATA);
 		}
 		if (versionMadeBy > MAX_16_BITS) {
@@ -5764,7 +5884,7 @@
 	}
 
 	function resolveMetadata(zipWriter, name, options) {
-		const encode = getOptionValue(zipWriter, options, OPTION_ENCODE_TEXT, encodeText);
+		const encode = getFunctionOptionValue(zipWriter, options, OPTION_ENCODE_TEXT) || encodeText;
 		let rawFilename = encode(name, TEXT_TYPE_FILENAME);
 		if (rawFilename === UNDEFINED_VALUE) {
 			rawFilename = encodeText(name);
@@ -5773,6 +5893,10 @@
 			throw new Error(ERR_INVALID_ENTRY_NAME);
 		}
 		const comment = options[PROPERTY_NAME_COMMENT] || "";
+		// deno-lint-ignore valid-typeof
+		if (typeof comment != STRING_TYPE) {
+			throw new Error(ERR_INVALID_ENTRY_COMMENT_TYPE);
+		}
 		let rawComment = encode(comment, TEXT_TYPE_COMMENT);
 		if (rawComment === UNDEFINED_VALUE) {
 			rawComment = encodeText(comment);
@@ -5784,16 +5908,14 @@
 		if (version > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		const lastModDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
-		const lastAccessDate = getOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
-		const creationDate = getOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
+		const lastModDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_LAST_MODIFICATION_DATE, new Date());
+		const lastAccessDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_LAST_ACCESS_DATE);
+		const creationDate = getDateOptionValue(zipWriter, options, PROPERTY_NAME_CREATION_DATE);
 		const internalFileAttributes = getAliasedOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_DEPRECATED_INTERNAL_FILE_ATTRIBUTES, 0);
 		const passThrough = getOptionValue(zipWriter, options, OPTION_PASS_THROUGH);
 		const password = getOptionValue(zipWriter, options, OPTION_PASSWORD);
 		const rawPassword = getOptionValue(zipWriter, options, OPTION_RAW_PASSWORD);
-		if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
-			throw new Error(ERR_INVALID_PASSWORD_TYPE);
-		}
+		checkPasswordOption(password, rawPassword);
 		const encryptionStrength = getNumberOptionValue(zipWriter, options, OPTION_ENCRYPTION_STRENGTH, 3);
 		const zipCrypto = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIPCRYPTO);
 		const extendedTimestamp = getOptionValue(zipWriter, options, OPTION_EXTENDED_TIMESTAMP, true);
@@ -5802,9 +5924,9 @@
 		const useWebWorkers = getOptionValue(zipWriter, options, OPTION_USE_WEB_WORKERS);
 		const transferStreams = getOptionValue(zipWriter, options, OPTION_TRANSFER_STREAMS);
 		const bufferedWrite = getOptionValue(zipWriter, options, OPTION_BUFFERED_WRITE);
-		const createTempStream = getOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
+		const createTempStream = getFunctionOptionValue(zipWriter, options, OPTION_CREATE_TEMP_STREAM);
 		const dataDescriptorSignature = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR_SIGNATURE, true);
-		const signal = getOptionValue(zipWriter, options, OPTION_SIGNAL);
+		const signal = checkSignalOption(getOptionValue(zipWriter, options, OPTION_SIGNAL));
 		const useUnicodeFileNames = getOptionValue(zipWriter, options, OPTION_USE_UNICODE_FILE_NAMES, true);
 		const compressionMethod = getOptionValue(zipWriter, options, PROPERTY_NAME_COMPRESSION_METHOD);
 		const registeredCodec = passThrough || compressionMethod === UNDEFINED_VALUE ? UNDEFINED_VALUE : getRegisteredCodec(compressionMethod);
@@ -5824,6 +5946,9 @@
 				level = 0;
 			}
 		}
+		if (passThrough) {
+			level = UNDEFINED_VALUE;
+		}
 		let useCompressionStream = getOptionValue(zipWriter, options, OPTION_USE_COMPRESSION_STREAM);
 		let dataDescriptor = getOptionValue(zipWriter, options, OPTION_DATA_DESCRIPTOR);
 		if (bufferedWrite && dataDescriptor === UNDEFINED_VALUE) {
@@ -5884,18 +6009,26 @@
 		if (!extraField) {
 			return EMPTY_UINT8_ARRAY;
 		}
+		if (!(extraField instanceof Map)) {
+			throw new Error(ERR_INVALID_EXTRAFIELD);
+		}
 		let extraFieldSize = 0;
 		let offset = 0;
-		extraField.forEach(data => extraFieldSize += 4 + getLength(data));
-		const rawExtraField = new Uint8Array(extraFieldSize);
-		const rawExtraFieldView = getDataView(rawExtraField);
 		extraField.forEach((data, type) => {
-			if (type > MAX_16_BITS) {
+			if (!Number.isInteger(type) || type < 0 || type > MAX_16_BITS) {
 				throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
 			}
+			if (!(data instanceof Uint8Array)) {
+				throw new Error(ERR_INVALID_EXTRAFIELD_DATA_TYPE);
+			}
 			if (getLength(data) > MAX_16_BITS) {
 				throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 			}
+			extraFieldSize += 4 + getLength(data);
+		});
+		const rawExtraField = new Uint8Array(extraFieldSize);
+		const rawExtraFieldView = getDataView(rawExtraField);
+		extraField.forEach((data, type) => {
 			setUint16(rawExtraFieldView, offset, type);
 			setUint16(rawExtraFieldView, offset + 2, getLength(data));
 			arraySet(rawExtraField, data, offset + 4);
@@ -5927,6 +6060,9 @@
 			if (uncompressedSize === UNDEFINED_VALUE) {
 				throw new Error(ERR_UNDEFINED_UNCOMPRESSED_SIZE);
 			}
+			if (compressionMethod === UNDEFINED_VALUE) {
+				throw new Error(ERR_UNDEFINED_COMPRESSION_METHOD);
+			}
 		}
 		const zip64Enabled = zip64 === true;
 		const encrypted = getOptionValue(zipWriter, options, PROPERTY_NAME_ENCRYPTED);
@@ -5982,8 +6118,8 @@
 	}
 
 	async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comment) {
-		const zipWriter = { options: writerOptions, config: getConfiguration() };
-		if (writerOptions[OPTION_SIGN_CENTRAL_DIRECTORY]) {
+		const zipWriter = { options: writerOptions };
+		if (checkFunctionOption(writerOptions[OPTION_SIGN_CENTRAL_DIRECTORY])) {
 			throw new Error(ERR_UNDETERMINED_SIZE);
 		}
 		if (comment !== UNDEFINED_VALUE && !(comment instanceof Uint8Array)) {
@@ -6009,7 +6145,7 @@
 			({ name } = attributesInfo);
 			const { resolvedOptions: metadata } = resolveMetadata(zipWriter, name, options);
 			if (metadata.level != 0 && metadata.compressionMethod === UNDEFINED_VALUE &&
-				!metadata.passThrough && !(await supportsDeflate(zipWriter.config))) {
+				!metadata.passThrough && !(await supportsDeflate(getConfiguration()))) {
 				metadata.level = 0;
 			}
 			const hasContent = !getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY);
@@ -6058,7 +6194,7 @@
 
 	async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		const {
-			files,
+			fileEntries,
 			writer
 		} = zipWriter;
 		const {
@@ -6080,12 +6216,12 @@
 		let writerSizeBeforeEntry;
 		let flushedBufferedSize = 0;
 		let fileWriter;
-		files.set(name, fileEntry);
+		fileEntries.set(name, fileEntry);
 		zipWriter.lastFileEntry = fileEntry;
 		try {
 			let lockPreviousFileEntry;
 			if (keepOrder) {
-				lockPreviousFileEntry = previousFileEntry && previousFileEntry.lock;
+				lockPreviousFileEntry = previousFileEntry && previousFileEntry.lockFileEntry;
 				requestLockCurrentFileEntry();
 			}
 			if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || !dataDescriptor) {
@@ -6106,11 +6242,8 @@
 			const diskOffset = getDiskOffset(writer);
 			if (zipWriter.addSplitZipSignature) {
 				delete zipWriter.addSplitZipSignature;
-				const signatureArray = new Uint8Array(4);
-				const signatureArrayView = getDataView(signatureArray);
-				setUint32(signatureArrayView, 0, SPLIT_ZIP_FILE_SIGNATURE);
-				await writeData(writer, signatureArray);
-				zipWriter.offset += 4;
+				await writeData(writer, getSplitZipSignatureArray());
+				zipWriter.offset += SPLIT_ZIP_FILE_SIGNATURE_LENGTH;
 			}
 			if (usdz && !bufferedWrite) {
 				appendExtraFieldUSDZ(entryInfo, zipWriter.offset - diskOffset);
@@ -6128,11 +6261,11 @@
 				writerSizeBeforeEntry = writer.size;
 				await writeData(fileWriter, localHeaderArray);
 			}
-			fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
+			fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, getConfiguration(), options);
 			if (!bufferedWrite) {
 				writingEntryData = false;
 			}
-			files.set(name, fileEntry);
+			fileEntries.set(name, fileEntry);
 			fileEntry.filename = name;
 			if (bufferedWrite) {
 				await Promise.all([fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
@@ -6173,7 +6306,7 @@
 					zipWriter.offset += flushedBufferedSize;
 				}
 			}
-			files.delete(name);
+			fileEntries.delete(name);
 			throw error;
 		} finally {
 			if (bufferedWrite) {
@@ -6195,7 +6328,7 @@
 		}
 
 		function requestLockCurrentFileEntry() {
-			fileEntry.lock = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
+			fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
 		}
 
 		async function requestLockWriter() {
@@ -6215,7 +6348,7 @@
 		}
 	}
 
-	async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryInfo, config, options) {
+	async function createFileEntry(reader, writer, { diskNumberStart, lockFileEntry }, entryInfo, config, options) {
 		const {
 			headerInfo,
 			dataDescriptorInfo,
@@ -6283,7 +6416,7 @@
 			codecURI
 		} = options;
 		const fileEntry = {
-			lock,
+			lockFileEntry,
 			versionMadeBy,
 			zip64,
 			directory: Boolean(directory),
@@ -6325,7 +6458,7 @@
 		}
 		const { writable } = writer;
 		if (reader) {
-			const readable = toCompatibleReadable(reader.createReadable ? reader.createReadable() : reader.readable);
+			const readable = toCompatibleReadable(createReadable(reader));
 			const size = reader.size;
 			const workerOptions = {
 				options: {
@@ -6437,14 +6570,14 @@
 		if (zip64 && (zip64UncompressedSize || zip64CompressedSize)) {
 			const length = 4 + 16;
 			const extraFieldZip64 = createRecordWriter(length);
-			extraFieldZip64.uint16(EXTRAFIELD_TYPE_ZIP64);
-			extraFieldZip64.uint16(length - 4);
+			extraFieldZip64.writeUint16(EXTRAFIELD_TYPE_ZIP64);
+			extraFieldZip64.writeUint16(length - 4);
 			rawLocalExtraFieldZip64 = extraFieldZip64.array;
 			if (zip64ExtraFieldComplete) {
-				extraFieldZip64.uint64(uncompressedSize);
+				extraFieldZip64.writeUint64(uncompressedSize);
 				if (uncompressedFile) {
 					const encryptionOverhead = encrypted ? (zipCrypto ? 12 : 16 + encryptionStrength * 4) : 0;
-					extraFieldZip64.uint64(passThrough ? 0 : uncompressedSize + encryptionOverhead);
+					extraFieldZip64.writeUint64(passThrough ? 0 : uncompressedSize + encryptionOverhead);
 				}
 			}
 		} else {
@@ -6453,8 +6586,8 @@
 		let rawExtraFieldAES;
 		if (encrypted && !zipCrypto) {
 			const extraFieldAES = createRecordWriter(getLength(EXTRAFIELD_DATA_AES) + 2);
-			extraFieldAES.uint16(EXTRAFIELD_TYPE_AES);
-			extraFieldAES.bytes(EXTRAFIELD_DATA_AES);
+			extraFieldAES.writeUint16(EXTRAFIELD_TYPE_AES);
+			extraFieldAES.writeBytes(EXTRAFIELD_DATA_AES);
 			rawExtraFieldAES = extraFieldAES.array;
 			rawExtraFieldAES[8] = encryptionStrength;
 		} else {
@@ -6470,15 +6603,15 @@
 				const extraFieldTimestampLength = 9 + (lastAccessDate ? 4 : 0) + (creationDate ? 4 : 0);
 				const extraFieldTimestamp = createRecordWriter(extraFieldTimestampLength);
 				extraFieldExtendedTimestampFlag = 0x1 + (lastAccessDate ? 0x2 : 0) + (creationDate ? 0x4 : 0);
-				extraFieldTimestamp.uint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-				extraFieldTimestamp.uint16(extraFieldTimestampLength - 4);
-				extraFieldTimestamp.uint8(extraFieldExtendedTimestampFlag);
-				extraFieldTimestamp.uint32(lastModTimeUnix);
+				extraFieldTimestamp.writeUint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+				extraFieldTimestamp.writeUint16(extraFieldTimestampLength - 4);
+				extraFieldTimestamp.writeUint8(extraFieldExtendedTimestampFlag);
+				extraFieldTimestamp.writeUint32(lastModTimeUnix);
 				if (lastAccessDate) {
-					extraFieldTimestamp.uint32(clampUnixTime(getTimeUnix(lastAccessDate)));
+					extraFieldTimestamp.writeUint32(clampUnixTime(getTimeUnix(lastAccessDate)));
 				}
 				if (creationDate) {
-					extraFieldTimestamp.uint32(clampUnixTime(getTimeUnix(creationDate)));
+					extraFieldTimestamp.writeUint32(clampUnixTime(getTimeUnix(creationDate)));
 				}
 				rawExtraFieldExtendedTimestamp = extraFieldTimestamp.array;
 			} else {
@@ -6491,14 +6624,14 @@
 				try {
 					const lastModTimeNTFS = getTimeNTFS(lastModDate);
 					const extraFieldNTFS = createRecordWriter(36);
-					extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS);
-					extraFieldNTFS.uint16(32);
+					extraFieldNTFS.writeUint16(EXTRAFIELD_TYPE_NTFS);
+					extraFieldNTFS.writeUint16(32);
 					extraFieldNTFS.skip(4);
-					extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS_TAG1);
-					extraFieldNTFS.uint16(24);
-					extraFieldNTFS.uint64(lastModTimeNTFS);
-					extraFieldNTFS.uint64(lastAccessDate ? getTimeNTFS(lastAccessDate) : lastModTimeNTFS);
-					extraFieldNTFS.uint64(creationDate ? getTimeNTFS(creationDate) : lastModTimeNTFS);
+					extraFieldNTFS.writeUint16(EXTRAFIELD_TYPE_NTFS_TAG1);
+					extraFieldNTFS.writeUint16(24);
+					extraFieldNTFS.writeUint64(lastModTimeNTFS);
+					extraFieldNTFS.writeUint64(lastAccessDate ? getTimeNTFS(lastAccessDate) : lastModTimeNTFS);
+					extraFieldNTFS.writeUint64(creationDate ? getTimeNTFS(creationDate) : lastModTimeNTFS);
 					rawExtraFieldNTFS = extraFieldNTFS.array;
 				} catch {
 					rawExtraFieldNTFS = EMPTY_UINT8_ARRAY;
@@ -6517,20 +6650,20 @@
 				const gidBytes = packUnixId(gid);
 				const payloadLength = 3 + uidBytes.length + gidBytes.length;
 				const extraFieldUnix = createRecordWriter(4 + payloadLength);
-				extraFieldUnix.uint16(EXTRAFIELD_TYPE_INFOZIP);
-				extraFieldUnix.uint16(payloadLength);
-				extraFieldUnix.uint8(1);
-				extraFieldUnix.uint8(uidBytes.length);
-				extraFieldUnix.bytes(uidBytes);
-				extraFieldUnix.uint8(gidBytes.length);
-				extraFieldUnix.bytes(gidBytes);
+				extraFieldUnix.writeUint16(EXTRAFIELD_TYPE_INFOZIP);
+				extraFieldUnix.writeUint16(payloadLength);
+				extraFieldUnix.writeUint8(1);
+				extraFieldUnix.writeUint8(uidBytes.length);
+				extraFieldUnix.writeBytes(uidBytes);
+				extraFieldUnix.writeUint8(gidBytes.length);
+				extraFieldUnix.writeBytes(gidBytes);
 				rawExtraFieldUnix = extraFieldUnix.array;
 			} else if (unixExtraFieldType == UNIX_EXTRA_FIELD_TYPE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 				const extraFieldUnix = createRecordWriter(8);
-				extraFieldUnix.uint16(EXTRAFIELD_TYPE_UNIX);
-				extraFieldUnix.uint16(4);
-				extraFieldUnix.uint16((uid === UNDEFINED_VALUE ? 0 : uid) & MAX_16_BITS);
-				extraFieldUnix.uint16((gid === UNDEFINED_VALUE ? 0 : gid) & MAX_16_BITS);
+				extraFieldUnix.writeUint16(EXTRAFIELD_TYPE_UNIX);
+				extraFieldUnix.writeUint16(4);
+				extraFieldUnix.writeUint16((uid === UNDEFINED_VALUE ? 0 : uid) & MAX_16_BITS);
+				extraFieldUnix.writeUint16((gid === UNDEFINED_VALUE ? 0 : gid) & MAX_16_BITS);
 				rawExtraFieldUnix = extraFieldUnix.array;
 			} else {
 				rawExtraFieldUnix = EMPTY_UINT8_ARRAY;
@@ -6580,18 +6713,18 @@
 		const localHeader = createRecordWriter(HEADER_SIZE + getLength(rawFilename) + extraFieldLength);
 		const localHeaderArray = localHeader.array;
 		const localHeaderView = getDataView(localHeaderArray);
-		localHeader.uint32(LOCAL_FILE_HEADER_SIGNATURE);
-		localHeader.bytes(headerArray);
-		localHeader.bytes(rawFilename);
+		localHeader.writeUint32(LOCAL_FILE_HEADER_SIGNATURE);
+		localHeader.writeBytes(headerArray);
+		localHeader.writeBytes(rawFilename);
 		if (writeLocalExtraFieldZip64) {
-			localHeader.bytes(rawLocalExtraFieldZip64);
-		}
-		localHeader.bytes(rawExtraFieldAES);
-		localHeader.bytes(rawExtraFieldExtendedTimestamp);
-		localHeader.bytes(rawExtraFieldNTFS);
-		localHeader.bytes(rawExtraFieldUnix);
-		localHeader.bytes(rawExtraField);
-		localHeader.bytes(rawLocalExtraField);
+			localHeader.writeBytes(rawLocalExtraFieldZip64);
+		}
+		localHeader.writeBytes(rawExtraFieldAES);
+		localHeader.writeBytes(rawExtraFieldExtendedTimestamp);
+		localHeader.writeBytes(rawExtraFieldNTFS);
+		localHeader.writeBytes(rawExtraFieldUnix);
+		localHeader.writeBytes(rawExtraField);
+		localHeader.writeBytes(rawLocalExtraField);
 		if (dataDescriptor) {
 			if (!zip64CompressedSize) {
 				setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, 0);
@@ -6781,7 +6914,7 @@
 
 
 	async function closeFile(zipWriter, comment, options) {
-		const directoryDataLength = createDirectoryRecords(zipWriter.files);
+		const directoryDataLength = createDirectoryRecords(zipWriter.fileEntries);
 		const { directoryStart, directoryArray } = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
 		const signatureLength = await writeDigitalSignatureRecord(zipWriter, directoryArray, options);
 		await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength, signatureLength });
@@ -6811,19 +6944,19 @@
 			if (zip64Offset || zip64DiskNumberStart || zip64UncompressedSize || zip64CompressedSize) {
 				const length = 4 + (zip64UncompressedSize ? 8 : 0) + (zip64CompressedSize ? 8 : 0) + (zip64Offset ? 8 : 0) + (zip64DiskNumberStart ? 4 : 0);
 				const extraFieldZip64 = createRecordWriter(length);
-				extraFieldZip64.uint16(EXTRAFIELD_TYPE_ZIP64);
-				extraFieldZip64.uint16(length - 4);
+				extraFieldZip64.writeUint16(EXTRAFIELD_TYPE_ZIP64);
+				extraFieldZip64.writeUint16(length - 4);
 				if (zip64UncompressedSize) {
-					extraFieldZip64.uint64(uncompressedSize);
+					extraFieldZip64.writeUint64(uncompressedSize);
 				}
 				if (zip64CompressedSize) {
-					extraFieldZip64.uint64(compressedSize);
+					extraFieldZip64.writeUint64(compressedSize);
 				}
 				if (zip64Offset) {
-					extraFieldZip64.uint64(fileEntry.offset);
+					extraFieldZip64.writeUint64(fileEntry.offset);
 				}
 				if (zip64DiskNumberStart) {
-					extraFieldZip64.uint32(fileEntry.diskNumberStart);
+					extraFieldZip64.writeUint32(fileEntry.diskNumberStart);
 				}
 				rawExtraFieldZip64 = extraFieldZip64.array;
 			} else {
@@ -6836,10 +6969,10 @@
 			const lastModTimeUnix = getTimeUnix(lastModDate);
 			if (extendedTimestamp && inUnixTimeRange(lastModTimeUnix)) {
 				const extraFieldTimestamp = createRecordWriter(9);
-				extraFieldTimestamp.uint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
-				extraFieldTimestamp.uint16(5);
-				extraFieldTimestamp.uint8(extraFieldExtendedTimestampFlag);
-				extraFieldTimestamp.uint32(lastModTimeUnix);
+				extraFieldTimestamp.writeUint16(EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP);
+				extraFieldTimestamp.writeUint16(5);
+				extraFieldTimestamp.writeUint8(extraFieldExtendedTimestampFlag);
+				extraFieldTimestamp.writeUint32(lastModTimeUnix);
 				rawExtraFieldTimestamp = extraFieldTimestamp.array;
 			} else {
 				rawExtraFieldTimestamp = EMPTY_UINT8_ARRAY;
@@ -6861,14 +6994,14 @@
 	}
 
 	async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
-		const { files, writer } = zipWriter;
+		const { fileEntries, writer } = zipWriter;
 		const directoryArray = new Uint8Array(directoryDataLength);
 		await initStream(writer);
 		let offset = 0;
 		let directoryDiskOffset = 0;
 		let directoryStartDiskNumber = getDiskNumber(writer);
 		let directoryStartDiskOffset = getDiskOffset(writer);
-		for (const [indexFileEntry, fileEntry] of Array.from(files.values()).entries()) {
+		for (const [indexFileEntry, fileEntry] of Array.from(fileEntries.values()).entries()) {
 			const {
 				offset: fileEntryOffset,
 				rawFilename,
@@ -6913,28 +7046,28 @@
 				setUint16(headerView, HEADER_OFFSET_VERSION, VERSION_ZIP64);
 			}
 			const directoryRecord = createRecordWriter(directoryRecordLength);
-			directoryRecord.uint32(CENTRAL_FILE_HEADER_SIGNATURE);
-			directoryRecord.uint16(versionMadeBy);
-			directoryRecord.bytes(headerArray.subarray(0, HEADER_SIZE - 4 - 2));
-			directoryRecord.uint16(extraFieldLength);
-			directoryRecord.uint16(getLength(rawComment));
-			directoryRecord.uint16(zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
-			directoryRecord.uint16(internalFileAttributes);
-			directoryRecord.uint32(externalFileAttributes);
-			directoryRecord.uint32(zip64Offset ? MAX_32_BITS : fileEntryOffset);
-			directoryRecord.bytes(rawFilename);
-			directoryRecord.bytes(rawExtraFieldZip64);
-			directoryRecord.bytes(rawExtraFieldAES);
-			directoryRecord.bytes(rawExtraFieldExtendedTimestamp);
-			directoryRecord.bytes(rawExtraFieldNTFS);
-			directoryRecord.bytes(rawExtraFieldUnix);
-			directoryRecord.bytes(rawExtraField);
-			directoryRecord.bytes(rawComment);
+			directoryRecord.writeUint32(CENTRAL_FILE_HEADER_SIGNATURE);
+			directoryRecord.writeUint16(versionMadeBy);
+			directoryRecord.writeBytes(headerArray.subarray(0, HEADER_SIZE - 4 - 2));
+			directoryRecord.writeUint16(extraFieldLength);
+			directoryRecord.writeUint16(getLength(rawComment));
+			directoryRecord.writeUint16(zip64DiskNumberStart ? MAX_16_BITS : diskNumberStart);
+			directoryRecord.writeUint16(internalFileAttributes);
+			directoryRecord.writeUint32(externalFileAttributes);
+			directoryRecord.writeUint32(zip64Offset ? MAX_32_BITS : fileEntryOffset);
+			directoryRecord.writeBytes(rawFilename);
+			directoryRecord.writeBytes(rawExtraFieldZip64);
+			directoryRecord.writeBytes(rawExtraFieldAES);
+			directoryRecord.writeBytes(rawExtraFieldExtendedTimestamp);
+			directoryRecord.writeBytes(rawExtraFieldNTFS);
+			directoryRecord.writeBytes(rawExtraFieldUnix);
+			directoryRecord.writeBytes(rawExtraField);
+			directoryRecord.writeBytes(rawComment);
 			arraySet(directoryArray, directoryRecord.array, offset);
 			offset += directoryRecordLength;
 			if (options.onprogress) {
 				try {
-					await options.onprogress(indexFileEntry + 1, files.size, new Entry(fileEntry));
+					await options.onprogress(indexFileEntry + 1, fileEntries.size, new Entry(fileEntry));
 				} catch {
 					// ignored
 				}
@@ -6948,7 +7081,7 @@
 	}
 
 	async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
-		const signCentralDirectory = getOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
+		const signCentralDirectory = getFunctionOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
 		if (signCentralDirectory) {
 			const signatureData = await signCentralDirectory(directoryArray);
 			const signatureDataLength = getLength(signatureData);
@@ -6956,9 +7089,9 @@
 				throw new Error(ERR_INVALID_SIGNATURE_DATA);
 			}
 			const signatureRecord = createRecordWriter(6 + signatureDataLength);
-			signatureRecord.uint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
-			signatureRecord.uint16(signatureDataLength);
-			signatureRecord.bytes(signatureData);
+			signatureRecord.writeUint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
+			signatureRecord.writeUint16(signatureDataLength);
+			signatureRecord.writeBytes(signatureData);
 			await writeData(zipWriter.writer, signatureRecord.array);
 			return 6 + signatureDataLength;
 		}
@@ -6969,7 +7102,7 @@
 		const { writer } = zipWriter;
 		const { directoryStart, signatureLength } = cdInfo;
 		let { directoryDataLength } = cdInfo;
-		let filesLength = zipWriter.files.size;
+		let fileEntriesLength = zipWriter.fileEntries.size;
 		let diskNumber = directoryStart.diskNumber;
 		let directoryOffset = getSegmentOffset(zipWriter, directoryStart);
 		let lastDiskNumber = getDiskNumber(writer);
@@ -6977,7 +7110,7 @@
 			lastDiskNumber++;
 		}
 		let zip64 = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIP64);
-		if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || filesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
+		if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || fileEntriesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
 			if (zip64 === false) {
 				throw new Error(ERR_UNSUPPORTED_FORMAT);
 			} else {
@@ -6994,37 +7127,37 @@
 		}
 		lastDiskNumber = getDiskNumber(writer);
 		if (zip64) {
-			endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_SIGNATURE);
-			endOfdirectoryRecord.uint64(44);
-			endOfdirectoryRecord.uint16(45);
-			endOfdirectoryRecord.uint16(45);
-			endOfdirectoryRecord.uint32(lastDiskNumber);
-			endOfdirectoryRecord.uint32(diskNumber);
-			endOfdirectoryRecord.uint64(filesLength);
-			endOfdirectoryRecord.uint64(filesLength);
-			endOfdirectoryRecord.uint64(directoryDataLength);
-			endOfdirectoryRecord.uint64(directoryOffset);
-			endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
-			endOfdirectoryRecord.uint32(lastDiskNumber);
-			endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
-			endOfdirectoryRecord.uint32(lastDiskNumber + 1);
+			endOfdirectoryRecord.writeUint32(ZIP64_END_OF_CENTRAL_DIR_SIGNATURE);
+			endOfdirectoryRecord.writeUint64(44);
+			endOfdirectoryRecord.writeUint16(45);
+			endOfdirectoryRecord.writeUint16(45);
+			endOfdirectoryRecord.writeUint32(lastDiskNumber);
+			endOfdirectoryRecord.writeUint32(diskNumber);
+			endOfdirectoryRecord.writeUint64(fileEntriesLength);
+			endOfdirectoryRecord.writeUint64(fileEntriesLength);
+			endOfdirectoryRecord.writeUint64(directoryDataLength);
+			endOfdirectoryRecord.writeUint64(directoryOffset);
+			endOfdirectoryRecord.writeUint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
+			endOfdirectoryRecord.writeUint32(lastDiskNumber);
+			endOfdirectoryRecord.writeUint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
+			endOfdirectoryRecord.writeUint32(lastDiskNumber + 1);
 			const supportZip64SplitFile = getOptionValue(zipWriter, options, OPTION_SUPPORT_ZIP64_SPLIT_FILE, true);
 			if (supportZip64SplitFile) {
 				lastDiskNumber = MAX_16_BITS;
 				diskNumber = MAX_16_BITS;
 			}
-			filesLength = MAX_16_BITS;
+			fileEntriesLength = MAX_16_BITS;
 			directoryOffset = MAX_32_BITS;
 			directoryDataLength = MAX_32_BITS;
 		}
-		endOfdirectoryRecord.uint32(END_OF_CENTRAL_DIR_SIGNATURE);
-		endOfdirectoryRecord.uint16(lastDiskNumber);
-		endOfdirectoryRecord.uint16(diskNumber);
-		endOfdirectoryRecord.uint16(filesLength);
-		endOfdirectoryRecord.uint16(filesLength);
-		endOfdirectoryRecord.uint32(directoryDataLength);
-		endOfdirectoryRecord.uint32(directoryOffset);
-		endOfdirectoryRecord.uint16(commentLength);
+		endOfdirectoryRecord.writeUint32(END_OF_CENTRAL_DIR_SIGNATURE);
+		endOfdirectoryRecord.writeUint16(lastDiskNumber);
+		endOfdirectoryRecord.writeUint16(diskNumber);
+		endOfdirectoryRecord.writeUint16(fileEntriesLength);
+		endOfdirectoryRecord.writeUint16(fileEntriesLength);
+		endOfdirectoryRecord.writeUint32(directoryDataLength);
+		endOfdirectoryRecord.writeUint32(directoryOffset);
+		endOfdirectoryRecord.writeUint16(commentLength);
 		await writeData(writer, endOfdirectoryRecord.array);
 		if (commentLength) {
 			await writeData(writer, comment);
@@ -7037,11 +7170,11 @@
 		let offset = 0;
 		return {
 			array,
-			uint8: value => { setUint8(view, offset, value); offset += 1; },
-			uint16: value => { setUint16(view, offset, value); offset += 2; },
-			uint32: value => { setUint32(view, offset, value); offset += 4; },
-			uint64: value => { setBigUint64(view, offset, BigInt(value)); offset += 8; },
-			bytes: value => { arraySet(array, value, offset); offset += getLength(value); },
+			writeUint8: value => { setUint8(view, offset, value); offset += 1; },
+			writeUint16: value => { setUint16(view, offset, value); offset += 2; },
+			writeUint32: value => { setUint32(view, offset, value); offset += 4; },
+			writeUint64: value => { setBigUint64(view, offset, BigInt(value)); offset += 8; },
+			writeBytes: value => { arraySet(array, value, offset); offset += getLength(value); },
 			skip: count => offset += count
 		};
 	}
@@ -7065,6 +7198,71 @@
 		return zipWriter.offset - diskOffset - (diskNumber ? zipWriter.initialOffset : 0);
 	}
 
+	async function startsWithSplitZipSignature(reader) {
+		const signatureArray = await readUint8Array(reader, 0, SPLIT_ZIP_FILE_SIGNATURE_LENGTH);
+		return getUint32(getDataView(signatureArray), 0) == SPLIT_ZIP_FILE_SIGNATURE;
+	}
+
+	async function copyZipData(zipWriter, reader, entries, directoryOffset, splitZipSignatureLength) {
+		const { writer } = zipWriter;
+		const entryPositions = new Map();
+		if (writer.closeDisk) {
+			const sortedEntries = Array.from(entries).sort((firstEntry, secondEntry) =>
+				getSourceOffset(reader, firstEntry) - getSourceOffset(reader, secondEntry));
+			let copiedLength = 0;
+			for (const entry of sortedEntries) {
+				const sourceOffset = getSourceOffset(reader, entry);
+				await copyData(zipWriter, reader, copiedLength, sourceOffset - copiedLength);
+				if (exceedsAvailableSize(writer, await getLocalHeaderLength(reader, sourceOffset))) {
+					await writer.closeDisk();
+				}
+				entryPositions.set(entry, {
+					offset: getSegmentOffset(zipWriter, writer),
+					diskNumberStart: getDiskNumber(writer)
+				});
+				copiedLength = sourceOffset;
+			}
+			await copyData(zipWriter, reader, copiedLength, directoryOffset - copiedLength);
+		} else {
+			await copyData(zipWriter, reader, 0, directoryOffset);
+			entries.forEach(entry => entryPositions.set(entry, {
+				offset: splitZipSignatureLength + getSourceOffset(reader, entry),
+				diskNumberStart: 0
+			}));
+		}
+		return entryPositions;
+	}
+
+	async function copyData(zipWriter, reader, offset, size) {
+		if (size > 0) {
+			const { writer } = zipWriter;
+			await createReadable(reader, { offset, size }).pipeTo(writer.writable, { preventClose: true, preventAbort: true });
+			writer.size += size;
+			zipWriter.offset += size;
+		}
+	}
+
+	async function getLocalHeaderLength(reader, offset) {
+		const headerArray = await readUint8Array(reader, offset, HEADER_SIZE);
+		if (getLength(headerArray) < HEADER_SIZE) {
+			return HEADER_SIZE;
+		}
+		const headerView = getDataView(headerArray);
+		return HEADER_SIZE +
+			getUint16(headerView, HEADER_OFFSET_FILENAME_LENGTH + LOCAL_HEADER_COMMON_OFFSET) +
+			getUint16(headerView, HEADER_OFFSET_EXTRAFIELD_LENGTH + LOCAL_HEADER_COMMON_OFFSET);
+	}
+
+	function getSourceOffset(reader, { offset, diskNumberStart }) {
+		return offset + (reader.getDiskOffset ? reader.getDiskOffset(diskNumberStart) : 0);
+	}
+
+	function getSplitZipSignatureArray() {
+		const signatureArray = new Uint8Array(SPLIT_ZIP_FILE_SIGNATURE_LENGTH);
+		setUint32(getDataView(signatureArray), 0, SPLIT_ZIP_FILE_SIGNATURE);
+		return signatureArray;
+	}
+
 	async function writeData(writer, array) {
 		const { writable } = writer;
 		const streamWriter = writable.getWriter();
@@ -7116,6 +7314,21 @@
 		return result === UNDEFINED_VALUE ? defaultValue : result;
 	}
 
+	function getDateOptionValue(zipWriter, options, name, defaultValue) {
+		const date = getOptionValue(zipWriter, options, name, defaultValue);
+		if (date === null) {
+			return defaultValue;
+		}
+		if (date !== UNDEFINED_VALUE && (typeof date.getTime != FUNCTION_TYPE || Number.isNaN(date.getTime()))) {
+			throw new Error(ERR_INVALID_DATE);
+		}
+		return date;
+	}
+
+	function getFunctionOptionValue(zipWriter, options, name) {
+		return checkFunctionOption(getOptionValue(zipWriter, options, name));
+	}
+
 	function getAliasedOptionValue(zipWriter, options, name, deprecatedName, defaultValue) {
 		const value = getAliasedValue(options, name, deprecatedName);
 		const result = value === UNDEFINED_VALUE ? getAliasedValue(zipWriter.options, name, deprecatedName) : value;
@@ -7130,9 +7343,6 @@
 		return toNumber(getOptionValue(zipWriter, options, name, defaultValue));
 	}
 
-	function toNumber(value) {
-		return typeof value == STRING_TYPE && value.trim() ? Number(value) : value;
-	}
 
 	function getMaximumCompressedSize(uncompressedSize) {
 		return uncompressedSize + (5 * (Math.floor(uncompressedSize / 16383) + 1));
@@ -7144,6 +7354,14 @@
 			: compressionMethod !== COMPRESSION_METHOD_STORE;
 	}
 
+	function getUint16(view, offset) {
+		return view.getUint16(offset, true);
+	}
+
+	function getUint32(view, offset) {
+		return view.getUint32(offset, true);
+	}
+
 	function setUint8(view, offset, value) {
 		view.setUint8(offset, value);
 	}
@@ -7187,9 +7405,9 @@
 		const headerRecord = createRecordWriter(HEADER_SIZE - 4);
 		const headerArray = headerRecord.array;
 		const headerView = getDataView(headerArray);
-		headerRecord.uint16(version);
-		headerRecord.uint16(bitFlag);
-		headerRecord.uint16(compressionMethod);
+		headerRecord.writeUint16(version);
+		headerRecord.writeUint16(bitFlag);
+		headerRecord.writeUint16(compressionMethod);
 		if (rawLastModDate === UNDEFINED_VALUE) {
 			const dateArray = new Uint32Array(1);
 			const dateView = getDataView(dateArray);
@@ -7197,20 +7415,20 @@
 			setUint16(dateView, 2, ((((lastModDate.getFullYear() - 1980) << 4) | (lastModDate.getMonth() + 1)) << 5) | lastModDate.getDate());
 			rawLastModDate = dateArray[0];
 		}
-		headerRecord.uint32(rawLastModDate);
+		headerRecord.writeUint32(rawLastModDate);
 		headerRecord.skip(4);
 		if (zip64CompressedSize || compressedSize !== UNDEFINED_VALUE) {
-			headerRecord.uint32(zip64CompressedSize ? MAX_32_BITS : compressedSize);
+			headerRecord.writeUint32(zip64CompressedSize ? MAX_32_BITS : compressedSize);
 		} else {
 			headerRecord.skip(4);
 		}
 		if (zip64UncompressedSize || uncompressedSize !== UNDEFINED_VALUE) {
-			headerRecord.uint32(zip64UncompressedSize ? MAX_32_BITS : uncompressedSize);
+			headerRecord.writeUint32(zip64UncompressedSize ? MAX_32_BITS : uncompressedSize);
 		} else {
 			headerRecord.skip(4);
 		}
-		headerRecord.uint16(getLength(rawFilename));
-		headerRecord.uint16(extraFieldLength);
+		headerRecord.writeUint16(getLength(rawFilename));
+		headerRecord.writeUint16(extraFieldLength);
 		return {
 			headerArray,
 			headerView,
@@ -7275,6 +7493,7 @@
 	const ERR_ENTRY_EXISTS = "Entry filename already exists";
 	const ERR_READABLE_CONSUMED = "Readable stream already consumed";
 	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_ABORT_EXPORT = "zipjs-abort-export";
 	const ERR_ABORTED = "The operation was aborted";
 	const ABORT_ERROR_NAME = "AbortError";
@@ -7307,13 +7526,14 @@
 				fs,
 				name,
 				data: params.data,
-				options: params.options,
+				options: params.options && Object.assign({}, params.options),
 				id: fs.entryIdCounter++,
 				parent,
 				children: [],
 				uncompressedSize: params.uncompressedSize || 0,
 				undeterminedSize: params.undeterminedSize || params.uncompressedSize === UNDEFINED_VALUE,
-				passThrough: params.passThrough
+				passThrough: params.passThrough,
+				defaultLastModDate: params.defaultLastModDate || new Date()
 			});
 			if (parent || !fs.root) {
 				fs.entries[zipEntry.id] = zipEntry;
@@ -7323,12 +7543,6 @@
 			}
 		}
 
-		moveTo(target) {
-			// deprecated
-			const zipEntry = this;
-			zipEntry.fs.move(zipEntry, target);
-		}
-
 		getFullname() {
 			return this.getRelativeName();
 		}
@@ -7360,6 +7574,11 @@
 				this.name = name;
 			}
 		}
+
+		setOptions(options) {
+			const entryOptions = Object.assign({}, this.options, options);
+			this.options = Object.fromEntries(Object.entries(entryOptions).filter(([, value]) => value !== UNDEFINED_VALUE));
+		}
 	}
 
 	class ZipFileEntry extends ZipEntry {
@@ -7386,7 +7605,7 @@
 				const reader = zipEntry.reader = createReader(zipEntry.Reader, zipEntry.data, options);
 				const dataSize = zipEntry.uncompressedSize || reader.size;
 				await Promise.all([initStream(reader), initStream(writer, dataSize)]);
-				const { signal } = options;
+				const signal = checkSignalOption(options.signal);
 				const readable = createProgressReadable(zipEntry, reader, options, signal);
 				const preventClose = !ownsWritable(writer) && Boolean(options.preventClose);
 				zipEntry.uncompressedSize = reader.size;
@@ -7604,10 +7823,6 @@
 			});
 		}
 
-		addData(name, params) {
-			return addChild(this, name, params);
-		}
-
 		importBlob(blob, options) {
 			return this.importZip(new BlobReader(blob), options);
 		}
@@ -7721,7 +7936,7 @@
 			if (options.bufferedWrite === UNDEFINED_VALUE) {
 				options.bufferedWrite = true;
 			}
-			const [readers] = await Promise.all([initReaders(zipEntry, options.readerOptions), initStream(writer)]);
+			const [readers] = await Promise.all([initReaders(zipEntry, checkReaderOptions(options.readerOptions)), initStream(writer)]);
 			const zipWriter = new ZipWriter(writer, options);
 			await exportZip(zipWriter, zipEntry, getTotalSize([zipEntry], getUncompressedSize), options, readers);
 			await zipWriter.close(options.globalComment);
@@ -7731,12 +7946,13 @@
 		getExportedSize(options = {}) {
 			const zipEntry = this;
 			options = Object.assign({}, options);
+			checkReaderOptions(options.readerOptions);
 			if (options.bufferedWrite === UNDEFINED_VALUE) {
 				options.bufferedWrite = true;
 			}
 			const writeOrderGuaranteed = !options.bufferedWrite ||
 				(options.keepOrder !== false && zipEntry.children.every(child => !child.children.length));
-			return getEntriesSize(options, Array.from(zipEntry.getChildren({ recursive: true }), child => {
+			return getEntriesSize(options, zipEntry.getChildren({ recursive: true }).filter(child => !isImplicitDirectory(child)).map(child => {
 				const { name, entryOptions } = getChildEntryOptions(child, zipEntry, options);
 				return { name, size: child.directory ? 0 : getDeterminedSize(child, isPassThrough(child, options)), options: entryOptions };
 			}), writeOrderGuaranteed, options.globalComment);
@@ -7775,7 +7991,7 @@
 	}
 
 
-	class FS {
+	class ZipFS {
 
 		constructor() {
 			resetFS(this);
@@ -7891,10 +8107,6 @@
 			return this.root.addFile(file, options);
 		}
 
-		addData(name, params) {
-			return this.root.addData(name, params);
-		}
-
 		importBlob(blob, options) {
 			resetFS(this);
 			return this.root.importBlob(blob, options);
@@ -7962,7 +8174,7 @@
 		}
 	}
 
-	const fs = { FS, ZipDirectoryEntry, ZipFileEntry };
+	const fs = { FS: ZipFS, ZipDirectoryEntry, ZipFileEntry };
 
 	function getTotalSize(entries, getEntrySize) {
 		let size = 0;
@@ -8106,7 +8318,7 @@
 	}
 
 	function forwardAbort(signal, abortController) {
-		if (!signal) {
+		if (!checkSignalOption(signal)) {
 			return () => { };
 		}
 		if (signal.aborted) {
@@ -8183,10 +8395,7 @@
 				});
 			}
 			if (isPassThrough(child, options)) {
-				let level, encryptionStrength;
-				if (compressionMethod === 0) {
-					level = 0;
-				}
+				let encryptionStrength;
 				if (extraFieldAES) {
 					encryptionStrength = extraFieldAES.strength;
 				}
@@ -8196,13 +8405,12 @@
 					zipCrypto,
 					crc32,
 					uncompressedSize,
-					level,
 					encryptionStrength,
 					compressionMethod
 				};
 			}
 		}
-		const entryOptions = Object.assign({}, zipEntryMetadata, options, passThroughOptions, childOptions, { directory: child.directory });
+		const entryOptions = Object.assign({ lastModDate: child.defaultLastModDate }, zipEntryMetadata, options, childOptions, passThroughOptions, { directory: child.directory });
 		if (!child.directory && entryOptions.passThrough && entryOptions.uncompressedSize === UNDEFINED_VALUE) {
 			throw new Error(ERR_INVALID_PASS_THROUGH);
 		}
@@ -8217,11 +8425,22 @@
 		return child.undeterminedSize ? UNDEFINED_VALUE : getExtractedSize(child, passThrough);
 	}
 
+	function checkReaderOptions(readerOptions) {
+		if (readerOptions && (typeof readerOptions != OBJECT_TYPE || Array.isArray(readerOptions))) {
+			throw new Error(ERR_INVALID_READER_OPTIONS);
+		}
+		return readerOptions;
+	}
+
 	function isPassThrough(child, options) {
 		const { readerOptions } = options;
 		return Boolean(!child.directory && (child.passThrough || (readerOptions && readerOptions.passThrough)));
 	}
 
+	function isImplicitDirectory(child) {
+		return child.directory && child.data === null;
+	}
+
 	function getUserExtraField(extraField) {
 		if (extraField) {
 			const userExtraField = new Map();
@@ -8239,7 +8458,7 @@
 	async function exportZip(zipWriter, entry, totalSize, options, readers) {
 		const { onstart, onprogress, onend, onentryprogress } = options;
 		const selectedEntry = entry;
-		const totalEntries = getTotalSize(entry.children, () => 1);
+		const totalEntries = getTotalSize(entry.children, child => isImplicitDirectory(child) ? 0 : 1);
 		let writtenSize = 0;
 		let writtenEntries = 0;
 		if (onstart) {
@@ -8268,6 +8487,9 @@
 		}
 
 		async function addChild(child) {
+			if (isImplicitDirectory(child)) {
+				return;
+			}
 			const { name, entryOptions } = getChildEntryOptions(child, selectedEntry, options);
 			let entryWrittenSize = 0;
 			const entryMetadata = await zipWriter.add(name, readers.get(child), Object.assign(entryOptions, {
@@ -8301,7 +8523,7 @@
 					if (handle.kind == "file") {
 						const file = await handle.getFile();
 						addedEntries.push(
-							parentEntry.addData(file.name, {
+							addChild(parentEntry, file.name, {
 								Reader: function () {
 									const readable = file.stream();
 									const size = file.size;
@@ -8335,10 +8557,11 @@
 
 	async function exportFileSystemHandle(zipEntry, directoryHandle, options) {
 		const { onstart, onprogress, onend } = options;
+		const readerOptions = checkReaderOptions(options.readerOptions);
 		const abortController = new AbortController();
 		const { signal } = abortController;
 		const releaseSignal = forwardAbort(options.signal, abortController);
-		const getDataOptions = Object.assign({}, options, options.readerOptions, {
+		const getDataOptions = Object.assign({}, options, readerOptions, {
 			signal,
 			onstart: UNDEFINED_VALUE,
 			onprogress: UNDEFINED_VALUE,
@@ -8535,7 +8758,12 @@
 	exports.ERR_ABORTED = ERR_ABORTED;
 	exports.ERR_ENTRY_EXISTS = ERR_ENTRY_EXISTS;
 	exports.ERR_INVALID_PASS_THROUGH = ERR_INVALID_PASS_THROUGH;
+	exports.ERR_INVALID_READER_OPTIONS = ERR_INVALID_READER_OPTIONS;
 	exports.ERR_READABLE_CONSUMED = ERR_READABLE_CONSUMED;
+	exports.ZipDirectoryEntry = ZipDirectoryEntry;
+	exports.ZipEntry = ZipEntry;
+	exports.ZipFS = ZipFS;
+	exports.ZipFileEntry = ZipFileEntry;
 	exports.fs = fs;
 
 }));