@zip.js/zip.js 2.5.24 → 2.6.0

package/README.md

@@ -2,3 +2,65 @@ zip.js is an open-source library (BSD-3-Clause license) for zipping and unzippin
 
 See here for more info:
 https://gildas-lormeau.github.io/zip.js/
+
+```js
+// Hello world with zip.js (and Streams)
+
+import { ZipWriter, ZipReader, BlobReader } from "https://deno.land/x/zipjs/index.js";
+
+// ----
+// Write the zip file
+// ----
+
+// Creates a TransformStream object where the zip content will be written.
+const zipStream = new TransformStream();
+// Creates a Promise object resolved to the zip content returned as a Blob object.
+const zipBlobPromise = new Response(zipStream.readable).blob();
+// Creates a ReadableStream object containing the text of the entry to add in the zip.
+const helloWorldReadable = new Blob(["Hello world!"], { type: "text/plain" }).stream();
+
+
+// Creates a ZipWriter object writing data via zipStream, adds the file "hello.txt" containing
+// the text "Hello world!" via helloWorldReadable in the zip, and closes the writer.
+const zipWriter = new ZipWriter(zipStream);
+await zipWriter.add("hello.txt", { readable: helloWorldReadable });
+await zipWriter.close();
+
+
+// Retrieves the Blob object containing the zip content.
+const zipBlob = await zipBlobPromise;
+
+// Uncomment the following code to download the zip file (in a browser)
+// 
+// const anchorElement = document.createElement("a");
+// anchorElement.href = URL.createObjectURL(zipBlob);
+// anchorElement.download = "hello.zip";
+// anchorElement.click();
+// 
+
+
+// ----
+// Read the zip file
+// ----
+
+// Creates a TransformStream object where the content of the first entry in the zip will be written.
+const contentStream = new TransformStream();
+// Creates a Promise object resolved to the first entry content returned as text.
+const contentTextPromise = new Response(contentStream.readable).text();
+
+
+// Reads zipBlob via a BlobReader object, retrieves metadata (name, dates, etc.) of the first entry, 
+// retrieves its content via contentStream, and closes the reader.
+// Note: it is *not* possible to use a ReadableStream object to read a zip because random access 
+// to data is required to fetch entries reliably and efficiently.
+const zipReader = new ZipReader(new BlobReader(zipBlob));
+const firstEntry = (await zipReader.getEntries()).shift();
+await firstEntry.getData(contentStream);
+await zipReader.close();
+
+
+// Displays "Hello world!".
+const contentText = await contentTextPromise;
+console.log(contentText);
+```
+See here for more examples: https://github.com/gildas-lormeau/zip.js/tree/master/tests/all

package/cli-deno/mc-zip.js

@@ -3,7 +3,7 @@
 /* global Deno, fetch, URL, TextEncoderStream */
 
 import { parse as parseArgs } from "https://deno.land/std@0.147.0/flags/mod.ts";
-import { fromFileUrl, normalize as normalizePath, resolve as resolvePath, extname } from "https://deno.land/std@0.147.0/path/mod.ts";
+import { normalize as normalizePath, resolve as resolvePath, extname } from "https://deno.land/std@0.147.0/path/mod.ts";
 import { configure, ZipWriter, terminateWorkers } from "../index.js";
 
 const args = parseArgs(Deno.args);
