@zip.js/zip.js 2.6.10 → 2.6.13

package/cli-deno/mc-zip.js

@@ -36,7 +36,7 @@ async function displayUsage() {
 	await stdout.write("  --data-descriptor-signature   add data descriptor signatures (default: false)\n");
 	await stdout.write("  --keep-order                  keep entries order (default: true)\n");
 	await stdout.write("  --zip64                       use Zip64 format (default: false)\n");
-	await stdout.write("  --prevent-parent-directories  remove occurences of \"../\" in filenames\n");
+	await stdout.write("  --prevent-parent-directories  remove occurences of \"../\" in filenames (default: true)\n");
 	await stdout.write("\n");
 	Deno.exit(-1);
 }

package/dist/zip-fs-full.js

@@ -8080,14 +8080,21 @@
 	 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	 */
 
+	/* global TextDecoder */
+
 	const CP437 = "\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split("");
+	const VALID_CP437 = CP437.length == 256;
 
-	var decodeCP437 = stringValue => {
-		let result = "";
-		for (let indexCharacter = 0; indexCharacter < stringValue.length; indexCharacter++) {
-			result += CP437[stringValue[indexCharacter]];
+	var decodeCP437 = (stringValue) => {
+		if (VALID_CP437) {
+			let result = "";
+			for (let indexCharacter = 0; indexCharacter < stringValue.length; indexCharacter++) {
+				result += CP437[stringValue[indexCharacter]];
+			}
+			return result;
+		} else {
+			return new TextDecoder().decode(stringValue);
 		}
-		return result;
 	};
 
 	/*
@@ -8767,6 +8774,7 @@
 				options,
 				config: getConfiguration(),
 				files: new Map(),
+				filenames: new Set(),
 				offset: writer.size || 0,
 				pendingCompressedSize: 0,
 				pendingEntries: [],
@@ -8785,9 +8793,17 @@
 				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);
 					workers--;
@@ -8824,9 +8840,6 @@
 		} else {
 			options.directory = name.endsWith(DIRECTORY_SIGNATURE);
 		}
-		if (zipWriter.files.has(name)) {
-			throw new Error(ERR_DUPLICATED_NAME);
-		}
 		const rawFilename = encodeText(name);
 		if (rawFilename.length > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_ENTRY_NAME);