@zip.js/zip.js 2.6.46 → 2.6.48

package/index.cjs

@@ -7920,7 +7920,6 @@ async function initHttpReader(httpReader, sendRequest, getRequestData) {
 
 async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest, getRequestData) {
 	const {
-		data,
 		useRangeHeader,
 		forceRangeRequests,
 		options
@@ -7932,10 +7931,11 @@ async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest,
 		}
 		return new Uint8Array(await response.arrayBuffer());
 	} else {
+		const { data } = httpReader;
 		if (!data) {
 			await getRequestData(httpReader, options);
 		}
-		return new Uint8Array(data.subarray(index, index + length));
+		return new Uint8Array(httpReader.data.subarray(index, index + length));
 	}
 }
 
@@ -8228,6 +8228,43 @@ async function initStream(stream, initSize) {
 	}
 }
 
+function initReader(reader) {
+	if (Array.isArray(reader)) {
+		reader = new SplitDataReader(reader);
+	}
+	if (reader instanceof ReadableStream) {
+		reader = {
+			readable: reader
+		};
+	}
+	return reader;
+}
+
+function initWriter(writer) {
+	if (writer.writable === UNDEFINED_VALUE && typeof writer.next == FUNCTION_TYPE$1) {
+		writer = new SplitDataWriter(writer);
+	}
+	if (writer instanceof WritableStream) {
+		writer = {
+			writable: writer
+		};
+	}
+	const { writable } = writer;
+	if (writable.size === UNDEFINED_VALUE) {
+		writable.size = 0;
+	}
+	const splitZipFile = writer instanceof SplitDataWriter;
+	if (!splitZipFile) {
+		Object.assign(writer, {
+			diskNumber: 0,
+			diskOffset: 0,
+			availableSize: Infinity,
+			maxSize: Infinity
+		});
+	}
+	return writer;
+}
+
 function readUint8Array(reader, offset, size, diskNumber) {
 	return reader.readUint8Array(offset, size, diskNumber);
 }
