@maplibre/geojson-vt 6.1.0 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplibre/geojson-vt",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Slice GeoJSON data into vector tiles efficiently",
   "type": "module",
   "exports": {
@@ -25,30 +25,26 @@
   "unpkg": "dist/geojson-vt.js",
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^1.0.0",
-    "@rollup/plugin-typescript": "^12.3.0",
     "@types/benchmark": "^2.1.5",
     "@types/geojson": "^7946.0.16",
-    "@types/node": "^25.5.2",
-    "@vitest/coverage-v8": "^4.1.2",
+    "@types/node": "^26.0.1",
+    "@vitest/coverage-v8": "^4.1.8",
     "benchmark": "^2.1.4",
-    "eslint": "^10.2.0",
-    "rollup": "^4.60.1",
-    "tslib": "^2.8.1",
-    "tsx": "^4.21.0",
-    "typedoc": "^0.28.18",
-    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.0",
-    "vitest": "^4.0.17"
+    "eslint": "^10.6.0",
+    "rolldown": "^1.1.3",
+    "tsx": "^4.22.4",
+    "typedoc": "^0.28.19",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.62.1",
+    "vitest": "^4.1.9"
   },
   "license": "ISC",
   "scripts": {
     "lint": "eslint",
     "test": "vitest",
     "coverage": "vitest run --coverage",
-    "build": "rollup -c && tsc -p tsconfig.declaration.json",
-    "watch": "rollup -cw",
+    "build": "rolldown -c && tsc -p tsconfig.declaration.json",
+    "watch": "rolldown -cw",
     "start": "npm run watch",
     "bench": "tsx bench/benchmark.ts && tsx --expose-gc bench/memory-bench.ts",
     "docs": "typedoc && mkdir -p docs/debug && cp -r debug/* docs/debug && find docs/debug -name '*.html' -exec sed -i 's|../dist/geojson-vt-dev.js|https://unpkg.com/@maplibre/geojson-vt@latest/dist/geojson-vt.js|g' {} +",
@@ -63,6 +59,6 @@
     "url": "https://github.com/maplibre/geojson-vt"
   },
   "dependencies": {
-    "kdbush": "^4.0.2"
+    "kdbush": "^4.1.0"
   }
 }

package/src/convert.test.ts

@@ -0,0 +1,40 @@
+import {test, expect, describe} from 'vitest';
+import {convertToInternal} from './convert';
+import {defaultOptions} from './geojsonvt';
+
+/**
+ * Wraps a geometry in `depth` nested GeometryCollections.
+ */
+function nestGeometryCollections(depth: number, inner: GeoJSON.Geometry): GeoJSON.Geometry {
+    let geometry = inner;
+    for (let i = 0; i < depth; i++) {
+        geometry = {type: 'GeometryCollection', geometries: [geometry]};
+    }
+    return geometry;
+}
+
+const point: GeoJSON.Point = {type: 'Point', coordinates: [0, 0]};
+
+function feature(geometry: GeoJSON.Geometry): GeoJSON.Feature {
+    return {type: 'Feature', geometry, properties: null};
+}
+describe('convertToInternal', () => {
+    test('converts a geometry nested in GeometryCollections', () => {
+        const features = convertToInternal(feature(nestGeometryCollections(3, point)), defaultOptions);
+
+        expect(features).toHaveLength(1);
+        expect(features[0].type).toBe('Point');
+    });
+
+    test('allows nesting up to the supported depth', () => {
+        const features = convertToInternal(feature(nestGeometryCollections(1024, point)), defaultOptions);
+
+        expect(features).toHaveLength(1);
+        expect(features[0].type).toBe('Point');
+    });
+
+    test('throws when GeometryCollection nesting exceeds the supported depth', () => {
+        expect(() => convertToInternal(feature(nestGeometryCollections(1025, point)), defaultOptions))
+            .toThrow('GeometryCollection nesting exceeds supported depth: 1024');
+    });
+})

package/src/convert.ts

@@ -3,6 +3,8 @@ import {simplify} from './simplify';
 import {createFeature, optimizeLineMemory} from './feature';
 import type {GeoJSONVTInternalFeature, GeoJSONVTOptions, SliceArray} from './definitions';
 