@@ -99,8 +99,6 @@ async function getFileInfo(file, options) {
 		if (!extname(name)) {
 			name += ".html";
 		}
-	} else if (file.startsWith("file:")) {
-		name = fromFileUrl(file);
 	} else {
 		name = file;
 		resolvedName = resolvePath(name);

package/dist/zip-fs-full.js

@@ -7017,7 +7017,6 @@
 	const MESSAGE_PULL = "pull";
 	const MESSAGE_DATA = "data";
 	const MESSAGE_CLOSE = "close";
-	const ERR_ABORT = "AbortError";
 
 	class Codec {
 
@@ -7285,7 +7284,7 @@
 	let indexWorker = 0;
 
 	async function runWorker(stream, workerOptions) {
-		const { options, config, streamOptions } = workerOptions;
+		const { options, config } = workerOptions;
 		const streamCopy = !options.compressed && !options.signed && !options.encrypted;
 		const { useWebWorkers, useCompressionStream, codecType } = options;
 		const { workerScripts } = config;
@@ -7307,16 +7306,7 @@
 				worker = await new Promise(resolve => pendingRequests.push({ resolve, stream, workerOptions }));
 			}
 		}
-		try {
-			return await worker.run();
-		} catch (error) {
-			const { signal } = streamOptions;
-			if (signal && signal.aborted && (signal.reason == error || error.name == ERR_ABORT)) {
-				throw new Error(ERR_ABORT);
-			} else {
-				throw error;
-			}
-		}
+		return worker.run();
 
 		function onTaskFinished(workerData) {
 			if (pendingRequests.length) {
@@ -7459,11 +7449,10 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
-	/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream */
+	/* global Blob, atob, btoa, XMLHttpRequest, URL, fetch, ReadableStream, WritableStream, FileReader */
 
 	const ERR_HTTP_STATUS = "HTTP error ";
 	const ERR_HTTP_RANGE = "HTTP Range not supported";
-	const ERR_NOT_SEEKABLE_READER = "Reader is not seekable";
 
 	const CONTENT_TYPE_TEXT_PLAIN = "text/plain";
 	const HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
@@ -7569,7 +7558,16 @@
 
 		getData() {
 			const writer = this;
-			return writer.blob.text();
+			if (writer.blob.text && (writer.encoding === undefined || (writer.encoding && writer.encoding.toLowerCase() == "utf-8"))) {
+				return writer.blob.text();
+			} else {
+				const reader = new FileReader();
+				return new Promise((resolve, reject) => {
+					reader.onload = event => resolve(event.target.result);
+					reader.onerror = () => reject(reader.error);
+					reader.readAsText(writer.blob, writer.encoding);
+				});
+			}
 		}
 	}
 
@@ -7689,32 +7687,6 @@
 		blobWriter.arrayBuffers = [];
 	}
 
-	class ReadableStreamReader extends Stream {
-
-		constructor(readable) {
-			super();
-			if (!readable) {
-				this.readable = new ReadableStream({});
-			}
-		}
-	}
-
-	class WritableStreamWriter extends Writer {
-
-		constructor(writable, { preventClose } = {}) {
-			super();
-			this.preventClose = preventClose;
-			if (!writable) {
-				writable = new WritableStream({});
-			}
-			Object.defineProperty(this, "writable", {
-				get() {
-					return writable;
-				}
-			});
-		}
-	}
-
 	class FetchReader extends Reader {
 
 		constructor(url, options) {
@@ -8331,7 +8303,7 @@
 			const extractPrependedData = getOptionValue$1(zipReader, options, "extractPrependedData");
 			const extractAppendedData = getOptionValue$1(zipReader, options, "extractAppendedData");
 			if (extractPrependedData) {
-				zipReader.prependedData = await readUint8Array(reader, 0, startOffset);
+				zipReader.prependedData = startOffset > 0 ? await readUint8Array(reader, 0, startOffset) : new Uint8Array();
 			}
 			zipReader.comment = commentLength ? await readUint8Array(reader, commentOffset + END_OF_CENTRAL_DIR_LENGTH, commentLength) : new Uint8Array();
 			if (extractAppendedData) {
@@ -10087,7 +10059,6 @@
 	exports.BlobWriter = BlobWriter;
 	exports.Data64URIReader = Data64URIReader;
 	exports.Data64URIWriter = Data64URIWriter;
-	exports.ERR_ABORT = ERR_ABORT;
 	exports.ERR_BAD_FORMAT = ERR_BAD_FORMAT;
 	exports.ERR_CENTRAL_DIRECTORY_NOT_FOUND = ERR_CENTRAL_DIRECTORY_NOT_FOUND;
 	exports.ERR_DUPLICATED_NAME = ERR_DUPLICATED_NAME;
@@ -10107,19 +10078,16 @@
 	exports.ERR_INVALID_SIGNATURE = ERR_INVALID_SIGNATURE;
 	exports.ERR_INVALID_VERSION = ERR_INVALID_VERSION;
 	exports.ERR_LOCAL_FILE_HEADER_NOT_FOUND = ERR_LOCAL_FILE_HEADER_NOT_FOUND;
-	exports.ERR_NOT_SEEKABLE_READER = ERR_NOT_SEEKABLE_READER;
 	exports.ERR_UNSUPPORTED_COMPRESSION = ERR_UNSUPPORTED_COMPRESSION;
 	exports.ERR_UNSUPPORTED_ENCRYPTION = ERR_UNSUPPORTED_ENCRYPTION;
 	exports.ERR_UNSUPPORTED_FORMAT = ERR_UNSUPPORTED_FORMAT;
 	exports.HttpRangeReader = HttpRangeReader;
 	exports.HttpReader = HttpReader;
-	exports.ReadableStreamReader = ReadableStreamReader;
 	exports.Reader = Reader;
 	exports.TextReader = TextReader;
 	exports.TextWriter = TextWriter;
 	exports.Uint8ArrayReader = Uint8ArrayReader;
 	exports.Uint8ArrayWriter = Uint8ArrayWriter;
-	exports.WritableStreamWriter = WritableStreamWriter;
 	exports.Writer = Writer;
 	exports.ZipReader = ZipReader;
 	exports.ZipWriter = ZipWriter;