@loaders.gl/i3s 4.0.0-alpha.22 → 4.0.0-alpha.23

package/dist/i3s-content-worker.js

@@ -66,7 +66,7 @@
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.22" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.23" : 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.");
   }
@@ -1272,7 +1272,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.22" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.23" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -4622,7 +4622,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.22" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.23" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -5019,7 +5019,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.22" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.23" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5572,7 +5572,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.22" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.23" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -6473,12 +6473,6 @@
   }
 
   // ../textures/src/compressed-texture-loader.ts
-  var DEFAULT_TEXTURE_LOADER_OPTIONS = {
-    "compressed-texture": {
-      libraryPath: "libs/",
-      useBasis: false
-    }
-  };
   var CompressedTextureWorkerLoader = {
     name: "Texture Containers",
     id: "compressed-texture",
@@ -6499,12 +6493,17 @@
       "application/octet-stream"
     ],
     binary: true,
-    options: DEFAULT_TEXTURE_LOADER_OPTIONS
+    options: {
+      "compressed-texture": {
+        libraryPath: "libs/",
+        useBasis: false
+      }
+    }
   };
   var CompressedTextureLoader = {
     ...CompressedTextureWorkerLoader,
     parse: async (arrayBuffer, options) => {
-      if (options["compressed-texture"].useBasis) {
+      if (options?.["compressed-texture"]?.useBasis) {
         options.basis = {
           format: {
             alpha: "BC3",
@@ -6514,7 +6513,8 @@
           containerFormat: "ktx2",
           module: "encoder"
         };
-        return (await parseBasis(arrayBuffer, options))[0];
+        const result = await parseBasis(arrayBuffer, options);
+        return result[0];
       }
       return parseCompressedTexture(arrayBuffer);
     }
@@ -7264,7 +7264,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.22" : "latest";
+  var VERSION7 = true ? "4.0.0-alpha.23" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7729,7 +7729,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.22" : "beta";
+  var VERSION8 = true ? "4.0.0-alpha.23" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/i3s-slpk-loader.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
 /** options to load data from SLPK */
 export type SLPKLoaderOptions = LoaderOptions & {
     slpk?: {

package/dist/i3s-slpk-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-slpk-loader.d.ts","sourceRoot":"","sources":["../src/i3s-slpk-loader.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQzE,qCAAqC;AACrC,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE;QACL,mCAAmC;QACnC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,uBAAuB;QACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,iBAAiB,CASzE,CAAC"}
+{"version":3,"file":"i3s-slpk-loader.d.ts","sourceRoot":"","sources":["../src/i3s-slpk-loader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ9E,qCAAqC;AACrC,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE;QACL,mCAAmC;QACnC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,uBAAuB;QACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,iBAAiB,CASzE,CAAC"}

package/dist/i3s-slpk-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLPKLoader = void 0;
-const zip_1 = require("@loaders.gl/zip");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 const parse_slpk_1 = require("./lib/parsers/parse-slpk/parse-slpk");
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -26,5 +26,5 @@ exports.SLPKLoader = {
  * @returns requested file
  */
 async function parseSLPK(data, options = {}) {
-    return (await (0, parse_slpk_1.parseSLPK)(new zip_1.DataViewFile(new DataView(data)))).getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
+    return (await (0, parse_slpk_1.parseSLPK)(new loader_utils_1.DataViewFile(new DataView(data)))).getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
 }

package/dist/lib/parsers/parse-i3s-tile-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AAKxF,OAAO,EAQL,cAAc,EACd,cAAc,EACd,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAyBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,cAAc,EAC3B,cAAc,EAAE,iBAAiB,EACjC,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,cAAc,CAAC,CAgEzB"}
+{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AAKxF,OAAO,EAQL,cAAc,EACd,cAAc,EACd,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAyBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,cAAc,EAC3B,cAAc,EAAE,iBAAiB,EACjC,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,cAAc,CAAC,CA4DzB"}

package/dist/lib/parsers/parse-i3s-tile-content.js

@@ -46,6 +46,7 @@ async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, opt
         const arrayBuffer = await response.arrayBuffer();
         // @ts-expect-error options is not properly typed
         if (options?.i3s.decodeTextures) {
+            // TODO - replace with switch
             if (loader === images_1.ImageLoader) {
                 const options = { ...tileOptions.textureLoaderOptions, image: { type: 'data' } };
                 try {
@@ -59,24 +60,19 @@ async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, opt
                     // context object is different between worker and node.js conversion script.
                     // To prevent error we parse data in ordinary way if it is not parsed by using context.
                     const texture = await (0, core_1.parse)(arrayBuffer, loader, options, context);
-                    // @ts-expect-error
                     content.texture = texture;
                 }
             }
             else if (loader === textures_1.CompressedTextureLoader || loader === textures_1.BasisLoader) {
                 let texture = await (0, core_1.load)(arrayBuffer, loader, tileOptions.textureLoaderOptions);
                 if (loader === textures_1.BasisLoader) {
-                    // @ts-expect-error
                     texture = texture[0];
                 }
                 content.texture = {
                     compressed: true,
                     mipmaps: false,
-                    // @ts-expect-error
                     width: texture[0].width,
-                    // @ts-expect-error
                     height: texture[0].height,
-                    // @ts-expect-error
                     data: texture
                 };
             }

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

@@ -1,4 +1,4 @@
-import { FileProvider } from '@loaders.gl/zip';
+import { FileProvider } from '@loaders.gl/loader-utils';
 import { SLPKArchive } from './slpk-archieve';
 /**
  * Creates slpk file handler from raw file

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":"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"}
+{"version":3,"file":"parse-slpk.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUtD,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/slpk-archieve.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import { FileProvider, HashElement } from '@loaders.gl/zip';
+import { FileProvider } from '@loaders.gl/loader-utils';
+import { HashElement } from '@loaders.gl/zip';
 /**
  * Class for handling information about slpk file
  */

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

@@ -1 +1 @@
-{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,YAAY,EAA2B,WAAW,EAAU,MAAM,iBAAiB,CAAC;AAuC5F;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,SAAS,CAAgB;gBACrB,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE;IAK9D;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,KAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8B1E;;;;OAIG;YACW,aAAa;IAmB3B;;;;OAIG;YACW,YAAY;IAmB1B,OAAO,CAAC,QAAQ,EAAE,MAAM;CAGzB"}
+{"version":3,"file":"slpk-archieve.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/parse-slpk/slpk-archieve.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAA0B,WAAW,EAAU,MAAM,iBAAiB,CAAC;AAuC9E;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,SAAS,CAAgB;gBACrB,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE;IAK9D;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,KAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8B1E;;;;OAIG;YACW,aAAa;IAmB3B;;;;OAIG;YACW,YAAY;IAmB1B,OAAO,CAAC,QAAQ,EAAE,MAAM;CAGzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0-alpha.22",
+  "version": "4.0.0-alpha.23",
   "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.22",
-    "@loaders.gl/draco": "4.0.0-alpha.22",
-    "@loaders.gl/images": "4.0.0-alpha.22",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.22",
-    "@loaders.gl/schema": "4.0.0-alpha.22",
-    "@loaders.gl/textures": "4.0.0-alpha.22",
-    "@loaders.gl/tiles": "4.0.0-alpha.22",
+    "@loaders.gl/compression": "4.0.0-alpha.23",
+    "@loaders.gl/draco": "4.0.0-alpha.23",
+    "@loaders.gl/images": "4.0.0-alpha.23",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.23",
+    "@loaders.gl/schema": "4.0.0-alpha.23",
+    "@loaders.gl/textures": "4.0.0-alpha.23",
+    "@loaders.gl/tiles": "4.0.0-alpha.23",
     "@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": "0da838c506d1275383f2fd3d244d9c72b25397d2"
+  "gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
 }

package/src/i3s-slpk-loader.ts

@@ -1,5 +1,5 @@
-import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
-import {DataViewFile} from '@loaders.gl/zip';
+import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {DataViewFile} from '@loaders.gl/loader-utils';
 import {parseSLPK as parseSLPKFromProvider} from './lib/parsers/parse-slpk/parse-slpk';
 
 // __VERSION__ is injected by babel-plugin-version-inline

package/src/lib/parsers/parse-i3s-tile-content.ts

@@ -70,6 +70,7 @@ export async function parseI3STileContent(
 
     // @ts-expect-error options is not properly typed
     if (options?.i3s.decodeTextures) {
+      // TODO - replace with switch
       if (loader === ImageLoader) {
         const options = {...tileOptions.textureLoaderOptions, image: {type: 'data'}};
         try {
@@ -82,23 +83,18 @@ export async function parseI3STileContent(
           // context object is different between worker and node.js conversion script.
           // To prevent error we parse data in ordinary way if it is not parsed by using context.
           const texture = await parse(arrayBuffer, loader, options, context);
-          // @ts-expect-error
           content.texture = texture;
         }
       } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
         let texture = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);
         if (loader === BasisLoader) {
-          // @ts-expect-error
           texture = texture[0];
         }
         content.texture = {
           compressed: true,
           mipmaps: false,
-          // @ts-expect-error
           width: texture[0].width,
-          // @ts-expect-error
           height: texture[0].height,
-          // @ts-expect-error
           data: texture
         };
       }

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

@@ -1,7 +1,7 @@
+import {FileProvider} from '@loaders.gl/loader-utils';
 import {
   parseZipCDFileHeader,
   cdSignature as cdHeaderSignature,
-  FileProvider,
   parseZipLocalFileHeader,
   searchFromTheEnd,
   HashElement,

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

@@ -1,5 +1,6 @@
 import md5 from 'md5';
-import {FileProvider, parseZipLocalFileHeader, HashElement, findBin} from '@loaders.gl/zip';
+import {FileProvider} from '@loaders.gl/loader-utils';
+import {parseZipLocalFileHeader, HashElement, findBin} from '@loaders.gl/zip';
 import {GZipCompression} from '@loaders.gl/compression';
 
 /** Description of real paths for different file types */