@zip.js/zip.js 2.7.43 → 2.7.45

package/lib/core/zip-reader.js

@@ -276,10 +276,16 @@ class ZipReader {
 				rawExtraField: directoryArray.subarray(extraFieldOffset, commentOffset)
 			});
 			const decode = getOptionValue(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,

package/lib/core/zip-writer.js

@@ -225,12 +225,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);
 	}
@@ -296,7 +302,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;
@@ -304,11 +310,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);
@@ -333,7 +339,7 @@ async function addFile(zipWriter, name, reader, options) {
 		zip64DiskNumberStart,
 		password,
 		rawPassword,
-		level: !useCompressionStream && zipWriter.config.CompressionStream === UNDEFINED_VALUE ? 0 : level,
+		level: !useCompressionStream && (zipWriter.config.CompressionStream === UNDEFINED_VALUE && zipWriter.config.CompressionStreamNative === UNDEFINED_VALUE) ? 0 : level,
 		useWebWorkers,
 		encryptionStrength,
 		extendedTimestamp,
@@ -451,7 +457,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;
@@ -1068,7 +1074,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 {

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.43",
+    "version": "2.7.45",
     "type": "module",
     "keywords": [
         "zip",
@@ -77,12 +77,9 @@
     "devDependencies": {
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-replace": "^5.0.5",
+        "@rollup/plugin-terser": "^0.4.4",
         "http-server": "^14.1.1",
-        "rollup": "^2.79.1",
-        "rollup-plugin-terser": "^7.0.2",
-        "typedoc": "^0.25.7"
-    },
-    "overrides": {
-        "terser": "^5.30.4"
+        "rollup": "^4.17.2",
+        "typedoc": "^0.25.13"
     }
 }