@loaders.gl/i3s 4.0.0-alpha.20 → 4.0.0-alpha.21

package/dist/i3s-content-worker.js

@@ -61,7 +61,7 @@
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.20" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.21" : DEFAULT_VERSION;
   if (false) {
     console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
   }
@@ -1045,7 +1045,7 @@
   var isFunction = (x) => typeof x === "function";
   var isObject = (x) => x !== null && typeof x === "object";
   var isPureObject = (x) => isObject(x) && x.constructor === {}.constructor;
-  var isIterable = (x) => x && typeof x[Symbol.iterator] === "function";
+  var isIterable = (x) => Boolean(x) && typeof x[Symbol.iterator] === "function";
   var isAsyncIterable = (x) => x && typeof x[Symbol.asyncIterator] === "function";
   var isResponse = (x) => typeof Response !== "undefined" && x instanceof Response || x && x.arrayBuffer && x.text && x.json;
   var isBlob = (x) => typeof Blob !== "undefined" && x instanceof Blob;
@@ -1262,7 +1262,7 @@
   var navigator_ = globalThis.navigator || {};
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION3 = true ? "4.0.0-alpha.20" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.21" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -2386,20 +2386,20 @@
       context.response = { headers, ok, redirected, status, statusText, type, url };
     }
     data = await getArrayBufferOrStringFromData(data, loader, options);
