@zip.js/zip.js 2.8.51 → 2.8.52

package/dist/zip-fs-core.js

@@ -89,6 +89,8 @@
 	const FILE_ATTR_MSDOS_ARCHIVE_MASK = 0x20;
 	const FILE_ATTR_UNIX_TYPE_MASK = 0o170000;
 	const FILE_ATTR_UNIX_TYPE_DIR = 0o040000;
+	const FILE_ATTR_UNIX_TYPE_SYMLINK = 0o120000;
+	const FILE_ATTR_UNIX_TYPE_FILE = 0o100000;
 	const FILE_ATTR_UNIX_EXECUTABLE_MASK = 0o111;
 	const FILE_ATTR_UNIX_DEFAULT_MASK = 0o644;
 	const FILE_ATTR_UNIX_SETUID_MASK = 0o4000;
@@ -257,8 +259,6 @@
 	 */
 
 
-	const HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-
 	function toCompatibleReadable(readable) {
 		if (readable instanceof ReadableStream) {
 			return readable;
@@ -281,12 +281,9 @@
 
 	function streamToBlob(readable, contentType) {
 		readable = toCompatibleReadable(readable);
+		const blobOptions = contentType ? { type: contentType } : {};
 		if (responseSupportsGlobalReadable()) {
-			const options = {};
-			if (contentType) {
-				options.headers = [[HTTP_HEADER_CONTENT_TYPE, contentType]];
-			}
-			return new Response(readable, options).blob();
+			return new Response(readable).blob().then(blob => contentType ? new Blob([blob], blobOptions) : blob);
 		}
 		const chunks = [];
 		return readable
@@ -295,7 +292,7 @@
 					chunks.push(chunk);
 				}
 			}))
-			.then(() => new Blob(chunks, contentType ? { type: contentType } : {}));
+			.then(() => new Blob(chunks, blobOptions));
 	}
 
 	function responseSupportsGlobalReadable() {
@@ -396,8 +393,10 @@
 				async pull(controller) {
 					const dataSize = size === UNDEFINED_VALUE ? chunkSize : Math.min(chunkSize, size - chunkOffset);
 					const data = await readUint8Array(reader, offset + chunkOffset, dataSize);
-					controller.enqueue(data);
-					if ((chunkOffset + chunkSize > size) || (size === UNDEFINED_VALUE && !data.length && dataSize)) {
+					if (data.length) {
+						controller.enqueue(data);
+					}
+					if ((chunkOffset + chunkSize >= size) || (size === UNDEFINED_VALUE && !data.length && dataSize)) {
 						controller.close();
 					} else {
 						chunkOffset += chunkSize;
@@ -475,6 +474,7 @@
 		constructor(contentType) {
 			super();
 			Object.assign(this, {
+				contentType,
 				data: "data:" + (contentType || "") + ";base64,",
 				pending: []
 			});
@@ -576,6 +576,7 @@
 					return transformStream.writable;
 				}
 			});
+			writer.contentType = contentType;
 			writer.blob = streamToBlob(transformStream.readable, contentType);
 			writer.blob.catch(() => { });
 		}
@@ -592,6 +593,26 @@
 		}
 	}
 
+	function getTextSize(text) {
+		let size = 0;
+		for (let indexCharacter = 0; indexCharacter < text.length; indexCharacter++) {
+			const characterCode = text.charCodeAt(indexCharacter);
+			if (characterCode < 0x80) {
+				size += 1;
+			} else if (characterCode < 0x800) {
+				size += 2;
+			} else if (characterCode < 0xd800 || characterCode >= 0xe000) {
+				size += 3;
+			} else if (characterCode < 0xdc00 && (text.charCodeAt(indexCharacter + 1) & 0xfc00) == 0xdc00) {
+				size += 4;
+				indexCharacter++;
+			} else {
+				size += 3;
+			}
+		}
+		return size;
+	}
+
 	class TextWriter extends BlobWriter {
 
 		constructor(encoding) {
@@ -1248,6 +1269,10 @@
 		}
 	}
 
