@loaders.gl/json 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/geojson-worker.js

@@ -1,7 +1,8 @@
+"use strict";
 (() => {
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
-    const transfersSet = transfers || new Set();
+    const transfersSet = transfers || /* @__PURE__ */ new Set();
     if (!object) {
     } else if (isTransferable(object)) {
       transfersSet.add(object);
@@ -44,11 +45,15 @@
     }
     return parentPort;
   }
-  var onMessageWrapperMap = new Map();
+  var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
+    /** Check that we are actually in a worker thread */
     static inWorkerThread() {
       return typeof self !== "undefined" || Boolean(getParentPort());
     }
+    /*
+     * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
+     */
     static set onmessage(onMessage) {
       function handleMessage(message) {
         const parentPort3 = getParentPort();
@@ -92,6 +97,11 @@
         globalThis.removeEventListener("message", onMessageWrapper);
       }
     }
+    /**
+     * Send a message from a worker to creating thread (main thread)
+     * @param type
+     * @param payload
+     */
     static postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
@@ -123,6 +133,7 @@
               loader,
               arrayBuffer: input,
               options,
+              // @ts-expect-error fetch missing
               context: {
                 ...context,
                 _parse: parseOnMainThread
@@ -196,26 +207,80 @@
     }
   }
 
-  // ../../node_modules/@math.gl/polygon/dist/esm/polygon-utils.js
+  // ../../node_modules/@babel/runtime/helpers/esm/typeof.js
+  function _typeof(obj) {
+    "@babel/helpers - typeof";
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
+      return typeof obj2;
+    } : function(obj2) {
+      return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
+    }, _typeof(obj);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/toPrimitive.js
+  function _toPrimitive(input, hint) {
+    if (_typeof(input) !== "object" || input === null)
+      return input;
+    var prim = input[Symbol.toPrimitive];
+    if (prim !== void 0) {
+      var res = prim.call(input, hint || "default");
+      if (_typeof(res) !== "object")
+        return res;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return (hint === "string" ? String : Number)(input);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/toPropertyKey.js
+  function _toPropertyKey(arg) {
+    var key = _toPrimitive(arg, "string");
+    return _typeof(key) === "symbol" ? key : String(key);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
+  function _defineProperty(obj, key, value) {
+    key = _toPropertyKey(key);
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+    return obj;
+  }
+
+  // ../../node_modules/@math.gl/polygon/dist/polygon-utils.js
+  var DimIndex = {
+    x: 0,
+    y: 1,
+    z: 2
+  };
   function getPolygonSignedArea(points, options = {}) {
     const {
       start = 0,
-      end = points.length
+      end = points.length,
+      plane = "xy"
     } = options;
     const dim = options.size || 2;
     let area2 = 0;
+    const i0 = DimIndex[plane[0]];
+    const i1 = DimIndex[plane[1]];
     for (let i = start, j = end - dim; i < end; i += dim) {
-      area2 += (points[i] - points[j]) * (points[i + 1] + points[j + 1]);
+      area2 += (points[i + i0] - points[j + i0]) * (points[i + i1] + points[j + i1]);
       j = i;
     }
     return area2 / 2;
   }
 
-  // ../../node_modules/@math.gl/polygon/dist/esm/earcut.js
-  function earcut(positions, holeIndices, dim = 2, areas) {
+  // ../../node_modules/@math.gl/polygon/dist/earcut.js
+  function earcut(positions, holeIndices, dim = 2, areas, plane = "xy") {
     const hasHoles = holeIndices && holeIndices.length;
     const outerLen = hasHoles ? holeIndices[0] * dim : positions.length;
-    let outerNode = linkedList(positions, 0, outerLen, dim, true, areas && areas[0]);
+    let outerNode = linkedList(positions, 0, outerLen, dim, true, areas && areas[0], plane);
     const triangles = [];
     if (!outerNode || outerNode.next === outerNode.prev)
       return triangles;
@@ -227,7 +292,7 @@
     let x;
     let y;
     if (hasHoles)
-      outerNode = eliminateHoles(positions, holeIndices, outerNode, dim, areas);
+      outerNode = eliminateHoles(positions, holeIndices, outerNode, dim, areas, plane);
     if (positions.length > 80 * dim) {
       minX = maxX = positions[0];
       minY = maxY = positions[1];
@@ -244,27 +309,30 @@
           maxY = y;
       }
       invSize = Math.max(maxX - minX, maxY - minY);
-      invSize = invSize !== 0 ? 1 / invSize : 0;
+      invSize = invSize !== 0 ? 32767 / invSize : 0;
     }
-    earcutLinked(outerNode, triangles, dim, minX, minY, invSize);
+    earcutLinked(outerNode, triangles, dim, minX, minY, invSize, 0);
     return triangles;
   }
-  function linkedList(data, start, end, dim, clockwise, area2) {
+  function linkedList(data, start, end, dim, clockwise, area2, plane) {
     let i;
     let last;
     if (area2 === void 0) {
       area2 = getPolygonSignedArea(data, {
         start,
         end,
-        size: dim
+        size: dim,
+        plane
       });
     }
+    let i0 = DimIndex[plane[0]];
+    let i1 = DimIndex[plane[1]];
     if (clockwise === area2 < 0) {
       for (i = start; i < end; i += dim)
-        last = insertNode(i, data[i], data[i + 1], last);
+        last = insertNode(i, data[i + i0], data[i + i1], last);
     } else {
       for (i = end - dim; i >= start; i -= dim)
-        last = insertNode(i, data[i], data[i + 1], last);
+        last = insertNode(i, data[i + i0], data[i + i1], last);
     }
     if (last && equals(last, last.next)) {
       removeNode(last);
@@ -305,9 +373,9 @@
       prev = ear.prev;
       next = ear.next;
       if (invSize ? isEarHashed(ear, minX, minY, invSize) : isEar(ear)) {
-        triangles.push(prev.i / dim);
-        triangles.push(ear.i / dim);
-        triangles.push(next.i / dim);
+        triangles.push(prev.i / dim | 0);
+        triangles.push(ear.i / dim | 0);
+        triangles.push(next.i / dim | 0);
         removeNode(ear);
         ear = next.next;
         stop = next.next;
@@ -333,9 +401,19 @@
     const c = ear.next;
     if (area(a, b, c) >= 0)
       return false;
-    let p = ear.next.next;
-    while (p !== ear.prev) {
-      if (pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+    const ax = a.x;
+    const bx = b.x;
+    const cx = c.x;
+    const ay = a.y;
+    const by = b.y;
+    const cy = c.y;
+    const x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx;
+    const y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy;
+    const x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx;
+    const y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy;
+    let p = c.next;
+    while (p !== a) {
+      if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
         return false;
       p = p.next;
     }
@@ -347,29 +425,35 @@
     const c = ear.next;
     if (area(a, b, c) >= 0)
       return false;
-    const minTX = a.x < b.x ? a.x < c.x ? a.x : c.x : b.x < c.x ? b.x : c.x;
-    const minTY = a.y < b.y ? a.y < c.y ? a.y : c.y : b.y < c.y ? b.y : c.y;
-    const maxTX = a.x > b.x ? a.x > c.x ? a.x : c.x : b.x > c.x ? b.x : c.x;
-    const maxTY = a.y > b.y ? a.y > c.y ? a.y : c.y : b.y > c.y ? b.y : c.y;
-    const minZ = zOrder(minTX, minTY, minX, minY, invSize);
-    const maxZ = zOrder(maxTX, maxTY, minX, minY, invSize);
+    const ax = a.x;
+    const bx = b.x;
+    const cx = c.x;
+    const ay = a.y;
+    const by = b.y;
+    const cy = c.y;
+    const x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx;
+    const y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy;
+    const x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx;
+    const y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy;
+    const minZ = zOrder(x0, y0, minX, minY, invSize);
+    const maxZ = zOrder(x1, y1, minX, minY, invSize);
     let p = ear.prevZ;
     let n = ear.nextZ;
     while (p && p.z >= minZ && n && n.z <= maxZ) {
-      if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+      if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
         return false;
       p = p.prevZ;
-      if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0)
+      if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0)
         return false;
       n = n.nextZ;
     }
     while (p && p.z >= minZ) {
-      if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0)
+      if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0)
         return false;
       p = p.prevZ;
     }
     while (n && n.z <= maxZ) {
-      if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0)
+      if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0)
         return false;
       n = n.nextZ;
     }
@@ -381,9 +465,9 @@
       const a = p.prev;
       const b = p.next.next;
       if (!equals(a, b) && intersects(a, p, p.next, b) && locallyInside(a, b) && locallyInside(b, a)) {
-        triangles.push(a.i / dim);
-        triangles.push(p.i / dim);
-        triangles.push(b.i / dim);
+        triangles.push(a.i / dim | 0);
+        triangles.push(p.i / dim | 0);
+        triangles.push(b.i / dim | 0);
         removeNode(p);
         removeNode(p.next);
         p = start = b;
@@ -401,8 +485,8 @@
           let c = splitPolygon(a, b);
           a = filterPoints(a, a.next);
           c = filterPoints(c, c.next);
-          earcutLinked(a, triangles, dim, minX, minY, invSize);
-          earcutLinked(c, triangles, dim, minX, minY, invSize);
+          earcutLinked(a, triangles, dim, minX, minY, invSize, 0);
+          earcutLinked(c, triangles, dim, minX, minY, invSize, 0);
           return;
         }
         b = b.next;
@@ -410,7 +494,7 @@
       a = a.next;
     } while (a !== start);
   }
-  function eliminateHoles(data, holeIndices, outerNode, dim, areas) {
+  function eliminateHoles(data, holeIndices, outerNode, dim, areas, plane) {
     const queue = [];
     let i;
     let len;
@@ -420,15 +504,14 @@
     for (i = 0, len = holeIndices.length; i < len; i++) {
       start = holeIndices[i] * dim;
       end = i < len - 1 ? holeIndices[i + 1] * dim : data.length;
-      list = linkedList(data, start, end, dim, false, areas && areas[i + 1]);
+      list = linkedList(data, start, end, dim, false, areas && areas[i + 1], plane);
       if (list === list.next)
         list.steiner = true;
       queue.push(getLeftmost(list));
     }
     queue.sort(compareX);
     for (i = 0; i < queue.length; i++) {
-      eliminateHole(queue[i], outerNode);
-      outerNode = filterPoints(outerNode, outerNode.next);
+      outerNode = eliminateHole(queue[i], outerNode);
     }
     return outerNode;
   }
@@ -436,12 +519,13 @@
     return a.x - b.x;
   }
   function eliminateHole(hole, outerNode) {
-    outerNode = findHoleBridge(hole, outerNode);
-    if (outerNode) {
-      const b = splitPolygon(outerNode, hole);
-      filterPoints(outerNode, outerNode.next);
-      filterPoints(b, b.next);
+    const bridge = findHoleBridge(hole, outerNode);
+    if (!bridge) {
+      return outerNode;
     }
+    const bridgeReverse = splitPolygon(bridge, hole);
+    filterPoints(bridgeReverse, bridgeReverse.next);
+    return filterPoints(bridge, bridge.next);
   }
   function findHoleBridge(hole, outerNode) {
     let p = outerNode;
@@ -454,21 +538,15 @@
         const x = p.x + (hy - p.y) * (p.next.x - p.x) / (p.next.y - p.y);
         if (x <= hx && x > qx) {
           qx = x;
-          if (x === hx) {
-            if (hy === p.y)
-              return p;
-            if (hy === p.next.y)
-              return p.next;
-          }
           m = p.x < p.next.x ? p : p.next;
+          if (x === hx)
+            return m;
         }
       }
       p = p.next;
     } while (p !== outerNode);
     if (!m)
       return null;
-    if (hx === qx)
-      return m;
     const stop = m;
     const mx = m.x;
     const my = m.y;
@@ -493,7 +571,7 @@
   function indexCurve(start, minX, minY, invSize) {
     let p = start;
     do {
-      if (p.z === null)
+      if (p.z === 0)
         p.z = zOrder(p.x, p.y, minX, minY, invSize);
       p.prevZ = p.prev;
       p.nextZ = p.next;
@@ -554,8 +632,8 @@
     return list;
   }
   function zOrder(x, y, minX, minY, invSize) {
-    x = 32767 * (x - minX) * invSize;
-    y = 32767 * (y - minY) * invSize;
+    x = (x - minX) * invSize | 0;
+    y = (y - minY) * invSize | 0;
     x = (x | x << 8) & 16711935;
     x = (x | x << 4) & 252645135;
     x = (x | x << 2) & 858993459;
@@ -577,7 +655,7 @@
     return leftmost;
   }
   function pointInTriangle(ax, ay, bx, by, cx, cy, px, py) {
-    return (cx - px) * (ay - py) - (ax - px) * (cy - py) >= 0 && (ax - px) * (by - py) - (bx - px) * (ay - py) >= 0 && (bx - px) * (cy - py) - (cx - px) * (by - py) >= 0;
+    return (cx - px) * (ay - py) >= (ax - px) * (cy - py) && (ax - px) * (by - py) >= (bx - px) * (ay - py) && (bx - px) * (cy - py) >= (cx - px) * (by - py);
   }
   function isValidDiagonal(a, b) {
     return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (area(a.prev, a, b.prev) || area(a, b.prev, b)) || equals(a, b) && area(a.prev, a, a.next) > 0 && area(b.prev, b, b.next) > 0);
@@ -636,8 +714,8 @@
     return inside;
   }
   function splitPolygon(a, b) {
-    const a2 = new Node(a.i, a.x, a.y);
-    const b2 = new Node(b.i, b.x, b.y);
+    const a2 = new Vertex(a.i, a.x, a.y);
+    const b2 = new Vertex(b.i, b.x, b.y);
     const an = a.next;
     const bp = b.prev;
     a.next = b;
@@ -651,7 +729,7 @@
     return b2;
   }
   function insertNode(i, x, y, last) {
-    const p = new Node(i, x, y);
+    const p = new Vertex(i, x, y);
     if (!last) {
       p.prev = p;
       p.next = p;
@@ -671,30 +749,39 @@
     if (p.nextZ)
       p.nextZ.prevZ = p.prevZ;
   }
-  function Node(i, x, y) {
-    this.i = i;
-    this.x = x;
-    this.y = y;
-    this.prev = null;
-    this.next = null;
-    this.z = null;
-    this.prevZ = null;
-    this.nextZ = null;
-    this.steiner = false;
-  }
+  var Vertex = class {
+    constructor(i, x, y) {
+      _defineProperty(this, "i", void 0);
+      _defineProperty(this, "x", void 0);
+      _defineProperty(this, "y", void 0);
+      _defineProperty(this, "prev", null);
+      _defineProperty(this, "next", null);
+      _defineProperty(this, "z", 0);
+      _defineProperty(this, "prevZ", null);
+      _defineProperty(this, "nextZ", null);
+      _defineProperty(this, "steiner", false);
+      this.i = i;
+      this.x = x;
+      this.y = y;
+    }
+  };
 
   // ../gis/src/lib/flat-geojson-to-binary.ts
   function flatGeojsonToBinary(features, geometryInfo, options) {
     const propArrayTypes = extractNumericPropTypes(features);
     const numericPropKeys = Object.keys(propArrayTypes).filter((k) => propArrayTypes[k] !== Array);
-    return fillArrays(features, {
-      propArrayTypes,
-      ...geometryInfo
-    }, {
-      numericPropKeys: options && options.numericPropKeys || numericPropKeys,
-      PositionDataType: options ? options.PositionDataType : Float32Array,
-      triangulate: options ? options.triangulate : true
-    });
+    return fillArrays(
+      features,
+      {
+        propArrayTypes,
+        ...geometryInfo
+      },
+      {
+        numericPropKeys: options && options.numericPropKeys || numericPropKeys,
+        PositionDataType: options ? options.PositionDataType : Float32Array,
+        triangulate: options ? options.triangulate : true
+      }
+    );
   }
   function extractNumericPropTypes(features) {
     const propArrayTypes = {};
@@ -818,16 +905,32 @@
     points.positions.set(geometry.data, indexMap.pointPosition * coordLength);
     const nPositions = geometry.data.length / coordLength;
     fillNumericProperties(points, properties, indexMap.pointPosition, nPositions);
-    points.globalFeatureIds.fill(indexMap.feature, indexMap.pointPosition, indexMap.pointPosition + nPositions);
-    points.featureIds.fill(indexMap.pointFeature, indexMap.pointPosition, indexMap.pointPosition + nPositions);
+    points.globalFeatureIds.fill(
+      indexMap.feature,
+      indexMap.pointPosition,
+      indexMap.pointPosition + nPositions
+    );
+    points.featureIds.fill(
+      indexMap.pointFeature,
+      indexMap.pointPosition,
+      indexMap.pointPosition + nPositions
+    );
     indexMap.pointPosition += nPositions;
   }
   function handleLineString(geometry, lines, indexMap, coordLength, properties) {
     lines.positions.set(geometry.data, indexMap.linePosition * coordLength);
     const nPositions = geometry.data.length / coordLength;
     fillNumericProperties(lines, properties, indexMap.linePosition, nPositions);
-    lines.globalFeatureIds.fill(indexMap.feature, indexMap.linePosition, indexMap.linePosition + nPositions);
-    lines.featureIds.fill(indexMap.lineFeature, indexMap.linePosition, indexMap.linePosition + nPositions);
+    lines.globalFeatureIds.fill(
+      indexMap.feature,
+      indexMap.linePosition,
+      indexMap.linePosition + nPositions
+    );
+    lines.featureIds.fill(
+      indexMap.lineFeature,
+      indexMap.linePosition,
+      indexMap.linePosition + nPositions
+    );
     for (let i = 0, il = geometry.indices.length; i < il; ++i) {
       const start = geometry.indices[i];
       const end = i === il - 1 ? geometry.data.length : geometry.indices[i + 1];
@@ -839,8 +942,16 @@
     polygons.positions.set(geometry.data, indexMap.polygonPosition * coordLength);
     const nPositions = geometry.data.length / coordLength;
     fillNumericProperties(polygons, properties, indexMap.polygonPosition, nPositions);
-    polygons.globalFeatureIds.fill(indexMap.feature, indexMap.polygonPosition, indexMap.polygonPosition + nPositions);
-    polygons.featureIds.fill(indexMap.polygonFeature, indexMap.polygonPosition, indexMap.polygonPosition + nPositions);
+    polygons.globalFeatureIds.fill(
+      indexMap.feature,
+      indexMap.polygonPosition,
+      indexMap.polygonPosition + nPositions
+    );
+    polygons.featureIds.fill(
+      indexMap.polygonFeature,
+      indexMap.polygonPosition,
+      indexMap.polygonPosition + nPositions
+    );
     for (let l = 0, ll = geometry.indices.length; l < ll; ++l) {
       const startPosition = indexMap.polygonPosition;
       polygons.polygonIndices[indexMap.polygonObject++] = startPosition;
@@ -849,7 +960,10 @@
       const nextIndices = geometry.indices[l + 1];
       for (let i = 0, il = indices.length; i < il; ++i) {
         const start = indices[i];
-        const end = i === il - 1 ? nextIndices === void 0 ? geometry.data.length : nextIndices[0] : indices[i + 1];
+        const end = i === il - 1 ? (
+          // last line, so either read to:
+          nextIndices === void 0 ? geometry.data.length : nextIndices[0]
+        ) : indices[i + 1];
         polygons.primitivePolygonIndices[indexMap.polygonRing++] = indexMap.polygonPosition;
         indexMap.polygonPosition += (end - start) / coordLength;
       }
@@ -908,6 +1022,7 @@
         featureIds: { value: polygons.featureIds, size: 1 },
         numericProps: wrapProps(polygons.numericProps, 1)
       }
+      // triangles not expected
     };
     if (binaryFeatures.polygons && polygons.triangles) {
       binaryFeatures.polygons.triangles = { value: new Uint32Array(polygons.triangles), size: 1 };
@@ -949,7 +1064,7 @@
     let polygonObjectsCount = 0;
     let polygonRingsCount = 0;
     let polygonFeaturesCount = 0;
-    const coordLengths = new Set();
+    const coordLengths = /* @__PURE__ */ new Set();
     for (const feature of features) {
       const geometry = feature.geometry;
       switch (geometry.type) {
@@ -1321,6 +1436,7 @@
       };
       return batch;
     }
+    // HELPERS
     _reallocateColumns() {
       if (this.length < this.allocated) {
         return;
@@ -1381,6 +1497,7 @@
       }
       return false;
     }
+    /** @deprecated Use addArrayRow or addObjectRow */
     addRow(row) {
       if (this.limitReached()) {
         return;
@@ -1394,6 +1511,7 @@
         this.addObjectRow(row);
       }
     }
+    /** Add one row to the batch */
     addArrayRow(row) {
       if (!this.aggregator) {
         const TableBatchType = this._getTableBatchType();
@@ -1401,6 +1519,7 @@
       }
       this.aggregator.addArrayRow(row);
     }
+    /** Add one row to the batch */
     addObjectRow(row) {
       if (!this.aggregator) {
         const TableBatchType = this._getTableBatchType();
@@ -1408,6 +1527,7 @@
       }
       this.aggregator.addObjectRow(row);
     }
+    /** Mark an incoming raw memory chunk has completed */
     chunkComplete(chunk) {
       if (chunk instanceof ArrayBuffer) {
         this.bytesUsed += chunk.byteLength;
@@ -1423,6 +1543,7 @@
     getFinalBatch(options) {
       return this._getBatch(options);
     }
+    // INTERNAL
     _estimateRowMB(row) {
       return Array.isArray(row) ? row.length * 8 : Object.keys(row).length * 8;
     }
@@ -1444,6 +1565,9 @@
       this.lastBatchEmittedMs = Date.now();
       return true;
     }
+    /**
+     * bytesUsed can be set via chunkComplete or via getBatch*
+     */
     _getBatch(options) {
       if (!this.aggregator) {
         return null;
@@ -1481,62 +1605,63 @@
 
   // src/lib/clarinet/clarinet.ts
   var MAX_BUFFER_LENGTH = Number.MAX_SAFE_INTEGER;
-  var STATE;
-  (function(STATE2) {
-    STATE2[STATE2["BEGIN"] = 0] = "BEGIN";
-    STATE2[STATE2["VALUE"] = 1] = "VALUE";
-    STATE2[STATE2["OPEN_OBJECT"] = 2] = "OPEN_OBJECT";
-    STATE2[STATE2["CLOSE_OBJECT"] = 3] = "CLOSE_OBJECT";
-    STATE2[STATE2["OPEN_ARRAY"] = 4] = "OPEN_ARRAY";
-    STATE2[STATE2["CLOSE_ARRAY"] = 5] = "CLOSE_ARRAY";
-    STATE2[STATE2["TEXT_ESCAPE"] = 6] = "TEXT_ESCAPE";
-    STATE2[STATE2["STRING"] = 7] = "STRING";
-    STATE2[STATE2["BACKSLASH"] = 8] = "BACKSLASH";
-    STATE2[STATE2["END"] = 9] = "END";
-    STATE2[STATE2["OPEN_KEY"] = 10] = "OPEN_KEY";
-    STATE2[STATE2["CLOSE_KEY"] = 11] = "CLOSE_KEY";
-    STATE2[STATE2["TRUE"] = 12] = "TRUE";
-    STATE2[STATE2["TRUE2"] = 13] = "TRUE2";
-    STATE2[STATE2["TRUE3"] = 14] = "TRUE3";
-    STATE2[STATE2["FALSE"] = 15] = "FALSE";
-    STATE2[STATE2["FALSE2"] = 16] = "FALSE2";
-    STATE2[STATE2["FALSE3"] = 17] = "FALSE3";
-    STATE2[STATE2["FALSE4"] = 18] = "FALSE4";
-    STATE2[STATE2["NULL"] = 19] = "NULL";
-    STATE2[STATE2["NULL2"] = 20] = "NULL2";
-    STATE2[STATE2["NULL3"] = 21] = "NULL3";
-    STATE2[STATE2["NUMBER_DECIMAL_POINT"] = 22] = "NUMBER_DECIMAL_POINT";
-    STATE2[STATE2["NUMBER_DIGIT"] = 23] = "NUMBER_DIGIT";
-  })(STATE || (STATE = {}));
   var Char = {
     tab: 9,
+    // \t
     lineFeed: 10,
+    // \n
     carriageReturn: 13,
+    // \r
     space: 32,
+    // " "
     doubleQuote: 34,
+    // "
     plus: 43,
+    // +
     comma: 44,
+    // ,
     minus: 45,
+    // -
     period: 46,
+    // .
     _0: 48,
+    // 0
     _9: 57,
+    // 9
     colon: 58,
+    // :
     E: 69,
+    // E
     openBracket: 91,
+    // [
     backslash: 92,
+    // \
     closeBracket: 93,
+    // ]
     a: 97,
+    // a
     b: 98,
+    // b
     e: 101,
+    // e
     f: 102,
+    // f
     l: 108,
+    // l
     n: 110,
+    // n
     r: 114,
+    // r
     s: 115,
+    // s
     t: 116,
+    // t
     u: 117,
+    // u
     openBrace: 123,
+    // {
     closeBrace: 125
+    // }
   };
   var stringTokenPattern = /[\\"\n]/g;
   var DEFAULT_OPTIONS2 = {
@@ -1571,9 +1696,11 @@
       this.closed = false;
       this.closedRoot = false;
       this.sawRoot = false;
+      // tag = null;
       this.error = null;
-      this.state = 0;
+      this.state = 0 /* BEGIN */;
       this.stack = [];
+      // mostly just for error reporting
       this.position = 0;
       this.column = 0;
       this.line = 1;
@@ -1587,7 +1714,7 @@
       this.emit("onready");
     }
     end() {
-      if (this.state !== 1 || this.depth !== 0)
+      if (this.state !== 1 /* VALUE */ || this.depth !== 0)
         this._error("Unexpected end");
       this._closeValue();
       this.c = "";
@@ -1602,6 +1729,7 @@
     close() {
       return this.write(null);
     }
+    // protected
     emit(event, data) {
       this.options[event]?.(data, this);
     }
@@ -1609,6 +1737,8 @@
       this._closeValue();
       this.emit(event, data);
     }
+    /* eslint-disable no-continue */
+    // eslint-disable-next-line complexity, max-statements
     write(chunk) {
       if (this.error) {
         throw this.error;
@@ -1639,111 +1769,111 @@
         } else
           this.column++;
         switch (this.state) {
-          case 0:
+          case 0 /* BEGIN */:
             if (c === Char.openBrace)
-              this.state = 2;
+              this.state = 2 /* OPEN_OBJECT */;
             else if (c === Char.openBracket)
-              this.state = 4;
+              this.state = 4 /* OPEN_ARRAY */;
             else if (!isWhitespace(c)) {
               this._error("Non-whitespace before {[.");
             }
             continue;
-          case 10:
-          case 2:
+          case 10 /* OPEN_KEY */:
+          case 2 /* OPEN_OBJECT */:
             if (isWhitespace(c))
               continue;
-            if (this.state === 10)
-              this.stack.push(11);
+            if (this.state === 10 /* OPEN_KEY */)
+              this.stack.push(11 /* CLOSE_KEY */);
             else if (c === Char.closeBrace) {
               this.emit("onopenobject");
               this.depth++;
               this.emit("oncloseobject");
               this.depth--;
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
               continue;
             } else
-              this.stack.push(3);
+              this.stack.push(3 /* CLOSE_OBJECT */);
             if (c === Char.doubleQuote)
-              this.state = 7;
+              this.state = 7 /* STRING */;
             else
               this._error('Malformed object key should start with "');
             continue;
-          case 11:
-          case 3:
+          case 11 /* CLOSE_KEY */:
+          case 3 /* CLOSE_OBJECT */:
             if (isWhitespace(c))
               continue;
             if (c === Char.colon) {
-              if (this.state === 3) {
-                this.stack.push(3);
+              if (this.state === 3 /* CLOSE_OBJECT */) {
+                this.stack.push(3 /* CLOSE_OBJECT */);
                 this._closeValue("onopenobject");
                 this.depth++;
               } else
                 this._closeValue("onkey");
-              this.state = 1;
+              this.state = 1 /* VALUE */;
             } else if (c === Char.closeBrace) {
               this.emitNode("oncloseobject");
               this.depth--;
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             } else if (c === Char.comma) {
-              if (this.state === 3)
-                this.stack.push(3);
+              if (this.state === 3 /* CLOSE_OBJECT */)
+                this.stack.push(3 /* CLOSE_OBJECT */);
               this._closeValue();
-              this.state = 10;
+              this.state = 10 /* OPEN_KEY */;
             } else
               this._error("Bad object");
             continue;
-          case 4:
-          case 1:
+          case 4 /* OPEN_ARRAY */:
+          case 1 /* VALUE */:
             if (isWhitespace(c))
               continue;
-            if (this.state === 4) {
+            if (this.state === 4 /* OPEN_ARRAY */) {
               this.emit("onopenarray");
               this.depth++;
-              this.state = 1;
+              this.state = 1 /* VALUE */;
               if (c === Char.closeBracket) {
                 this.emit("onclosearray");
                 this.depth--;
-                this.state = this.stack.pop() || 1;
+                this.state = this.stack.pop() || 1 /* VALUE */;
                 continue;
               } else {
-                this.stack.push(5);
+                this.stack.push(5 /* CLOSE_ARRAY */);
               }
             }
             if (c === Char.doubleQuote)
-              this.state = 7;
+              this.state = 7 /* STRING */;
             else if (c === Char.openBrace)
-              this.state = 2;
+              this.state = 2 /* OPEN_OBJECT */;
             else if (c === Char.openBracket)
-              this.state = 4;
+              this.state = 4 /* OPEN_ARRAY */;
             else if (c === Char.t)
-              this.state = 12;
+              this.state = 12 /* TRUE */;
             else if (c === Char.f)
-              this.state = 15;
+              this.state = 15 /* FALSE */;
             else if (c === Char.n)
-              this.state = 19;
+              this.state = 19 /* NULL */;
             else if (c === Char.minus) {
               this.numberNode += "-";
             } else if (Char._0 <= c && c <= Char._9) {
               this.numberNode += String.fromCharCode(c);
-              this.state = 23;
+              this.state = 23 /* NUMBER_DIGIT */;
             } else
               this._error("Bad value");
             continue;
-          case 5:
+          case 5 /* CLOSE_ARRAY */:
             if (c === Char.comma) {
-              this.stack.push(5);
+              this.stack.push(5 /* CLOSE_ARRAY */);
               this._closeValue("onvalue");
-              this.state = 1;
+              this.state = 1 /* VALUE */;
             } else if (c === Char.closeBracket) {
               this.emitNode("onclosearray");
               this.depth--;
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             } else if (isWhitespace(c))
               continue;
             else
               this._error("Bad array");
             continue;
-          case 7:
+          case 7 /* STRING */:
             if (this.textNode === void 0) {
               this.textNode = "";
             }
@@ -1767,7 +1897,7 @@
                     break STRING_BIGLOOP;
                 }
                 if (c === Char.doubleQuote && !slashed) {
-                  this.state = this.stack.pop() || 1;
+                  this.state = this.stack.pop() || 1 /* VALUE */;
                   this.textNode += chunk.substring(starti, i - 1);
                   this.position += i - 1 - starti;
                   break;
@@ -1826,77 +1956,77 @@
             this.slashed = slashed;
             this.unicodeI = unicodeI;
             continue;
-          case 12:
+          case 12 /* TRUE */:
             if (c === Char.r)
-              this.state = 13;
+              this.state = 13 /* TRUE2 */;
             else
               this._error(`Invalid true started with t${c}`);
             continue;
-          case 13:
+          case 13 /* TRUE2 */:
             if (c === Char.u)
-              this.state = 14;
+              this.state = 14 /* TRUE3 */;
             else
               this._error(`Invalid true started with tr${c}`);
             continue;
-          case 14:
+          case 14 /* TRUE3 */:
             if (c === Char.e) {
               this.emit("onvalue", true);
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             } else
               this._error(`Invalid true started with tru${c}`);
             continue;
-          case 15:
+          case 15 /* FALSE */:
             if (c === Char.a)
-              this.state = 16;
+              this.state = 16 /* FALSE2 */;
             else
               this._error(`Invalid false started with f${c}`);
             continue;
-          case 16:
+          case 16 /* FALSE2 */:
             if (c === Char.l)
-              this.state = 17;
+              this.state = 17 /* FALSE3 */;
             else
               this._error(`Invalid false started with fa${c}`);
             continue;
-          case 17:
+          case 17 /* FALSE3 */:
             if (c === Char.s)
-              this.state = 18;
+              this.state = 18 /* FALSE4 */;
             else
               this._error(`Invalid false started with fal${c}`);
             continue;
-          case 18:
+          case 18 /* FALSE4 */:
             if (c === Char.e) {
               this.emit("onvalue", false);
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             } else
               this._error(`Invalid false started with fals${c}`);
             continue;
-          case 19:
+          case 19 /* NULL */:
             if (c === Char.u)
-              this.state = 20;
+              this.state = 20 /* NULL2 */;
             else
               this._error(`Invalid null started with n${c}`);
             continue;
-          case 20:
+          case 20 /* NULL2 */:
             if (c === Char.l)
-              this.state = 21;
+              this.state = 21 /* NULL3 */;
             else
               this._error(`Invalid null started with nu${c}`);
             continue;
-          case 21:
+          case 21 /* NULL3 */:
             if (c === Char.l) {
               this.emit("onvalue", null);
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             } else
               this._error(`Invalid null started with nul${c}`);
             continue;
-          case 22:
+          case 22 /* NUMBER_DECIMAL_POINT */:
             if (c === Char.period) {
               this.numberNode += ".";
-              this.state = 23;
+              this.state = 23 /* NUMBER_DIGIT */;
             } else
               this._error("Leading zero not followed by .");
             continue;
-          case 23:
+          case 23 /* NUMBER_DIGIT */:
             if (Char._0 <= c && c <= Char._9)
               this.numberNode += String.fromCharCode(c);
             else if (c === Char.period) {
@@ -1914,7 +2044,7 @@
             } else {
               this._closeNumber();
               i--;
-              this.state = this.stack.pop() || 1;
+              this.state = this.stack.pop() || 1 /* VALUE */;
             }
             continue;
           default:
@@ -2015,6 +2145,12 @@ Char: ${this.c}`;
       }
       return true;
     }
+    /**
+     * Sets the value pointed at by path
+     * TODO - handle root path
+     * @param object
+     * @param value
+     */
     setFieldAtPath(object, value) {
       const path = [...this.path];
       path.shift();
@@ -2024,6 +2160,11 @@ Char: ${this.c}`;
       }
       object[field] = value;
     }
+    /**
+     * Gets the value pointed at by path
+     * TODO - handle root path
+     * @param object
+     */
     getFieldAtPath(object) {
       const path = [...this.path];
       path.shift();
@@ -2092,6 +2233,7 @@ Char: ${this.c}`;
     close() {
       this.parser.close();
     }
+    // PRIVATE METHODS
     _pushOrSet(value) {
       const { container, key } = this.currentState;
       if (key !== null) {
@@ -2138,6 +2280,7 @@ Char: ${this.c}`;
           }
           this._openArray();
         },
+        // Redefine onopenarray to inject value for top-level object
         onopenobject: (name) => {
           if (!this.topLevelObject) {
             this.topLevelObject = {};
@@ -2156,6 +2299,13 @@ Char: ${this.c}`;
       const jsonpaths = options.jsonpaths || [];
       this.jsonPaths = jsonpaths.map((jsonpath) => new JSONPath(jsonpath));
     }
+    /**
+     * write REDEFINITION
+     * - super.write() chunk to parser
+     * - get the contents (so far) of "topmost-level" array as batch of rows
+     * - clear top-level array
+     * - return the batch of rows\
+     */
     write(chunk) {
       super.write(chunk);
       let array = [];
@@ -2165,6 +2315,11 @@ Char: ${this.c}`;
       }
       return array;
     }
+    /**
+     * Returns a partially formed result object
+     * Useful for returning the "wrapper" object when array is not top level
+     * e.g. GeoJSON
+     */
     getPartialResult() {
       return this.topLevelObject;
     }
@@ -2177,6 +2332,10 @@ Char: ${this.c}`;
     getJsonPath() {
       return this.jsonpath;
     }
+    // PRIVATE METHODS
+    /**
+     * Checks is this.getJsonPath matches the jsonpaths provided in options
+     */
     _matchJSONPath() {
       const currentPath = this.getJsonPath();
       if (this.jsonPaths.length === 0) {
@@ -2210,11 +2369,13 @@ Char: ${this.c}`;
       if (rows.length > 0 && isFirstChunk) {
         if (metadata) {
           const initialBatch = {
+            // Common fields
             shape,
             batchType: "partial-result",
             data: [],
             length: 0,
             bytesUsed: 0,
+            // JSON additions
             container: parser.getPartialResult(),
             jsonpath: jsonpath2
           };
@@ -2248,13 +2409,14 @@ Char: ${this.c}`;
         jsonpath: parser.getStreamingJsonPathAsString(),
         data: [],
         length: 0
+        // schema: null
       };
       yield finalBatch;
     }
   }
 
   // src/geojson-loader.ts
-  var VERSION = true ? "4.0.0-beta.2" : "latest";
+  var VERSION = true ? "4.0.0-beta.3" : "latest";
   var GeoJSONWorkerLoader = {
     name: "GeoJSON",
     id: "geojson",
@@ -2280,7 +2442,9 @@ Char: ${this.c}`;
   };
   var GeoJSONLoader = {
     ...GeoJSONWorkerLoader,
+    // @ts-expect-error
     parse,
+    // @ts-expect-error
     parseTextSync,
     parseInBatches
   };
@@ -2299,6 +2463,8 @@ Char: ${this.c}`;
     }
     const table = {
       shape: "geojson-table",
+      // TODO - deduce schema from geojson
+      // TODO check that parsed data is of type FeatureCollection
       type: "FeatureCollection",
       features: geojson?.features || []
     };