@zip.js/zip.js 2.8.60 → 2.8.61

package/dist/zip-fs-core.js

@@ -6674,6 +6674,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;
@@ -6695,10 +6702,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,
@@ -7086,7 +7104,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;
@@ -7132,9 +7149,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);
 		}
@@ -7162,27 +7177,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++;
@@ -7195,6 +7206,7 @@
 				await initStream(writer);
 			} else {
 				fileWriter = writer;
+				await lockPreviousFileEntry;
 				await requestLockWriter();
 			}
 			await initStream(fileWriter);
@@ -7207,7 +7219,6 @@
 			}
 			const { localHeaderArray } = headerInfo;
 			if (!bufferedWrite) {
-				await lockPreviousFileEntry;
 				await skipDiskIfNeeded();
 			}
 			const diskNumberStart = getDiskNumber(writer);
@@ -7272,8 +7283,8 @@
 			if (bufferedWrite) {
 				zipWriter.bufferedWrites--;
 			}
-			if (releaseLockCurrentFileEntry) {
-				releaseLockCurrentFileEntry();
+			if (releaseLockFileEntry) {
+				releaseLockFileEntry(lockPreviousFileEntry);
 			}
 			if (releaseLockWriter) {
 				releaseLockWriter();
@@ -7287,10 +7298,6 @@
 			}
 		}
 
-		function requestLockCurrentFileEntry() {
-			fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
-		}
-
 		async function requestLockWriter() {
 			zipWriter.writerLocked = true;
 			const { lockWriter } = zipWriter;
@@ -8610,7 +8617,7 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	const VERSION = "2.8.60";
+	const VERSION = "2.8.61";
 
 	/*
 	 Copyright (c) 2025 Gildas Lormeau. All rights reserved.
@@ -9549,12 +9556,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) {