@zip.js/zip.js 2.8.60 → 2.8.61

package/index-native.cjs

@@ -6670,6 +6670,13 @@ async function addFile(zipWriter, name, reader, options) {
 	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;
@@ -6691,10 +6698,21 @@ async function addFile(zipWriter, name, reader, options) {
 		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,
@@ -7082,7 +7100,6 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 	}
 	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;
@@ -7128,9 +7145,7 @@ async function getEntriesSize(writerOptions, entries, writeOrderGuaranteed, comm
 		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);
 	}
@@ -7158,27 +7173,23 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		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++;
@@ -7191,6 +7202,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			await initStream(writer);
 		} else {
 			fileWriter = writer;
+			await lockPreviousFileEntry;
 			await requestLockWriter();
 		}
 		await initStream(fileWriter);
@@ -7203,7 +7215,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 		const { localHeaderArray } = headerInfo;
 		if (!bufferedWrite) {
-			await lockPreviousFileEntry;
 			await skipDiskIfNeeded();
 		}
 		const diskNumberStart = getDiskNumber(writer);
@@ -7268,8 +7279,8 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		if (bufferedWrite) {
 			zipWriter.bufferedWrites--;
 		}
-		if (releaseLockCurrentFileEntry) {
-			releaseLockCurrentFileEntry();
+		if (releaseLockFileEntry) {
+			releaseLockFileEntry(lockPreviousFileEntry);
 		}
 		if (releaseLockWriter) {
 			releaseLockWriter();
@@ -7283,10 +7294,6 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		}
 	}
 
-	function requestLockCurrentFileEntry() {
-		fileEntry.lockFileEntry = new Promise(resolve => releaseLockCurrentFileEntry = resolve);
-	}
-
 	async function requestLockWriter() {
 		zipWriter.writerLocked = true;
 		const { lockWriter } = zipWriter;
@@ -8606,7 +8613,7 @@ function formatSupported(StreamClass, format) {
  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.
@@ -9583,12 +9590,13 @@ class ZipDirectoryEntry extends ZipEntry {
 		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) {