+	function ownsWritable(writer) {
+		return Boolean(writer && writer.getData);
+	}
+
 	function isHttpFamily(url) {
 		const { baseURI } = getConfiguration();
 		const { protocol } = new URL(url, baseURI);
@@ -3783,6 +3808,8 @@
 	const PROPERTY_NAME_RAW_CREATION_DATE = "rawCreationDate";
 	const PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES = "internalFileAttributes";
 	const PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES = "externalFileAttributes";
+	const PROPERTY_NAME_DEPRECATED_INTERNAL_FILE_ATTRIBUTES = "internalFileAttribute";
+	const PROPERTY_NAME_DEPRECATED_EXTERNAL_FILE_ATTRIBUTES = "externalFileAttribute";
 	const PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW = "msdosAttributesRaw";
 	const PROPERTY_NAME_MSDOS_ATTRIBUTES = "msdosAttributes";
 	const PROPERTY_NAME_MS_DOS_COMPATIBLE = "msDosCompatible";
@@ -3793,6 +3820,7 @@
 	const PROPERTY_NAME_ZIPCRYPTO = "zipCrypto";
 	const PROPERTY_NAME_DIRECTORY = "directory";
 	const PROPERTY_NAME_EXECUTABLE = "executable";
+	const PROPERTY_NAME_SYMLINK = "symlink";
 	const PROPERTY_NAME_COMPRESSION_METHOD = "compressionMethod";
 	const PROPERTY_NAME_SIGNATURE = "signature";
 	const PROPERTY_NAME_CRC32 = "crc32";
@@ -3836,6 +3864,8 @@
 		PROPERTY_NAME_DISK_NUMBER_START,
 		PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES,
 		PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES,
+		PROPERTY_NAME_DEPRECATED_INTERNAL_FILE_ATTRIBUTES,
+		PROPERTY_NAME_DEPRECATED_EXTERNAL_FILE_ATTRIBUTES,
 		PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW,
 		PROPERTY_NAME_MSDOS_ATTRIBUTES,
 		PROPERTY_NAME_MS_DOS_COMPATIBLE,
@@ -3846,6 +3876,7 @@
 		PROPERTY_NAME_ZIPCRYPTO,
 		PROPERTY_NAME_DIRECTORY,
 		PROPERTY_NAME_EXECUTABLE,
+		PROPERTY_NAME_SYMLINK,
 		PROPERTY_NAME_COMPRESSION_METHOD,
 		PROPERTY_NAME_SIGNATURE,
 		PROPERTY_NAME_CRC32,
@@ -4308,15 +4339,18 @@
 				const setuid = Boolean(fileEntry.unixMode & FILE_ATTR_UNIX_SETUID_MASK);
 				const setgid = Boolean(fileEntry.unixMode & FILE_ATTR_UNIX_SETGID_MASK);
 				const sticky = Boolean(fileEntry.unixMode & FILE_ATTR_UNIX_STICKY_MASK);
-				const executable = (fileEntry.unixMode !== UNDEFINED_VALUE)
+				const unixType = fileEntry.unixMode === UNDEFINED_VALUE ? unixExternalUpper : fileEntry.unixMode;
+				const symlink = (unixType & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_SYMLINK;
+				const executable = !symlink && ((fileEntry.unixMode !== UNDEFINED_VALUE)
 					? ((fileEntry.unixMode & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)
-					: (unixCompatible && ((unixExternalUpper & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0));
+					: (unixCompatible && ((unixExternalUpper & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0)));
 				const modeIsDir = fileEntry.unixMode !== UNDEFINED_VALUE && ((fileEntry.unixMode & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_DIR);
 				const upperIsDir = ((unixExternalUpper & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_DIR);
 				Object.assign(fileEntry, {
 					setuid,
 					setgid,
 					sticky,
+					symlink,
 					unixExternalUpper,
 					internalFileAttribute: fileEntry.internalFileAttributes,
 					externalFileAttribute: fileEntry.externalFileAttributes,
@@ -4382,6 +4416,10 @@
 		}
 
 		async close() {
+			const { reader } = this;
+			if (!reader.readUint8Array && reader.readable && !reader.readable.locked) {
+				await reader.readable.cancel();
+			}
 		}
 	}
 
@@ -4566,7 +4604,7 @@
 					throw error;
 				}
 			} finally {
-				const preventClose = getOptionValue$1(zipEntry, options, OPTION_PREVENT_CLOSE);
+				const preventClose = !ownsWritable(writer) && getOptionValue$1(zipEntry, options, OPTION_PREVENT_CLOSE);
 				if (!preventClose && writable && !writable.locked) {
 					const writableWriter = writable.getWriter();
 					if (abortError) {
@@ -4810,8 +4848,8 @@
 			return;
 		}
 		const extraFieldView = getDataView(extraField.data);
-		const lastAccessDate = new Date(getUint32(extraFieldView, 0) * 1000);
-		const lastModDate = new Date(getUint32(extraFieldView, 4) * 1000);
+		const lastAccessDate = new Date((getUint32(extraFieldView, 0) | 0) * 1000);
+		const lastModDate = new Date((getUint32(extraFieldView, 4) | 0) * 1000);
 		const extraFieldData = { lastAccessDate, lastModDate };
 		if (extraField.data.length >= 12) {
 			extraFieldData.uid = getUint16(extraFieldView, 8);
@@ -5240,6 +5278,7 @@
 	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_DATA = "Extra field data exceeds 64KB";
 	const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
@@ -5249,6 +5288,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_UNDETERMINED_SIZE = "Undetermined size";
 	const ERR_UNDEFINED_READER = "Undefined reader";
 	const ERR_ZIP_NOT_EMPTY = "Zip file not empty";
 	const ERR_INVALID_UID = "Invalid uid (must be integer 0..2^32-1)";
@@ -5456,7 +5496,7 @@
 				await Promise.allSettled(Array.from(pendingAddFileCalls));
 			}
 			await closeFile(zipWriter, comment, options);
-			const preventClose = getOptionValue(zipWriter, options, OPTION_PREVENT_CLOSE);
+			const preventClose = !ownsWritable(writer) && getOptionValue(zipWriter, options, OPTION_PREVENT_CLOSE);
 			if (!preventClose) {
 				await writable.getWriter().close();
 			}
@@ -5553,7 +5593,7 @@
 		if (versionMadeBy > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_VERSION);
 		}
-		let externalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES);
+		let externalFileAttributes = getAliasedOptionValue(zipWriter, options, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_DEPRECATED_EXTERNAL_FILE_ATTRIBUTES);
 		const externalFileAttributesProvided = externalFileAttributes !== UNDEFINED_VALUE;
 		if (!externalFileAttributesProvided) {
 			externalFileAttributes = 0;
@@ -5601,7 +5641,9 @@
 			}
 			if (!externalFileAttributesProvided || unixModeProvided) {
 				if (directory) {
-					unixMode |= FILE_ATTR_UNIX_TYPE_DIR;
+					unixMode = (unixMode & ~FILE_ATTR_UNIX_TYPE_MASK) | FILE_ATTR_UNIX_TYPE_DIR;
+				} else if (!(unixMode & FILE_ATTR_UNIX_TYPE_MASK)) {
+					unixMode |= FILE_ATTR_UNIX_TYPE_FILE;
 				}
 				externalFileAttributes = ((unixMode & MAX_16_BITS) << 16) | (externalFileAttributes & MAX_16_BITS);
 			}
@@ -5654,15 +5696,12 @@
 		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 internalFileAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, 0);
+		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);
-		let password, rawPassword;
-		if (!passThrough) {
-			password = getOptionValue(zipWriter, options, OPTION_PASSWORD);
-			rawPassword = getOptionValue(zipWriter, options, OPTION_RAW_PASSWORD);
-			if ((password && typeof password != STRING_TYPE) || (rawPassword && !(rawPassword instanceof Uint8Array))) {
-				throw new Error(ERR_INVALID_PASSWORD_TYPE);
-			}
+		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);
 		}
 		const encryptionStrength = getNumberOptionValue(zipWriter, options, OPTION_ENCRYPTION_STRENGTH, 3);
 		const zipCrypto = getOptionValue(zipWriter, options, PROPERTY_NAME_ZIPCRYPTO);
@@ -5775,14 +5814,24 @@
 	}
 
 	async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, options) {
+		if (metadata.passThrough && !reader && !getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY)) {
+			throw new Error(ERR_UNDEFINED_READER);
+		}
+		let contentSize;
+		if (reader) {
+			reader = new GenericReader(reader);
+			await initStream(reader);
+			({ size: contentSize } = reader);
+		}
+		return Object.assign({ reader }, resolveEntrySizes(zipWriter, Boolean(reader), contentSize, metadata, options));
+	}
+
+	function resolveEntrySizes(zipWriter, hasContent, contentSize, metadata, options) {
 		const { passThrough, zipCrypto, password, rawPassword, encryptionStrength } = metadata;
 		let { dataDescriptor, zip64, level, compressionMethod } = metadata;
 		let maximumCompressedSize = 0;
 		let uncompressedSize = 0;
-		if (passThrough) {
-			if (!reader) {
-				throw new Error(ERR_UNDEFINED_READER);
-			}
+		if (passThrough && hasContent) {
 			uncompressedSize = options[PROPERTY_NAME_UNCOMPRESSED_SIZE];
 			if (uncompressedSize === UNDEFINED_VALUE) {
 				throw new Error(ERR_UNDEFINED_UNCOMPRESSED_SIZE);
@@ -5790,29 +5839,30 @@
 		}
 		const zip64Enabled = zip64 === true;
 		const encrypted = getOptionValue(zipWriter, options, PROPERTY_NAME_ENCRYPTED);
-		const encryptedEntry = Boolean(reader) && (Boolean((password && getLength(password)) || (rawPassword && getLength(rawPassword))) || (passThrough && encrypted));
-		if (!reader) {
+		if (hasContent && passThrough && !encrypted && getLength(password, rawPassword)) {
+			throw new Error(ERR_UNSUPPORTED_ENCRYPTION_PASS_THROUGH);
+		}
+		const encryptedEntry = hasContent && (Boolean((password && getLength(password)) || (rawPassword && getLength(rawPassword))) || (passThrough && encrypted));
+		if (!hasContent) {
 			level = 0;
 			compressionMethod = COMPRESSION_METHOD_STORE;
 		}
 		const encryptionOverhead = encryptedEntry ? (zipCrypto ? 12 : 16 + encryptionStrength * 4) : 0;
-		if (reader) {
-			reader = new GenericReader(reader);
-			await initStream(reader);
+		if (hasContent) {
 			if (!passThrough) {
-				if (reader.size === UNDEFINED_VALUE) {
+				if (contentSize === UNDEFINED_VALUE) {
 					dataDescriptor = true;
 					if (zip64 || zip64 === UNDEFINED_VALUE) {
 						zip64 = true;
 						uncompressedSize = maximumCompressedSize = MAX_32_BITS + 1;
 					}
 				} else {
-					options.uncompressedSize = uncompressedSize = reader.size;
-					maximumCompressedSize = getMaximumCompressedSize(uncompressedSize) + encryptionOverhead;
+					options.uncompressedSize = uncompressedSize = contentSize;
+					maximumCompressedSize = (isCompressed(compressionMethod, level) ? getMaximumCompressedSize(uncompressedSize) : uncompressedSize) + encryptionOverhead;
 				}
 			} else {
 				options.uncompressedSize = uncompressedSize;
-				maximumCompressedSize = getMaximumCompressedSize(uncompressedSize) + encryptionOverhead;
+				maximumCompressedSize = contentSize === UNDEFINED_VALUE ? getMaximumCompressedSize(uncompressedSize) + encryptionOverhead : contentSize;
 			}
 		}
 		const zip64UncompressedSize = zip64Enabled || uncompressedSize >= MAX_32_BITS;
@@ -5826,7 +5876,7 @@
 		}
 		zip64 = zip64 || false;
 		return {
-			reader,
+			maximumCompressedSize,
 			resolvedOptions: {
 				dataDescriptor,
 				zip64,
@@ -5840,6 +5890,78 @@
 		};
 	}
 
+	async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comment) {
+		const zipWriter = { options: writerOptions, config: getConfiguration() };
+		if (writerOptions[OPTION_SIGN_CENTRAL_DIRECTORY]) {
+			throw new Error(ERR_UNDETERMINED_SIZE);
+		}
+		const commentLength = getLength(comment);
+		if (commentLength > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_COMMENT);
+		}
+		const usdz = writerOptions[OPTION_USDZ];
+		const files = new Map();
+		let layoutDependsOnWriteOrder = Boolean(usdz);
+		let offset = 0;
+		for (const entry of entries) {
+			let { name } = entry;
+			const { size } = entry;
+			const options = Object.assign({}, entry.options);
+			name = name.trim();
+			if (getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY) && !name.endsWith(DIRECTORY_SIGNATURE)) {
+				name += DIRECTORY_SIGNATURE;
+			}
+			const attributesInfo = resolveAttributes(zipWriter, name, options);
+			({ name } = attributesInfo);
+			const { resolvedOptions: metadata } = resolveMetadata(zipWriter, name, options);
+			if (metadata.level != 0 && metadata.compressionMethod === UNDEFINED_VALUE &&
+				!metadata.passThrough && !(await supportsDeflate(zipWriter.config))) {
+				metadata.level = 0;
+			}
+			const hasContent = !getOptionValue(zipWriter, options, PROPERTY_NAME_DIRECTORY);
+			if (hasContent && size === UNDEFINED_VALUE) {
+				throw new Error(ERR_UNDETERMINED_SIZE);
+			}
+			const { maximumCompressedSize, resolvedOptions: sizes } = resolveEntrySizes(zipWriter, hasContent, size, metadata, options);
+			if (hasContent && !metadata.passThrough && isCompressed(sizes.compressionMethod, sizes.level)) {
+				throw new Error(ERR_UNDETERMINED_SIZE);
+			}
+			const entryOptions = Object.assign({}, options, attributesInfo.resolvedOptions, metadata, sizes);
+			const headerInfo = getHeaderInfo(entryOptions);
+			const dataDescriptorInfo = getDataDescriptorInfo(entryOptions);
+			const entryInfo = {
+				headerInfo,
+				metadataSize: getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray)
+			};
+			if (usdz) {
+				appendExtraFieldUSDZ(entryInfo, offset);
+			}
+			const compressedSize = hasContent ? maximumCompressedSize : 0;
+			if (offset >= MAX_32_BITS) {
+				layoutDependsOnWriteOrder = true;
+			}
+			files.set(name, Object.assign({}, entryOptions, headerInfo, {
+				offset,
+				diskNumberStart: 0,
+				compressedSize
+			}));
+			offset += entryInfo.metadataSize + compressedSize;
+		}
+		if (layoutDependsOnWriteOrder && !writeOrderGuaranteed) {
+			throw new Error(ERR_UNDETERMINED_SIZE);
+		}
+		const directoryDataLength = createDirectoryRecords(files);
+		let zip64 = getOptionValue(zipWriter, writerOptions, PROPERTY_NAME_ZIP64);
+		if (offset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || files.size >= MAX_16_BITS) {
+			if (zip64 === false) {
+				throw new Error(ERR_UNSUPPORTED_FORMAT);
+			} else {
+				zip64 = true;
+			}
+		}
+		return offset + directoryDataLength + commentLength + (zip64 ? ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH : END_OF_CENTRAL_DIR_LENGTH);
+	}
+
 	async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		const {
 			files,
@@ -6211,9 +6333,7 @@
 			crc32
 		} = options;
 		let { version, compressionMethod } = options;
-		const compressed = !directory && (compressionMethod === UNDEFINED_VALUE
-			? (level === UNDEFINED_VALUE || level > 0)
-			: compressionMethod !== COMPRESSION_METHOD_STORE);
+		const compressed = !directory && isCompressed(compressionMethod, level);
 		let rawLocalExtraFieldZip64;
 		const uncompressedFile = passThrough || !compressed;
 		const zip64ExtraFieldComplete = zip64 && (options.bufferedWrite || !dataDescriptor || ((!zip64UncompressedSize && !zip64CompressedSize) || uncompressedFile));
@@ -6900,6 +7020,16 @@
 		return result === UNDEFINED_VALUE ? defaultValue : result;
 	}
 
