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

package/dist/i3s-content-worker.js

@@ -38,6 +38,11 @@
     }
   });
 
+  // ../loader-utils/src/loader-types.ts
+  async function parseFromContext(data, loaders, options, context) {
+    return context._parse(data, loaders, options, context);
+  }
+
   // ../loader-utils/src/lib/env-utils/assert.ts
   function assert(condition, message) {
     if (!condition) {
@@ -61,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.21" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.22" : 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.");
   }
@@ -659,7 +664,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -672,7 +677,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve2, reject) => {
       const id = requestId++;
       const onMessage2 = (type, payload2) => {
@@ -696,7 +701,12 @@
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -1262,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.21" : "untranspiled source";
+  var VERSION3 = true ? "4.0.0-alpha.22" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -1843,11 +1853,11 @@
     loaders._state = loaders._state || {};
     return loaders._state;
   }
-  var getGlobalLoaderOptions = () => {
+  function getGlobalLoaderOptions() {
     const state = getGlobalLoaderState();
     state.globalOptions = state.globalOptions || { ...DEFAULT_LOADER_OPTIONS };
     return state.globalOptions;
-  };
+  }
   function normalizeOptions(options, loader, loaders, url) {
     loaders = loaders || [];
     loaders = Array.isArray(loaders) ? loaders : [loaders];
@@ -2030,8 +2040,10 @@
     reason = reason || (loader ? `matched MIME type ${type}` : "");
     loader = loader || findLoaderByInitialBytes(loaders, data);
     reason = reason || (loader ? `matched initial data ${getFirstCharacters(data)}` : "");
-    loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
-    reason = reason || (loader ? `matched fallback MIME type ${type}` : "");
+    if (options?.fallbackMimeType) {
+      loader = loader || findLoaderByMIMEType(loaders, options?.fallbackMimeType);
+      reason = reason || (loader ? `matched fallback MIME type ${type}` : "");
+    }
     if (reason) {
       log.log(1, `selectLoader selected ${loader?.name}: ${reason}.`);
     }
@@ -2127,7 +2139,7 @@
     }
     switch (typeof test) {
       case "function":
-        return test(data, loader);
+        return test(data);
       case "string":
         const magic = getMagicString(data, byteOffset, test.length);
         return test === magic;
@@ -2342,7 +2354,7 @@
     return newContext;
   }
   function getLoadersFromContext(loaders, context) {
-    if (!context && loaders && !Array.isArray(loaders)) {
+    if (loaders && !Array.isArray(loaders)) {
       return loaders;
     }
     let candidateLoaders;
@@ -2353,12 +2365,11 @@
       const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];
       candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
     }
-    return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;
+    return candidateLoaders && candidateLoaders.length ? candidateLoaders : void 0;
   }
 
   // ../core/src/lib/api/parse.ts
   async function parse(data, loaders, options, context) {
-    assert2(!context || typeof context === "object");
     if (loaders && !Array.isArray(loaders) && !isLoaderObject(loaders)) {
       context = void 0;
       options = loaders;
@@ -2374,7 +2385,7 @@
       return null;
     }
     options = normalizeOptions(options, loader, candidateLoaders, url);
-    context = getLoaderContext({ url, parse, loaders: candidateLoaders }, options, context || null);
+    context = getLoaderContext({ url, _parse: parse, loaders: candidateLoaders }, options, context || null);
     return await parseWithLoader(loader, data, options, context);
   }
   async function parseWithLoader(loader, data, options, context) {
@@ -4611,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.21" : "latest";
+  var VERSION4 = true ? "4.0.0-alpha.22" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -5008,7 +5019,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION5 = true ? "4.0.0-alpha.22" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5561,7 +5572,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.0.0-alpha.21" : "beta";
+  var VERSION6 = true ? "4.0.0-alpha.22" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7253,7 +7264,7 @@
   }
 
   // src/i3s-attribute-loader.ts
