@zip.js/zip.js 2.6.67 → 2.6.69

package/index.d.ts

@@ -1185,6 +1185,10 @@ declare class ZipEntry {
      * The children of the entry.
      */
     children: ZipEntry[]
+    /**
+     * Clones the entry
+     */
+    clone(): ZipEntry
     /**
      * Returns the full filename of the entry
      */

package/lib/core/io.js

@@ -262,8 +262,8 @@ class FetchReader extends Reader {
 	}
 
 	async init() {
-		super.init();
 		await initHttpReader(this, sendFetchRequest, getFetchRequestData);
+		super.init();
 	}
 
 	readUint8Array(index, length) {
@@ -279,8 +279,8 @@ class XHRReader extends Reader {
 	}
 
 	async init() {
-		super.init();
 		await initHttpReader(this, sendXMLHttpRequest, getXMLHttpRequestData);
+		super.init();
 	}
 
 	readUint8Array(index, length) {
@@ -467,8 +467,8 @@ class HttpReader extends Reader {
 	}
 
 	async init() {
-		super.init();
 		await this.reader.init();
+		super.init();
 	}
 
 	readUint8Array(index, length) {
@@ -503,11 +503,11 @@ class Uint8ArrayReader extends Reader {
 class Uint8ArrayWriter extends Writer {
 
 	init(initSize = 0) {
-		super.init();
 		Object.assign(this, {
 			offset: 0,
 			array: new Uint8Array(initSize)
 		});
+		super.init();
 	}
 
 	writeUint8Array(array) {
@@ -534,7 +534,6 @@ class SplitDataReader extends Reader {
 	}
 
 	async init() {
-		super.init();
 		const reader = this;
 		const { readers } = reader;
 		reader.lastDiskNumber = 0;
@@ -542,6 +541,7 @@ class SplitDataReader extends Reader {
 			await diskReader.init();
 			reader.size += diskReader.size;
 		}));
+		super.init();
 	}
 
 	async readUint8Array(offset, length, diskNumber = 0) {

package/lib/core/zip-fs-core.js

@@ -125,6 +125,10 @@ class ZipFileEntry extends ZipEntry {
 		}
 	}
 
+	clone() {
+		return new ZipFileEntry(this.fs, this.name, this);
+	}
+
 	async getData(writer, options = {}) {
 		const zipEntry = this;
 		if (!writer || (writer.constructor == zipEntry.Writer && zipEntry.data)) {
@@ -212,6 +216,10 @@ class ZipDirectoryEntry extends ZipEntry {
 		this.directory = true;
 	}
 
+	clone() {
+		return new ZipDirectoryEntry(this.fs, this.name);
+	}
+
 	addDirectory(name) {
 		return addChild(this, name, null, true);
 	}
@@ -504,12 +512,12 @@ function getZipBlobReader(options) {
 		}
 
 		async init() {
-			super.init();
 			const zipBlobReader = this;
 			zipBlobReader.size = zipBlobReader.entry.uncompressedSize;
 			const data = await zipBlobReader.entry.getData(new BlobWriter(), Object.assign({}, zipBlobReader.options, options));
 			zipBlobReader.data = data;
 			zipBlobReader.blobReader = new BlobReader(data);
+			super.init();
 		}
 
 		readUint8Array(index, length) {
@@ -520,7 +528,7 @@ function getZipBlobReader(options) {
 
 async function initReaders(entry) {
 	if (entry.children.length) {
-		for (const child of entry.children) {
+		await Promise.all(entry.children.map(async child => {
 			if (child.directory) {
 				await initReaders(child);
 			} else {
@@ -528,17 +536,19 @@ async function initReaders(entry) {
 				await initStream(reader);
 				child.uncompressedSize = reader.size;
 			}
-		}
+		}));
 	}
 }
 
 function detach(entry) {
-	const children = entry.parent.children;
-	children.forEach((child, index) => {
-		if (child.id == entry.id) {
-			children.splice(index, 1);
-		}
-	});
+	if (entry.parent) {
+		const children = entry.parent.children;
+		children.forEach((child, index) => {
+			if (child.id == entry.id) {
+				children.splice(index, 1);
+			}
+		});
+	}
 }
 
 async function exportZip(zipWriter, entry, totalSize, options) {

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