+	function getAliasedOptionValue(zipWriter, options, name, deprecatedName, defaultValue) {
+		const value = getAliasedValue(options, name, deprecatedName);
+		const result = value === UNDEFINED_VALUE ? getAliasedValue(zipWriter.options, name, deprecatedName) : value;
+		return result === UNDEFINED_VALUE ? defaultValue : result;
+	}
+
+	function getAliasedValue(options, name, deprecatedName) {
+		return options[name] === UNDEFINED_VALUE ? options[deprecatedName] : options[name];
+	}
+
 	function getNumberOptionValue(zipWriter, options, name, defaultValue) {
 		return toNumber(getOptionValue(zipWriter, options, name, defaultValue));
 	}
@@ -6912,6 +7042,12 @@
 		return uncompressedSize + (5 * (Math.floor(uncompressedSize / 16383) + 1));
 	}
 
+	function isCompressed(compressionMethod, level) {
+		return compressionMethod === UNDEFINED_VALUE
+			? (level === UNDEFINED_VALUE || level > 0)
+			: compressionMethod !== COMPRESSION_METHOD_STORE;
+	}
+
 	function setUint8(view, offset, value) {
 		view.setUint8(offset, value);
 	}
@@ -7042,6 +7178,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_ABORT_EXPORT = "zipjs-abort-export";
 	const ERR_ABORTED = "The operation was aborted";
 	const ABORT_ERROR_NAME = "AbortError";
