@zip.js/zip.js 2.8.60 → 2.9.0

package/dist/zip-fs.js

@@ -495,7 +495,7 @@
 	// Every table MUST stay a PACKED_SMI array: build with array literals (not `new Array(n)`,
 	// which is HOLEY) and store the signed int32 XOR result (no `>>> 0`). An unsigned or holey
 	// table becomes a V8 FixedDoubleArray whose every hot-loop lookup unboxes a double (~1.6x
-	// slower). Signedness is irrelevant to the result — the reads mask/shift it and the final
+	// slower). Signedness is irrelevant to the result: the reads mask/shift it and the final
 	// `~crc` normalizes it. Do NOT reintroduce `>>> 0` here or switch to `new Array(256)`.
 	const T = [[], [], [], [], [], [], [], []];
 	for (let n = 0; n < 256; n++) {
@@ -3483,7 +3483,7 @@
 
 	/* global TextDecoder */
 
-	const CP437 = "\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split("");
+	const CP437 = "\0\u263A\u263B\u2665\u2666\u2663\u2660\u2022\u25D8\u25CB\u25D9\u2642\u2640\u266A\u266B\u263C\u25BA\u25C4\u2195\u203C\u00B6\u00A7\u25AC\u21A8\u2191\u2193\u2192\u2190\u221F\u2194\u25B2\u25BC !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u2302\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00A2\u00A3\u00A5\u20A7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u2310\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u00DF\u0393\u03C0\u03A3\u03C3\u00B5\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u03C6\u03B5\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u00A0".split("");
 	const VALID_CP437 = CP437.length == 256;
 
 	function decodeCP437(stringValue) {
@@ -4749,6 +4749,7 @@
 	const WARNING_WRAPPED_ENTRIES_COUNT = "wrapped entries count";
 	const WARNING_APPENDED_DATA = "appended data";
 	const WARNING_PREPENDED_DATA = "prepended data";
+	const WARNING_PREPENDED_CENTRAL_DIRECTORY = "prepended central directory";
 	const WARNING_TRAILING_CENTRAL_DIRECTORY_DATA = "trailing central directory data";
 	const WARNING_DUPLICATE_FILENAME = "duplicate filename";
 	const WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY = "mismatched zip64 end of central directory record";
@@ -4842,6 +4843,7 @@
 			let diskNumber = getUint16$1(endOfDirectoryView, 6);
 			let filesLength = getUint16$1(endOfDirectoryView, 10);
 			let prependedDataLength = 0;
+			let prependedCentralDirectory;
 			let startOffset;
 			let zip64EndOfDirectory;
 			let zip64EndOfDirectoryVersion2;
@@ -4945,6 +4947,7 @@
 						directoryDataOffset = expectedDirectoryDataOffset;
 						if (directoryDataOffset > originalDirectoryDataOffset) {
 							prependedDataLength += directoryDataOffset - originalDirectoryDataOffset;
+							prependedCentralDirectory = storedPointsAtDirectory;
 						}
 						directoryArray = await readUint8Array(reader, directoryDataOffset, directoryDataLength);
 						directoryView = getDataView(directoryArray);
@@ -5172,6 +5175,9 @@
 			if (prependedDataLength || (filesLength && startOffset > SPLIT_ZIP_FILE_SIGNATURE_LENGTH)) {
 				addWarning(warnings, WARNING_PREPENDED_DATA);
 			}
+			if (prependedCentralDirectory) {
+				addWarning(warnings, WARNING_PREPENDED_CENTRAL_DIRECTORY);
+			}
 			if (extractPrependedData) {
 				zipReader.prependedData = startOffset > splitZipSignatureLength ?
 					await readUint8Array(reader, splitZipSignatureLength, startOffset - splitZipSignatureLength) :
@@ -6232,6 +6238,7 @@
 		WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD: WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD,
 		WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES: WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES,
 		WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY: WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY,
+		WARNING_PREPENDED_CENTRAL_DIRECTORY: WARNING_PREPENDED_CENTRAL_DIRECTORY,
 		WARNING_PREPENDED_DATA: WARNING_PREPENDED_DATA,
 		WARNING_TRAILING_CENTRAL_DIRECTORY_DATA: WARNING_TRAILING_CENTRAL_DIRECTORY_DATA,
 		WARNING_UNKNOWN_VERSION: WARNING_UNKNOWN_VERSION,
@@ -6680,6 +6687,13 @@
 		const { comment } = metadataInfo;
 		const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
 		zipWriter.fileEntries.set(name, UNDEFINED_VALUE);
+		const previousFileEntry = zipWriter.lastFileEntry;
+		const pendingFileEntry = {};
+		let releaseLockFileEntry;
+		if (metadataInfo.resolvedOptions.keepOrder) {
+			pendingFileEntry.lockFileEntry = new Promise(resolve => releaseLockFileEntry = resolve);
+		}
+		zipWriter.lastFileEntry = pendingFileEntry;
 		let fileEntry;
 		try {
 			const { resolvedOptions } = metadataInfo;
@@ -6701,10 +6715,21 @@
 			const headerInfo = getHeaderInfo(options);
 			const dataDescriptorInfo = getDataDescriptorInfo(options);
 			const metadataSize = getLength(headerInfo.localHeaderArray, dataDescriptorInfo.dataDescriptorArray);
-			fileEntry = await getFileEntry(zipWriter, name, reader, { headerInfo, dataDescriptorInfo, metadataSize }, options);
+			fileEntry = await getFileEntry(zipWriter, name, reader, {
+				headerInfo,
+				dataDescriptorInfo,
+				metadataSize,
+				fileEntry: pendingFileEntry,
+				previousFileEntry,
+				releaseLockFileEntry
+			}, options);
 		} catch (error) {
 			zipWriter.fileEntries.delete(name);
 			throw error;
+		} finally {
+			if (releaseLockFileEntry) {
+				releaseLockFileEntry(previousFileEntry && previousFileEntry.lockFileEntry);
+			}
 		}
 		Object.assign(fileEntry, {
 			name,
@@ -7092,7 +7117,6 @@
 		}
 		const usdz = writerOptions[OPTION_USDZ];
 		const files = new Map();
-		let layoutDependsOnWriteOrder = Boolean(usdz);
 		const initialOffset = writerOptions[OPTION_OFFSET] === UNDEFINED_VALUE ? 0 : writerOptions[OPTION_OFFSET];
 		let offset = initialOffset;
 		let minimumEntrySize = INFINITY_VALUE;
@@ -7138,9 +7162,7 @@
 			minimumEntrySize = Math.min(minimumEntrySize, entrySize);
 			offset += entrySize;
 		}
-		if (files.size && offset - minimumEntrySize >= MAX_32_BITS) {
-			layoutDependsOnWriteOrder = true;
-		}
+		const layoutDependsOnWriteOrder = files.size > 1 && (usdz || offset - minimumEntrySize >= MAX_32_BITS);
 		if (layoutDependsOnWriteOrder && !writeOrderGuaranteed) {
 			throw new Error(ERR_UNDETERMINED_SIZE);
 		}
@@ -7168,27 +7190,23 @@
 			signal
 		} = options;
 		const {
-			headerInfo
+			headerInfo,
+			fileEntry: pendingFileEntry,
+			previousFileEntry,
+			releaseLockFileEntry
 		} = entryInfo;
 		const usdz = zipWriter.options[OPTION_USDZ];
-		const previousFileEntry = zipWriter.lastFileEntry;
-		let fileEntry = {};
+		let fileEntry = pendingFileEntry;
 		let bufferedWrite;
 		let releaseLockWriter;
-		let releaseLockCurrentFileEntry;
 		let writingBufferedEntryData;
 		let writingEntryData;
 		let writerSizeBeforeEntry;
 		let flushedBufferedSize = 0;
 		let fileWriter;
+		const lockPreviousFileEntry = keepOrder && previousFileEntry ? previousFileEntry.lockFileEntry : UNDEFINED_VALUE;
 		fileEntries.set(name, fileEntry);
-		zipWriter.lastFileEntry = fileEntry;
 		try {
-			let lockPreviousFileEntry;
-			if (keepOrder) {
-				lockPreviousFileEntry = previousFileEntry && previousFileEntry.lockFileEntry;
-				requestLockCurrentFileEntry();
-			}
 			if (options.bufferedWrite || !keepOrder || zipWriter.writerLocked || zipWriter.bufferedWrites || (!dataDescriptor && !emptyEntry)) {
 				bufferedWrite = true;
 				zipWriter.bufferedWrites++;
@@ -7201,6 +7219,7 @@
 				await initStream(writer);
 			} else {
 				fileWriter = writer;
+				await lockPreviousFileEntry;
 				await requestLockWriter();
 			}
 			await initStream(fileWriter);
@@ -7213,7 +7232,6 @@
 			}
 			const { localHeaderArray } = headerInfo;
 			if (!bufferedWrite) {
-				await lockPreviousFileEntry;
 				await skipDiskIfNeeded();
 			}
 			const diskNumberStart = getDiskNumber(writer);
@@ -7278,8 +7296,8 @@
 			if (bufferedWrite) {
 				zipWriter.bufferedWrites--;
 			}
-			if (releaseLockCurrentFileEntry) {
-				releaseLockCurrentFileEntry();
+			if (releaseLockFileEntry) {
+				releaseLockFileEntry(lockPreviousFileEntry);
 			}
 			if (releaseLockWriter) {
 				releaseLockWriter();
@@ -7293,10 +7311,6 @@
 			}
 		}
 
-		function requestLockCurrentFileEntry() {
-			fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
-		}
-
 		async function requestLockWriter() {
 			zipWriter.writerLocked = true;
 			const { lockWriter } = zipWriter;
@@ -8616,7 +8630,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.8.60";
+	const VERSION = "2.9.0";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -9968,12 +9982,13 @@
 			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, zipEntry.getChildren({ recursive: true }).filter(child => !isImplicitDirectory(child)).map(child => {
+			const entries = 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);
+			});
+			const writeOrderGuaranteed = !options.bufferedWrite ||
+				(entries.every(entry => entry.options.keepOrder !== false) && zipEntry.children.every(child => !child.children.length));
+			return getEntriesSize(options, entries, writeOrderGuaranteed, options.globalComment);
 		}
 
 		getChildByName(name) {
@@ -10987,6 +11002,7 @@
 	exports.WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD = WARNING_MISMATCHED_LOCAL_FILE_HEADER_COMPRESSION_METHOD;
 	exports.WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES = WARNING_MISMATCHED_LOCAL_FILE_HEADER_CRC32_OR_SIZES;
 	exports.WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY = WARNING_MISMATCHED_ZIP64_END_OF_CENTRAL_DIRECTORY;
+	exports.WARNING_PREPENDED_CENTRAL_DIRECTORY = WARNING_PREPENDED_CENTRAL_DIRECTORY;
 	exports.WARNING_PREPENDED_DATA = WARNING_PREPENDED_DATA;
 	exports.WARNING_TRAILING_CENTRAL_DIRECTORY_DATA = WARNING_TRAILING_CENTRAL_DIRECTORY_DATA;
 	exports.WARNING_UNKNOWN_VERSION = WARNING_UNKNOWN_VERSION;