@zip.js/zip.js 2.6.78 → 2.6.80

package/index.cjs

@@ -10096,6 +10096,7 @@ class ZipEntry {
 			fs,
 			name,
 			data: params.data,
+			options: params.options,
 			id: fs.entries.length,
 			parent,
 			children: [],
@@ -10262,39 +10263,43 @@ class ZipDirectoryEntry extends ZipEntry {
 		return clonedEntry;
 	}
 
-	addDirectory(name) {
-		return addChild(this, name, null, true);
+	addDirectory(name, options) {
+		return addChild(this, name, { options }, true);
 	}
 
-	addText(name, text) {
+	addText(name, text, options = {}) {
 		return addChild(this, name, {
 			data: text,
 			Reader: TextReader,
-			Writer: TextWriter
+			Writer: TextWriter,
+			options
 		});
 	}
 
-	addBlob(name, blob) {
+	addBlob(name, blob, options = {}) {
 		return addChild(this, name, {
 			data: blob,
 			Reader: BlobReader,
-			Writer: BlobWriter
+			Writer: BlobWriter,
+			options
 		});
 	}
 
-	addData64URI(name, dataURI) {
+	addData64URI(name, dataURI, options = {}) {
 		return addChild(this, name, {
 			data: dataURI,
 			Reader: Data64URIReader,
-			Writer: Data64URIWriter
+			Writer: Data64URIWriter,
+			options
 		});
 	}
 
-	addUint8Array(name, array) {
+	addUint8Array(name, array, options = {}) {
 		return addChild(this, name, {
 			data: array,
 			Reader: Uint8ArrayReader,
-			Writer: Uint8ArrayWriter
+			Writer: Uint8ArrayWriter,
+			options
 		});
 	}
 
@@ -10305,18 +10310,20 @@ class ZipDirectoryEntry extends ZipEntry {
 				constructor(url) {
 					super(url, options);
 				}
-			}
+			},
+			options
 		});
 	}
 
-	addReadable(name, readable) {
+	addReadable(name, readable, options = {}) {
 		return addChild(this, name, {
-			Reader: function () { return { readable }; }
+			Reader: function () { return { readable }; },
+			options
 		});
 	}
 
-	addFileSystemEntry(fileSystemEntry) {
-		return addFileSystemEntry(this, fileSystemEntry);
+	addFileSystemEntry(fileSystemEntry, options = {}) {
+		return addFileSystemEntry(this, fileSystemEntry, options);
 	}
 
 	addData(name, params) {
@@ -10454,32 +10461,32 @@ class FS {
 		return this.root.getChildByName(name);
 	}
 
-	addDirectory(name) {
-		return this.root.addDirectory(name);
+	addDirectory(name, options) {
+		return this.root.addDirectory(name, options);
 	}
 
-	addText(name, text) {
-		return this.root.addText(name, text);
+	addText(name, text, options) {
+		return this.root.addText(name, text, options);
 	}
 
-	addBlob(name, blob) {
-		return this.root.addBlob(name, blob);
+	addBlob(name, blob, options) {
+		return this.root.addBlob(name, blob, options);
 	}
 
-	addData64URI(name, dataURI) {
-		return this.root.addData64URI(name, dataURI);
+	addData64URI(name, dataURI, options) {
+		return this.root.addData64URI(name, dataURI, options);
 	}
 
 	addHttpContent(name, url, options) {
 		return this.root.addHttpContent(name, url, options);
 	}
 
-	addReadable(name, readable) {
-		return this.root.addReadable(name, readable);
+	addReadable(name, readable, options) {
+		return this.root.addReadable(name, readable, options);
 	}
 
-	addFileSystemEntry(fileSystemEntry) {
-		return this.root.addFileSystemEntry(fileSystemEntry);
+	addFileSystemEntry(fileSystemEntry, options) {
+		return this.root.addFileSystemEntry(fileSystemEntry, options);
 	}
 
 	addData(name, params) {
@@ -10574,7 +10581,16 @@ async function initReaders(entry, options) {
 				await initReaders(child, options);
 			} else {
 				const reader = child.reader = new child.Reader(child.data, options);
-				await initStream(reader);
+				try {
+					await initStream(reader);
+				} catch (error) {
+					try {
+						error.entryId = child.id;
+					} catch (_error) {
+						// ignored
+					}
+					throw error;
+				}
 				child.uncompressedSize = reader.size;
 			}
 		}));
@@ -10612,9 +10628,32 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 
 		async function processChild(child) {
 			const name = options.relativePath ? child.getRelativeName(selectedEntry) : child.getFullname();
+			let externalFileAttribute;
+			let versionMadeBy;
+			let comment;
+			let lastModDate;
+			let lastAccessDate;
+			let creationDate;
+			let childOptions = child.options || {};
+			if (child.data instanceof Entry) {
+				({
+					externalFileAttribute,
+					versionMadeBy,
+					comment,
+					lastModDate,
+					lastAccessDate,
+					creationDate
+				} = child.data);
+			}
 			await zipWriter.add(name, child.reader, Object.assign({
 				directory: child.directory
 			}, Object.assign({}, options, {
+				externalFileAttribute,
+				versionMadeBy,
+				comment,
+				lastModDate,
+				lastAccessDate,
+				creationDate,
 				onprogress: async indexProgress => {
 					if (options.onprogress) {
 						entryOffsets.set(name, indexProgress);
@@ -10625,30 +10664,30 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 						}
 					}
 				}
-			})));
+			}, childOptions)));
 			await process(zipWriter, child);
 		}
 	}
 }
 
-async function addFileSystemEntry(zipEntry, fileSystemEntry) {
+async function addFileSystemEntry(zipEntry, fileSystemEntry, options) {
 	if (fileSystemEntry.isDirectory) {
-		const entry = zipEntry.addDirectory(fileSystemEntry.name);
+		const entry = zipEntry.addDirectory(fileSystemEntry.name, options);
 		await addDirectory(entry, fileSystemEntry);
 		return entry;
 	} else {
-		return new Promise((resolve, reject) => fileSystemEntry.file(file => resolve(zipEntry.addBlob(fileSystemEntry.name, file)), reject));
+		return new Promise((resolve, reject) => fileSystemEntry.file(file => resolve(zipEntry.addBlob(fileSystemEntry.name, file, options)), reject));
 	}
 
 	async function addDirectory(zipEntry, fileEntry) {
 		const children = await getChildren(fileEntry);
 		for (const child of children) {
 			if (child.isDirectory) {
-				await addDirectory(zipEntry.addDirectory(child.name), child);
+				await addDirectory(zipEntry.addDirectory(child.name, options), child);
 			} else {
 				await new Promise((resolve, reject) => {
 					child.file(file => {
-						const childZipEntry = zipEntry.addBlob(child.name, file);
+						const childZipEntry = zipEntry.addBlob(child.name, file, options);
 						childZipEntry.uncompressedSize = file.size;
 						resolve(childZipEntry);
 					}, reject);

package/index.d.ts

@@ -1326,66 +1326,73 @@ export class ZipDirectoryEntry extends ZipEntry {
     /**
      * Adds a directory
      * 
-     * @param name The relative filename of the directory
+     * @param name The relative filename of the directory.
+     * @param options The options.
      * @returns A {@link ZipDirectoryEntry} instance.
      */
-    addDirectory(name: string): ZipDirectoryEntry
+    addDirectory(name: string, options?: ZipWriterAddDataOptions): ZipDirectoryEntry
     /**
      * Adds an entry with content provided as text
      * 
      * @param name The relative filename of the entry.
-     * @param text The text. 
+     * @param text The text.
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addText(name: string, text: string): ZipFileEntry<string, string>
+    addText(name: string, text: string, options?: ZipWriterAddDataOptions): ZipFileEntry<string, string>
     /**
      * Adds aentry entry with content provided as a `Blob` instance
      * 
      * @param name The relative filename of the entry.
-     * @param blob The `Blob` instance. 
+     * @param blob The `Blob` instance.
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addBlob(name: string, blob: Blob): ZipFileEntry<Blob, Blob>
+    addBlob(name: string, blob: Blob, options?: ZipWriterAddDataOptions): ZipFileEntry<Blob, Blob>
     /**
      * Adds aentry entry with content provided as a Data URI `string` encoded in Base64
      * 
      * @param name The relative filename of the entry.
      * @param dataURI The Data URI `string` encoded in Base64.
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addData64URI(name: string, dataURI: string): ZipFileEntry<string, string>
+    addData64URI(name: string, dataURI: string, options?: ZipWriterAddDataOptions): ZipFileEntry<string, string>
     /**
      * Adds an entry with content provided as a `Uint8Array` instance
      * 
      * @param name The relative filename of the entry.
-     * @param array The `Uint8Array` instance. 
+     * @param array The `Uint8Array` instance.
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addUint8Array(name: string, array: Uint8Array): ZipFileEntry<Uint8Array, Uint8Array>
+    addUint8Array(name: string, array: Uint8Array, options?: ZipWriterAddDataOptions): ZipFileEntry<Uint8Array, Uint8Array>
     /**
      * Adds an entry with content fetched from a URL
      * 
      * @param name The relative filename of the entry.
      * @param url The URL.
-     * @param options The options. 
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addHttpContent(name: string, url: string, options?: HttpOptions): ZipFileEntry<string, void>
+    addHttpContent(name: string, url: string, options?: HttpOptions & ZipWriterAddDataOptions): ZipFileEntry<string, void>
     /**
      * Adds aentry entry with content provided via a `ReadableStream` instance
      * 
      * @param name The relative filename of the entry.
-     * @param readable The `ReadableStream` instance. 
+     * @param readable The `ReadableStream` instance.
+     * @param options The options.
      * @returns A {@link ZipFileEntry} instance.
      */
-    addReadable(name: string, readable: ReadableStream): ZipFileEntry<ReadableStream, void>
+    addReadable(name: string, readable: ReadableStream, options?: ZipWriterAddDataOptions): ZipFileEntry<ReadableStream, void>
     /**
      * Adds an entry with content provided via a `FileSystemEntry` instance
      * 
-     * @param fileSystemEntry The `FileSystemEntry` instance. 
+     * @param fileSystemEntry The `FileSystemEntry` instance.
+     * @param options The options.
      * @returns A promise resolving to a {@link ZipFileEntry} or a {@link ZipDirectoryEntry} instance.
      */
-    addFileSystemEntry(fileSystemEntry: FileSystemEntry): Promise<ZipEntry>
+    addFileSystemEntry(fileSystemEntry: FileSystemEntry, options?: ZipWriterAddDataOptions): Promise<ZipEntry>
     /**
      * Extracts a zip file provided as a `Blob` instance into the entry
      * 

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

@@ -48,6 +48,9 @@ import {
 import {
 	ZipWriter
 } from "./zip-writer.js";
+import {
+	Entry
+} from "./zip-entry.js";
 
 class ZipEntry {
 
@@ -63,6 +66,7 @@ class ZipEntry {
 			fs,
 			name,
 			data: params.data,
+			options: params.options,
 			id: fs.entries.length,
 			parent,
 			children: [],
@@ -229,39 +233,43 @@ class ZipDirectoryEntry extends ZipEntry {
 		return clonedEntry;
 	}
 
-	addDirectory(name) {
-		return addChild(this, name, null, true);
+	addDirectory(name, options) {
+		return addChild(this, name, { options }, true);
 	}
 
-	addText(name, text) {
+	addText(name, text, options = {}) {
 		return addChild(this, name, {
 			data: text,
 			Reader: TextReader,
-			Writer: TextWriter
+			Writer: TextWriter,
+			options
 		});
 	}
 
-	addBlob(name, blob) {
+	addBlob(name, blob, options = {}) {
 		return addChild(this, name, {
 			data: blob,
 			Reader: BlobReader,
-			Writer: BlobWriter
+			Writer: BlobWriter,
+			options
 		});
 	}
 
-	addData64URI(name, dataURI) {
+	addData64URI(name, dataURI, options = {}) {
 		return addChild(this, name, {
 			data: dataURI,
 			Reader: Data64URIReader,
-			Writer: Data64URIWriter
+			Writer: Data64URIWriter,
+			options
 		});
 	}
 
-	addUint8Array(name, array) {
+	addUint8Array(name, array, options = {}) {
 		return addChild(this, name, {
 			data: array,
 			Reader: Uint8ArrayReader,
-			Writer: Uint8ArrayWriter
+			Writer: Uint8ArrayWriter,
+			options
 		});
 	}
 
@@ -272,18 +280,20 @@ class ZipDirectoryEntry extends ZipEntry {
 				constructor(url) {
 					super(url, options);
 				}
-			}
+			},
+			options
 		});
 	}
 
-	addReadable(name, readable) {
+	addReadable(name, readable, options = {}) {
 		return addChild(this, name, {
-			Reader: function () { return { readable }; }
+			Reader: function () { return { readable }; },
+			options
 		});
 	}
 
-	addFileSystemEntry(fileSystemEntry) {
-		return addFileSystemEntry(this, fileSystemEntry);
+	addFileSystemEntry(fileSystemEntry, options = {}) {
+		return addFileSystemEntry(this, fileSystemEntry, options);
 	}
 
 	addData(name, params) {
@@ -421,32 +431,32 @@ class FS {
 		return this.root.getChildByName(name);
 	}
 
-	addDirectory(name) {
-		return this.root.addDirectory(name);
+	addDirectory(name, options) {
+		return this.root.addDirectory(name, options);
 	}
 
-	addText(name, text) {
-		return this.root.addText(name, text);
+	addText(name, text, options) {
+		return this.root.addText(name, text, options);
 	}
 
-	addBlob(name, blob) {
-		return this.root.addBlob(name, blob);
+	addBlob(name, blob, options) {
+		return this.root.addBlob(name, blob, options);
 	}
 
-	addData64URI(name, dataURI) {
-		return this.root.addData64URI(name, dataURI);
+	addData64URI(name, dataURI, options) {
+		return this.root.addData64URI(name, dataURI, options);
 	}
 
 	addHttpContent(name, url, options) {
 		return this.root.addHttpContent(name, url, options);
 	}
 
-	addReadable(name, readable) {
-		return this.root.addReadable(name, readable);
+	addReadable(name, readable, options) {
+		return this.root.addReadable(name, readable, options);
 	}
 
-	addFileSystemEntry(fileSystemEntry) {
-		return this.root.addFileSystemEntry(fileSystemEntry);
+	addFileSystemEntry(fileSystemEntry, options) {
+		return this.root.addFileSystemEntry(fileSystemEntry, options);
 	}
 
 	addData(name, params) {
@@ -542,7 +552,16 @@ async function initReaders(entry, options) {
 				await initReaders(child, options);
 			} else {
 				const reader = child.reader = new child.Reader(child.data, options);
-				await initStream(reader);
+				try {
+					await initStream(reader);
+				} catch (error) {
+					try {
+						error.entryId = child.id;
+					} catch (_error) {
+						// ignored
+					}
+					throw error;
+				}
 				child.uncompressedSize = reader.size;
 			}
 		}));
@@ -580,9 +599,32 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 
 		async function processChild(child) {
 			const name = options.relativePath ? child.getRelativeName(selectedEntry) : child.getFullname();
+			let externalFileAttribute;
+			let versionMadeBy;
+			let comment;
+			let lastModDate;
+			let lastAccessDate;
+			let creationDate;
+			let childOptions = child.options || {};
+			if (child.data instanceof Entry) {
+				({
+					externalFileAttribute,
+					versionMadeBy,
+					comment,
+					lastModDate,
+					lastAccessDate,
+					creationDate
+				} = child.data);
+			}
 			await zipWriter.add(name, child.reader, Object.assign({
 				directory: child.directory
 			}, Object.assign({}, options, {
+				externalFileAttribute,
+				versionMadeBy,
+				comment,
+				lastModDate,
+				lastAccessDate,
+				creationDate,
 				onprogress: async indexProgress => {
 					if (options.onprogress) {
 						entryOffsets.set(name, indexProgress);
@@ -593,30 +635,30 @@ async function exportZip(zipWriter, entry, totalSize, options) {
 						}
 					}
 				}
-			})));
+			}, childOptions)));
 			await process(zipWriter, child);
 		}
 	}
 }
 
-async function addFileSystemEntry(zipEntry, fileSystemEntry) {
+async function addFileSystemEntry(zipEntry, fileSystemEntry, options) {
 	if (fileSystemEntry.isDirectory) {
-		const entry = zipEntry.addDirectory(fileSystemEntry.name);
+		const entry = zipEntry.addDirectory(fileSystemEntry.name, options);
 		await addDirectory(entry, fileSystemEntry);
 		return entry;
 	} else {
-		return new Promise((resolve, reject) => fileSystemEntry.file(file => resolve(zipEntry.addBlob(fileSystemEntry.name, file)), reject));
+		return new Promise((resolve, reject) => fileSystemEntry.file(file => resolve(zipEntry.addBlob(fileSystemEntry.name, file, options)), reject));
 	}
 
 	async function addDirectory(zipEntry, fileEntry) {
 		const children = await getChildren(fileEntry);
 		for (const child of children) {
 			if (child.isDirectory) {
-				await addDirectory(zipEntry.addDirectory(child.name), child);
+				await addDirectory(zipEntry.addDirectory(child.name, options), child);
 			} else {
 				await new Promise((resolve, reject) => {
 					child.file(file => {
-						const childZipEntry = zipEntry.addBlob(child.name, file);
+						const childZipEntry = zipEntry.addBlob(child.name, file, options);
 						childZipEntry.uncompressedSize = file.size;
 						resolve(childZipEntry);
 					}, reject);

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