@zip.js/zip.js 2.7.43 → 2.7.44

package/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.
 
@@ -1042,7 +1041,7 @@ function Deflate() {
 		bi_windup(); // align on byte boundary
 		last_eob_len = 8; // enough lookahead for inflate
 
-		if (header) {
+		{
 			put_short(len);
 			put_short(~len);
 		}
@@ -1057,7 +1056,7 @@ function Deflate() {
 		eof // true if this is the last block for a file
 	) {
 		send_bits((STORED_BLOCK << 1) + (eof ? 1 : 0), 3); // send block type
-		copy_block(buf, stored_len, true); // with header
+		copy_block(buf, stored_len); // with header
 	}
 
 	// Determine the best encoding for the current block: dynamic trees, static
@@ -4327,6 +4326,7 @@ const FUNCTION_TYPE = "function";
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 class StreamAdapter {
 
 	constructor(Codec) {
@@ -4377,6 +4377,7 @@ class StreamAdapter {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const MINIMUM_CHUNK_SIZE = 64;
 let maxWorkers = 2;
 try {
@@ -4491,6 +4492,7 @@ function setIfDefined(propertyName, propertyValue) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 function getMimeType$1() {
 	return "application/octet-stream";
 }
@@ -4523,6 +4525,7 @@ function getMimeType$1() {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const table$1 = {
 	"application": {
 		"andrew-inset": "ez",
@@ -6214,6 +6217,7 @@ class Crc32 {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 class Crc32Stream extends TransformStream {
 
 	constructor() {
@@ -6263,6 +6267,7 @@ class Crc32Stream extends TransformStream {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 function encodeText(value) {
 	if (typeof TextEncoder == UNDEFINED_TYPE) {
 		value = unescape(encodeURIComponent(value));
@@ -7124,6 +7129,7 @@ misc.hmacSha1 = class {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const GET_RANDOM_VALUES_SUPPORTED = typeof crypto != UNDEFINED_TYPE && typeof crypto.getRandomValues == FUNCTION_TYPE;
 
 const ERR_INVALID_PASSWORD = "Invalid password";
@@ -7166,6 +7172,7 @@ function getRandomValues(array) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const BLOCK_LENGTH = 16;
 const RAW_FORMAT = "raw";
 const PBKDF2_ALGORITHM = { name: "PBKDF2" };
@@ -7469,6 +7476,7 @@ function toBits(codecBytes, chunk) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const HEADER_LENGTH = 12;
 
 class ZipCryptoDecryptionStream extends TransformStream {
@@ -7616,6 +7624,7 @@ function getInt32(number) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const COMPRESSION_FORMAT = "deflate-raw";
 
 class DeflateStream extends TransformStream {
@@ -7756,6 +7765,7 @@ function pipeThrough(readable, transformStream) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const MESSAGE_EVENT_TYPE = "message";
 const MESSAGE_START = "start";
 const MESSAGE_PULL = "pull";
@@ -7877,6 +7887,7 @@ class ChunkStream extends TransformStream {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 // deno-lint-ignore valid-typeof
 let WEB_WORKERS_SUPPORTED = typeof Worker != UNDEFINED_TYPE;
 
@@ -8205,6 +8216,7 @@ async function onMessage({ data }, workerData) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 let pool = [];
 const pendingRequests = [];
 
@@ -8368,6 +8380,7 @@ function createCodecClass(constructor, constructorOptions, registerDataHandler)
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const ERR_HTTP_STATUS = "HTTP error ";
 const ERR_HTTP_RANGE = "HTTP Range not supported";
 const ERR_ITERATOR_COMPLETED_TOO_SOON = "Writer iterator completed too soon";
@@ -9128,6 +9141,7 @@ function decodeCP437(stringValue) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 function decodeText(value, encoding) {
 	if (encoding && encoding.trim().toLowerCase() == "cp437") {
 		return decodeCP437(value);
@@ -9229,6 +9243,7 @@ class Entry {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const ERR_BAD_FORMAT = "File format is not recognized";
 const ERR_EOCDR_NOT_FOUND = "End of central directory not found";
 const ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND = "End of Zip64 central directory locator not found";
@@ -9407,10 +9422,16 @@ class ZipReader {
 				rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset)
 			});
 			const decode = getOptionValue$1(zipReader, options, "decodeText") || decodeText;
-			const [filename, comment] = await Promise.all([
-				decode(rawFilename, filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437),
-				decode(rawComment, commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437)
-			]);
+			const rawFilenameEncoding = filenameUTF8 ? CHARSET_UTF8 : filenameEncoding || CHARSET_CP437;
+			const rawCommentEncoding = commentUTF8 ? CHARSET_UTF8 : commentEncoding || CHARSET_CP437;
+			let filename = decode(rawFilename, rawFilenameEncoding);
+			if (filename === UNDEFINED_VALUE) {
+				filename = decodeText(rawFilename, rawFilenameEncoding);
+			}
+			let comment = decode(rawComment, rawCommentEncoding);
+			if (comment === UNDEFINED_VALUE) {
+				comment = decodeText(rawComment, rawCommentEncoding);
+			}
 			Object.assign(fileEntry, {
 				rawComment,
 				filename,
@@ -9484,7 +9505,7 @@ class ZipReaderStream {
 	}
 }
 
-class ZipEntry$1 {
+let ZipEntry$1 = class ZipEntry {
 
 	constructor(reader, config, options) {
 		Object.assign(this, {
@@ -9598,7 +9619,7 @@ class ZipEntry$1 {
 		}
 		return checkPasswordOnly ? UNDEFINED_VALUE : writer.getData ? writer.getData() : writable;
 	}
-}
+};
 
 function readCommonHeader(directory, dataView, offset) {
 	const rawBitFlag = directory.rawBitFlag = getUint16(dataView, offset + 2);
@@ -9892,6 +9913,7 @@ function getDataView$1(array) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 const ERR_DUPLICATED_NAME = "File already exists";
 const ERR_INVALID_COMMENT = "Zip file comment exceeds 64KB";
 const ERR_INVALID_ENTRY_COMMENT = "File entry comment exceeds 64KB";
@@ -10014,12 +10036,18 @@ async function addFile(zipWriter, name, reader, options) {
 		options.directory = name.endsWith(DIRECTORY_SIGNATURE);
 	}
 	const encode = getOptionValue(zipWriter, options, "encodeText", encodeText);
-	const rawFilename = encode(name);
+	let rawFilename = encode(name);
+	if (rawFilename === UNDEFINED_VALUE) {
+		rawFilename = encodeText(name);
+	}
 	if (getLength(rawFilename) > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_ENTRY_NAME);
 	}
 	const comment = options.comment || "";
-	const rawComment = encode(comment);
+	let rawComment = encode(comment);
+	if (rawComment === UNDEFINED_VALUE) {
+		rawComment = encodeText(comment);
+	}
 	if (getLength(rawComment) > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_ENTRY_COMMENT);
 	}
@@ -10085,7 +10113,7 @@ async function addFile(zipWriter, name, reader, options) {
 			dataDescriptor = true;
 			if (zip64 || zip64 === UNDEFINED_VALUE) {
 				zip64 = true;
-				uncompressedSize = maximumCompressedSize = MAX_32_BITS;
+				uncompressedSize = maximumCompressedSize = MAX_32_BITS + 1;
 			}
 		} else {
 			uncompressedSize = reader.size;
@@ -10093,11 +10121,11 @@ async function addFile(zipWriter, name, reader, options) {
 		}
 	}
 	const { diskOffset, diskNumber, maxSize } = zipWriter.writer;
-	const zip64UncompressedSize = zip64Enabled || uncompressedSize >= MAX_32_BITS;
-	const zip64CompressedSize = zip64Enabled || maximumCompressedSize >= MAX_32_BITS;
-	const zip64Offset = zip64Enabled || zipWriter.offset + zipWriter.pendingEntriesSize - diskOffset >= MAX_32_BITS;
+	const zip64UncompressedSize = zip64Enabled || uncompressedSize > MAX_32_BITS;
+	const zip64CompressedSize = zip64Enabled || maximumCompressedSize > MAX_32_BITS;
+	const zip64Offset = zip64Enabled || zipWriter.offset + zipWriter.pendingEntriesSize - diskOffset > MAX_32_BITS;
 	const supportZip64SplitFile = getOptionValue(zipWriter, options, "supportZip64SplitFile", true);
-	const zip64DiskNumberStart = (supportZip64SplitFile && zip64Enabled) || diskNumber + Math.ceil(zipWriter.pendingEntriesSize / maxSize) >= MAX_16_BITS;
+	const zip64DiskNumberStart = (supportZip64SplitFile && zip64Enabled) || diskNumber + Math.ceil(zipWriter.pendingEntriesSize / maxSize) > MAX_16_BITS;
 	if (zip64Offset || zip64UncompressedSize || zip64CompressedSize || zip64DiskNumberStart) {
 		if (zip64 === false || !keepOrder) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
@@ -10240,7 +10268,7 @@ async function getFileEntry(zipWriter, name, reader, entryInfo, options) {
 		fileEntry.offset = zipWriter.offset - diskOffset;
 		if (fileEntry.zip64) {
 			setZip64ExtraInfo(fileEntry, options);
-		} else if (fileEntry.offset >= MAX_32_BITS) {
+		} else if (fileEntry.offset > MAX_32_BITS) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		}
 		zipWriter.offset += fileEntry.size;
@@ -10857,7 +10885,7 @@ async function closeFile(zipWriter, comment, options) {
 		lastDiskNumber++;
 	}
 	let zip64 = getOptionValue(zipWriter, options, "zip64");
-	if (directoryOffset >= MAX_32_BITS || directoryDataLength >= MAX_32_BITS || filesLength >= MAX_16_BITS || lastDiskNumber >= MAX_16_BITS) {
+	if (directoryOffset > MAX_32_BITS || directoryDataLength > MAX_32_BITS || filesLength > MAX_16_BITS || lastDiskNumber > MAX_16_BITS) {
 		if (zip64 === false) {
 			throw new Error(ERR_UNSUPPORTED_FORMAT);
 		} else {
@@ -10996,6 +11024,7 @@ function getLength(...arrayLikes) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 class ZipEntry {
 
 	constructor(fs, name, params, parent) {
@@ -11833,9 +11862,10 @@ function addChild(parent, name, params, directory) {
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 let baseURL;
 try {
-	baseURL = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href));
+	baseURL = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href));
 } catch (_error) {
 	// ignored
 }
@@ -11844,6 +11874,7 @@ e(configure);
 
 /// <reference types="./index.d.ts" />
 
+
 configure({ Deflate: ZipDeflate, Inflate: ZipInflate });
 
 exports.BlobReader = BlobReader;

package/index.d.ts

@@ -629,15 +629,21 @@ export class Uint8ArrayWriter extends Writer<Uint8Array> { }
  * Represents an instance used to create an unzipped stream.
  *
  * @example
- * This example will take a zip file, decompress it and then recompress each file in it, saving it to disk.
+ * This example will take a zip file, decompress it and then save its files and directories to disk.
  * ```
- * for await (const entry of (await fetch(urlToZippedFile)).body.pipeThrough(new ZipWriterStream()))
- *   if (entry.readable) {
- *     console.log(entry.filename)
- *     entry.readable
- *       .pipeThrough(ZipReaderStream().transform(entry.filename))
- *       .pipeTo((await Deno.create(entry.filename + '.zip')).writable)
+ * import {resolve} from "https://deno.land/std/path/mod.ts";
+ * import {ensureDir, ensureFile} from "https://deno.land/std/fs/mod.ts";
+ *
+ * for await (const entry of (await fetch(urlToZippedFile)).body.pipeThrough(new ZipReaderStream())) {
+ *   const fullPath = resolve(destination, entry.filename);
+ *   if (entry.directory) {
+ *     await ensureDir(fullPath);
+ *     continue;
  *   }
+ *
+ *   await ensureFile(fullPath);
+ *   await entry.readable?.pipeTo((await Deno.create(fullPath)).writable);
+ * }
  * ```
  */
 export class ZipReaderStream<T> {
@@ -786,9 +792,9 @@ export interface GetEntriesOptions {
    * 
    * @param value The raw text value.
    * @param encoding The encoding of the text.
-   * @returns The decoded text value.
+   * @returns The decoded text value or `undefined` if the raw text value should be decoded by zip.js.
    */
-  decodeText?(value: Uint8Array, encoding: string): string
+  decodeText?(value: Uint8Array, encoding: string): string | undefined;
 }
 
 /**
@@ -1235,7 +1241,7 @@ export interface ZipWriterConstructorOptions {
   /**
    * `true` to keep the order of the entry physically in the zip file.
    *
-   * When set to `true`, the use of web workers will be improved. However, it also prevents files larger than 4GB from being created without setting the `zip54` option to `true` explicitly.
+   * When set to `true`, the use of web workers will be improved. However, it also prevents files larger than 4GB from being created without setting the `zip64` option to `true` explicitly.
    * Another solution to improve the use of web workers is to add entries from smallest to largest in uncompressed size.
    *
    * @defaultValue true
@@ -1355,9 +1361,9 @@ export interface ZipWriterConstructorOptions {
    * Encode the filename and the comment of the entry.
    * 
    * @param text The text to encode.
-   * @returns The encoded text.
+   * @returns The encoded text or `undefined` if the text should be encoded by zip.js.
    */
-  encodeText?(text: string): Uint8Array
+  encodeText?(text: string): Uint8Array | undefined;
 }
 
 /**