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

package/dist/dist.min.js

@@ -13,6 +13,44 @@
       __defProp(target, name, { get: all[name], enumerable: true });
   };
 
+  // ../loader-utils/src/loader-types.ts
+  async function parseFromContext(data, loaders, options, context) {
+    return context._parse(data, loaders, options, context);
+  }
+  var init_loader_types = __esm({
+    "../loader-utils/src/loader-types.ts"() {
+    }
+  });
+
+  // ../loader-utils/src/lib/binary-utils/array-buffer-utils.ts
+  function concatenateTypedArrays(...typedArrays) {
+    const arrays = typedArrays;
+    const TypedArrayConstructor = arrays && arrays.length > 1 && arrays[0].constructor || null;
+    if (!TypedArrayConstructor) {
+      throw new Error('"concatenateTypedArrays" - incorrect quantity of arguments or arguments have incompatible data types');
+    }
+    const sumLength = arrays.reduce((acc, value) => acc + value.length, 0);
+    const result = new TypedArrayConstructor(sumLength);
+    let offset = 0;
+    for (const array of arrays) {
+      result.set(array, offset);
+      offset += array.length;
+    }
+    return result;
+  }
+  var init_array_buffer_utils = __esm({
+    "../loader-utils/src/lib/binary-utils/array-buffer-utils.ts"() {
+    }
+  });
+
+  // ../loader-utils/src/index.ts
+  var init_src = __esm({
+    "../loader-utils/src/index.ts"() {
+      init_loader_types();
+      init_array_buffer_utils();
+    }
+  });
+
   // ../schema/src/lib/mesh/mesh-utils.ts
   function getMeshBoundingBox(attributes) {
     let minX = Infinity;
@@ -45,7 +83,7 @@
   });
 
   // ../schema/src/index.ts
