@loaders.gl/json 3.1.0-beta.3 → 3.1.1

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export type { GeoJSONLoaderOptions as _GeoJSONLoaderOptions } from './geojson-lo
 export { GeoJSONLoader as _GeoJSONLoader, GeoJSONWorkerLoader as _GeoJSONWorkerLoader } from './geojson-loader';
 export { default as _JSONPath } from './lib/jsonpath/jsonpath';
 export { default as _ClarinetParser } from './lib/clarinet/clarinet';
+export { rebuildJsonObject as _rebuildJsonObject } from './lib/parse-json-in-batches';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,YAAY,EAAC,oBAAoB,IAAI,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EACL,aAAa,IAAI,cAAc,EAC/B,mBAAmB,IAAI,oBAAoB,EAC5C,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,YAAY,EAAC,oBAAoB,IAAI,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EACL,aAAa,IAAI,cAAc,EAC/B,mBAAmB,IAAI,oBAAoB,EAC5C,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,MAAM,6BAA6B,CAAC"}

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._ClarinetParser = exports._JSONPath = exports._GeoJSONWorkerLoader = exports._GeoJSONLoader = exports.NDJSONLoader = exports.JSONLoader = void 0;
+exports._rebuildJsonObject = exports._ClarinetParser = exports._JSONPath = exports._GeoJSONWorkerLoader = exports._GeoJSONLoader = exports.NDJSONLoader = exports.JSONLoader = void 0;
 var json_loader_1 = require("./json-loader");
 Object.defineProperty(exports, "JSONLoader", { enumerable: true, get: function () { return json_loader_1.JSONLoader; } });
 var ndjson_loader_1 = require("./ndjson-loader");
@@ -15,3 +15,5 @@ var jsonpath_1 = require("./lib/jsonpath/jsonpath");
 Object.defineProperty(exports, "_JSONPath", { enumerable: true, get: function () { return __importDefault(jsonpath_1).default; } });
 var clarinet_1 = require("./lib/clarinet/clarinet");
 Object.defineProperty(exports, "_ClarinetParser", { enumerable: true, get: function () { return __importDefault(clarinet_1).default; } });
+var parse_json_in_batches_1 = require("./lib/parse-json-in-batches");
+Object.defineProperty(exports, "_rebuildJsonObject", { enumerable: true, get: function () { return parse_json_in_batches_1.rebuildJsonObject; } });

package/dist/lib/parse-json-in-batches.d.ts

@@ -1,4 +1,5 @@
 import type { Batch } from '@loaders.gl/schema';
 import type { JSONLoaderOptions } from '../json-loader';
 export default function parseJSONInBatches(binaryAsyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options: JSONLoaderOptions): AsyncIterable<Batch>;
+export declare function rebuildJsonObject(batch: any, data: any): any;
 //# sourceMappingURL=parse-json-in-batches.d.ts.map

