@zip.js/zip.js 2.6.15 → 2.6.16

package/README.md

@@ -79,8 +79,8 @@ import {
 // Write the zip file
 // ----
 
-// Creates a TransformStream object where the zip content will be written in
-// the `writable` property.
+// Creates a TransformStream object, the zip content will be written in the
+// `writable` property.
 const zipFileWriter = new TransformStream();
 // Creates a Promise object resolved to the zip content returned as a Blob
 // object via the `readable` property of `zipFileWriter`.
@@ -106,8 +106,8 @@ const zipFileBlob = await zipFileBlobPromise;
 
 // Creates a BlobReader object used to read `zipFileBlob`.
 const zipFileReader = new BlobReader(zipFileBlob);
-// Creates a TransformStream object where the content of the first entry in the
-// zip will be written in the `writable` property.
+// Creates a TransformStream object, the content of the first entry in the zip
+// will be written in the `writable` property.
 const helloWorldWriter = new TransformStream();
 // Creates a Promise object resolved to the content of the first entry returned
 // as text via the `readable` property of `helloWorldWriter`.

package/dist/README.md

@@ -1,8 +1,10 @@
 # Built scripts of zip.js
- 
+
+**Warning**: These files are not compatible with ES modules, i.e. they cannot be imported with `import`. Instead, import `index.js` in the root folder of the project or one of the files prefixed with `zip-` in the [`/lib`](../lib) folder (e.g. `/lib/zip-no-worker-inflate.js`).
+
 - for production (minified):
 
-|                                | [`ZipReader`](https://gildas-lormeau.github.io/zip.js/core-api.html#zip-reading) API | [`ZipWriter`](https://gildas-lormeau.github.io/zip.js/core-api.html#zip-writing) API | [`zip.fs`](https://gildas-lormeau.github.io/zip.js/fs-api.html#fs-constructor) API | Web Workers | No Web Workers | Usage                                                 |
+|                                | [`ZipReader`](https://gildas-lormeau.github.io/zip.js/api/classes/ZipReader.html) API | [`ZipWriter`](https://gildas-lormeau.github.io/zip.js/api/classes/ZipWriter.html) API | [`zip.fs`](https://gildas-lormeau.github.io/zip.js/api/classes/FS.html) API | Web Workers | No Web Workers | Usage                                                 |
 |--------------------------------|-----------------|-----------------|--------------|-------------|----------------|-------------------------------------------------------|
 | `zip.min.js`                   |               x |               x |              |           x |                | compression/decompression with web workers            |
 | `zip-no-worker.min.js`         |               x |               x |              |             |              x | compression/decompression without web workers         |
@@ -14,13 +16,13 @@
 
 - for development/debugging:
 
-|                       | [`zip`](https://gildas-lormeau.github.io/zip.js/core-api.html) API | [`zip.fs`](https://gildas-lormeau.github.io/zip.js/fs-api.html#fs-constructor) API | Web Workers | No Web Workers | 
+|                       | `zip` API | [`zip.fs`](https://gildas-lormeau.github.io/zip.js/api/classes/FS.html) API | Web Workers | No Web Workers | 
 |-----------------------|-----------|--------------|-------------|----------------|
 | `zip.js`              |         x |              |           x |                |
 | `zip-full.js`         |         x |              |           x |              x |
 | `zip-fs.js`           |         x |            x |           x |                |
 | `zip-fs-full.js`      |         x |            x |           x |              x |
 
-- `z-worker.js` can be used as a web worker script if the [CSP](https://developer.mozilla.org/docs/Web/HTTP/CSP) does not allow to load it with a Blob URI
+- `z-worker.js` can be used as a web worker script if the [Content Security Policy](https://developer.mozilla.org/docs/Web/HTTP/CSP) blocks scripts loaded with a `blob:` scheme
 - `z-worker-fflate.js` is the web worker script for using [fflate](https://gildas-lormeau.github.io/zip.js/core-api.html#alternative-codec-fflate)
 - `z-worker-pako.js` is the web worker script for using [pako](https://gildas-lormeau.github.io/zip.js/core-api.html#alternative-codec-pako)

package/dist/zip-fs-full.js

@@ -8767,6 +8767,7 @@
 	const EXTRAFIELD_LENGTH_ZIP64 = 24;
 
 	let workers = 0;
+	const pendingEntries = [];
 
 	class ZipWriter {
 
@@ -8779,7 +8780,6 @@
 				filenames: new Set(),
 				offset: writer.size || 0,
 				pendingCompressedSize: 0,
-				pendingEntries: [],
 				pendingAddFileCalls: new Set()
 			});
 		}
@@ -8788,36 +8788,34 @@
 			const zipWriter = this;
 			const {
 				pendingAddFileCalls,
-				pendingEntries,
 				config
 			} = zipWriter;
 			if (workers < config.maxWorkers) {
 				workers++;
-				let promiseAddFile;
-				try {
-					name = name.trim();
-					if (zipWriter.filenames.has(name)) {
-						throw new Error(ERR_DUPLICATED_NAME);
-					}
-					zipWriter.filenames.add(name);
-					promiseAddFile = addFile(zipWriter, name, reader, options);
-					pendingAddFileCalls.add(promiseAddFile);
-					return await promiseAddFile;
-				} catch (error) {
-					zipWriter.filenames.delete(name);
-					throw error;
-				} finally {
-					pendingAddFileCalls.delete(promiseAddFile);
+			} else {
+				await new Promise(resolve => pendingEntries.push(resolve));
+			}
+			let promiseAddFile;
+			try {
+				name = name.trim();
+				if (zipWriter.filenames.has(name)) {
+					throw new Error(ERR_DUPLICATED_NAME);
+				}
+				zipWriter.filenames.add(name);
+				promiseAddFile = addFile(zipWriter, name, reader, options);
+				pendingAddFileCalls.add(promiseAddFile);
+				return await promiseAddFile;
+			} catch (error) {
+				zipWriter.filenames.delete(name);
+				throw error;
+			} finally {
+				pendingAddFileCalls.delete(promiseAddFile);
+				const pendingEntry = pendingEntries.shift();
+				if (pendingEntry) {
+					pendingEntry();
+				} else {
 					workers--;
-					const pendingEntry = pendingEntries.shift();
-					if (pendingEntry) {
-						zipWriter.add(pendingEntry.name, pendingEntry.reader, pendingEntry.options)
-							.then(pendingEntry.resolve)
-							.catch(pendingEntry.reject);
-					}
 				}
-			} else {
-				return new Promise((resolve, reject) => pendingEntries.push({ name, reader, options, resolve, reject }));
 			}
 		}