-    if (loader.parseTextSync && typeof data === "string") {
-      options.dataType = "text";
-      return loader.parseTextSync(data, options, context, loader);
+    const loaderWithParser = loader;
+    if (loaderWithParser.parseTextSync && typeof data === "string") {
+      return loaderWithParser.parseTextSync(data, options, context);
     }
     if (canParseWithWorker(loader, options)) {
       return await parseWithWorker(loader, data, options, context, parse);
     }
-    if (loader.parseText && typeof data === "string") {
-      return await loader.parseText(data, options, context, loader);
+    if (loaderWithParser.parseText && typeof data === "string") {
+      return await loaderWithParser.parseText(data, options, context);
     }
-    if (loader.parse) {
-      return await loader.parse(data, options, context, loader);
+    if (loaderWithParser.parse) {
+      return await loaderWithParser.parse(data, options, context);
     }
-    assert2(!loader.parseSync);
+    assert2(!loaderWithParser.parseSync);
     throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
   }
 
@@ -4611,7 +4611,7 @@
   _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
 
   // ../images/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.0.0-alpha.20" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.21" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -5008,7 +5008,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.20" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.21" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5561,7 +5561,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.20" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.21" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7253,7 +7253,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.20" : "latest";
+  var VERSION7 = true ? "4.0.0-alpha.21" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7716,7 +7716,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.20" : "beta";
+  var VERSION8 = true ? "4.0.0-alpha.21" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/lib/parsers/parse-slpk/parse-slpk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,YAAY,EAMb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,iBACN,YAAY,cACf,MAAM,KAAK,IAAI,kBACzB,QAAQ,WAAW,CA8BrB,CAAC"}
+{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAMb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,eAAO,MAAM,SAAS,iBACN,YAAY,cACf,MAAM,KAAK,IAAI,kBACzB,QAAQ,WAAW,CA8BrB,CAAC"}

package/dist/lib/parsers/parse-slpk/parse-slpk.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSLPK = void 0;
-const md5_1 = __importDefault(require("md5"));
 const zip_1 = require("@loaders.gl/zip");
 const slpk_archieve_1 = require("./slpk-archieve");
 /**
@@ -19,7 +15,7 @@ const parseSLPK = async (fileProvider, cb) => {
     let hashData;
     if (cdFileHeader?.fileName !== '@specialIndexFileHASH128@') {
         cb?.('SLPK doesnt contain hash file');
-        hashData = await generateHashInfo(fileProvider);
+        hashData = await (0, zip_1.generateHashInfo)(fileProvider);
         cb?.('hash info has been composed according to central directory records');
     }
     else {
@@ -35,22 +31,3 @@ const parseSLPK = async (fileProvider, cb) => {
     return new slpk_archieve_1.SLPKArchive(fileProvider, hashData);
 };
 exports.parseSLPK = parseSLPK;
-/**
- * generates hash info from central directory
- * @param fileProvider - provider of the archive
- * @returns ready to use hash info
- */
-const generateHashInfo = async (fileProvider) => {
-    const { cdStartOffset } = await (0, zip_1.parseEoCDRecord)(fileProvider);
-    let cdHeader = await (0, zip_1.parseZipCDFileHeader)(cdStartOffset, fileProvider);
-    const hashInfo = [];
-    while (cdHeader) {
-        hashInfo.push({
-            hash: Buffer.from((0, md5_1.default)(cdHeader.fileName.split('\\').join('/').toLocaleLowerCase()), 'hex'),
-            offset: cdHeader.localHeaderOffset
-        });
-        cdHeader = await (0, zip_1.parseZipCDFileHeader)(cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength), fileProvider);
-    }
-    hashInfo.sort((a, b) => (0, zip_1.compareHashes)(a.hash, b.hash));
-    return hashInfo;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0-alpha.20",
+  "version": "4.0.0-alpha.21",
   "description": "i3s .",
   "license": "MIT",
   "publishConfig": {
@@ -33,13 +33,13 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.0.0-alpha.20",
-    "@loaders.gl/draco": "4.0.0-alpha.20",
-    "@loaders.gl/images": "4.0.0-alpha.20",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.20",
-    "@loaders.gl/schema": "4.0.0-alpha.20",
-    "@loaders.gl/textures": "4.0.0-alpha.20",
-    "@loaders.gl/tiles": "4.0.0-alpha.20",
+    "@loaders.gl/compression": "4.0.0-alpha.21",
+    "@loaders.gl/draco": "4.0.0-alpha.21",
+    "@loaders.gl/images": "4.0.0-alpha.21",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.21",
+    "@loaders.gl/schema": "4.0.0-alpha.21",
+    "@loaders.gl/textures": "4.0.0-alpha.21",
+    "@loaders.gl/tiles": "4.0.0-alpha.21",
     "@luma.gl/constants": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -49,5 +49,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0-alpha.8"
   },
-  "gitHead": "ac122e83102657c38207d59c631a5ce4e7aa46bd"
+  "gitHead": "df5d670b136192b26941396e944f9c46be788e83"
 }

package/src/lib/parsers/parse-slpk/parse-slpk.ts

@@ -1,14 +1,12 @@
-import md5 from 'md5';
 import {
   parseZipCDFileHeader,
   cdSignature as cdHeaderSignature,
-  parseEoCDRecord,
   FileProvider,
   parseZipLocalFileHeader,
   searchFromTheEnd,
   HashElement,
-  compareHashes,
-  parseHashFile
+  parseHashFile,
+  generateHashInfo
 } from '@loaders.gl/zip';
 import {SLPKArchive} from './slpk-archieve';
 
@@ -52,26 +50,3 @@ export const parseSLPK = async (
 
   return new SLPKArchive(fileProvider, hashData);
 };
-
-/**
- * generates hash info from central directory
- * @param fileProvider - provider of the archive
- * @returns ready to use hash info
- */
-const generateHashInfo = async (fileProvider: FileProvider): Promise<HashElement[]> => {
-  const {cdStartOffset} = await parseEoCDRecord(fileProvider);
-  let cdHeader = await parseZipCDFileHeader(cdStartOffset, fileProvider);
-  const hashInfo: HashElement[] = [];
-  while (cdHeader) {
-    hashInfo.push({
-      hash: Buffer.from(md5(cdHeader.fileName.split('\\').join('/').toLocaleLowerCase()), 'hex'),
-      offset: cdHeader.localHeaderOffset
-    });
-    cdHeader = await parseZipCDFileHeader(
-      cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength),
-      fileProvider
-    );
-  }
-  hashInfo.sort((a, b) => compareHashes(a.hash, b.hash));
-  return hashInfo;
-};