package/dist/lib/parse-json-in-batches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-json-in-batches.d.ts","sourceRoot":"","sources":["../../src/lib/parse-json-in-batches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAOtD,wBAA+B,kBAAkB,CAC/C,mBAAmB,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACvE,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,KAAK,CAAC,CA+EtB"}
+{"version":3,"file":"parse-json-in-batches.d.ts","sourceRoot":"","sources":["../../src/lib/parse-json-in-batches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAQtD,wBAA+B,kBAAkB,CAC/C,mBAAmB,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACvE,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,KAAK,CAAC,CA+EtB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,OAmB5C"}

package/dist/lib/parse-json-in-batches.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.rebuildJsonObject = void 0;
 const schema_1 = require("@loaders.gl/schema");
 const loader_utils_1 = require("@loaders.gl/loader-utils");
 const streaming_json_parser_1 = __importDefault(require("./parser/streaming-json-parser"));
+const jsonpath_1 = __importDefault(require("./jsonpath/jsonpath"));
 // TODO - support batch size 0 = no batching/single batch?
 // eslint-disable-next-line max-statements, complexity
 async function* parseJSONInBatches(binaryAsyncIterator, options) {
@@ -78,3 +80,21 @@ async function* parseJSONInBatches(binaryAsyncIterator, options) {
     }
 }
 exports.default = parseJSONInBatches;
+function rebuildJsonObject(batch, data) {
+    // Last batch will have this special type and will provide all the root object of the parsed file
+    (0, loader_utils_1.assert)(batch.batchType === 'final-result');
+    // The streamed JSON data is a top level array (jsonpath = '$'), just return the array of row objects
+    if (batch.jsonpath === '$') {
+        return data;
+    }
+    // (jsonpath !== '$') The streamed data is not a top level array, so stitch it back in to the top-level object
+    if (batch.jsonpath && batch.jsonpath.length > 1) {
+        const topLevelObject = batch.container;
+        const streamingPath = new jsonpath_1.default(batch.jsonpath);
+        streamingPath.setFieldAtPath(topLevelObject, data);
+        return topLevelObject;
+    }
+    // No jsonpath, in this case nothing was streamed.
+    return batch.container;
+}
+exports.rebuildJsonObject = rebuildJsonObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "3.1.0-beta.3",
+  "version": "3.1.1",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "publishConfig": {
@@ -35,9 +35,9 @@
     "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-worker.js"
   },
   "dependencies": {
-    "@loaders.gl/gis": "3.1.0-beta.3",
-    "@loaders.gl/loader-utils": "3.1.0-beta.3",
-    "@loaders.gl/schema": "3.1.0-beta.3"
+    "@loaders.gl/gis": "3.1.1",
+    "@loaders.gl/loader-utils": "3.1.1",
+    "@loaders.gl/schema": "3.1.1"
   },
-  "gitHead": "3537c382b3ea4e092b24b6f94c3edee72076039c"
+  "gitHead": "ed3c238bcb68ab5a2d4ddc64319f6f4c02a20df7"
 }

package/src/index.ts

@@ -11,3 +11,5 @@ export {
 
 export {default as _JSONPath} from './lib/jsonpath/jsonpath';
 export {default as _ClarinetParser} from './lib/clarinet/clarinet';
+
+export {rebuildJsonObject as _rebuildJsonObject} from './lib/parse-json-in-batches';

package/src/lib/parse-json-in-batches.ts

@@ -1,8 +1,9 @@
 import type {Batch} from '@loaders.gl/schema';
 import type {JSONLoaderOptions} from '../json-loader';
 import {TableBatchBuilder} from '@loaders.gl/schema';
-import {makeTextDecoderIterator} from '@loaders.gl/loader-utils';
+import {assert, makeTextDecoderIterator} from '@loaders.gl/loader-utils';
 import StreamingJSONParser from './parser/streaming-json-parser';
+import JSONPath from './jsonpath/jsonpath';
 
 // TODO - support batch size 0 = no batching/single batch?
 // eslint-disable-next-line max-statements, complexity
@@ -89,3 +90,24 @@ export default async function* parseJSONInBatches(
     yield finalBatch;
   }
 }
+
+export function rebuildJsonObject(batch, data) {
+  // Last batch will have this special type and will provide all the root object of the parsed file
+  assert(batch.batchType === 'final-result');
+
+  // The streamed JSON data is a top level array (jsonpath = '$'), just return the array of row objects
+  if (batch.jsonpath === '$') {
+    return data;
+  }
+
+  // (jsonpath !== '$') The streamed data is not a top level array, so stitch it back in to the top-level object
+  if (batch.jsonpath && batch.jsonpath.length > 1) {
+    const topLevelObject = batch.container;
+    const streamingPath = new JSONPath(batch.jsonpath);
+    streamingPath.setFieldAtPath(topLevelObject, data);
+    return topLevelObject;
+  }
+
+  // No jsonpath, in this case nothing was streamed.
+  return batch.container;
+}