-  var init_src = __esm({
+  var init_src2 = __esm({
     "../schema/src/index.ts"() {
       init_mesh_utils();
     }
@@ -260,34 +298,6 @@
     }
   });
 
-  // ../loader-utils/src/lib/binary-utils/array-buffer-utils.ts
-  function concatenateTypedArrays(...typedArrays) {
-    const arrays = typedArrays;
-    const TypedArrayConstructor = arrays && arrays.length > 1 && arrays[0].constructor || null;
-    if (!TypedArrayConstructor) {
-      throw new Error('"concatenateTypedArrays" - incorrect quantity of arguments or arguments have incompatible data types');
-    }
-    const sumLength = arrays.reduce((acc, value) => acc + value.length, 0);
-    const result = new TypedArrayConstructor(sumLength);
-    let offset = 0;
-    for (const array of arrays) {
-      result.set(array, offset);
-      offset += array.length;
-    }
-    return result;
-  }
-  var init_array_buffer_utils = __esm({
-    "../loader-utils/src/lib/binary-utils/array-buffer-utils.ts"() {
-    }
-  });
-
-  // ../loader-utils/src/index.ts
-  var init_src2 = __esm({
-    "../loader-utils/src/index.ts"() {
-      init_array_buffer_utils();
-    }
-  });
-
   // src/lib/helpers/skirt.ts
   function addSkirt(attributes, triangles, skirtHeight, outsideIndices) {
     const outsideEdges = outsideIndices ? getOutsideEdgesFromIndices(outsideIndices, attributes.POSITION.value) : getOutsideEdgesFromTriangles(triangles);
@@ -376,7 +386,7 @@
   }
   var init_skirt = __esm({
     "src/lib/helpers/skirt.ts"() {
-      init_src2();
+      init_src();
     }
   });
 
@@ -446,7 +456,7 @@
   }
   var init_parse_quantized_mesh = __esm({
     "src/lib/parse-quantized-mesh.ts"() {
-      init_src();
+      init_src2();
       init_decode_quantized_mesh();
       init_skirt();
     }
@@ -1056,7 +1066,7 @@
   }
   var init_parse_terrain = __esm({
     "src/lib/parse-terrain.ts"() {
-      init_src();
+      init_src2();
       init_martini();
       init_delatin();
       init_skirt();
@@ -1140,13 +1150,14 @@
       mimeType: "application/x.image",
       image: { ...options?.image, type: "data" }
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
     return makeTerrainMeshFromImage(image, terrainOptions);
   }
   var TerrainLoader2, QuantizedMeshLoader2;
   var init_src3 = __esm({
     "src/index.ts"() {
+      init_src();
       init_parse_quantized_mesh();
       init_parse_terrain();
       init_terrain_loader();

package/dist/es5/index.js

@@ -22,6 +22,7 @@ exports.parseTerrain = parseTerrain;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _loaderUtils = require("@loaders.gl/loader-utils");
 var _parseQuantizedMesh = require("./lib/parse-quantized-mesh");
 var _parseTerrain2 = require("./lib/parse-terrain");
 var _terrainLoader = require("./terrain-loader");
@@ -48,7 +49,7 @@ function _parseTerrain() {
             })
           });
           _context2.next = 3;
-          return context === null || context === void 0 ? void 0 : context.parse(arrayBuffer, loadImageOptions);
+          return (0, _loaderUtils.parseFromContext)(arrayBuffer, [], loadImageOptions, context);
         case 3:
           image = _context2.sent;
           terrainOptions = _objectSpread(_objectSpread({}, TerrainLoader.options.terrain), options === null || options === void 0 ? void 0 : options.terrain);

package/dist/es5/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_parseQuantizedMesh","require","_parseTerrain2","_terrainLoader","_quantizedMeshLoader","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","TerrainLoader","TerrainWorkerLoader","parse","parseTerrain","exports","_x","_x2","_x3","_parseTerrain","_asyncToGenerator2","_regenerator","mark","_callee2","arrayBuffer","options","context","loadImageOptions","image","terrainOptions","wrap","_callee2$","_context2","prev","next","mimeType","type","sent","terrain","abrupt","makeTerrainMeshFromImage","stop","QuantizedMeshLoader","QuantizedMeshWorkerLoader","parseSync","parseQuantizedMesh","_parse","_callee","_callee$","_context","_x4","_x5"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseQuantizedMesh} from './lib/parse-quantized-mesh';\nimport {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';\n\nimport {TerrainLoader as TerrainWorkerLoader, TerrainLoaderOptions} from './terrain-loader';\nimport {\n  QuantizedMeshLoader as QuantizedMeshWorkerLoader,\n  QuantizedMeshLoaderOptions\n} from './quantized-mesh-loader';\n\n// TerrainLoader\n\nexport {TerrainWorkerLoader};\n\nexport const TerrainLoader: LoaderWithParser<any, never, TerrainLoaderOptions> = {\n  ...TerrainWorkerLoader,\n  parse: parseTerrain\n};\n\nexport async function parseTerrain(\n  arrayBuffer: ArrayBuffer,\n  options?: TerrainLoaderOptions,\n  context?: LoaderContext\n) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options?.image, type: 'data'}\n  };\n  const image = await context?.parse(arrayBuffer, loadImageOptions);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  const terrainOptions = {...TerrainLoader.options.terrain, ...options?.terrain} as TerrainOptions;\n  return makeTerrainMeshFromImage(image, terrainOptions);\n}\n\n// QuantizedMeshLoader\n\nexport {QuantizedMeshWorkerLoader};\n\n/**\n * Loader for quantized meshes\n */\nexport const QuantizedMeshLoader: LoaderWithParser<any, never, QuantizedMeshLoaderOptions> = {\n  ...QuantizedMeshWorkerLoader,\n  parseSync: (arrayBuffer, options) => parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh']),\n  parse: async (arrayBuffer, options) =>\n    parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh'])\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["_loaderUtils","require","_parseQuantizedMesh","_parseTerrain2","_terrainLoader","_quantizedMeshLoader","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","TerrainLoader","TerrainWorkerLoader","parse","parseTerrain","exports","_x","_x2","_x3","_parseTerrain","_asyncToGenerator2","_regenerator","mark","_callee2","arrayBuffer","options","context","loadImageOptions","image","terrainOptions","wrap","_callee2$","_context2","prev","next","mimeType","type","parseFromContext","sent","terrain","abrupt","makeTerrainMeshFromImage","stop","QuantizedMeshLoader","QuantizedMeshWorkerLoader","parseSync","parseQuantizedMesh","_parse","_callee","_callee$","_context","_x4","_x5"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseFromContext} from '@loaders.gl/loader-utils';\nimport {parseQuantizedMesh} from './lib/parse-quantized-mesh';\nimport {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';\n\nimport {TerrainLoader as TerrainWorkerLoader, TerrainLoaderOptions} from './terrain-loader';\nimport {\n  QuantizedMeshLoader as QuantizedMeshWorkerLoader,\n  QuantizedMeshLoaderOptions\n} from './quantized-mesh-loader';\n\n// TerrainLoader\n\nexport {TerrainWorkerLoader};\n\nexport const TerrainLoader: LoaderWithParser<any, never, TerrainLoaderOptions> = {\n  ...TerrainWorkerLoader,\n  parse: parseTerrain\n};\n\nexport async function parseTerrain(\n  arrayBuffer: ArrayBuffer,\n  options?: TerrainLoaderOptions,\n  context?: LoaderContext\n) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options?.image, type: 'data'}\n  };\n  const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context!);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  const terrainOptions = {...TerrainLoader.options.terrain, ...options?.terrain} as TerrainOptions;\n  // @ts-expect-error sort out image typing asap\n  return makeTerrainMeshFromImage(image, terrainOptions);\n}\n\n// QuantizedMeshLoader\n\nexport {QuantizedMeshWorkerLoader};\n\n/**\n * Loader for quantized meshes\n */\nexport const QuantizedMeshLoader: LoaderWithParser<any, never, QuantizedMeshLoaderOptions> = {\n  ...QuantizedMeshWorkerLoader,\n  parseSync: (arrayBuffer, options) => parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh']),\n  parse: async (arrayBuffer, options) =>\n    parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh'])\n};\n"],"mappings":"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"}

package/dist/es5/lib/utils/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VERSION = void 0;
-var VERSION = typeof "4.0.0-alpha.21" !== 'undefined' ? "4.0.0-alpha.21" : 'latest';
+var VERSION = typeof "4.0.0-alpha.22" !== 'undefined' ? "4.0.0-alpha.22" : 'latest';
 exports.VERSION = VERSION;
 //# sourceMappingURL=version.js.map

package/dist/esm/index.js

@@ -1,3 +1,4 @@
+import { parseFromContext } from '@loaders.gl/loader-utils';
 import { parseQuantizedMesh } from './lib/parse-quantized-mesh';
 import { makeTerrainMeshFromImage } from './lib/parse-terrain';
 import { TerrainLoader as TerrainWorkerLoader } from './terrain-loader';
@@ -16,7 +17,7 @@ export async function parseTerrain(arrayBuffer, options, context) {
       type: 'data'
     }
   };
