@zip.js/zip.js 2.18.1 → 2.18.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. package/deno.json +1 -1
  2. package/dist/zip-core-external.js +6 -14
  3. package/dist/zip-core-external.min.js +1 -1
  4. package/dist/zip-core.js +6 -14
  5. package/dist/zip-core.min.js +1 -1
  6. package/dist/zip-fs-core-external.js +6 -14
  7. package/dist/zip-fs-core-external.min.js +1 -1
  8. package/dist/zip-fs-core.js +6 -14
  9. package/dist/zip-fs-core.min.js +1 -1
  10. package/dist/zip-fs-external.js +6 -14
  11. package/dist/zip-fs-external.min.js +1 -1
  12. package/dist/zip-fs-native.js +6 -14
  13. package/dist/zip-fs-native.min.js +1 -1
  14. package/dist/zip-fs.js +6 -14
  15. package/dist/zip-fs.min.js +1 -1
  16. package/dist/zip-legacy.js +6 -14
  17. package/dist/zip-legacy.min.js +1 -1
  18. package/dist/zip-native.js +6 -14
  19. package/dist/zip-native.min.js +1 -1
  20. package/dist/zip.js +6 -14
  21. package/dist/zip.min.js +1 -1
  22. package/index-native.cjs +6 -14
  23. package/index-native.min.js +1 -1
  24. package/index.cjs +6 -14
  25. package/index.d.cts +6 -5
  26. package/index.d.ts +6 -5
  27. package/index.min.js +1 -1
  28. package/lib/core/version.js +1 -1
  29. package/lib/core/zip-reader.js +5 -13
  30. package/package.json +1 -1
package/lib/core/version.js CHANGED
@@ -26,6 +26,6 @@
26
26
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
27
  */
28
28
 
29
- const VERSION = "2.18.1";
29
+ const VERSION = "2.18.2";
30
30
 
31
31
  export { VERSION };
package/lib/core/zip-reader.js CHANGED
@@ -1458,19 +1458,11 @@ async function detectOverlappingEntry({
1458
1458
  const zip64 = Boolean(extraFieldZip64);
1459
1459
  const dataDescriptorArray = await readUint8Array(reader, dataOffset + compressedSize, DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH);
1460
1460
  const dataDescriptorView = getDataView(dataDescriptorArray);
1461
- const ignoreCrc32 = fileEntry.encrypted && !fileEntry.zipCrypto;
1462
- let localDataDescriptor;
1463
- for (const [zip64Layout, signature] of [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]) {
1464
- const candidate = readDataDescriptor(dataDescriptorView, zip64Layout, signature);
1465
- if (candidate && (ignoreCrc32 || candidate.crc32 == crc32) &&
1466
- candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize) {
1467
- localDataDescriptor = candidate;
1468
- break;
1469
- }
1470
- }
1471
- if (!localDataDescriptor) {
1472
- localDataDescriptor = readDataDescriptor(dataDescriptorView, zip64, false);
1473
- }
1461
+ const candidates = [[zip64, true], [zip64, false], [!zip64, true], [!zip64, false]]
1462
+ .map(([zip64Layout, signature]) => readDataDescriptor(dataDescriptorView, zip64Layout, signature))
1463
+ .filter(candidate => candidate && candidate.compressedSize == compressedSize && candidate.uncompressedSize == uncompressedSize);
1464
+ const localDataDescriptor = candidates.find(candidate => candidate.crc32 == crc32) || candidates[0] ||
1465
+ readDataDescriptor(dataDescriptorView, zip64, true) || readDataDescriptor(dataDescriptorView, zip64, false);
1474
1466
  if (localDataDescriptor) {
1475
1467
  fileEntry.localDirectory.dataDescriptor = localDataDescriptor;
1476
1468
  dataDescriptorLength = getDataDescriptorLength(localDataDescriptor.zip64, localDataDescriptor.signature);
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
4
4
  "author": "Gildas Lormeau",
5
5
  "license": "BSD-3-Clause",
6
- "version": "2.18.1",
6
+ "version": "2.18.2",
7
7
  "type": "module",
8
8
  "keywords": [
9
9
  "zip",