@zip.js/zip.js 2.8.17 → 2.8.18

package/dist/zip-native.js

@@ -1964,6 +1964,8 @@
 	 */
 
 
+	const MODULE_WORKER_OPTIONS = { type: "module" };
+
 	let webWorkerSupported, webWorkerURI, webWorkerOptions;
 	let transferStreamsSupported = true;
 	let initModule = () => { };
@@ -2172,11 +2174,8 @@
 		return { writable, closed };
 	}
 
-	function getWebWorker(url, baseURI, workerData, isModuleType = false, useBlobURI = true) {
+	function getWebWorker(url, baseURI, workerData, isModuleType, useBlobURI = true) {
 		let worker, resolvedURI, resolvedOptions;
-		if (isModuleType) {
-			resolvedOptions = { type: "module" };
-		}
 		if (webWorkerURI === UNDEFINED_VALUE) {
 			// deno-lint-ignore valid-typeof
 			const isFunctionURI = typeof url == FUNCTION_TYPE;
@@ -2188,6 +2187,12 @@
 			const isDataURI = resolvedURI.startsWith("data:");
 			const isBlobURI = resolvedURI.startsWith("blob:");
 			if (isDataURI || isBlobURI) {
+				if (isModuleType === UNDEFINED_VALUE) {
+					isModuleType = false;
+				}
+				if (isModuleType) {
+					resolvedOptions = MODULE_WORKER_OPTIONS;
+				}
 				try {
 					worker = new Worker(resolvedURI, resolvedOptions);
 				} catch (error) {
@@ -2207,6 +2212,12 @@
 					}
 				}
 			} else {
+				if (isModuleType === UNDEFINED_VALUE) {
+					isModuleType = true;
+				}
+				if (isModuleType) {
+					resolvedOptions = MODULE_WORKER_OPTIONS;
+				}
 				try {
 					resolvedURI = new URL(resolvedURI, baseURI);
 				} catch {
@@ -2216,7 +2227,7 @@
 					worker = new Worker(resolvedURI, resolvedOptions);
 				} catch (error) {
 					if (!isModuleType) {
-						return getWebWorker(url, baseURI, workerData, true, useBlobURI);
+						return getWebWorker(url, baseURI, workerData, false, useBlobURI);
 					} else {
 						throw error;
 					}
@@ -4890,7 +4901,6 @@
 		let writingBufferedEntryData;
 		let writingEntryData;
 		let fileWriter;
-		let blobPromise;
 		files.set(name, fileEntry);
 		try {
 			let lockPreviousFileEntry;
@@ -4899,7 +4909,7 @@
 				requestLockCurrentFileEntry();
 			}
 			if ((options.bufferedWrite || zipWriter.writerLocked || (zipWriter.bufferedWrites && keepOrder) || !dataDescriptor) && !usdz) {
-				fileWriter = new TransformStream();
+				fileWriter = new TransformStream(undefined, undefined, { highWaterMark: Infinity });
 				fileWriter.size = 0;
 				bufferedWrite = true;
 				zipWriter.bufferedWrites++;
@@ -4930,20 +4940,20 @@
 				await skipDiskIfNeeded(writable);
 			}
 			const { diskNumber } = writer;
-			writingEntryData = true;
 			fileEntry.diskNumberStart = diskNumber;
-			if (bufferedWrite) {
-				blobPromise = new Response(fileWriter.readable).blob();
-			} else {
+			if (!bufferedWrite) {
+				writingEntryData = true;
 				await writeData(fileWriter, localHeaderArray);
 			}
 			fileEntry = await createFileEntry(reader, fileWriter, fileEntry, entryInfo, zipWriter.config, options);
 			const { zip64 } = fileEntry;
-			writingEntryData = false;
+			if (!bufferedWrite) {
+				writingEntryData = false;
+			}
 			files.set(name, fileEntry);
 			fileEntry.filename = name;
 			if (bufferedWrite) {
-				const [blob] = await Promise.all([blobPromise, fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
+				await Promise.all([fileWriter.writable.getWriter().close(), lockPreviousFileEntry]);
 				await requestLockWriter();
 				writingBufferedEntryData = true;
 				fileEntry.diskNumberStart = writer.diskNumber;
@@ -4954,7 +4964,7 @@
 				updateLocalHeader(fileEntry, localHeaderView, options);
 				await skipDiskIfNeeded(writable);
 				await writeData(writer, localHeaderArray);
-				await blob.stream().pipeTo(writable, { preventClose: true, preventAbort: true, signal });
+				await fileWriter.readable.pipeTo(writable, { preventClose: true, preventAbort: true, signal });
 				writer.size += fileWriter.size;
 				writingBufferedEntryData = false;
 			} else {
@@ -4969,7 +4979,7 @@
 			zipWriter.offset += fileEntry.size;
 			return fileEntry;
 		} catch (error) {
-			if ((bufferedWrite && writingBufferedEntryData) || (!bufferedWrite && writingEntryData)) {
+			if (writingBufferedEntryData || writingEntryData) {
 				zipWriter.hasCorruptedEntries = true;
 				if (error) {
 					try {