-  const image = await (context === null || context === void 0 ? void 0 : context.parse(arrayBuffer, loadImageOptions));
+  const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
   const terrainOptions = {
     ...TerrainLoader.options.terrain,
     ...(options === null || options === void 0 ? void 0 : options.terrain)

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["parseQuantizedMesh","makeTerrainMeshFromImage","TerrainLoader","TerrainWorkerLoader","QuantizedMeshLoader","QuantizedMeshWorkerLoader","parse","parseTerrain","arrayBuffer","options","context","loadImageOptions","mimeType","image","type","terrainOptions","terrain","parseSync"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseQuantizedMesh} from './lib/parse-quantized-mesh';\nimport {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';\n\nimport {TerrainLoader as TerrainWorkerLoader, TerrainLoaderOptions} from './terrain-loader';\nimport {\n  QuantizedMeshLoader as QuantizedMeshWorkerLoader,\n  QuantizedMeshLoaderOptions\n} from './quantized-mesh-loader';\n\n// TerrainLoader\n\nexport {TerrainWorkerLoader};\n\nexport const TerrainLoader: LoaderWithParser<any, never, TerrainLoaderOptions> = {\n  ...TerrainWorkerLoader,\n  parse: parseTerrain\n};\n\nexport async function parseTerrain(\n  arrayBuffer: ArrayBuffer,\n  options?: TerrainLoaderOptions,\n  context?: LoaderContext\n) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options?.image, type: 'data'}\n  };\n  const image = await context?.parse(arrayBuffer, loadImageOptions);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  const terrainOptions = {...TerrainLoader.options.terrain, ...options?.terrain} as TerrainOptions;\n  return makeTerrainMeshFromImage(image, terrainOptions);\n}\n\n// QuantizedMeshLoader\n\nexport {QuantizedMeshWorkerLoader};\n\n/**\n * Loader for quantized meshes\n */\nexport const QuantizedMeshLoader: LoaderWithParser<any, never, QuantizedMeshLoaderOptions> = {\n  ...QuantizedMeshWorkerLoader,\n  parseSync: (arrayBuffer, options) => parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh']),\n  parse: async (arrayBuffer, options) =>\n    parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh'])\n};\n"],"mappings":"AACA,SAAQA,kBAAkB,QAAO,4BAA4B;AAC7D,SAAwBC,wBAAwB,QAAO,qBAAqB;AAE5E,SAAQC,aAAa,IAAIC,mBAAmB,QAA6B,kBAAkB;AAC3F,SACEC,mBAAmB,IAAIC,yBAAyB,QAE3C,yBAAyB;AAIhC,SAAQF,mBAAmB;AAE3B,OAAO,MAAMD,aAAiE,GAAG;EAC/E,GAAGC,mBAAmB;EACtBG,KAAK,EAAEC;AACT,CAAC;AAED,OAAO,eAAeA,YAAYA,CAChCC,WAAwB,EACxBC,OAA8B,EAC9BC,OAAuB,EACvB;EACA,MAAMC,gBAAgB,GAAG;IACvB,GAAGF,OAAO;IACVG,QAAQ,EAAE,qBAAqB;IAC/BC,KAAK,EAAE;MAAC,IAAGJ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEI,KAAK;MAAEC,IAAI,EAAE;IAAM;EACzC,CAAC;EACD,MAAMD,KAAK,GAAG,OAAMH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEJ,KAAK,CAACE,WAAW,EAAEG,gBAAgB,CAAC;EAEjE,MAAMI,cAAc,GAAG;IAAC,GAAGb,aAAa,CAACO,OAAO,CAACO,OAAO;IAAE,IAAGP,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEO,OAAO;EAAA,CAAmB;EAChG,OAAOf,wBAAwB,CAACY,KAAK,EAAEE,cAAc,CAAC;AACxD;AAIA,SAAQV,yBAAyB;AAKjC,OAAO,MAAMD,mBAA6E,GAAG;EAC3F,GAAGC,yBAAyB;EAC5BY,SAAS,EAAEA,CAACT,WAAW,EAAEC,OAAO,KAAKT,kBAAkB,CAACQ,WAAW,EAAEC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAG,gBAAgB,CAAC,CAAC;EACjGH,KAAK,EAAE,MAAAA,CAAOE,WAAW,EAAEC,OAAO,KAChCT,kBAAkB,CAACQ,WAAW,EAAEC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAG,gBAAgB,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"index.js","names":["parseFromContext","parseQuantizedMesh","makeTerrainMeshFromImage","TerrainLoader","TerrainWorkerLoader","QuantizedMeshLoader","QuantizedMeshWorkerLoader","parse","parseTerrain","arrayBuffer","options","context","loadImageOptions","mimeType","image","type","terrainOptions","terrain","parseSync"],"sources":["../../src/index.ts"],"sourcesContent":["import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parseFromContext} from '@loaders.gl/loader-utils';\nimport {parseQuantizedMesh} from './lib/parse-quantized-mesh';\nimport {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';\n\nimport {TerrainLoader as TerrainWorkerLoader, TerrainLoaderOptions} from './terrain-loader';\nimport {\n  QuantizedMeshLoader as QuantizedMeshWorkerLoader,\n  QuantizedMeshLoaderOptions\n} from './quantized-mesh-loader';\n\n// TerrainLoader\n\nexport {TerrainWorkerLoader};\n\nexport const TerrainLoader: LoaderWithParser<any, never, TerrainLoaderOptions> = {\n  ...TerrainWorkerLoader,\n  parse: parseTerrain\n};\n\nexport async function parseTerrain(\n  arrayBuffer: ArrayBuffer,\n  options?: TerrainLoaderOptions,\n  context?: LoaderContext\n) {\n  const loadImageOptions = {\n    ...options,\n    mimeType: 'application/x.image',\n    image: {...options?.image, type: 'data'}\n  };\n  const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context!);\n  // Extend function to support additional mesh generation options (square grid or delatin)\n  const terrainOptions = {...TerrainLoader.options.terrain, ...options?.terrain} as TerrainOptions;\n  // @ts-expect-error sort out image typing asap\n  return makeTerrainMeshFromImage(image, terrainOptions);\n}\n\n// QuantizedMeshLoader\n\nexport {QuantizedMeshWorkerLoader};\n\n/**\n * Loader for quantized meshes\n */\nexport const QuantizedMeshLoader: LoaderWithParser<any, never, QuantizedMeshLoaderOptions> = {\n  ...QuantizedMeshWorkerLoader,\n  parseSync: (arrayBuffer, options) => parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh']),\n  parse: async (arrayBuffer, options) =>\n    parseQuantizedMesh(arrayBuffer, options?.['quantized-mesh'])\n};\n"],"mappings":"AACA,SAAQA,gBAAgB,QAAO,0BAA0B;AACzD,SAAQC,kBAAkB,QAAO,4BAA4B;AAC7D,SAAwBC,wBAAwB,QAAO,qBAAqB;AAE5E,SAAQC,aAAa,IAAIC,mBAAmB,QAA6B,kBAAkB;AAC3F,SACEC,mBAAmB,IAAIC,yBAAyB,QAE3C,yBAAyB;AAIhC,SAAQF,mBAAmB;AAE3B,OAAO,MAAMD,aAAiE,GAAG;EAC/E,GAAGC,mBAAmB;EACtBG,KAAK,EAAEC;AACT,CAAC;AAED,OAAO,eAAeA,YAAYA,CAChCC,WAAwB,EACxBC,OAA8B,EAC9BC,OAAuB,EACvB;EACA,MAAMC,gBAAgB,GAAG;IACvB,GAAGF,OAAO;IACVG,QAAQ,EAAE,qBAAqB;IAC/BC,KAAK,EAAE;MAAC,IAAGJ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEI,KAAK;MAAEC,IAAI,EAAE;IAAM;EACzC,CAAC;EACD,MAAMD,KAAK,GAAG,MAAMd,gBAAgB,CAACS,WAAW,EAAE,EAAE,EAAEG,gBAAgB,EAAED,OAAQ,CAAC;EAEjF,MAAMK,cAAc,GAAG;IAAC,GAAGb,aAAa,CAACO,OAAO,CAACO,OAAO;IAAE,IAAGP,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEO,OAAO;EAAA,CAAmB;EAEhG,OAAOf,wBAAwB,CAACY,KAAK,EAAEE,cAAc,CAAC;AACxD;AAIA,SAAQV,yBAAyB;AAKjC,OAAO,MAAMD,mBAA6E,GAAG;EAC3F,GAAGC,yBAAyB;EAC5BY,SAAS,EAAEA,CAACT,WAAW,EAAEC,OAAO,KAAKT,kBAAkB,CAACQ,WAAW,EAAEC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAG,gBAAgB,CAAC,CAAC;EACjGH,KAAK,EAAE,MAAAA,CAAOE,WAAW,EAAEC,OAAO,KAChCT,kBAAkB,CAACQ,WAAW,EAAEC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAG,gBAAgB,CAAC;AAC/D,CAAC"}

