@loaders.gl/zip 4.3.0-alpha.2 → 4.3.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/zip",
-  "version": "4.3.0-alpha.2",
+  "version": "4.3.0-alpha.4",
   "description": "Zip Archive Loader",
   "license": "MIT",
   "type": "module",
@@ -39,14 +39,14 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.3.0-alpha.2",
-    "@loaders.gl/crypto": "4.3.0-alpha.2",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.2",
+    "@loaders.gl/compression": "4.3.0-alpha.4",
+    "@loaders.gl/crypto": "4.3.0-alpha.4",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.4",
     "jszip": "^3.1.5",
     "md5": "^2.3.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "77a3cb538ab7a1fbf74245f25590210451689f5c"
+  "gitHead": "4900ac4c4de20366c050b80cef04dc5b52d167af"
 }

package/src/filesystems/IndexedArchive.ts

@@ -1,4 +1,4 @@
-import {FileProvider} from '@loaders.gl/loader-utils';
+import {FileProviderInterface} from '@loaders.gl/loader-utils';
 import {ZipFileSystem} from './zip-filesystem';
 
 /**
@@ -6,7 +6,7 @@ import {ZipFileSystem} from './zip-filesystem';
  * a hash file inside that allows to increase reading speed
  */
 export abstract class IndexedArchive {
-  public fileProvider: FileProvider;
+  public fileProvider: FileProviderInterface;
   public fileName?: string;
 
   /**
@@ -15,7 +15,11 @@ export abstract class IndexedArchive {
    * @param hashTable - pre-loaded hashTable. If presented, getFile will skip reading the hash file
    * @param fileName - name of the archive. It is used to add to an URL of a loader context
    */
-  constructor(fileProvider: FileProvider, hashTable?: Record<string, bigint>, fileName?: string) {
+  constructor(
+    fileProvider: FileProviderInterface,
+    hashTable?: Record<string, bigint>,
+    fileName?: string
+  ) {
     this.fileProvider = fileProvider;
     this.fileName = fileName;
   }

package/src/filesystems/zip-filesystem.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {FileSystem, isBrowser} from '@loaders.gl/loader-utils';
-import {FileProvider, isFileProvider} from '@loaders.gl/loader-utils';
+import {FileProviderInterface, isFileProvider} from '@loaders.gl/loader-utils';
 import {FileHandleFile} from '@loaders.gl/loader-utils';
 import {ZipCDFileHeader, makeZipCDHeaderIterator} from '../parse-zip/cd-file-header';
 import {parseZipLocalFileHeader} from '../parse-zip/local-file-header';
@@ -29,7 +29,7 @@ export const ZIP_COMPRESSION_HANDLERS: {[key: number]: CompressionHandler} = {
  */
 export class ZipFileSystem implements FileSystem {
   /** FileProvider instance promise */
-  public fileProvider: FileProvider | null = null;
+  public fileProvider: FileProviderInterface | null = null;
   public fileName?: string;
   public archive: IndexedArchive | null = null;
 
@@ -37,7 +37,7 @@ export class ZipFileSystem implements FileSystem {
    * Constructor
    * @param file - instance of FileProvider or file path string
    */
-  constructor(file: FileProvider | IndexedArchive | string) {
+  constructor(file: FileProviderInterface | IndexedArchive | string) {
     // Try to open file in NodeJS
     if (typeof file === 'string') {
       this.fileName = file;

package/src/hash-file-utility.ts

@@ -4,7 +4,7 @@
 
 import {MD5Hash} from '@loaders.gl/crypto';
 import {
-  FileProvider,
+  FileProviderInterface,
   concatenateArrayBuffers,
   concatenateArrayBuffersFromArray
 } from '@loaders.gl/loader-utils';
@@ -42,7 +42,7 @@ function bufferToHex(buffer: ArrayBuffer, start: number, length: number): string
  * @returns ready to use hash info
  */
 export async function makeHashTableFromZipHeaders(
-  fileProvider: FileProvider
+  fileProvider: FileProviderInterface
 ): Promise<Record<string, bigint>> {
   const zipCDIterator = makeZipCDHeaderIterator(fileProvider);
   return getHashTable(zipCDIterator);

package/src/parse-zip/cd-file-header.ts

@@ -4,7 +4,7 @@
 
 import {
   DataViewFile,
-  FileProvider,
+  FileProviderInterface,
   compareArrayBuffers,
   concatenateArrayBuffers
 } from '@loaders.gl/loader-utils';
@@ -66,7 +66,7 @@ export const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x01, 0x02]);
  */
 export const parseZipCDFileHeader = async (
   headerOffset: bigint,
-  file: FileProvider
+  file: FileProviderInterface
 ): Promise<ZipCDFileHeader | null> => {
   if (headerOffset >= file.length) {
     return null;
@@ -127,7 +127,7 @@ export const parseZipCDFileHeader = async (
  * @param fileProvider - file provider that provider random access to the file
  */
 export async function* makeZipCDHeaderIterator(
-  fileProvider: FileProvider
+  fileProvider: FileProviderInterface
 ): AsyncIterable<ZipCDFileHeader> {
   const {cdStartOffset, cdByteSize} = await parseEoCDRecord(fileProvider);
   const centralDirectory = new DataViewFile(

package/src/parse-zip/end-of-central-directory.ts

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FileProvider, compareArrayBuffers, concatenateArrayBuffers} from '@loaders.gl/loader-utils';
+import {
+  FileProviderInterface,
+  compareArrayBuffers,
+  concatenateArrayBuffers
+} from '@loaders.gl/loader-utils';
 import {ZipSignature, searchFromTheEnd} from './search-from-the-end';
 import {setFieldToNumber} from './zip64-info-generation';
 
@@ -64,7 +68,7 @@ const ZIP64_COMMENT_OFFSET = 56n;
  * @param file - FileProvider instance
  * @returns Info from the header
  */
-export const parseEoCDRecord = async (file: FileProvider): Promise<ZipEoCDRecord> => {
+export const parseEoCDRecord = async (file: FileProviderInterface): Promise<ZipEoCDRecord> => {
   const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
 
   let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));

package/src/parse-zip/local-file-header.ts

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FileProvider, compareArrayBuffers, concatenateArrayBuffers} from '@loaders.gl/loader-utils';
+import {
+  FileProviderInterface,
+  compareArrayBuffers,
+  concatenateArrayBuffers
+} from '@loaders.gl/loader-utils';
 import {ZipSignature} from './search-from-the-end';
 import {createZip64Info, setFieldToNumber} from './zip64-info-generation';
 
@@ -43,7 +47,7 @@ export const signature: ZipSignature = new Uint8Array([0x50, 0x4b, 0x03, 0x04]);
  */
 export const parseZipLocalFileHeader = async (
   headerOffset: bigint,
-  file: FileProvider
+  file: FileProviderInterface
 ): Promise<ZipLocalFileHeader | null> => {
   const mainHeader = new DataView(await file.slice(headerOffset, headerOffset + FILE_NAME_OFFSET));
 

package/src/parse-zip/search-from-the-end.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FileProvider} from '@loaders.gl/loader-utils';
+import {FileProviderInterface} from '@loaders.gl/loader-utils';
 
 /** Description of zip signature type */
 export type ZipSignature = Uint8Array;
@@ -16,7 +16,7 @@ const buffLength = 1024;
  * @returns
  */
 export const searchFromTheEnd = async (
-  file: FileProvider,
+  file: FileProviderInterface,
   target: ZipSignature
 ): Promise<bigint> => {
   const searchWindow = [