@@ -8442,13 +8479,8 @@ const ZIP64_EXTRACTION = {
 class ZipReader {
 
 	constructor(reader, options = {}) {
-		if (reader instanceof ReadableStream) {
-			reader = {
-				readable: reader
-			};
-		}
 		Object.assign(this, {
-			reader,
+			reader: initReader(reader),
 			options,
 			config: getConfiguration()
 		});
@@ -8460,11 +8492,7 @@ class ZipReader {
 		const { config } = zipReader;
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
-			if (Array.isArray(reader)) {
-				reader = new SplitDataReader(reader);
-			} else {
-				reader = new BlobReader(await new Response(reader.readable).blob());
-			}
+			reader = new BlobReader(await new Response(reader.readable).blob());
 			await initStream(reader);
 		}
 		if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
@@ -8697,17 +8725,10 @@ class ZipEntry$1 {
 		readable.diskNumberStart = diskNumberStart;
 		readable.offset = dataOffset;
 		const size = readable.size = compressedSize;
-		if (writer instanceof WritableStream) {
-			writer = {
-				writable: writer
-			};
-		}
-		const { writable } = writer;
-		if (writable.size === UNDEFINED_VALUE) {
-			writable.size = 0;
-		}
 		const signal = getOptionValue$1(zipEntry, options, "signal");
+		writer = initWriter(writer);
 		await initStream(writer, uncompressedSize);
+		const { writable } = writer;
 		const { onstart, onprogress, onend } = options;
 		const workerOptions = {
 			options: {
@@ -9038,27 +9059,10 @@ const pendingEntries = [];
 class ZipWriter {
 
 	constructor(writer, options = {}) {
-		if (writer.writable === UNDEFINED_VALUE && typeof writer.next == FUNCTION_TYPE$1) {
-			writer = new SplitDataWriter(writer);
-		}
-		if (writer instanceof WritableStream) {
-			writer = { writable: writer };
-		}
-		if (writer.writable.size === UNDEFINED_VALUE) {
-			writer.writable.size = 0;
-		}
-		const splitZipFile = writer instanceof SplitDataWriter;
-		if (!splitZipFile) {
-			Object.assign(writer, {
-				diskNumber: 0,
-				diskOffset: 0,
-				availableSize: Infinity,
-				maxSize: Infinity
-			});
-		}
+		writer = initWriter(writer);
 		Object.assign(this, {
 			writer,
-			addSplitZipSignature: splitZipFile,
+			addSplitZipSignature: writer instanceof SplitDataWriter,
 			options,
 			config: getConfiguration(),
 			files: new Map(),
@@ -9190,11 +9194,7 @@ async function addFile(zipWriter, name, reader, options) {
 	let maximumEntrySize = 0;
 	let uncompressedSize = 0;
 	if (reader) {
-		if (reader instanceof ReadableStream) {
-			reader = {
-				readable: reader
-			};
-		}
+		reader = initReader(reader);
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE) {
 			dataDescriptor = true;

package/index.d.ts

@@ -854,7 +854,7 @@ export interface Entry {
      * @param options The options.
      * @returns A promise resolving to the type to data associated to `writer`.
      */
-    getData?<Type>(writer: Writer<Type> | WritableWriter | WritableStream, options?: EntryGetDataOptions): Promise<Type>
+    getData?<Type>(writer: Writer<Type> | WritableWriter | WritableStream | AsyncGenerator<Writer<unknown> | WritableWriter | WritableStream, boolean>, options?: EntryGetDataOptions): Promise<Type>
 }
 
 /**
@@ -902,7 +902,7 @@ export class ZipWriter<Type> {
      * @param options The options.
      * @returns A promise resolving to an `Entry` instance.
      */
-    add<ReaderType>(filename: string, reader?: Reader<ReaderType> | ReadableReader | ReadableStream, options?: ZipWriterAddDataOptions): Promise<Entry>
+    add<ReaderType>(filename: string, reader?: Reader<ReaderType> | ReadableReader | ReadableStream | Reader<unknown>[] | ReadableReader[] | ReadableStream[], options?: ZipWriterAddDataOptions): Promise<Entry>
     /**
      * Writes the entries directory, writes the global comment, and returns the content of the zip file
      * 

package/lib/core/io.js

@@ -46,7 +46,10 @@ const DEFAULT_CHUNK_SIZE = 64 * 1024;
 
 const PROPERTY_NAME_WRITABLE = "writable";
 
-import { UNDEFINED_VALUE } from "./constants.js";
+import {
+	UNDEFINED_VALUE,
+	FUNCTION_TYPE
+} from "./constants.js";
 import { getConfiguration } from "./configuration.js";
 
 class Stream {
@@ -338,7 +341,6 @@ async function initHttpReader(httpReader, sendRequest, getRequestData) {
 
 async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest, getRequestData) {
 	const {
-		data,
 		useRangeHeader,
 		forceRangeRequests,
 		options
@@ -350,10 +352,11 @@ async function readUint8ArrayHttpReader(httpReader, index, length, sendRequest,
 		}
 		return new Uint8Array(await response.arrayBuffer());
 	} else {
+		const { data } = httpReader;
 		if (!data) {
 			await getRequestData(httpReader, options);
 		}
-		return new Uint8Array(data.subarray(index, index + length));
+		return new Uint8Array(httpReader.data.subarray(index, index + length));
 	}
 }
 
@@ -646,6 +649,43 @@ async function initStream(stream, initSize) {
 	}
 }
 
+function initReader(reader) {
+	if (Array.isArray(reader)) {
+		reader = new SplitDataReader(reader);
+	}
+	if (reader instanceof ReadableStream) {
+		reader = {
+			readable: reader
+		};
+	}
+	return reader;
+}
+
+function initWriter(writer) {
+	if (writer.writable === UNDEFINED_VALUE && typeof writer.next == FUNCTION_TYPE) {
+		writer = new SplitDataWriter(writer);
+	}
+	if (writer instanceof WritableStream) {
+		writer = {
+			writable: writer
+		};
+	}
+	const { writable } = writer;
+	if (writable.size === UNDEFINED_VALUE) {
+		writable.size = 0;
+	}
+	const splitZipFile = writer instanceof SplitDataWriter;
+	if (!splitZipFile) {
+		Object.assign(writer, {
+			diskNumber: 0,
+			diskOffset: 0,
+			availableSize: Infinity,
+			maxSize: Infinity
+		});
+	}
+	return writer;
+}
+
 function readUint8Array(reader, offset, size, diskNumber) {
 	return reader.readUint8Array(offset, size, diskNumber);
 }
@@ -655,6 +695,8 @@ const SplitZipWriter = SplitDataWriter;
 
 export {
 	initStream,
+	initReader,
+	initWriter,
 	readUint8Array,
 	Reader,
 	Writer,

package/lib/core/zip-reader.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global BigInt, Response, ReadableStream, WritableStream */
+/* global BigInt, Response */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -71,9 +71,10 @@ import {
 } from "./codec-pool.js";
 import {
 	initStream,
+	initReader,
+	initWriter,
 	readUint8Array,
-	BlobReader,
-	SplitDataReader
+	BlobReader
 } from "./io.js";
 import { decodeText } from "./util/decode-text.js";
 import { Crc32 } from "./streams/codecs/crc32.js";
@@ -128,13 +129,8 @@ const ZIP64_EXTRACTION = {
 class ZipReader {
 
 	constructor(reader, options = {}) {
-		if (reader instanceof ReadableStream) {
-			reader = {
-				readable: reader
-			};
-		}
 		Object.assign(this, {
-			reader,
+			reader: initReader(reader),
 			options,
 			config: getConfiguration()
 		});
@@ -146,11 +142,7 @@ class ZipReader {
 		const { config } = zipReader;
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE || !reader.readUint8Array) {
-			if (Array.isArray(reader)) {
-				reader = new SplitDataReader(reader);
-			} else {
-				reader = new BlobReader(await new Response(reader.readable).blob());
-			}
+			reader = new BlobReader(await new Response(reader.readable).blob());
 			await initStream(reader);
 		}
 		if (reader.size < END_OF_CENTRAL_DIR_LENGTH) {
@@ -400,17 +392,10 @@ class ZipEntry {
 		readable.diskNumberStart = diskNumberStart;
 		readable.offset = dataOffset;
 		const size = readable.size = compressedSize;
-		if (writer instanceof WritableStream) {
-			writer = {
-				writable: writer
-			};
-		}
-		const { writable } = writer;
-		if (writable.size === UNDEFINED_VALUE) {
-			writable.size = 0;
-		}
 		const signal = getOptionValue(zipEntry, options, "signal");
+		writer = initWriter(writer);
 		await initStream(writer, uncompressedSize);
+		const { writable } = writer;
 		const { onstart, onprogress, onend } = options;
 		const workerOptions = {
 			options: {

package/lib/core/zip-writer.js

@@ -26,7 +26,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* global BigInt, ReadableStream, WritableStream */
+/* global BigInt */
 // deno-lint-ignore-file no-this-alias
 
 import {
@@ -61,8 +61,7 @@ import {
 	DIRECTORY_SIGNATURE,
 	MIN_DATE,
 	MAX_DATE,
-	UNDEFINED_VALUE,
-	FUNCTION_TYPE
+	UNDEFINED_VALUE
 } from "./constants.js";
 import {
 	getConfiguration,
@@ -74,6 +73,8 @@ import {
 } from "./codec-pool.js";
 import {
 	initStream,
+	initReader,
+	initWriter,
 	BlobWriter,
 	SplitDataWriter
 } from "./io.js";
@@ -108,27 +109,10 @@ const pendingEntries = [];
 class ZipWriter {
 
 	constructor(writer, options = {}) {
-		if (writer.writable === UNDEFINED_VALUE && typeof writer.next == FUNCTION_TYPE) {
-			writer = new SplitDataWriter(writer);
-		}
-		if (writer instanceof WritableStream) {
-			writer = { writable: writer };
-		}
-		if (writer.writable.size === UNDEFINED_VALUE) {
-			writer.writable.size = 0;
-		}
-		const splitZipFile = writer instanceof SplitDataWriter;
-		if (!splitZipFile) {
-			Object.assign(writer, {
-				diskNumber: 0,
-				diskOffset: 0,
-				availableSize: Infinity,
-				maxSize: Infinity
-			});
-		}
+		writer = initWriter(writer);
 		Object.assign(this, {
 			writer,
-			addSplitZipSignature: splitZipFile,
+			addSplitZipSignature: writer instanceof SplitDataWriter,
 			options,
 			config: getConfiguration(),
 			files: new Map(),
@@ -273,11 +257,7 @@ async function addFile(zipWriter, name, reader, options) {
 	let maximumEntrySize = 0;
 	let uncompressedSize = 0;
 	if (reader) {
-		if (reader instanceof ReadableStream) {
-			reader = {
-				readable: reader
-			};
-		}
+		reader = initReader(reader);
 		await initStream(reader);
 		if (reader.size === UNDEFINED_VALUE) {
 			dataDescriptor = true;

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.46",
+    "version": "2.6.48",
     "type": "module",
     "keywords": [
         "zip",
@@ -51,12 +51,12 @@
     },
     "homepage": "https://gildas-lormeau.github.io/zip.js",
     "devDependencies": {
-        "@rollup/plugin-node-resolve": "^14.1.0",
+        "@rollup/plugin-node-resolve": "^15.0.0",
         "@rollup/plugin-replace": "^4.0.0",
         "http-server": "^14.1.1",
         "rollup": "^2.79.1",
         "rollup-plugin-terser": "^7.0.2",
-        "typedoc": "^0.23.15"
+        "typedoc": "^0.23.16"
     },
     "overrides": {
         "terser": "^5.15.0"

package/tests/all/test-split-data.js

@@ -24,7 +24,7 @@ async function test() {
 		new zip.TextReader(TEXT_CONTENT),
 		new zip.BlobReader(BLOB_CONTENT)
 	];
-	await zipWriter.add("loremx2.txt", new zip.SplitDataReader(readers));
+	await zipWriter.add("loremx2.txt", readers);
 	const blob = await zipWriter.close();
 	const zipReader = new zip.ZipReader(new zip.BlobReader(blob));
 	const firstEntry = (await zipReader.getEntries()).shift();