@@ -7079,6 +7216,7 @@
 				parent,
 				children: [],
 				uncompressedSize: params.uncompressedSize || 0,
+				undeterminedSize: params.undeterminedSize || params.uncompressedSize === UNDEFINED_VALUE,
 				passThrough: params.passThrough
 			});
 			if (parent || !fs.root) {
@@ -7146,16 +7284,17 @@
 
 		async getData(writer, options = {}) {
 			const zipEntry = this;
-			if (!writer || (writer.constructor == zipEntry.Writer && zipEntry.data)) {
+			if (!writer || (writer.constructor == zipEntry.Writer && zipEntry.data && keepsContentType(writer, zipEntry.data))) {
 				return zipEntry.data;
 			} else {
 				const reader = zipEntry.reader = createReader(zipEntry.Reader, zipEntry.data, options);
-				const uncompressedSize = zipEntry.data ? zipEntry.data.uncompressedSize : reader.size;
-				await Promise.all([initStream(reader), initStream(writer, uncompressedSize)]);
-				const { readable } = reader;
+				const dataSize = zipEntry.uncompressedSize || reader.size;
+				await Promise.all([initStream(reader), initStream(writer, dataSize)]);
 				const { signal } = options;
+				const readable = createProgressReadable(zipEntry, reader, options, signal);
+				const preventClose = !ownsWritable(writer) && Boolean(options.preventClose);
 				zipEntry.uncompressedSize = reader.size;
-				await toCompatibleReadable(readable).pipeTo(toCompatibleWritable(writer.writable), { signal });
+				await toCompatibleReadable(readable).pipeTo(toCompatibleWritable(writer.writable), { signal, preventClose, preventAbort: preventClose });
 				return writer.getData ? writer.getData() : writer.writable;
 			}
 		}
@@ -7286,7 +7425,7 @@
 				Reader: TextReader,
 				Writer: TextWriter,
 				options,
-				uncompressedSize: text.length
+				uncompressedSize: getTextSize(text)
 			});
 		}
 