package/dist/esm/lib/utils/version.js

@@ -1,2 +1,2 @@
-export const VERSION = typeof "4.0.0-alpha.21" !== 'undefined' ? "4.0.0-alpha.21" : 'latest';
+export const VERSION = typeof "4.0.0-alpha.22" !== 'undefined' ? "4.0.0-alpha.22" : 'latest';
 //# sourceMappingURL=version.js.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAI9E,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EACL,mBAAmB,IAAI,yBAAyB,EAChD,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAE7B,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAG5E,CAAC;AAEF,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,EAC9B,OAAO,CAAC,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;GAWxB;AAID,OAAO,EAAC,yBAAyB,EAAC,CAAC;AAEnC;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,0BAA0B,CAKxF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAK9E,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EACL,mBAAmB,IAAI,yBAAyB,EAChD,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAE7B,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAoB,CAG5E,CAAC;AAEF,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,EAC9B,OAAO,CAAC,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;GAYxB;AAID,OAAO,EAAC,yBAAyB,EAAC,CAAC;AAEnC;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,0BAA0B,CAKxF,CAAC"}

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuantizedMeshLoader = exports.QuantizedMeshWorkerLoader = exports.parseTerrain = exports.TerrainLoader = exports.TerrainWorkerLoader = void 0;
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 const parse_quantized_mesh_1 = require("./lib/parse-quantized-mesh");
 const parse_terrain_1 = require("./lib/parse-terrain");
 const terrain_loader_1 = require("./terrain-loader");