+const MAX_GEOMETRY_COLLECTION_DEPTH = 1024;
+
 /**
  * converts GeoJSON to internal source features (an intermediate projected JSON vector format with simplification data)
  * @param data
@@ -28,11 +30,15 @@ export function convertToInternal(data: GeoJSON.GeoJSON, options: GeoJSONVTOptio
     return features;
 }
 
-function featureToInternal(features: GeoJSONVTInternalFeature[], geojson: GeoJSON.Feature, options: GeoJSONVTOptions, index?: number) {
+function featureToInternal(features: GeoJSONVTInternalFeature[], geojson: GeoJSON.Feature, options: GeoJSONVTOptions, index?: number, depth = 0) {
     if (!geojson.geometry) return;
 
+    if (depth > MAX_GEOMETRY_COLLECTION_DEPTH) {
+        throw new Error('GeometryCollection nesting exceeds supported depth: ' + MAX_GEOMETRY_COLLECTION_DEPTH);
+    }
+
     if (geojson.geometry.type === 'GeometryCollection') {
-        convertGeometryCollection(features, geojson, geojson.geometry, options, index);
+        convertGeometryCollection(features, geojson, geojson.geometry, options, index, depth + 1);
         return;
     }
 
@@ -82,14 +88,14 @@ function getFeatureId(geojson: GeoJSON.Feature, options: GeoJSONVTOptions, index
     return geojson.id;
 }
 
-function convertGeometryCollection(features: GeoJSONVTInternalFeature[], geojson: GeoJSON.Feature, geometry: GeoJSON.GeometryCollection, options: GeoJSONVTOptions, index?: number) {
+function convertGeometryCollection(features: GeoJSONVTInternalFeature[], geojson: GeoJSON.Feature, geometry: GeoJSON.GeometryCollection, options: GeoJSONVTOptions, index?: number, depth = 0) {
     for (const geom of geometry.geometries) {
         featureToInternal(features, {
             id: geojson.id,
             type: 'Feature',
             geometry: geom,
             properties: geojson.properties
-        }, options, index);
+        }, options, index, depth);
     }
 }
 

package/src/difference.ts

@@ -95,7 +95,7 @@ export function applySourceDiff(source: GeoJSONVTInternalFeature[], dataDiff: Ge
         }
 
         if (removeFeatures.length) {
-            affected.push(...removeFeatures);
+            affected = affected.concat(removeFeatures);
             const removeIds = new Set(removeFeatures.map(f => f.id));
             source = source.filter(f => !removeIds.has(f.id));
         }
@@ -103,15 +103,15 @@ export function applySourceDiff(source: GeoJSONVTInternalFeature[], dataDiff: Ge
         if (diff.add.size) {
             let addFeatures = convertToInternal({type: 'FeatureCollection', features: Array.from(diff.add.values())}, options);
             addFeatures = wrap(addFeatures, options);
-            affected.push(...addFeatures);
-            source.push(...addFeatures);
+            affected = affected.concat(addFeatures);
+            source = source.concat(addFeatures);
         }
     }
 
     if (diff.update.size) {
         // Features can be duplicated across the antimeridian (wrap) in a single tile, so must update all instances with the same id
         const oldFeaturesMap = new Map<string | number, GeoJSONVTInternalFeature[]>();
-        const keepFeatures = [];
+        let keepFeatures: GeoJSONVTInternalFeature[] = [];
         for (const feature of source) {
             if (diff.update.has(feature.id)) {
                 oldFeaturesMap.set(feature.id, [...(oldFeaturesMap.get(feature.id) || []), feature]);
@@ -124,8 +124,8 @@ export function applySourceDiff(source: GeoJSONVTInternalFeature[], dataDiff: Ge
             if (!oldFeatures || oldFeatures.length === 0) continue;
             const updatedFeatures = getUpdatedFeatures(oldFeatures, update, options);
 
-            affected.push(...oldFeatures, ...updatedFeatures);
-            keepFeatures.push(...updatedFeatures);
+            affected = affected.concat(oldFeatures, updatedFeatures);
+            keepFeatures = keepFeatures.concat(updatedFeatures);
         }
         source = keepFeatures;
     }