@zip.js/zip.js 2.7.34 → 2.7.35

package/lib/core/io.js

@@ -584,8 +584,8 @@ class SplitDataWriter extends Stream {
 
 	constructor(writerGenerator, maxSize = 4294967295) {
 		super();
-		const zipWriter = this;
-		Object.assign(zipWriter, {
+		const writer = this;
+		Object.assign(writer, {
 			diskNumber: 0,
 			diskOffset: 0,
 			size: 0,
@@ -595,7 +595,7 @@ class SplitDataWriter extends Stream {
 		let diskSourceWriter, diskWritable, diskWriter;
 		const writable = new WritableStream({
 			async write(chunk) {
-				const { availableSize } = zipWriter;
+				const { availableSize } = writer;
 				if (!diskWriter) {
 					const { value, done } = await writerGenerator.next();
 					if (done && !value) {
@@ -604,9 +604,9 @@ class SplitDataWriter extends Stream {
 						diskSourceWriter = value;
 						diskSourceWriter.size = 0;
 						if (diskSourceWriter.maxSize) {
-							zipWriter.maxSize = diskSourceWriter.maxSize;
+							writer.maxSize = diskSourceWriter.maxSize;
 						}
-						zipWriter.availableSize = zipWriter.maxSize;
+						writer.availableSize = writer.maxSize;
 						await initStream(diskSourceWriter);
 						diskWritable = value.writable;
 						diskWriter = diskWritable.getWriter();
@@ -615,8 +615,8 @@ class SplitDataWriter extends Stream {
 				} else if (chunk.length >= availableSize) {
 					await writeChunk(chunk.slice(0, availableSize));
 					await closeDisk();
-					zipWriter.diskOffset += diskSourceWriter.size;
-					zipWriter.diskNumber++;
+					writer.diskOffset += diskSourceWriter.size;
+					writer.diskNumber++;
 					diskWriter = null;
 					await this.write(chunk.slice(availableSize));
 				} else {
@@ -628,7 +628,7 @@ class SplitDataWriter extends Stream {
 				await closeDisk();
 			}
 		});
-		Object.defineProperty(zipWriter, PROPERTY_NAME_WRITABLE, {
+		Object.defineProperty(writer, PROPERTY_NAME_WRITABLE, {
 			get() {
 				return writable;
 			}
@@ -640,8 +640,8 @@ class SplitDataWriter extends Stream {
 				await diskWriter.ready;
 				await diskWriter.write(chunk);
 				diskSourceWriter.size += chunkLength;
-				zipWriter.size += chunkLength;
-				zipWriter.availableSize -= chunkLength;
+				writer.size += chunkLength;
+				writer.availableSize -= chunkLength;
 			}
 		}
 
@@ -661,6 +661,8 @@ function isHttpFamily(url) {
 async function initStream(stream, initSize) {
 	if (stream.init && !stream.initialized) {
 		await stream.init(initSize);
+	} else {
+		return Promise.resolve();
 	}
 }
 

package/lib/core/zip-reader.js

@@ -7,8 +7,8 @@
  1. Redistributions of source code must retain the above copyright notice,
  this list of conditions and the following disclaimer.
 
- 2. Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in 
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
  the documentation and/or other materials provided with the distribution.
 
  3. The names of the authors may not be used to endorse or promote products
@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global BigInt, Response, WritableStream */
+/* global BigInt, Response, WritableStream, ReadableStream, TransformStream */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -209,7 +209,7 @@ class ZipReader {
 		}
 		if (directoryDataOffset >= reader.size) {
 			prependedDataLength = reader.size - directoryDataOffset - directoryDataLength - END_OF_CENTRAL_DIR_LENGTH;
-			directoryDataOffset = reader.size - directoryDataLength - END_OF_CENTRAL_DIR_LENGTH;	
+			directoryDataOffset = reader.size - directoryDataLength - END_OF_CENTRAL_DIR_LENGTH;
 		}
 		if (expectedLastDiskNumber != lastDiskNumber) {
 			throw new Error(ERR_SPLIT_ZIP_FILE);
@@ -326,8 +326,37 @@ class ZipReader {
 	}
 }
 
+class ZipReaderStream {
+
+	constructor(options = {}) {
+		const { readable, writable } = new TransformStream();
+		const gen = new ZipReader(readable, options).getEntriesGenerator();
+		this.readable = new ReadableStream({
+			async pull(controller) {
+				const { done, value } = await gen.next();
+				if (done)
+					return controller.close();
+				const chunk = {
+					...value,
+					readable: (function () {
+						const { readable, writable } = new TransformStream();
+						if (value.getData) {
+							value.getData(writable);
+							return readable;
+						}
+					})()
+				};
+				delete chunk.getData;
+				controller.enqueue(chunk);
+			}
+		});
+		this.writable = writable;
+	}
+}
+
 export {
 	ZipReader,
+	ZipReaderStream,
 	ERR_BAD_FORMAT,
 	ERR_EOCDR_NOT_FOUND,
 	ERR_EOCDR_ZIP64_NOT_FOUND,
@@ -721,4 +750,4 @@ function setUint32(view, offset, value) {
 
 function getDataView(array) {
 	return new DataView(array.buffer);
-}
+}

package/lib/core/zip-writer.js

@@ -7,8 +7,8 @@
  1. Redistributions of source code must retain the above copyright notice,
  this list of conditions and the following disclaimer.
 
- 2. Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in 
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
  the documentation and/or other materials provided with the distribution.
 
  3. The names of the authors may not be used to endorse or promote products
@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global BigInt */
+/* global BigInt, TransformStream, Response */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -75,9 +75,7 @@ import {
 import {
 	initStream,
 	initReader,
-	initWriter,
-	BlobWriter,
-	SplitDataWriter
+	initWriter
 } from "./io.js";
 import { encodeText } from "./util/encode-text.js";
 import {
@@ -110,9 +108,12 @@ class ZipWriter {
 
 	constructor(writer, options = {}) {
 		writer = initWriter(writer);
+		const addSplitZipSignature =
+			writer.availableSize !== UNDEFINED_VALUE && writer.availableSize > 0 && writer.availableSize !== Infinity &&
+			writer.maxSize !== UNDEFINED_VALUE && writer.maxSize > 0 && writer.maxSize !== Infinity;
 		Object.assign(this, {
 			writer,
-			addSplitZipSignature: writer instanceof SplitDataWriter,
+			addSplitZipSignature,
 			options,
 			config: getConfiguration(),
 			files: new Map(),
@@ -175,8 +176,36 @@ class ZipWriter {
 	}
 }
 
+class ZipWriterStream {
+
+	constructor(options = {}) {
+		const { readable, writable } = new TransformStream();
+		this.readable = readable;
+		this.zipWriter = new ZipWriter(writable, options);
+	}
+
+	transform(path) {
+		const { readable, writable } = new TransformStream({
+			flush: () => { this.zipWriter.close(); }
+		});
+		this.zipWriter.add(path, readable);
+		return { readable: this.readable, writable };
+	}
+
+	writable(path) {
+		const { readable, writable } = new TransformStream();
+		this.zipWriter.add(path, readable);
+		return writable;
+	}
+
+	close(comment = undefined, options = {}) {
+		return this.zipWriter.close(comment, options);
+	}
+}
+
 export {
 	ZipWriter,
+	ZipWriterStream,
 	ERR_DUPLICATED_NAME,
 	ERR_INVALID_COMMENT,
 	ERR_INVALID_ENTRY_NAME,
@@ -358,6 +387,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 	let writingBufferedEntryData;
 	let writingEntryData;
 	let fileWriter;
+	let blobPromise;
 	files.set(name, fileEntry);
 	try {
 		let lockPreviousFileEntry;
@@ -366,7 +396,8 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 			requestLockCurrentFileEntry();
 		}
 		if ((options.bufferedWrite || zipWriter.writerLocked || (zipWriter.bufferedWrites && keepOrder) || !dataDescriptor) && !usdz) {
-			fileWriter = new BlobWriter();
+			fileWriter = new TransformStream();
+			blobPromise = new Response(fileWriter.readable).blob();
 			fileWriter.writable.size = 0;
 			bufferedWrite = true;
 			zipWriter.bufferedWrites++;
@@ -402,7 +433,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		fileEntry.filename = name;
 		if (bufferedWrite) {
 			await fileWriter.writable.getWriter().close();
-			let blob = await fileWriter.getData();
+			let blob = await blobPromise;
 			await lockPreviousFileEntry;
 			await requestLockWriter();
 			writingBufferedEntryData = true;
@@ -1145,4 +1176,4 @@ function getLength(...arrayLikes) {
 	let result = 0;
 	arrayLikes.forEach(arrayLike => arrayLike && (result += arrayLike.length));
 	return result;
-}
+}

package/lib/zip-fs.js

@@ -7,8 +7,8 @@
  1. Redistributions of source code must retain the above copyright notice,
  this list of conditions and the following disclaimer.
 
- 2. Redistributions in binary form must reproduce the above copyright 
- notice, this list of conditions and the following disclaimer in 
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
  the documentation and/or other materials provided with the distribution.
 
  3. The names of the authors may not be used to endorse or promote products
@@ -50,4 +50,4 @@ export {
 	getMimeType,
 	initShimAsyncCodec,
 	terminateWorkers
-};
+};

package/package.json

@@ -3,7 +3,7 @@
     "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
     "author": "Gildas Lormeau",
     "license": "BSD-3-Clause",
-    "version": "2.7.34",
+    "version": "2.7.35",
     "type": "module",
     "keywords": [
         "zip",