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

package/dist/dist.dev.js

@@ -240,7 +240,6 @@ var __exports__ = (() => {
       };
       return batch;
     }
-    // HELPERS
     _reallocateColumns() {
       if (this.length < this.allocated) {
         return;
@@ -304,7 +303,6 @@ var __exports__ = (() => {
       }
       return false;
     }
-    /** @deprecated Use addArrayRow or addObjectRow */
     addRow(row) {
       if (this.limitReached()) {
         return;
@@ -318,7 +316,6 @@ var __exports__ = (() => {
         this.addObjectRow(row);
       }
     }
-    /** Add one row to the batch */
     addArrayRow(row) {
       if (!this.aggregator) {
         const TableBatchType = this._getTableBatchType();
@@ -326,7 +323,6 @@ var __exports__ = (() => {
       }
       this.aggregator.addArrayRow(row);
     }
-    /** Add one row to the batch */
     addObjectRow(row) {
       if (!this.aggregator) {
         const TableBatchType = this._getTableBatchType();
@@ -334,7 +330,6 @@ var __exports__ = (() => {
       }
       this.aggregator.addObjectRow(row);
     }
-    /** Mark an incoming raw memory chunk has completed */
     chunkComplete(chunk) {
       if (chunk instanceof ArrayBuffer) {
         this.bytesUsed += chunk.byteLength;
@@ -350,7 +345,6 @@ var __exports__ = (() => {
     getFinalBatch(options) {
       return this._getBatch(options);
     }
-    // INTERNAL
     _estimateRowMB(row) {
       return Array.isArray(row) ? row.length * 8 : Object.keys(row).length * 8;
     }
@@ -372,9 +366,6 @@ var __exports__ = (() => {
       this.lastBatchEmittedMs = Date.now();
       return true;
     }
-    /**
-     * bytesUsed can be set via chunkComplete or via getBatch*
-     */
     _getBatch(options) {
       if (!this.aggregator) {
         return null;
@@ -683,7 +674,6 @@ var __exports__ = (() => {
         name,
         type: type.type || "null",
         nullable: type.nullable
-        // metadata: {}
       };
     }
     if (Array.isArray(column) && column.length > 0) {
@@ -693,7 +683,6 @@ var __exports__ = (() => {
         name,
         type,
         nullable: true
-        // metadata: {},
       };
     }
     throw new Error("empty table");
@@ -704,7 +693,6 @@ var __exports__ = (() => {
       name,
       type,
       nullable: true
-      // metadata: {}
     };
   }
 
@@ -876,7 +864,7 @@ var __exports__ = (() => {
 
   // src/lib/clarinet/clarinet.ts
   var MAX_BUFFER_LENGTH = Number.MAX_SAFE_INTEGER;
-  var STATE = /* @__PURE__ */ function(STATE2) {
+  var STATE = function(STATE2) {
     STATE2[STATE2["BEGIN"] = 0] = "BEGIN";
     STATE2[STATE2["VALUE"] = 1] = "VALUE";
     STATE2[STATE2["OPEN_OBJECT"] = 2] = "OPEN_OBJECT";
@@ -905,61 +893,33 @@ var __exports__ = (() => {
   }(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 = {
@@ -993,11 +953,9 @@ var __exports__ = (() => {
     closed = false;
     closedRoot = false;
     sawRoot = false;
-    // tag = null;
     error = null;
     state = STATE.BEGIN;
     stack = [];
-    // mostly just for error reporting
     position = 0;
     column = 0;
     line = 1;
@@ -1030,7 +988,6 @@ var __exports__ = (() => {
     close() {
       return this.write(null);
     }
-    // protected
     emit(event, data) {
       this.options[event]?.(data, this);
     }
@@ -1038,8 +995,6 @@ var __exports__ = (() => {
       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;
@@ -1446,12 +1401,6 @@ 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();
@@ -1461,11 +1410,6 @@ 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();
@@ -1540,7 +1484,6 @@ Char: ${this.c}`;
     close() {
       this.parser.close();
     }
-    // PRIVATE METHODS
     _pushOrSet(value) {
       const {
         container,
@@ -1601,7 +1544,6 @@ Char: ${this.c}`;
           }
           this._openArray();
         },
-        // Redefine onopenarray to inject value for top-level object
         onopenobject: (name) => {
           if (!this.topLevelObject) {
             this.topLevelObject = {};
@@ -1617,13 +1559,6 @@ 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 = [];
@@ -1633,11 +1568,6 @@ 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;
     }
@@ -1650,10 +1580,6 @@ 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) {
@@ -1693,13 +1619,11 @@ 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
           };
@@ -1739,7 +1663,6 @@ Char: ${this.c}`;
         jsonpath: parser.getStreamingJsonPathAsString(),
         data: [],
         length: 0
-        // schema: null
       };
       yield finalBatch;
     }
@@ -1765,7 +1688,6 @@ Char: ${this.c}`;
       shape: "object-row-table",
       table: false,
       jsonpaths: []
-      // batchSize: 'auto'
     }
   };
   var JSONLoader = {
@@ -1860,12 +1782,7 @@ Char: ${this.c}`;
     module: "json",
     version: VERSION2,
     extensions: ["ndjson", "jsonl"],
-    mimeTypes: [
-      "application/x-ndjson",
-      "application/jsonlines",
-      // https://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html#cm-batch
-      "application/json-seq"
-    ],
+    mimeTypes: ["application/x-ndjson", "application/jsonlines", "application/json-seq"],
     category: "table",
     text: true,
     parse: async (arrayBuffer) => parseNDJSONSync(new TextDecoder().decode(arrayBuffer)),
@@ -2588,10 +2505,7 @@ Char: ${this.c}`;
       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 ? (
-          // last line, so either read to:
-          nextIndices === void 0 ? geometry.data.length : nextIndices[0]
-        ) : indices[i + 1];
+        const end = i === il - 1 ? nextIndices === void 0 ? geometry.data.length : nextIndices[0] : indices[i + 1];
         polygons.primitivePolygonIndices[indexMap.polygonRing++] = indexMap.polygonPosition;
         indexMap.polygonPosition += (end - start) / coordLength;
       }
@@ -2693,7 +2607,6 @@ Char: ${this.c}`;
         },
         numericProps: wrapProps(polygons.numericProps, 1)
       }
-      // triangles not expected
     };
     if (binaryFeatures.polygons && polygons.triangles) {
       binaryFeatures.polygons.triangles = {
@@ -2956,9 +2869,7 @@ Char: ${this.c}`;
   };
   var GeoJSONLoader = {
     ...GeoJSONWorkerLoader,
-    // @ts-expect-error
     parse: parse2,
-    // @ts-expect-error
     parseTextSync: parseTextSync2,
     parseInBatches: parseInBatches2
   };
@@ -2983,8 +2894,6 @@ 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 || []
     };

package/dist/geojson-worker.js

@@ -2416,7 +2416,7 @@ Char: ${this.c}`;
   }
 
   // src/geojson-loader.ts
-  var VERSION = true ? "4.0.0-beta.3" : "latest";
+  var VERSION = true ? "4.0.0-beta.5" : "latest";
   var GeoJSONWorkerLoader = {
     name: "GeoJSON",
     id: "geojson",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.5",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "type": "module",
@@ -43,9 +43,9 @@
     "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-beta.3",
-    "@loaders.gl/loader-utils": "4.0.0-beta.3",
-    "@loaders.gl/schema": "4.0.0-beta.3"
+    "@loaders.gl/gis": "4.0.0-beta.5",
+    "@loaders.gl/loader-utils": "4.0.0-beta.5",
+    "@loaders.gl/schema": "4.0.0-beta.5"
   },
-  "gitHead": "7ba9621cc51c7a26c407086ac86171f35b8712af"
+  "gitHead": "a6f5a0d1a316cc22396e5a4d480c14329d1ef146"
 }