@loaders.gl/terrain - npm Package Compare versions

Comparing version 4.0.0-alpha.21 to 4.0.0-alpha.22

dist/dist.min.js

@@ -16,2 +16,40 @@ (() => {
 
+  // ../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
@@ -49,3 +87,3 @@ function getMeshBoundingBox(attributes) {
   // ../schema/src/index.ts
-  var init_src = __esm({
+  var init_src2 = __esm({
     "../schema/src/index.ts"() {
@@ -265,30 +303,2 @@ init_mesh_utils();
 
-  // ../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
@@ -382,3 +392,3 @@ function addSkirt(attributes, triangles, skirtHeight, outsideIndices) {
     "src/lib/helpers/skirt.ts"() {
-      init_src2();
+      init_src();
     }
@@ -453,3 +463,3 @@ });
     "src/lib/parse-quantized-mesh.ts"() {
-      init_src();
+      init_src2();
       init_decode_quantized_mesh();
@@ -1064,3 +1074,3 @@ init_skirt();
     "src/lib/parse-terrain.ts"() {
-      init_src();
+      init_src2();
       init_martini();
@@ -1149,3 +1159,3 @@ init_delatin();
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
@@ -1157,2 +1167,3 @@ return makeTerrainMeshFromImage(image, terrainOptions);
     "src/index.ts"() {
+      init_src();
       init_parse_quantized_mesh();
@@ -1159,0 +1170,0 @@ init_parse_terrain();

dist/es5/index.js

@@ -25,2 +25,3 @@ "use strict";
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _loaderUtils = require("@loaders.gl/loader-utils");
 var _parseQuantizedMesh = require("./lib/parse-quantized-mesh");
@@ -52,3 +53,3 @@ var _parseTerrain2 = require("./lib/parse-terrain");
           _context2.next = 3;
-          return context === null || context === void 0 ? void 0 : context.parse(arrayBuffer, loadImageOptions);
+          return (0, _loaderUtils.parseFromContext)(arrayBuffer, [], loadImageOptions, context);
         case 3:
@@ -55,0 +56,0 @@ image = _context2.sent;

dist/es5/lib/utils/version.js

@@ -7,4 +7,4 @@ "use strict";
 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

dist/esm/index.js

@@ -0,1 +1,2 @@
+import { parseFromContext } from '@loaders.gl/loader-utils';
 import { parseQuantizedMesh } from './lib/parse-quantized-mesh';
@@ -19,3 +20,3 @@ import { makeTerrainMeshFromImage } from './lib/parse-terrain';
   };
-  const image = await (context === null || context === void 0 ? void 0 : context.parse(arrayBuffer, loadImageOptions));
+  const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
   const terrainOptions = {
@@ -22,0 +23,0 @@ ...TerrainLoader.options.terrain,

dist/esm/lib/utils/version.js

@@ -1,2 +0,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

dist/index.js

 "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");
@@ -20,5 +21,6 @@ const parse_terrain_1 = require("./lib/parse-terrain");
     };
-    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);
@@ -25,0 +27,0 @@ }

dist/quantized-mesh-worker.js

 (() => {
+  // ../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
@@ -128,3 +133,3 @@ function getTransferList(object, recursive = true, transfers) {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
@@ -142,3 +147,3 @@ });
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
@@ -167,3 +172,8 @@ const id = requestId++;
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
@@ -1183,3 +1193,3 @@ let parser;
   // src/lib/utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION = true ? "4.0.0-alpha.22" : "latest";
 
@@ -1239,3 +1249,3 @@ // src/terrain-loader.ts
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
@@ -1242,0 +1252,0 @@ return makeTerrainMeshFromImage(image, terrainOptions);

dist/terrain-worker.js

 (() => {
+  // ../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
@@ -128,3 +133,3 @@ function getTransferList(object, recursive = true, transfers) {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
@@ -142,3 +147,3 @@ });
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
@@ -167,3 +172,8 @@ const id = requestId++;
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
@@ -1183,3 +1193,3 @@ let parser;
   // src/lib/utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.21" : "latest";
+  var VERSION = true ? "4.0.0-alpha.22" : "latest";
 
@@ -1239,3 +1249,3 @@ // src/terrain-loader.ts
     };
-    const image = await context?.parse(arrayBuffer, loadImageOptions);
+    const image = await parseFromContext(arrayBuffer, [], loadImageOptions, context);
     const terrainOptions = { ...TerrainLoader2.options.terrain, ...options?.terrain };
@@ -1242,0 +1252,0 @@ return makeTerrainMeshFromImage(image, terrainOptions);

package.json

 {
   "name": "@loaders.gl/terrain",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.22",
   "description": "Framework-independent loader for terrain raster formats",
@@ -38,8 +38,8 @@ "license": "MIT",
     "@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"
 }

src/index.ts

 import type {LoaderContext, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {parseFromContext} from '@loaders.gl/loader-utils';
 import {parseQuantizedMesh} from './lib/parse-quantized-mesh';
@@ -30,5 +31,6 @@ import {TerrainOptions, makeTerrainMeshFromImage} from './lib/parse-terrain';
   };
-  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);
@@ -35,0 +37,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

502573

increased by0.29%

Lines of code

8383

increased by0.41%

Dependency changes

• + [e-mail]/images@4.0.0-alpha.22(transitive)

• + [e-mail]/loader-utils@4.0.0-alpha.22(transitive)

• + [e-mail]/schema@4.0.0-alpha.22(transitive)

• + [e-mail]/worker-utils@4.0.0-alpha.22(transitive)

• - [e-mail]/images@4.0.0-alpha.21(transitive)

• - [e-mail]/loader-utils@4.0.0-alpha.21(transitive)

• - [e-mail]/schema@4.0.0-alpha.21(transitive)

• - [e-mail]/worker-utils@4.0.0-alpha.21(transitive)

• [e-mail]/images@4.0.0-alpha.22

• [e-mail]/loader-utils@4.0.0-alpha.22

• [e-mail]/schema@4.0.0-alpha.22