-  var VERSION7 = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION7 = true ? "4.0.0-alpha.22" : "latest";
   var I3SAttributeLoader = {
     name: "I3S Attribute",
     id: "i3s-attribute",
@@ -7376,9 +7387,11 @@
         if (loader === ImageLoader) {
           const options2 = { ...tileOptions.textureLoaderOptions, image: { type: "data" } };
           try {
-            content.texture = await context.parse(arrayBuffer2, options2);
+            const texture = await parseFromContext(arrayBuffer2, [], options2, context);
+            content.texture = texture;
           } catch (e2) {
-            content.texture = await parse(arrayBuffer2, loader, options2);
+            const texture = await parse(arrayBuffer2, loader, options2, context);
+            content.texture = texture;
           }
         } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
           let texture = await load(arrayBuffer2, loader, tileOptions.textureLoaderOptions);
@@ -7716,7 +7729,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION8 = true ? "4.0.0-alpha.21" : "beta";
+  var VERSION8 = true ? "4.0.0-alpha.22" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/i3s-loader.d.ts

@@ -1,6 +1,5 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
 import { I3SParseOptions } from './types';
-import { LoaderOptions } from './../../loader-utils/src/types';
 export type I3SLoaderOptions = LoaderOptions & {
     i3s?: I3SParseOptions;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"i3s-loader.d.ts","sourceRoot":"","sources":["../src/i3s-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAK/D,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAW7D,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAwBvB,CAAC"}
+{"version":3,"file":"i3s-loader.d.ts","sourceRoot":"","sources":["../src/i3s-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK9E,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAWxC,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAwBvB,CAAC"}

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

@@ -1,4 +1,4 @@
-import type { LoaderOptions, LoaderContext } from '@loaders.gl/loader-utils';
+import { LoaderOptions, LoaderContext } from '@loaders.gl/loader-utils';
 import { I3STileContent, I3STileOptions, I3STilesetOptions } from '../../types';
 export declare function parseI3STileContent(arrayBuffer: ArrayBuffer, tileOptions: I3STileOptions, tilesetOptions: I3STilesetOptions, options?: LoaderOptions, context?: LoaderContext): Promise<I3STileContent>;
 //# sourceMappingURL=parse-i3s-tile-content.d.ts.map

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,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E,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,CA8DzB"}
+{"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"}

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

@@ -4,6 +4,7 @@ exports.parseI3STileContent = void 0;
 const core_1 = require("@loaders.gl/core");
 const core_2 = require("@math.gl/core");
 const geospatial_1 = require("@math.gl/geospatial");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 const images_1 = require("@loaders.gl/images");
 const draco_1 = require("@loaders.gl/draco");
 const textures_1 = require("@loaders.gl/textures");
@@ -48,16 +49,18 @@ async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, opt
             if (loader === images_1.ImageLoader) {
                 const options = { ...tileOptions.textureLoaderOptions, image: { type: 'data' } };
                 try {
-                    // @ts-ignore context must be defined
                     // Image constructor is not supported in worker thread.
                     // Do parsing image data on the main thread by using context to avoid worker issues.
-                    content.texture = await context.parse(arrayBuffer, options);
+                    const texture = await (0, loader_utils_1.parseFromContext)(arrayBuffer, [], options, context);
+                    // @ts-expect-error
+                    content.texture = texture;
                 }
                 catch (e) {
                     // 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 = await (0, core_1.parse)(arrayBuffer, loader, options);
+                    content.texture = texture;
                 }
             }
             else if (loader === textures_1.CompressedTextureLoader || loader === textures_1.BasisLoader) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.22",
   "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.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",
+    "@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",
     "@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": "df5d670b136192b26941396e944f9c46be788e83"
+  "gitHead": "0da838c506d1275383f2fd3d244d9c72b25397d2"
 }

package/src/i3s-loader.ts

@@ -1,10 +1,9 @@
-import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parse} from '@loaders.gl/core';
 import {I3SContentLoader} from './i3s-content-loader';
 import {normalizeTileData, normalizeTilesetData} from './lib/parsers/parse-i3s';
 import {COORDINATE_SYSTEM} from './lib/parsers/constants';
 import {I3SParseOptions} from './types';
-import {LoaderOptions} from './../../loader-utils/src/types';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.

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

@@ -2,7 +2,7 @@ import type {TypedArray} from '@loaders.gl/schema';
 import {load, parse} from '@loaders.gl/core';
 import {Vector3, Matrix4} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
-import type {LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';
+import {LoaderOptions, LoaderContext, parseFromContext} from '@loaders.gl/loader-utils';
 import {ImageLoader} from '@loaders.gl/images';
 import {DracoLoader, DracoMesh} from '@loaders.gl/draco';
 import {BasisLoader, CompressedTextureLoader} from '@loaders.gl/textures';
@@ -73,15 +73,17 @@ export async function parseI3STileContent(
       if (loader === ImageLoader) {
         const options = {...tileOptions.textureLoaderOptions, image: {type: 'data'}};
         try {
-          // @ts-ignore context must be defined
           // Image constructor is not supported in worker thread.
           // Do parsing image data on the main thread by using context to avoid worker issues.
-          content.texture = await context.parse(arrayBuffer, options);
+          const texture = await parseFromContext(arrayBuffer, [], options, context!);
+          // @ts-expect-error
+          content.texture = texture;
         } catch (e) {
           // 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 = await parse(arrayBuffer, loader, options);
+          content.texture = texture;
         }
       } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
         let texture = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);