@zip.js/zip.js 2.6.9 → 2.6.12

package/tests/all/test-worker-timeout.js

@@ -12,16 +12,11 @@ async function test() {
 	zip.configure({ chunkSize: 128, terminateWorkerTimeout: Infinity, useWebWorkers: true });
 	const blobWriter = new zip.BlobWriter("application/zip");
 	const zipWriter = new zip.ZipWriter(blobWriter);
-	const entry = await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
-	if (entry.compressionMethod == 0x08) {
-		await zipWriter.close();
-		const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
-		const entries = await zipReader.getEntries();
-		if (entries[0].compressionMethod == 0x08) {
-			const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
-			await zipReader.close();
-			zip.terminateWorkers();
-			return TEXT_CONTENT == (await data.text()) && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
-		}
-	}
+	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
+	await zipWriter.close();
+	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const entries = await zipReader.getEntries();
+	await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
+	await zipReader.close();
+	zip.terminateWorkers();
 }

package/tests/all/test-wrapped.js

@@ -19,10 +19,12 @@ async function test() {
 	await zipWriter.close(COMMENT);
 	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()), { extractPrependedData: true });
 	const entries = await zipReader.getEntries();
-	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
+	await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();
 	const comment = Array.from(zipReader.comment).toString();
 	const prependedData = Array.from(zipReader.prependedData).toString();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && prependedData == Array.from(PREPENDED_DATA) && comment == Array.from(COMMENT);
+	if (prependedData != Array.from(PREPENDED_DATA) || comment != Array.from(COMMENT)) {
+		throw new Error();
+	}
 }

package/tests/all/test-writable-stream.js

@@ -12,30 +12,28 @@ async function test() {
 	zip.configure({ chunkSize: 128, useWebWorkers: true });
 	const blobWriter = new zip.BlobWriter("application/zip");
 	const zipWriter = new zip.ZipWriter(blobWriter);
-	const entry = await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
-	if (entry.compressionMethod == 0x08) {
-		await zipWriter.close();
-		const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
-		const entries = await zipReader.getEntries();
-		if (entries[0].compressionMethod == 0x08) {
-			const data = new Uint8Array(entries[0].uncompressedSize);
-			let dataOffset = 0;
-			let writerClosed;
-			const writer = {
-				writable: new WritableStream({
-					write(chunk) {
-						data.set(chunk, dataOffset);
-						dataOffset += chunk.length;
-					},
-					close() {
-						writerClosed = true;
-					}
-				})
-			};
-			await entries[0].getData(writer);
-			await zipReader.close();
-			zip.terminateWorkers();
-			return TEXT_CONTENT == (await new Blob([data]).text()) && writerClosed;
-		}
+	await zipWriter.add(FILENAME, new zip.BlobReader(BLOB));
+	await zipWriter.close();
+	const zipReader = new zip.ZipReader(new zip.BlobReader(blobWriter.getData()));
+	const entries = await zipReader.getEntries();
+	const data = new Uint8Array(entries[0].uncompressedSize);
+	let dataOffset = 0;
+	let writerClosed;
+	const writer = {
+		writable: new WritableStream({
+			write(chunk) {
+				data.set(chunk, dataOffset);
+				dataOffset += chunk.length;
+			},
+			close() {
+				writerClosed = true;
+			}
+		})
+	};
+	await entries[0].getData(writer);
+	await zipReader.close();
+	zip.terminateWorkers();
+	if (TEXT_CONTENT != await new Blob([data]).text() || !writerClosed) {
+		throw new Error();
 	}
 }

package/tests/all/test-zip64-auto.js

@@ -23,5 +23,7 @@ async function test() {
 	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && entries[0].zip64 && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
+	if (TEXT_CONTENT != await data.text()) {
+		throw new Error();
+	}
 }

package/tests/all/test-zip64-crypto.js

@@ -29,5 +29,7 @@ async function test() {
 	}
 	await zipReader.close();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && entries[0].zip64 && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
+	if (TEXT_CONTENT != await data.text() || !entries[0].zip64 || entries[0].uncompressedSize != TEXT_CONTENT.length) {
+		throw new Error();
+	}
 }

package/tests/all/test-zip64.js

@@ -19,5 +19,7 @@ async function test() {
 	const data = await entries[0].getData(new zip.BlobWriter(zip.getMimeType(entries[0].filename)));
 	await zipReader.close();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && entries[0].zip64 && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
+	if (TEXT_CONTENT != await data.text() || !entries[0].zip64 || entries[0].uncompressedSize != TEXT_CONTENT.length) {
+		throw new Error();
+	}
 }

package/tests/all/test-zipcrypto.js

@@ -35,5 +35,7 @@ async function test() {
 	}
 	await zipReader.close();
 	zip.terminateWorkers();
-	return TEXT_CONTENT == (await data.text()) && entries[0].filename == FILENAME && entries[0].uncompressedSize == TEXT_CONTENT.length;
+	if (TEXT_CONTENT != await data.text()) {
+		throw new Error();
+	}
 }

package/tests/node-runner.js

@@ -8,25 +8,33 @@ async function runTests() {
 	let passed = true;
 	let passedCount = 0;
 	const tests = data.filter(test => !test.env || test.env.includes("node"));
-	console.log("running", tests.length, "tests from ./node-runner.js");
+	console.log("\u001b[38;5;240mrunning " + tests.length + " tests from ./node-runner.js\u001b[0m");
+	const start = Date.now();
 	for (const test of tests) {
 		const fn = async () => (await import("./all/" + test.script)).test();
 		try {
-			console.log(test.title + "...", await fn() && "ok");
+			const start = Date.now();
+			console.log(test.title + " ...", (await fn(), "\u001b[32mok\u001b[0m"), "\u001b[38;5;240m(" + delayToString(Date.now() - start) + ")\u001b[0m");
 			passedCount++;
 		} catch (error) {
 			passed = false;
-			console.error(test.title + "...", "FAILED");
+			console.error(test.title + "...", "\u001b[31mFAILED\u001b[0m");
 			console.error(error);
 		}
 	}
 	console.log("");
-	if (passed) {
-		console.log("ok", "|", passedCount, "passed");
-		console.log("");
-	} else {
-		console.error("error: Test failed");
-		console.log("");
+	console.log("\u001b[32mok\u001b[0m", "|", passedCount + " passed", "|", (tests.length - passedCount) + " failed", "\u001b[38;5;240m(" + delayToString(Date.now() - start) + ")\u001b[0m");
+	console.log("");
+	if (!passed) {
+		console.error("\u001b[31merror\u001b[0m: Test failed");
 		process.exit(-1);
 	}
+}
+
+function delayToString(delay) {
+	if (delay < 1000) {
+		return delay + "ms";
+	} else {
+		return Math.floor(delay / 1000) + "s";
+	}
 }

package/tests/tests-data.js

@@ -9,6 +9,7 @@ export default ([
 	{ title: "Custom IO classes", script: "./test-custom-io.js" },
 	{ title: "Data descriptor signature", script: "./test-data-descriptor-signature.js" },
 	{ title: "Data descriptor", script: "./test-data-descriptor.js" },
+	{ title: "Duplicated Filename", script: "./test-duplicated-filename.js" },
 	{ title: "Empty zip file", script: "./test-empty.js" },
 	{ title: "Extended timestamp", script: "./test-extended-timestamp.js" },
 	{ title: "Extra field", script: "./test-extra-field.js" },

package/build.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-npx rollup -c

package/tests/run-tests.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-deno test --allow-read ./deno-runner.js