@@ -17,9 +18,10 @@ async function parseTerrain(arrayBuffer, options, context) {
         mimeType: 'application/x.image',
         image: { ...options?.image, type: 'data' }
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await (0, loader_utils_1.parseFromContext)(arrayBuffer, [], loadImageOptions, context);
     // Extend function to support additional mesh generation options (square grid or delatin)
     const terrainOptions = { ...exports.TerrainLoader.options.terrain, ...options?.terrain };
+    // @ts-expect-error sort out image typing asap
     return (0, parse_terrain_1.makeTerrainMeshFromImage)(image, terrainOptions);
 }
 exports.parseTerrain = parseTerrain;

package/dist/quantized-mesh-worker.js

@@ -1,4 +1,9 @@
 (() => {
+  // ../loader-utils/src/loader-types.ts
+  async function parseFromContext(data, loaders, options, context) {
+    return context._parse(data, loaders, options, context);
+  }
+
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || new Set();
@@ -125,7 +130,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -138,7 +143,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id = requestId++;
       const onMessage = (type, payload2) => {
@@ -162,7 +167,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) {
@@ -1177,7 +1187,7 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION = true ? "4.0.0-alpha.22" : "latest";
 
   // src/terrain-loader.ts
   var TerrainLoader = {
@@ -1232,7 +1242,7 @@
       mimeType: "application/x.image",
       image: { ...options?.image, type: "data" }
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
     return makeTerrainMeshFromImage(image, terrainOptions);
   }

package/dist/terrain-worker.js

@@ -1,4 +1,9 @@
 (() => {
+  // ../loader-utils/src/loader-types.ts
+  async function parseFromContext(data, loaders, options, context) {
+    return context._parse(data, loaders, options, context);
+  }
+
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || new Set();
@@ -125,7 +130,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -138,7 +143,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id = requestId++;
       const onMessage = (type, payload2) => {
@@ -162,7 +167,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) {
@@ -1177,7 +1187,7 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION = true ? "4.0.0-alpha.22" : "latest";
 
   // src/terrain-loader.ts
   var TerrainLoader = {
@@ -1232,7 +1242,7 @@
       mimeType: "application/x.image",
       image: { ...options?.image, type: "data" }
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
     return makeTerrainMeshFromImage(image, terrainOptions);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/terrain",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.22",
   "description": "Framework-independent loader for terrain raster formats",
   "license": "MIT",
   "publishConfig": {
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@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/images": "4.0.0-alpha.22",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.22",
+    "@loaders.gl/schema": "4.0.0-alpha.22",
     "@mapbox/martini": "^0.2.0"
   },
-  "gitHead": "df5d670b136192b26941396e944f9c46be788e83"
+  "gitHead": "0da838c506d1275383f2fd3d244d9c72b25397d2"
 }

package/src/index.ts

@@ -1,4 +1,5 @@
 import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {parseFromContext} from '@loaders.gl/loader-utils';
 import {parseQuantizedMesh} from './lib/parse-quantized-mesh';
 import {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';
 
@@ -27,9 +28,10 @@ export async function parseTerrain(
     mimeType: 'application/x.image',
     image: {...options?.image, type: 'data'}
   };
-  const image = await context?.parse(arrayBuffer, loadImageOptions);
+  const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context!);
   // Extend function to support additional mesh generation options (square grid or delatin)
   const terrainOptions = {...TerrainLoader.options.terrain, ...options?.terrain} as TerrainOptions;
+  // @ts-expect-error sort out image typing asap
   return makeTerrainMeshFromImage(image, terrainOptions);
 }