@@ -7415,10 +7554,16 @@
 		}
 
 		async importZip(reader, options = {}) {
-			await initStream(reader);
-			const zipReader = new ZipReader(reader, options);
+			let zipReader;
+			if (reader && typeof reader.getEntries == FUNCTION_TYPE) {
+				zipReader = reader;
+				options = Object.assign({}, zipReader.options, options);
+			} else {
+				await initStream(reader);
+				zipReader = new ZipReader(reader, options);
+			}
 			const importedEntries = [];
-			const entries = await zipReader.getEntries();
+			const entries = await zipReader.getEntries(options);
 			for (const entry of entries) {
 				let parent = this;
 				try {
@@ -7440,7 +7585,7 @@
 						importedEntries.push(addChild(parent, name, {
 							data: entry,
 							Reader: getZipBlobReader(Object.assign({}, options)),
-							uncompressedSize: entry.uncompressedSize,
+							uncompressedSize: options.passThrough ? entry.compressedSize : entry.uncompressedSize,
 							passThrough: options.passThrough
 						}));
 					} else {
@@ -7482,11 +7627,25 @@
 			}
 			const [readers] = await Promise.all([initReaders(zipEntry, options.readerOptions), initStream(writer)]);
 			const zipWriter = new ZipWriter(writer, options);
-			await exportZip(zipWriter, zipEntry, getTotalSize([zipEntry], "uncompressedSize"), options, readers);
-			await zipWriter.close();
+			await exportZip(zipWriter, zipEntry, getTotalSize([zipEntry], getUncompressedSize), options, readers);
+			await zipWriter.close(options.globalComment);
 			return writer.getData ? writer.getData() : writer.writable;
 		}
 
+		getExportedSize(options = {}) {
+			const zipEntry = this;
+			options = Object.assign({}, options);
+			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 => {
+				const { name, entryOptions } = getChildEntryOptions(child, zipEntry, options);
+				return { name, size: child.directory ? 0 : getDeterminedSize(child, isPassThrough(child, options)), options: entryOptions };
+			}), writeOrderGuaranteed, options.globalComment);
+		}
+
 		getChildByName(name) {
 			const children = this.children;
 			for (let childIndex = 0; childIndex < children.length; childIndex++) {
@@ -7694,6 +7853,10 @@
 			return this.root.exportZip(writer, options);
 		}
 
+		getExportedSize(options) {
+			return this.root.getExportedSize(options);
+		}
+
 		isPasswordProtected() {
 			return this.root.isPasswordProtected();
 		}
@@ -7705,12 +7868,12 @@
 
 	const fs = { FS, ZipDirectoryEntry, ZipFileEntry };
 
-	function getTotalSize(entries, propertyName) {
+	function getTotalSize(entries, getEntrySize) {
 		let size = 0;
 		const pendingEntries = Array.from(entries);
 		while (pendingEntries.length) {
 			const entry = pendingEntries.pop();
-			size += entry[propertyName] || 0;
+			size += getEntrySize(entry) || 0;
 			for (const child of entry.children) {
 				pendingEntries.push(child);
 			}
@@ -7718,6 +7881,15 @@
 		return size;
 	}
 
+	function getUncompressedSize(entry) {
+		return entry.uncompressedSize;
+	}
+
+	function getExtractedSize(entry, passThrough) {
+		const { data } = entry;
+		return passThrough && data instanceof Entry ? data.compressedSize : entry.uncompressedSize;
+	}
+
 	function getReadableReader(readable) {
 		let consumed;
 		return function () {
@@ -7740,10 +7912,17 @@
 
 			async init() {
 				const zipBlobReader = this;
-				zipBlobReader.size = zipBlobReader.entry.uncompressedSize;
-				const data = await zipBlobReader.entry.getData(new BlobWriter(), Object.assign({}, options, zipBlobReader.options));
+				const readerOptions = Object.assign({}, options, zipBlobReader.options);
+				const { checkOverlappingEntry, checkOverlappingEntryOnly } = readerOptions;
+				const data = await zipBlobReader.entry.getData(new BlobWriter(), Object.assign(readerOptions, {
+					checkPasswordOnly: false,
+					checkOverlappingEntry: checkOverlappingEntryOnly || checkOverlappingEntry,
+					checkOverlappingEntryOnly: false,
+					preventClose: false
+				}));
 				zipBlobReader.data = data;
 				zipBlobReader.blobReader = new BlobReader(data);
+				zipBlobReader.size = data.size;
 				super.init();
 			}
 
@@ -7757,6 +7936,30 @@
 		return Reader.prototype ? new Reader(data, options) : Reader(data, options);
 	}
 
+	function keepsContentType(writer, data) {
+		const { contentType } = writer;
+		if (contentType === UNDEFINED_VALUE) {
+			return true;
+		} else if (writer.constructor == BlobWriter) {
+			return data.type == contentType;
+		} else if (writer.constructor == Data64URIWriter) {
+			return data.startsWith(writer.data);
+		} else {
+			return true;
+		}
+	}
+
+	function createProgressReadable(zipEntry, reader, options, signal) {
+		const { onstart, onprogress, onend } = options;
+		const { readable } = reader;
+		const coreReaderReportsProgress = zipEntry.data instanceof Entry;
+		if (coreReaderReportsProgress || (!onstart && !onprogress && !onend)) {
+			return readable;
+		} else {
+			return toCompatibleReadable(readable).pipeThrough(new ProgressWatcherStream({ onstart, onprogress, onend, size: reader.size }), { signal });
+		}
+	}
+
 	async function initReaders(entry, options) {
 		const fileEntries = [];
 		const pendingEntries = [entry];
@@ -7789,6 +7992,7 @@
 			}
 			if (reader.size !== UNDEFINED_VALUE) {
 				child.uncompressedSize = reader.size;
+				child.undeterminedSize = false;
 			}
 		}));
 		return readers;
@@ -7838,6 +8042,90 @@
 		return error;
 	}
 
