@zip.js/zip.js 2.6.34 → 2.6.36

package/index.d.ts

@@ -272,7 +272,7 @@ export function getMimeType(fileExtension: string): string
  * zip.js can handle multiple types of data thanks to a generic API. This feature is based on 2 abstract constructors: `Reader` and `Writer`. 
  * The classes inheriting from `Reader` help to read data from a source of data. The classes inheriting from `Writer` help to write data into a destination.
  */
-interface DataProcessor {
+interface Initializable {
     /**
      * Initializes the instance asynchronously
      */
@@ -317,7 +317,7 @@ interface ReadableReader {
  * }
  * ```
  */
-export class Reader<Type> implements ReadableReader, DataProcessor {
+export class Reader<Type> implements Initializable, ReadableReader {
     /**
      * Creates the `Reader` instance
      * 
@@ -479,7 +479,7 @@ interface WritableWriter {
  * }
  * ```
  */
-export class Writer<Type> implements DataProcessor, WritableWriter {
+export class Writer<Type> implements Initializable, WritableWriter {
     /**
      * The `WritableStream` instance.
      */
@@ -521,13 +521,27 @@ export class TextWriter extends Writer<string> {
 /**
  * Represents a `Writer` instance used to retrieve the written data as a `Blob` instance.
  */
-export class BlobWriter extends Writer<Blob> {
+export class BlobWriter implements Initializable, WritableWriter {
+    /**
+    * The `WritableStream` instance.
+    */
+    writable: WritableStream
+    /**
+     * Initializes the instance asynchronously
+     */
+    init(): Promise<void>
     /**
      * Creates the `BlobWriter` instance
      * 
      * @param mimeString The MIME type of the content.
      */
     constructor(mimeString?: string)
+    /**
+     * Retrieves all the written data
+     * 
+     * @returns A promise resolving to the written data.
+     */
+    getData(): Promise<Blob>
 }
 
 /**
@@ -545,7 +559,7 @@ export class Data64URIWriter extends Writer<string> {
 /**
  * Represents a `Writer` instance used to retrieve the written data from a generator of `Writer` instances  (i.e. split zip files).
  */
-export class SplitZipWriter implements DataProcessor, WritableWriter {
+export class SplitZipWriter implements Initializable, WritableWriter {
     /**
     * The `WritableStream` instance.
     */
@@ -558,9 +572,9 @@ export class SplitZipWriter implements DataProcessor, WritableWriter {
      * Creates the `SplitZipWriter` instance
      * 
      * @param writerGenerator The MIME type of the content.
-     * @param maxSize The maximum size of the data written into `Writer` instances.
+     * @param maxSize The maximum size of the data written into `Writer` instances (default: 4GB).
      */
-    constructor(writerGenerator: AsyncGenerator<Writer<any> | WritableWriter | WritableStream, boolean>, maxSize: number)
+    constructor(writerGenerator: AsyncGenerator<Writer<any> | WritableWriter | WritableStream, boolean>, maxSize?: number)
 }
 
 /**

package/lib/core/io.js

@@ -571,14 +571,14 @@ class SplitZipWriter extends Stream {
 
 	constructor(writerGenerator, maxSize = 4294967296) {
 		super();
-		const writer = this;
-		Object.assign(writer, {
+		const zipWriter = this;
+		Object.assign(zipWriter, {
 			diskNumber: 0,
 			diskOffset: 0,
 			size: 0,
 			availableSize: maxSize
 		});
-		let currentWriter, diskWritable, diskWriter;
+		let diskSourceWriter, diskWritable, diskWriter;
 		const writable = new WritableStream({
 			async write(chunk) {
 				if (!diskWriter) {
@@ -586,43 +586,49 @@ class SplitZipWriter extends Stream {
 					if (done && !value) {
 						throw new Error(ERR_ITERATOR_COMPLETED_TOO_SOON);
 					} else {
-						currentWriter = value;
-						currentWriter.size = 0;
+						diskSourceWriter = value;
+						diskSourceWriter.size = 0;
 						diskWritable = value.writable;
 						diskWriter = diskWritable.getWriter();
 					}
 					await this.write(chunk);
-				} else if (diskWriter && currentWriter.size + chunk.length > maxSize) {
-					await diskWriter.ready;
-					const chunkLength = maxSize - currentWriter.size;
-					await diskWriter.write(chunk.slice(0, chunkLength));
-					chunk = chunk.slice(chunkLength);
-					currentWriter.size += chunkLength;
-					writer.size += chunkLength;
-					writer.diskOffset += diskWritable.size = currentWriter.size;
-					writer.diskNumber++;
-					await diskWriter.close();
+				} else if (diskSourceWriter.size + chunk.length >= maxSize) {
+					const chunkLength = maxSize - diskSourceWriter.size;
+					await writeChunk(chunk.slice(0, chunkLength));
+					await closeDisk();
+					zipWriter.diskOffset += diskSourceWriter.size;
+					zipWriter.diskNumber++;
 					diskWriter = null;
-					await this.write(chunk);
+					await this.write(chunk.slice(chunkLength));
 				} else {
-					await diskWriter.ready;
-					await diskWriter.write(chunk);
-					currentWriter.size += chunk.length;
-					writer.size += chunk.length;
+					if (chunk.length) {
+						await writeChunk(chunk);
+					}
+					zipWriter.availableSize = maxSize - diskSourceWriter.size;
 				}
-				writer.availableSize = maxSize - currentWriter.size;
 			},
 			async close() {
 				await diskWriter.ready;
-				diskWritable.size = currentWriter.size;
-				await diskWriter.close();
+				await closeDisk();
 			}
 		});
-		Object.defineProperty(writer, PROPERTY_NAME_WRITABLE, {
+		Object.defineProperty(zipWriter, PROPERTY_NAME_WRITABLE, {
 			get() {
 				return writable;
 			}
 		});
+
+		async function writeChunk(chunk) {
+			await diskWriter.ready;
+			await diskWriter.write(chunk);
+			diskSourceWriter.size += chunk.length;
+			zipWriter.size += chunk.length;
+		}
+
+		async function closeDisk() {
+			diskWritable.size = diskSourceWriter.size;
+			await diskWriter.close();
+		}
 	}
 }
 

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.6.34",
+    "version": "2.6.36",
     "type": "module",
     "keywords": [
         "zip",