@loaders.gl/textures 3.3.0-alpha.5 → 3.3.0-alpha.7

package/dist/ktx2-basis-writer-worker.js

@@ -28,7 +28,7 @@
   });
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "3.3.0-alpha.5" : DEFAULT_VERSION;
+  var VERSION = true ? "3.3.0-alpha.7" : 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.");
   }
@@ -237,10 +237,10 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION3 = true ? "3.3.0-alpha.5" : "beta";
+  var VERSION3 = true ? "3.3.0-alpha.7" : "beta";
 
   // src/lib/parsers/basis-module-loader.ts
-  var VERSION4 = true ? "3.3.0-alpha.5" : "beta";
+  var VERSION4 = true ? "3.3.0-alpha.7" : "beta";
   var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
   var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
   var loadBasisEncoderPromise;

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

@@ -3,7 +3,7 @@ declare type NumpyHeader = {
     shape: number[];
 };
 export declare function parseNPY(arrayBuffer: ArrayBuffer, options?: unknown): {
-    data: any;
+    data: Uint8Array | Uint32Array | Int32Array | Int8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
     header: NumpyHeader;
 } | null;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"parse-npy.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-npy.ts"],"names":[],"mappings":"AAEA,aAAK,WAAW,GAAG;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC;AA6BpD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO;;;SA+BnE"}
+{"version":3,"file":"parse-npy.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-npy.ts"],"names":[],"mappings":"AAEA,aAAK,WAAW,GAAG;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC;AAwCpD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO;;;SA+BnE"}

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

