@zip.js/zip.js 2.7.14 → 2.7.15

package/index.cjs

@@ -10131,7 +10131,7 @@ class ZipEntry {
 			id: fs.entries.length,
 			parent,
 			children: [],
-			uncompressedSize: 0
+			uncompressedSize: params.uncompressedSize || 0
 		});
 		fs.entries.push(zipEntry);
 		if (parent) {
@@ -10328,7 +10328,8 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: text,
 			Reader: TextReader,
 			Writer: TextWriter,
-			options
+			options,
+			uncompressedSize: text.length
 		});
 	}
 
@@ -10337,16 +10338,23 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: blob,
 			Reader: BlobReader,
 			Writer: BlobWriter,
-			options
+			options,
+			uncompressedSize: blob.size
 		});
 	}
 
 	addData64URI(name, dataURI, options = {}) {
+		let dataEnd = dataURI.length;
+		while (dataURI.charAt(dataEnd - 1) == "=") {
+			dataEnd--;
+		}
+		const dataStart = dataURI.indexOf(",") + 1;
 		return addChild(this, name, {
 			data: dataURI,
 			Reader: Data64URIReader,
 			Writer: Data64URIWriter,
-			options
+			options,
+			uncompressedSize: Math.floor((dataEnd - dataStart) * 0.75)
 		});
 	}
 
@@ -10355,7 +10363,8 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: array,
 			Reader: Uint8ArrayReader,
 			Writer: Uint8ArrayWriter,
-			options
+			options,
+			uncompressedSize: array.length
 		});
 	}
 
@@ -10397,7 +10406,8 @@ class ZipDirectoryEntry extends ZipEntry {
 				const size = file.size;
 				return { readable, size };
 			},
-			options
+			options,
+			uncompressedSize: file.size
 		});
 	}
 
@@ -10463,7 +10473,8 @@ class ZipDirectoryEntry extends ZipEntry {
 				if (!entry.directory) {
 					importedEntries.push(addChild(parent, name, {
 						data: entry,
-						Reader: getZipBlobReader(Object.assign({}, options))
+						Reader: getZipBlobReader(Object.assign({}, options)),
+						uncompressedSize: entry.uncompressedSize
 					}));
 				}
 			} catch (error) {
@@ -10816,10 +10827,9 @@ async function addFileSystemHandle(zipEntry, handle, options) {
 							const size = file.size;
 							return { readable, size };
 						},
-						options: {
-							lastModDate: new Date(file.lastModified)
-						}
-					}, options)
+						options: Object.assign({}, { lastModDate: new Date(file.lastModified) }, options),
+						uncompressedSize: file.size
+					})
 				);
 			} else if (handle.kind == "directory") {
 				const directoryEntry = parentEntry.addDirectory(handle.name);

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

@@ -71,7 +71,7 @@ class ZipEntry {
 			id: fs.entries.length,
 			parent,
 			children: [],
-			uncompressedSize: 0
+			uncompressedSize: params.uncompressedSize || 0
 		});
 		fs.entries.push(zipEntry);
 		if (parent) {
@@ -268,7 +268,8 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: text,
 			Reader: TextReader,
 			Writer: TextWriter,
-			options
+			options,
+			uncompressedSize: text.length
 		});
 	}
 
@@ -277,16 +278,23 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: blob,
 			Reader: BlobReader,
 			Writer: BlobWriter,
-			options
+			options,
+			uncompressedSize: blob.size
 		});
 	}
 
 	addData64URI(name, dataURI, options = {}) {
+		let dataEnd = dataURI.length;
+		while (dataURI.charAt(dataEnd - 1) == "=") {
+			dataEnd--;
+		}
+		const dataStart = dataURI.indexOf(",") + 1;
 		return addChild(this, name, {
 			data: dataURI,
 			Reader: Data64URIReader,
 			Writer: Data64URIWriter,
-			options
+			options,
+			uncompressedSize: Math.floor((dataEnd - dataStart) * 0.75)
 		});
 	}
 
@@ -295,7 +303,8 @@ class ZipDirectoryEntry extends ZipEntry {
 			data: array,
 			Reader: Uint8ArrayReader,
 			Writer: Uint8ArrayWriter,
-			options
+			options,
+			uncompressedSize: array.length
 		});
 	}
 
@@ -337,7 +346,8 @@ class ZipDirectoryEntry extends ZipEntry {
 				const size = file.size;
 				return { readable, size };
 			},
-			options
+			options,
+			uncompressedSize: file.size
 		});
 	}
 
@@ -403,7 +413,8 @@ class ZipDirectoryEntry extends ZipEntry {
 				if (!entry.directory) {
 					importedEntries.push(addChild(parent, name, {
 						data: entry,
-						Reader: getZipBlobReader(Object.assign({}, options))
+						Reader: getZipBlobReader(Object.assign({}, options)),
+						uncompressedSize: entry.uncompressedSize
 					}));
 				}
 			} catch (error) {
@@ -757,10 +768,9 @@ async function addFileSystemHandle(zipEntry, handle, options) {
 							const size = file.size;
 							return { readable, size };
 						},
-						options: {
-							lastModDate: new Date(file.lastModified)
-						}
-					}, options)
+						options: Object.assign({}, { lastModDate: new Date(file.lastModified) }, options),
+						uncompressedSize: file.size
+					})
 				);
 			} else if (handle.kind == "directory") {
 				const directoryEntry = parentEntry.addDirectory(handle.name);

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