@loaders.gl/textures 4.2.0-alpha.5 → 4.2.0-beta.1

package/src/lib/parsers/basis-module-loader.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import {registerJSModules, getJSModuleOrNull} from '@loaders.gl/loader-utils';
 import {loadLibrary} from '@loaders.gl/worker-utils';
 
 export const BASIS_EXTERNAL_LIBRARIES = {
@@ -23,12 +24,13 @@ let loadBasisTranscoderPromise;
  * @returns {BasisFile} promise
  */
 export async function loadBasisTranscoderModule(options) {
-  const modules = options.modules || {};
-  if (modules.basis) {
-    return modules.basis;
+  registerJSModules(options.modules);
+  const basis = getJSModuleOrNull('basis');
+  if (basis) {
+    return basis;
   }
 
-  loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
+  loadBasisTranscoderPromise ||= loadBasisTranscoder(options);
   return await loadBasisTranscoderPromise;
 }
 

package/src/lib/parsers/crunch-module-loader.ts

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 // @ts-nocheck
+import {getJSModuleOrNull, LoaderOptions, registerJSModules} from '@loaders.gl/loader-utils';
 import {loadLibrary} from '@loaders.gl/worker-utils';
 
 export const CRUNCH_EXTERNAL_LIBRARIES = {
@@ -15,10 +16,11 @@ export const CRUNCH_EXTERNAL_LIBRARIES = {
  * @param options - loader options
  * @returns Promise of module object
  */
-export async function loadCrunchModule(options): Promise<any> {
-  const modules = options.modules || {};
-  if (modules.crunch) {
-    return modules.crunch;
+export async function loadCrunchModule(options: LoaderOptions): Promise<any> {
+  registerJSModules(options.modules);
+  const crunch = getJSModuleOrNull('crunch');
+  if (crunch) {
+    return crunch;
   }
 
   return loadCrunch(options);
@@ -31,7 +33,7 @@ let crunchModule;
  * @param {any} options - Loader options
  * @returns {Promise<any>} Promise of Module object
  */
-async function loadCrunch(options) {
+async function loadCrunch(options: LoaderOptions): Promise<any> {
   if (crunchModule) {
     return crunchModule;
   }
@@ -40,7 +42,7 @@ async function loadCrunch(options) {
 
   // Depends on how import happened...
   // @ts-ignore TS2339: Property does not exist on type
-  loadCrunchDecoder = loadCrunchDecoder || globalThis.LoadCrunchDecoder;
+  loadCrunchDecoder ||= globalThis.LoadCrunchDecoder;
   crunchModule = loadCrunchDecoder();
   return crunchModule;
 }

package/src/npy-loader.ts

@@ -9,14 +9,22 @@ import {parseNPY, NPYTile} from './lib/parsers/parse-npy';
 // \x93NUMPY
 const NPY_MAGIC_NUMBER = new Uint8Array([147, 78, 85, 77, 80, 89]);
 
+/** NPYLoader for numpy tiles */
 export type NPYLoaderOptions = LoaderOptions & {
-  npy?: {};
+  /** NPYLoader for numpy tiles */
+  npy?: {
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
+  };
 };
 
 /**
  * Worker loader for numpy "tiles"
  */
-export const NPYWorkerLoader: Loader<NPYTile, never, NPYLoaderOptions> = {
+export const NPYWorkerLoader = {
+  dataType: null as any as NPYTile,
+  batchType: null as never,
+
   name: 'NPY',
   id: 'npy',
   module: 'textures',
@@ -28,13 +36,13 @@ export const NPYWorkerLoader: Loader<NPYTile, never, NPYLoaderOptions> = {
   options: {
     npy: {}
   }
-};
+} as const satisfies Loader<NPYTile, never, NPYLoaderOptions>;
 
 /**
  * Loader for numpy "tiles"
  */
-export const NPYLoader: LoaderWithParser<any, any, NPYLoaderOptions> = {
+export const NPYLoader = {
   ...NPYWorkerLoader,
   parseSync: parseNPY,
   parse: async (arrayBuffer: ArrayBuffer, options?: LoaderOptions) => parseNPY(arrayBuffer, options)
-};
+} as const satisfies LoaderWithParser<any, any, NPYLoaderOptions>;