@@ -35,17 +35,17 @@ function parseNPY(arrayBuffer, options) {
     const numpyType = header.descr;
     const ArrayType = DTYPES[numpyType.slice(1, 3)];
     if (!ArrayType) {
-        // eslint-disable-next-line no-console, no-undef
-        console.warn(`Decoding of npy dtype not implemented: ${numpyType}`);
-        return null;
+        throw new Error(`Unimplemented type ${numpyType}`);
     }
     const nArrayElements = header.shape?.reduce((a, b) => a * b);
     const arrayByteLength = nArrayElements * ArrayType.BYTES_PER_ELEMENT;
+    if (arrayBuffer.byteLength < headerEndOffset + arrayByteLength) {
+        throw new Error('Buffer overflow');
+    }
     const data = new ArrayType(arrayBuffer.slice(headerEndOffset, headerEndOffset + arrayByteLength));
     // Swap endianness if needed
     if ((numpyType[0] === '>' && LITTLE_ENDIAN_OS) || (numpyType[0] === '<' && !LITTLE_ENDIAN_OS)) {
-        // eslint-disable-next-line no-console, no-undef
-        console.warn('Data is wrong endianness, byte swapping not yet implemented.');
+        throw new Error('Incorrect endianness');
     }
     return {
         data,
@@ -65,11 +65,11 @@ function parseHeader(view) {
     let offset = 8;
     let headerLength;
     if (majorVersion >= 2) {
-        headerLength = view.getUint32(8, true);
+        headerLength = view.getUint32(offset, true);
         offset += 4;
     }
     else {
-        headerLength = view.getUint16(8, true);
+        headerLength = view.getUint16(offset, true);
         offset += 2;
     }
     const encoding = majorVersion <= 2 ? 'latin1' : 'utf-8';

package/dist/npy-loader.d.ts

@@ -21,8 +21,8 @@ export declare const NPYWorkerLoader: {
  */
 export declare const NPYLoader: {
     parseSync: typeof parseNPY;
-    parse: (arrayBuffer: ArrayBuffer, options?: LoaderOptions | undefined) => Promise<{
-        data: any;
+    parse: (arrayBuffer: ArrayBuffer, options?: LoaderOptions) => Promise<{
+        data: Uint8Array | Uint32Array | Int32Array | Int8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
         header: {
             descr: string;
             shape: number[];

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

@@ -1 +1 @@
-{"version":3,"file":"npy-loader.d.ts","sourceRoot":"","sources":["../src/npy-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAKjD;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;CAY3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;yBAGO,WAAW;;;;;;;;;;;;;;;;;;CACvC,CAAC;AAGF,eAAO,MAAM,yBAAyB,EAAE,MAAwB,CAAC;AACjE,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}
+{"version":3,"file":"npy-loader.d.ts","sourceRoot":"","sources":["../src/npy-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAKjD;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;CAY3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;yBAGO,WAAW,YAAY,aAAa;;;;;;;;;;;;;;;;;;CAChE,CAAC;AAGF,eAAO,MAAM,yBAAyB,EAAE,MAAwB,CAAC;AACjE,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}

package/dist/npy-worker.js

@@ -1,6 +1,6 @@
 (() => {
   // src/lib/utils/version.ts
-  var VERSION = true ? "3.3.0-alpha.5" : "beta";
+  var VERSION = true ? "3.3.0-alpha.7" : "beta";
 
   // src/lib/parsers/parse-npy.ts
   function systemIsLittleEndian() {
@@ -28,14 +28,16 @@
     const numpyType = header.descr;
     const ArrayType = DTYPES[numpyType.slice(1, 3)];
     if (!ArrayType) {
-      console.warn(`Decoding of npy dtype not implemented: ${numpyType}`);
-      return null;
+      throw new Error(`Unimplemented type ${numpyType}`);
     }
     const nArrayElements = header.shape?.reduce((a, b) => a * b);
     const arrayByteLength = nArrayElements * ArrayType.BYTES_PER_ELEMENT;
+    if (arrayBuffer.byteLength < headerEndOffset + arrayByteLength) {
+      throw new Error("Buffer overflow");
+    }
     const data = new ArrayType(arrayBuffer.slice(headerEndOffset, headerEndOffset + arrayByteLength));
     if (numpyType[0] === ">" && LITTLE_ENDIAN_OS || numpyType[0] === "<" && !LITTLE_ENDIAN_OS) {
-      console.warn("Data is wrong endianness, byte swapping not yet implemented.");
+      throw new Error("Incorrect endianness");
     }
     return {
       data,
@@ -47,10 +49,10 @@
     let offset = 8;
     let headerLength;
     if (majorVersion >= 2) {
-      headerLength = view.getUint32(8, true);
+      headerLength = view.getUint32(offset, true);
       offset += 4;
     } else {
-      headerLength = view.getUint16(8, true);
+      headerLength = view.getUint16(offset, true);
       offset += 2;
     }
     const encoding = majorVersion <= 2 ? "latin1" : "utf-8";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/textures",
-  "version": "3.3.0-alpha.5",
+  "version": "3.3.0-alpha.7",
   "description": "Framework-independent loaders for compressed and super compressed (basis) textures ",
   "license": "MIT",
   "publishConfig": {
@@ -45,15 +45,15 @@
     "build-ktx2-basis-writer-nodejs-worker": "esbuild src/workers/ktx2-basis-writer-nodejs-worker.ts --platform=node --target=esnext,node12 --bundle --outfile=dist/ktx2-basis-writer-nodejs-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/images": "3.3.0-alpha.5",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.5",
-    "@loaders.gl/schema": "3.3.0-alpha.5",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.5",
+    "@loaders.gl/images": "3.3.0-alpha.7",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.7",
+    "@loaders.gl/schema": "3.3.0-alpha.7",
+    "@loaders.gl/worker-utils": "3.3.0-alpha.7",
     "ktx-parse": "^0.0.4",
     "texture-compressor": "^1.0.2"
   },
   "devDependencies": {
-    "@loaders.gl/polyfills": "3.3.0-alpha.5"
+    "@loaders.gl/polyfills": "3.3.0-alpha.7"
   },
-  "gitHead": "d2df3bead97710c45fd2974cd51ecd7d5f7f5ea4"
+  "gitHead": "29b08f3519c50984e84bf4234e607cab7c7d1c3e"
 }

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

@@ -1,6 +1,17 @@
 // import type {TextureLevel} from '@loaders.gl/schema';
 
 type NumpyHeader = {descr: string; shape: number[]};
+type TypedArrayConstructor =
+  | typeof Int8Array
+  | typeof Uint8Array
+  | typeof Int16Array
+  | typeof Uint16Array
+  | typeof Int32Array
+  | typeof Uint32Array
+  | typeof Int32Array
+  | typeof Uint32Array
+  | typeof Float32Array
+  | typeof Float64Array;
 
 function systemIsLittleEndian() {
   const a = new Uint32Array([0x12345678]);
@@ -18,7 +29,7 @@ const LITTLE_ENDIAN_OS = systemIsLittleEndian();
 //
 // Here I only include the second and third characters, and check endianness
 // separately
-const DTYPES: Record<string, any> = {
+const DTYPES: Record<string, TypedArrayConstructor> = {
   u1: Uint8Array,
   i1: Int8Array,
   u2: Uint16Array,
@@ -40,20 +51,20 @@ export function parseNPY(arrayBuffer: ArrayBuffer, options?: unknown) {
   const numpyType = header.descr;
   const ArrayType = DTYPES[numpyType.slice(1, 3)];
   if (!ArrayType) {
-    // eslint-disable-next-line no-console, no-undef
-    console.warn(`Decoding of npy dtype not implemented: ${numpyType}`);
-    return null;
+    throw new Error(`Unimplemented type ${numpyType}`);
   }
 
   const nArrayElements = header.shape?.reduce((a: number, b: number): number => a * b);
   const arrayByteLength = nArrayElements * ArrayType.BYTES_PER_ELEMENT;
 
+  if (arrayBuffer.byteLength < headerEndOffset + arrayByteLength) {
+    throw new Error('Buffer overflow');
+  }
   const data = new ArrayType(arrayBuffer.slice(headerEndOffset, headerEndOffset + arrayByteLength));
 
   // Swap endianness if needed
   if ((numpyType[0] === '>' && LITTLE_ENDIAN_OS) || (numpyType[0] === '<' && !LITTLE_ENDIAN_OS)) {
-    // eslint-disable-next-line no-console, no-undef
-    console.warn('Data is wrong endianness, byte swapping not yet implemented.');
+    throw new Error('Incorrect endianness');
   }
 
   return {
@@ -73,12 +84,12 @@ function parseHeader(view: DataView): {header: NumpyHeader; headerEndOffset: num
   // const minorVersion = view.getUint8(7);
 
   let offset = 8;
-  let headerLength;
+  let headerLength: number;
   if (majorVersion >= 2) {
-    headerLength = view.getUint32(8, true);
+    headerLength = view.getUint32(offset, true);
     offset += 4;
   } else {
-    headerLength = view.getUint16(8, true);
+    headerLength = view.getUint16(offset, true);
     offset += 2;
   }