@zip.js/zip.js 2.7.4 → 2.7.6

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

@@ -367,25 +367,36 @@ class ZipDirectoryEntry extends ZipEntry {
 		const zipReader = new ZipReader(reader, options);
 		const importedEntries = [];
 		const entries = await zipReader.getEntries();
-		entries.forEach((entry) => {
+		for (const entry of entries) {
 			let parent = this;
-			const path = entry.filename.split("/");
-			const name = path.pop();
-			path.forEach(pathPart => {
-				const previousParent = parent;
-				parent = parent.getChildByName(pathPart);
-				if (!parent) {
-					parent = new ZipDirectoryEntry(this.fs, pathPart, { data: entry }, previousParent);
-					importedEntries.push(parent);
+			try {
+				const path = entry.filename.split("/");
+				const name = path.pop();
+				path.forEach((pathPart, pathIndex) => {
+					const previousParent = parent;
+					parent = parent.getChildByName(pathPart);
+					if (!parent) {
+						parent = new ZipDirectoryEntry(this.fs, pathPart, { data: pathIndex == path.length - 1 ? entry : null }, previousParent);
+						importedEntries.push(parent);
+					}
+				});
+				if (!entry.directory) {
+					importedEntries.push(addChild(parent, name, {
+						data: entry,
+						Reader: getZipBlobReader(Object.assign({}, options))
+					}));
 				}
-			});
-			if (!entry.directory) {
-				importedEntries.push(addChild(parent, name, {
-					data: entry,
-					Reader: getZipBlobReader(Object.assign({}, options))
-				}));
+			} catch (error) {
+				try {
+					error.cause = {
+						entry
+					};
+				} catch (_error) {
+					// ignored
+				}
+				throw error;
 			}
-		});
+		}
 		return importedEntries;
 	}
 
@@ -620,6 +631,9 @@ async function initReaders(entry, options) {
 				} catch (error) {
 					try {
 						error.entryId = child.id;
+						error.cause = {
+							entry: child
+						};
 					} catch (_error) {
 						// ignored
 					}
@@ -652,7 +666,7 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 
 		async function exportChild() {
 			if (options.bufferedWrite) {
-				await Promise.all(entry.children.map(processChild));
+				await Promise.allSettled(entry.children.map(processChild));
 			} else {
 				for (const child of entry.children) {
 					await processChild(child);

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