+	function getChildEntryOptions(child, selectedEntry, options) {
+		const name = options.relativePath ? child.getRelativeName(selectedEntry) : child.getFullname();
+		const childOptions = child.options || {};
+		let zipEntryMetadata = {};
+		let passThroughOptions = {};
+		if (child.data instanceof Entry) {
+			const {
+				externalFileAttributes,
+				versionMadeBy,
+				comment,
+				lastModDate,
+				creationDate,
+				lastAccessDate,
+				uncompressedSize,
+				encrypted,
+				zipCrypto,
+				crc32,
+				compressionMethod,
+				extraFieldAES,
+				internalFileAttributes,
+				extraField,
+				uid,
+				gid
+			} = child.data;
+			zipEntryMetadata = {
+				externalFileAttributes,
+				versionMadeBy,
+				comment,
+				lastModDate,
+				creationDate,
+				lastAccessDate,
+				internalFileAttributes
+			};
+			const userExtraField = getUserExtraField(extraField);
+			if (userExtraField) {
+				zipEntryMetadata.extraField = userExtraField;
+			}
+			if (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE) {
+				Object.assign(zipEntryMetadata, {
+					uid,
+					gid,
+					unixExtraFieldType: INFOZIP_EXTRA_FIELD_TYPE
+				});
+			}
+			if (isPassThrough(child, options)) {
+				let level, encryptionStrength;
+				if (compressionMethod === 0) {
+					level = 0;
+				}
+				if (extraFieldAES) {
+					encryptionStrength = extraFieldAES.strength;
+				}
+				passThroughOptions = {
+					passThrough: true,
+					encrypted,
+					zipCrypto,
+					crc32,
+					uncompressedSize,
+					level,
+					encryptionStrength,
+					compressionMethod
+				};
+			}
+		}
+		const entryOptions = Object.assign({}, zipEntryMetadata, options, passThroughOptions, childOptions, { directory: child.directory });
+		if (!child.directory && entryOptions.passThrough && entryOptions.uncompressedSize === UNDEFINED_VALUE) {
+			throw new Error(ERR_INVALID_PASS_THROUGH);
+		}
+		return { name, entryOptions };
+	}
+
+	function getDeterminedSize(child, passThrough) {
+		const { reader } = child;
+		if (reader && reader.size !== UNDEFINED_VALUE) {
+			return reader.size;
+		}
+		return child.undeterminedSize ? UNDEFINED_VALUE : getExtractedSize(child, passThrough);
+	}
+
+	function isPassThrough(child, options) {
+		const { readerOptions } = options;
+		return Boolean(!child.directory && (child.passThrough || (readerOptions && readerOptions.passThrough)));
+	}
+
 	function getUserExtraField(extraField) {
 		if (extraField) {
 			const userExtraField = new Map();
@@ -7853,8 +8141,14 @@
 	}
 
 	async function exportZip(zipWriter, entry, totalSize, options, readers) {
+		const { onstart, onprogress, onend, onentryprogress } = options;
 		const selectedEntry = entry;
-		const entryOffsets = new Map();
+		const totalEntries = getTotalSize(entry.children, () => 1);
+		let writtenSize = 0;
+		let writtenEntries = 0;
+		if (onstart) {
+			await callHandler(onstart, totalSize);
+		}
 		if (options.bufferedWrite) {
 			await processChildren(entry);
 		} else {
@@ -7862,6 +8156,9 @@
 				await addChild(child);
 			}
 		}
+		if (onend) {
+			await callHandler(onend, writtenSize);
+		}
 
 		async function processChildren(entry) {
 			const results = await Promise.allSettled(entry.children.map(async child => {
@@ -7875,81 +8172,23 @@
 		}
 
 		async function addChild(child) {
-			const name = options.relativePath ? child.getRelativeName(selectedEntry) : child.getFullname();
-			const childOptions = child.options || {};
-			let zipEntryOptions = {};
-			if (child.data instanceof Entry) {
-				const {
-					externalFileAttributes,
-					versionMadeBy,
-					comment,
-					lastModDate,
-					creationDate,
-					lastAccessDate,
-					uncompressedSize,
-					encrypted,
-					zipCrypto,
-					crc32,
-					compressionMethod,
-					extraFieldAES,
-					internalFileAttributes,
-					extraField,
-					uid,
-					gid
-				} = child.data;
-				zipEntryOptions = {
-					externalFileAttributes,
-					versionMadeBy,
-					comment,
-					lastModDate,
-					creationDate,
-					lastAccessDate,
-					internalFileAttributes
-				};
-				const userExtraField = getUserExtraField(extraField);
-				if (userExtraField) {
-					zipEntryOptions.extraField = userExtraField;
-				}
-				if (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE) {
-					Object.assign(zipEntryOptions, {
-						uid,
-						gid,
-						unixExtraFieldType: options.unixExtraFieldType || INFOZIP_EXTRA_FIELD_TYPE
-					});
-				}
-				if (child.passThrough) {
-					let level, encryptionStrength;
-					if (compressionMethod === 0) {
-						level = 0;
-					}
-					if (extraFieldAES) {
-						encryptionStrength = extraFieldAES.strength;
-					}
-					zipEntryOptions = Object.assign(zipEntryOptions, {
-						passThrough: true,
-						encrypted,
-						zipCrypto,
-						crc32,
-						uncompressedSize,
-						level,
-						encryptionStrength,
-						compressionMethod
-					});
-				}
-			}
-			await zipWriter.add(name, readers.get(child), Object.assign({}, options, zipEntryOptions, childOptions, {
-				directory: child.directory,
+			const { name, entryOptions } = getChildEntryOptions(child, selectedEntry, options);
+			let entryWrittenSize = 0;
+			const entryMetadata = await zipWriter.add(name, readers.get(child), Object.assign(entryOptions, {
+				onstart: UNDEFINED_VALUE,
+				onend: UNDEFINED_VALUE,
 				onprogress: async indexProgress => {
-					if (options.onprogress) {
-						entryOffsets.set(name, indexProgress);
-						try {
-							await options.onprogress(Array.from(entryOffsets.values()).reduce((previousValue, currentValue) => previousValue + currentValue), totalSize);
-						} catch {
-							// ignored
-						}
+					writtenSize += indexProgress - entryWrittenSize;
+					entryWrittenSize = indexProgress;
+					if (onprogress) {
+						await callHandler(onprogress, writtenSize, totalSize);
 					}
 				}
 			}));
+			writtenEntries++;
+			if (onentryprogress) {
+				await callHandler(onentryprogress, writtenEntries, totalEntries, entryMetadata);
+			}
 		}
 	}
 
@@ -7977,7 +8216,7 @@
 							})
 						);
 					} else if (handle.kind == "directory") {
-						const directoryEntry = parentEntry.addDirectory(handle.name);
+						const directoryEntry = parentEntry.addDirectory(handle.name, options);
 						addedEntries.push(directoryEntry);
 						for await (const childHandle of handle.values()) {
 							await addFile(directoryEntry, childHandle, addedEntries, entryName);
@@ -7999,15 +8238,29 @@
 	}
 
 	async function exportFileSystemHandle(zipEntry, directoryHandle, options) {
-		const totalSize = getTotalSize([zipEntry], "uncompressedSize");
-		const writtenSizes = new Map();
+		const { onstart, onprogress, onend } = options;
 		const abortController = new AbortController();
 		const { signal } = abortController;
 		const releaseSignal = forwardAbort(options.signal, abortController);
+		const getDataOptions = Object.assign({}, options, options.readerOptions, {
+			signal,
+			onstart: UNDEFINED_VALUE,
+			onprogress: UNDEFINED_VALUE,
+			onend: UNDEFINED_VALUE,
+			preventClose: false
+		});
+		const totalSize = getTotalSize([zipEntry], entry => getExtractedSize(entry, getDataOptions.passThrough));
 		const exportedEntryNames = [];
 		let exportAborted = false;
+		let writtenSize = 0;
 		try {
+			if (onstart) {
+				await callHandler(onstart, totalSize);
+			}
 			await exportChildren(zipEntry, directoryHandle);
+			if (onend) {
+				await callHandler(onend, writtenSize);
+			}
 		} catch (error) {
 			try {
 				error.exportedEntryNames = exportedEntryNames;
@@ -8020,6 +8273,25 @@
 		}
 		return directoryHandle;
 
+		function createProgressWritable(writable) {
+			const writer = writable.getWriter();
+			return new WritableStream({
+				async write(chunk) {
+					await writer.write(chunk);
+					writtenSize += chunk.length;
+					if (onprogress) {
+						await callHandler(onprogress, writtenSize, totalSize);
+					}
+				},
+				close() {
+					return writer.close();
+				},
+				abort(reason) {
+					return writer.abort(reason);
+				}
+			});
+		}
+
 		async function exportChildren(entry, parentHandle) {
 			if (options.concurrent) {
 				const results = await Promise.allSettled(entry.children.map(child => exportChild(child, parentHandle)));
@@ -8051,19 +8323,7 @@
 					const fileHandle = await parentHandle.getFileHandle(child.name, { create: true });
 					const writable = await fileHandle.createWritable();
 					try {
-						await child.getData({ writable }, Object.assign({}, options, {
-							signal,
-							onprogress: async progress => {
-								if (options.onprogress) {
-									writtenSizes.set(child.id, progress);
-									try {
-										await options.onprogress(Array.from(writtenSizes.values()).reduce((previousValue, currentValue) => previousValue + currentValue, 0), totalSize);
-									} catch {
-										// ignored
-									}
-								}
-							}
-						}));
+						await child.getData({ writable: createProgressWritable(writable) }, getDataOptions);
 					} catch (error) {
 						throw exportAborted ? new Error(ERR_ABORT_EXPORT) : error;
 					}
@@ -8178,6 +8438,7 @@
 
 	exports.ERR_ABORTED = ERR_ABORTED;
 	exports.ERR_ENTRY_EXISTS = ERR_ENTRY_EXISTS;
+	exports.ERR_INVALID_PASS_THROUGH = ERR_INVALID_PASS_THROUGH;
 	exports.ERR_READABLE_CONSUMED = ERR_READABLE_CONSUMED;
 	exports.fs = fs;