@loaders.gl/i3s 4.2.0-alpha.6 → 4.2.0-beta.2

package/src/arcgis-webscene-loader.ts

@@ -13,11 +13,9 @@ export type ArcGISWebSceneLoaderOptions = LoaderOptions & {};
  * Loader for ArcGIS WebScene
  * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/
  */
-export const ArcGISWebSceneLoader: LoaderWithParser<
-  ArcGISWebSceneData,
-  never,
-  ArcGISWebSceneLoaderOptions
-> = {
+export const ArcGISWebSceneLoader = {
+  dataType: null as unknown as ArcGISWebSceneData,
+  batchType: null as never,
   name: 'ArcGIS Web Scene Loader',
   id: 'arcgis-web-scene',
   module: 'i3s',
@@ -26,7 +24,7 @@ export const ArcGISWebSceneLoader: LoaderWithParser<
   parse,
   extensions: ['json'],
   options: {}
-};
+} as const satisfies LoaderWithParser<ArcGISWebSceneData, never, ArcGISWebSceneLoaderOptions>;
 
 /**
  * Parse ArcGIS webscene

package/src/i3s-attribute-loader.ts

@@ -14,7 +14,9 @@ const REJECTED_STATUS = 'rejected';
 /**
  * Loader for I3S attributes
  */
-export const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions> = {
+export const I3SAttributeLoader = {
+  dataType: null as unknown as I3STileAttributes,
+  batchType: null as never,
   name: 'I3S Attribute',
   id: 'i3s-attribute',
   module: 'i3s',
@@ -24,7 +26,7 @@ export const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SL
   extensions: ['bin'],
   options: {},
   binary: true
-};
+} as const satisfies LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions>;
 
 
 // TODO - these seem to use the loader rather than being part of the loader. Move to different file...

package/src/i3s-building-scene-layer-loader.ts

@@ -8,14 +8,14 @@ import {parseBuildingSceneLayer} from './lib/parsers/parse-i3s-building-scene-la
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
 /**
  * Loader for I3S - Building Scene Layer
  */
-export const I3SBuildingSceneLayerLoader: LoaderWithParser<
-  BuildingSceneLayerTileset,
-  never,
-  I3SLoaderOptions
-> = {
+export const I3SBuildingSceneLayerLoader = {
+  dataType: null as unknown as BuildingSceneLayerTileset,
+  batchType: null as never,
+
   name: 'I3S Building Scene Layer',
   id: 'i3s-building-scene-layer',
   module: 'i3s',
@@ -24,7 +24,7 @@ export const I3SBuildingSceneLayerLoader: LoaderWithParser<
   parse,
   extensions: ['json'],
   options: {}
-};
+} as const satisfies LoaderWithParser<BuildingSceneLayerTileset, never, I3SLoaderOptions>;
 
 async function parse(
   data: ArrayBuffer,

package/src/i3s-content-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderWithParser, LoaderContext} from '@loaders.gl/loader-utils';
 import type {I3SLoaderOptions} from './i3s-loader';
 import {parseI3STileContent} from './lib/parsers/parse-i3s-tile-content';
@@ -11,7 +15,10 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 /**
  * Loader for I3S - Indexed 3D Scene Layer
  */
-export const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions> = {
+export const I3SContentLoader = {
+  dataType: null as unknown as I3STileContent | null,
+  batchType: null as never,
+
   name: 'I3S Content (Indexed Scene Layers)',
   id: 'i3s-content',
   module: 'i3s',
@@ -23,7 +30,7 @@ export const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3
   options: {
     'i3s-content': {}
   }
-};
+} as const satisfies LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions>;
 
 async function parse(data, options?: I3SLoaderOptions, context?: LoaderContext) {
   const {tile, _tileOptions, tileset, _tilesetOptions} = options?.i3s || {};

package/src/i3s-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parse} from '@loaders.gl/core';
 import type {I3STilesetHeader} from './types';
@@ -24,7 +28,10 @@ export type I3SLoaderOptions = LoaderOptions & {
 /**
  * Loader for I3S - Indexed 3D Scene Layer
  */
-export const I3SLoader: LoaderWithParser<I3STilesetHeader, never, LoaderOptions> = {
+export const I3SLoader = {
+  dataType: null as unknown as I3STilesetHeader,
+  batchType: null as never,
+
   name: 'I3S (Indexed Scene Layers)',
   id: 'i3s',
   module: 'i3s',
@@ -47,7 +54,7 @@ export const I3SLoader: LoaderWithParser<I3STilesetHeader, never, LoaderOptions>
       coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS
     }
   }
-};
+} as const satisfies LoaderWithParser<I3STilesetHeader, never, LoaderOptions>;
 
 async function parseI3S(data, options: I3SLoaderOptions = {}, context): Promise<I3STilesetHeader> {
   const url = context.url;

package/src/i3s-node-page-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {I3SLoaderOptions} from './i3s-loader';
 import type {NodePage} from './types';
@@ -9,7 +13,10 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 /**
  * Loader for I3S node pages
  */
-export const I3SNodePageLoader: LoaderWithParser<NodePage, never, I3SLoaderOptions> = {
+export const I3SNodePageLoader = {
+  dataType: null as unknown as NodePage,
+  batchType: null as never,
+
   name: 'I3S Node Page',
   id: 'i3s-node-page',
   module: 'i3s',
@@ -20,7 +27,7 @@ export const I3SNodePageLoader: LoaderWithParser<NodePage, never, I3SLoaderOptio
   options: {
     i3s: {}
   }
-};
+} as const satisfies LoaderWithParser<NodePage, never, I3SLoaderOptions>;
 
 async function parseNodePage(data: ArrayBuffer, options?: LoaderOptions): Promise<NodePage> {
   return JSON.parse(new TextDecoder().decode(data)) as NodePage;

package/src/i3s-slpk-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {DataViewFile} from '@loaders.gl/loader-utils';
 import {parseSLPKArchive} from './lib/parsers/parse-slpk/parse-slpk';
@@ -21,7 +25,10 @@ export type SLPKLoaderOptions = LoaderOptions & {
  * @todo - this reloads the entire archive for every tile, should be optimized
  * @todo - this should be updated to use `parseFile` and ReadableFile
  */
-export const SLPKLoader: LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions> = {
+export const SLPKLoader = {
+  dataType: null as unknown as ArrayBuffer,
+  batchType: null as never,
+
   name: 'I3S SLPK (Scene Layer Package)',
   id: 'slpk',
   module: 'i3s',
@@ -33,4 +40,4 @@ export const SLPKLoader: LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions>
     const archive = await parseSLPKArchive(new DataViewFile(new DataView(data)));
     return archive.getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
   }
-};
+} as const satisfies LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions>;

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

@@ -76,17 +76,16 @@ export async function parseI3STileContent(
         try {
           // Image constructor is not supported in worker thread.
           // Do parsing image data on the main thread by using context to avoid worker issues.
-          const texture = await parseFromContext(arrayBuffer, [], options, context!);
-          // @ts-expect-error
+          const texture: any = await parseFromContext(arrayBuffer, [], options, context!);
           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);
+          const texture: any = await parse(arrayBuffer, loader, options, context);
           content.texture = texture;
         }
       } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
-        let texture = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);
+        let texture: any = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);
         if (loader === BasisLoader) {
           texture = texture[0];
         }