@loaders.gl/json 3.1.0-alpha.3 → 3.1.0-beta.2

package/dist/lib/parser/json-parser.js

@@ -1,127 +1,98 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import ClarinetParser from '../clarinet/clarinet';
-import JSONPath from '../jsonpath/jsonpath';
-export default class JSONParser {
-  constructor() {
-    _defineProperty(this, "jsonpath", void 0);
-
-    _defineProperty(this, "_parser", void 0);
-
-    this.reset();
-
-    this._initializeParser();
-  }
-
-  reset() {
-    this.result = undefined;
-    this.previousStates = [];
-    this.currentState = Object.freeze({
-      container: [],
-      key: null
-    });
-    this.jsonpath = new JSONPath();
-  }
-
-  write(chunk) {
-    this.parser.write(chunk);
-  }
-
-  close() {
-    this.parser.close();
-  }
-
-  _pushOrSet(value) {
-    const {
-      container,
-      key
-    } = this.currentState;
-
-    if (key !== null) {
-      container[key] = value;
-      this.currentState.key = null;
-    } else {
-      container.push(value);
+"use strict";
+// @ts-nocheck
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const clarinet_1 = __importDefault(require("../clarinet/clarinet"));
+const jsonpath_1 = __importDefault(require("../jsonpath/jsonpath"));
+// JSONParser builds a JSON object using the events emitted by the Clarinet parser
+class JSONParser {
+    constructor(options) {
+        this.result = undefined;
+        this.previousStates = [];
+        this.currentState = Object.freeze({ container: [], key: null });
+        this.jsonpath = new jsonpath_1.default();
+        this.reset();
+        this.parser = new clarinet_1.default({
+            onready: () => {
+                this.jsonpath = new jsonpath_1.default();
+                this.previousStates.length = 0;
+                this.currentState.container.length = 0;
+            },
+            onopenobject: (name) => {
+                this._openObject({});
+                if (typeof name !== 'undefined') {
+                    this.parser.emit('onkey', name);
+                }
+            },
+            onkey: (name) => {
+                this.jsonpath.set(name);
+                this.currentState.key = name;
+            },
+            oncloseobject: () => {
+                this._closeObject();
+            },
+            onopenarray: () => {
+                this._openArray();
+            },
+            onclosearray: () => {
+                this._closeArray();
+            },
+            onvalue: (value) => {
+                this._pushOrSet(value);
+            },
+            onerror: (error) => {
+                throw error;
+            },
+            onend: () => {
+                this.result = this.currentState.container.pop();
+            },
+            ...options
+        });
     }
-  }
-
-  _openArray(newContainer = []) {
-    this.jsonpath.push(null);
-
-    this._pushOrSet(newContainer);
-
-    this.previousStates.push(this.currentState);
-    this.currentState = {
-      container: newContainer,
-      isArray: true,
-      key: null
-    };
-  }
-
-  _closeArray() {
-    this.jsonpath.pop();
-    this.currentState = this.previousStates.pop();
-  }
-
-  _openObject(newContainer = {}) {
-    this.jsonpath.push(null);
-
-    this._pushOrSet(newContainer);
-
-    this.previousStates.push(this.currentState);
-    this.currentState = {
-      container: newContainer,
-      isArray: false,
-      key: null
-    };
-  }
-
-  _closeObject() {
-    this.jsonpath.pop();
-    this.currentState = this.previousStates.pop();
-  }
-
-  _initializeParser() {
-    this._parser = new ClarinetParser({
-      onready: () => {
-        this.jsonpath = new JSONPath();
-        this.previousStates.length = 0;
-        this.currentState.container.length = 0;
-      },
-      onopenobject: name => {
-        this._openObject({});
-
-        if (typeof name !== 'undefined') {
-          this.parser.onkey(name);
+    reset() {
+        this.result = undefined;
+        this.previousStates = [];
+        this.currentState = Object.freeze({ container: [], key: null });
+        this.jsonpath = new jsonpath_1.default();
+    }
+    write(chunk) {
+        this.parser.write(chunk);
+    }
+    close() {
+        this.parser.close();
+    }
+    // PRIVATE METHODS
+    _pushOrSet(value) {
+        const { container, key } = this.currentState;
+        if (key !== null) {
+            container[key] = value;
+            this.currentState.key = null;
         }
-      },
-      onkey: name => {
-        this.jsonpath.set(name);
-        this.currentState.key = name;
-      },
-      oncloseobject: () => {
-        this._closeObject();
-      },
-      onopenarray: () => {
-        this._openArray();
-      },
-      onclosearray: () => {
-        this._closeArray();
-      },
-      onvalue: value => {
-        this._pushOrSet(value);
-      },
-      onerror: error => {
-        throw error;
-      },
-      onend: () => {
-        this.result = this.currentState.container.pop();
-      }
-    });
-  }
-
-  get parser() {
-    return this._parser;
-  }
-
+        else {
+            container.push(value);
+        }
+    }
+    _openArray(newContainer = []) {
+        this.jsonpath.push(null);
+        this._pushOrSet(newContainer);
+        this.previousStates.push(this.currentState);
+        this.currentState = { container: newContainer, isArray: true, key: null };
+    }
+    _closeArray() {
+        this.jsonpath.pop();
+        this.currentState = this.previousStates.pop();
+    }
+    _openObject(newContainer = {}) {
+        this.jsonpath.push(null);
+        this._pushOrSet(newContainer);
+        this.previousStates.push(this.currentState);
+        this.currentState = { container: newContainer, isArray: false, key: null };
+    }
+    _closeObject() {
+        this.jsonpath.pop();
+        this.currentState = this.previousStates.pop();
+    }
 }
-//# sourceMappingURL=json-parser.js.map
+exports.default = JSONParser;

package/dist/lib/parser/streaming-json-parser.d.ts

@@ -0,0 +1,37 @@
+import { default as JSONParser } from './json-parser';
+import JSONPath from '../jsonpath/jsonpath';
+/**
+ * The `StreamingJSONParser` looks for the first array in the JSON structure.
+ * and emits an array of chunks
+ */
+export default class StreamingJSONParser extends JSONParser {
+    private jsonPaths;
+    private streamingJsonPath;
+    private streamingArray;
+    private topLevelObject;
+    constructor(options?: {
+        [key: string]: any;
+    });
+    /**
+     * 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: any): any[];
+    /**
+     * Returns a partially formed result object
+     * Useful for returning the "wrapper" object when array is not top level
+     * e.g. GeoJSON
+     */
+    getPartialResult(): object | null;
+    getStreamingJsonPath(): JSONPath | null;
+    getStreamingJsonPathAsString(): string | null;
+    getJsonPath(): JSONPath;
+    /**
+     * Checks is this.getJsonPath matches the jsonpaths provided in options
+     */
+    _matchJSONPath(): boolean;
+}
+//# sourceMappingURL=streaming-json-parser.d.ts.map

package/dist/lib/parser/streaming-json-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"streaming-json-parser.d.ts","sourceRoot":"","sources":["../../../src/lib/parser/streaming-json-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,iBAAiB,CAAyB;IAClD,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,cAAc,CAAuB;gBAEjC,OAAO,GAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAM;IAiC9C;;;;;;OAMG;IACH,KAAK,CAAC,KAAK,KAAA;IAUX;;;;OAIG;IACH,gBAAgB;IAIhB,oBAAoB;IAIpB,4BAA4B;IAI5B,WAAW;IAMX;;OAEG;IACH,cAAc;CAkBf"}

package/dist/lib/parser/streaming-json-parser.js

@@ -1,98 +1,100 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { default as JSONParser } from './json-parser';
-import JSONPath from '../jsonpath/jsonpath';
-export default class StreamingJSONParser extends JSONParser {
-  constructor(options = {}) {
-    super();
-
-    _defineProperty(this, "jsonPaths", void 0);
-
-    _defineProperty(this, "streamingJsonPath", null);
-
-    _defineProperty(this, "streamingArray", null);
-
-    _defineProperty(this, "topLevelObject", null);
-
-    const jsonpaths = options.jsonpaths || [];
-    this.jsonPaths = jsonpaths.map(jsonpath => new JSONPath(jsonpath));
-
-    this._extendParser();
-  }
-
-  write(chunk) {
-    super.write(chunk);
-    let array = [];
-
-    if (this.streamingArray) {
-      array = [...this.streamingArray];
-      this.streamingArray.length = 0;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const json_parser_1 = __importDefault(require("./json-parser"));
+const jsonpath_1 = __importDefault(require("../jsonpath/jsonpath"));
+/**
+ * The `StreamingJSONParser` looks for the first array in the JSON structure.
+ * and emits an array of chunks
+ */
+class StreamingJSONParser extends json_parser_1.default {
+    constructor(options = {}) {
+        super({
+            onopenarray: () => {
+                if (!this.streamingArray) {
+                    if (this._matchJSONPath()) {
+                        // @ts-ignore
+                        this.streamingJsonPath = this.getJsonPath().clone();
+                        this.streamingArray = [];
+                        this._openArray(this.streamingArray);
+                        return;
+                    }
+                }
+                this._openArray();
+            },
+            // Redefine onopenarray to inject value for top-level object
+            onopenobject: (name) => {
+                if (!this.topLevelObject) {
+                    this.topLevelObject = {};
+                    this._openObject(this.topLevelObject);
+                }
+                else {
+                    this._openObject({});
+                }
+                if (typeof name !== 'undefined') {
+                    this.parser.emit('onkey', name);
+                }
+            }
+        });
+        this.streamingJsonPath = null;
+        this.streamingArray = null;
+        this.topLevelObject = null;
+        const jsonpaths = options.jsonpaths || [];
+        this.jsonPaths = jsonpaths.map((jsonpath) => new jsonpath_1.default(jsonpath));
     }
-
-    return array;
-  }
-
-  getPartialResult() {
-    return this.topLevelObject;
-  }
-
-  getStreamingJsonPath() {
-    return this.streamingJsonPath;
-  }
-
-  getStreamingJsonPathAsString() {
-    return this.streamingJsonPath && this.streamingJsonPath.toString();
-  }
-
-  getJsonPath() {
-    return this.jsonpath;
-  }
-
-  _matchJSONPath() {
-    const currentPath = this.getJsonPath();
-
-    if (this.jsonPaths.length === 0) {
-      return true;
+    /**
+     * 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 = [];
+        if (this.streamingArray) {
+            array = [...this.streamingArray];
+            this.streamingArray.length = 0;
+        }
+        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;
+    }
+    getStreamingJsonPath() {
+        return this.streamingJsonPath;
     }
-
-    for (const jsonPath of this.jsonPaths) {
-      if (jsonPath.equals(currentPath)) {
-        return true;
-      }
+    getStreamingJsonPathAsString() {
+        return this.streamingJsonPath && this.streamingJsonPath.toString();
     }
-
-    return false;
-  }
-
-  _extendParser() {
-    this.parser.onopenarray = () => {
-      if (!this.streamingArray) {
-        if (this._matchJSONPath()) {
-          this.streamingJsonPath = this.getJsonPath().clone();
-          this.streamingArray = [];
-
-          this._openArray(this.streamingArray);
-
-          return;
+    getJsonPath() {
+        return this.jsonpath;
+    }
+    // PRIVATE METHODS
+    /**
+     * Checks is this.getJsonPath matches the jsonpaths provided in options
+     */
+    _matchJSONPath() {
+        const currentPath = this.getJsonPath();
+        // console.debug(`Testing JSONPath`, currentPath);
+        // Backwards compatibility, match any array
+        // TODO implement using wildcard once that is supported
+        if (this.jsonPaths.length === 0) {
+            return true;
+        }
+        for (const jsonPath of this.jsonPaths) {
+            if (jsonPath.equals(currentPath)) {
+                return true;
+            }
         }
-      }
-
-      this._openArray();
-    };
-
-    this.parser.onopenobject = name => {
-      if (!this.topLevelObject) {
-        this.topLevelObject = {};
-
-        this._openObject(this.topLevelObject);
-      } else {
-        this._openObject({});
-      }
-
-      if (typeof name !== 'undefined') {
-        this.parser.onkey(name);
-      }
-    };
-  }
-
+        return false;
+    }
 }
-//# sourceMappingURL=streaming-json-parser.js.map
+exports.default = StreamingJSONParser;

package/dist/ndjson-loader.d.ts

@@ -0,0 +1,22 @@
+import type { Batch } from '@loaders.gl/schema';
+import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+export declare const NDJSONLoader: {
+    name: string;
+    id: string;
+    module: string;
+    version: any;
+    extensions: string[];
+    mimeTypes: string[];
+    category: string;
+    text: boolean;
+    parse: typeof parse;
+    parseTextSync: typeof parseTextSync;
+    parseInBatches: typeof parseInBatches;
+    options: {};
+};
+declare function parse(arrayBuffer: ArrayBuffer): Promise<any[]>;
+declare function parseTextSync(text: string): any[];
+declare function parseInBatches(asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options?: LoaderOptions): AsyncIterable<Batch>;
+export declare const _typecheckNDJSONLoader: LoaderWithParser;
+export {};
+//# sourceMappingURL=ndjson-loader.d.ts.map

package/dist/ndjson-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ndjson-loader.d.ts","sourceRoot":"","sources":["../src/ndjson-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAQ9E,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAaxB,CAAC;AAEF,iBAAe,KAAK,CAAC,WAAW,EAAE,WAAW,kBAE5C;AAED,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,SAElC;AAED,iBAAS,cAAc,CACrB,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,KAAK,CAAC,CAEtB;AAED,eAAO,MAAM,sBAAsB,EAAE,gBAA+B,CAAC"}

package/dist/ndjson-loader.js

@@ -1,30 +1,35 @@
-import parseNDJSONSync from './lib/parse-ndjson';
-import parseNDJSONInBatches from './lib/parse-ndjson-in-batches';
-const VERSION = typeof "3.1.0-alpha.3" !== 'undefined' ? "3.1.0-alpha.3" : 'latest';
-export const NDJSONLoader = {
-  name: 'NDJSON',
-  id: 'ndjson',
-  module: 'json',
-  version: VERSION,
-  extensions: ['ndjson'],
-  mimeTypes: ['application/x-ndjson'],
-  category: 'table',
-  text: true,
-  parse,
-  parseTextSync,
-  parseInBatches,
-  options: {}
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckNDJSONLoader = exports.NDJSONLoader = void 0;
+const parse_ndjson_1 = __importDefault(require("./lib/parse-ndjson"));
+const parse_ndjson_in_batches_1 = __importDefault(require("./lib/parse-ndjson-in-batches"));
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+exports.NDJSONLoader = {
+    name: 'NDJSON',
+    id: 'ndjson',
+    module: 'json',
+    version: VERSION,
+    extensions: ['ndjson'],
+    mimeTypes: ['application/x-ndjson'],
+    category: 'table',
+    text: true,
+    parse,
+    parseTextSync,
+    parseInBatches,
+    options: {}
 };
-
 async function parse(arrayBuffer) {
-  return parseTextSync(new TextDecoder().decode(arrayBuffer));
+    return parseTextSync(new TextDecoder().decode(arrayBuffer));
 }
-
 function parseTextSync(text) {
-  return parseNDJSONSync(text);
+    return (0, parse_ndjson_1.default)(text);
 }
-
 function parseInBatches(asyncIterator, options) {
-  return parseNDJSONInBatches(asyncIterator, options);
+    return (0, parse_ndjson_in_batches_1.default)(asyncIterator, options);
 }
-//# sourceMappingURL=ndjson-loader.js.map
+exports._typecheckNDJSONLoader = exports.NDJSONLoader;

package/dist/workers/geojson-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=geojson-worker.d.ts.map

package/dist/workers/geojson-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geojson-worker.d.ts","sourceRoot":"","sources":["../../src/workers/geojson-worker.ts"],"names":[],"mappings":""}

package/dist/workers/geojson-worker.js

@@ -1,4 +1,5 @@
-import { createLoaderWorker } from '@loaders.gl/loader-utils';
-import { GeoJSONLoader } from '../geojson-loader';
-createLoaderWorker(GeoJSONLoader);
-//# sourceMappingURL=geojson-worker.js.map
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const loader_utils_1 = require("@loaders.gl/loader-utils");
+const geojson_loader_1 = require("../geojson-loader");
+(0, loader_utils_1.createLoaderWorker)(geojson_loader_1.GeoJSONLoader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "3.1.0-alpha.3",
+  "version": "3.1.0-beta.2",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "publishConfig": {
@@ -20,9 +20,9 @@
     "JSON stream",
     "JSON async iterator"
   ],
-  "types": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "main": "dist/es5/index.js",
+  "module": "dist/esm/index.js",
   "sideEffects": false,
   "files": [
     "src",
@@ -31,13 +31,13 @@
   ],
   "scripts": {
     "pre-build": "npm run build-bundle && npm run build-worker",
-    "build-bundle": "webpack --config ../../scripts/webpack/bundle.js",
-    "build-worker": "webpack --entry ./src/workers/geojson-worker.ts --output ./dist/geojson-worker.js --config ../../scripts/webpack/worker.js"
+    "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/bundle.js",
+    "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-worker.js"
   },
   "dependencies": {
-    "@loaders.gl/gis": "3.1.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.1.0-alpha.3",
-    "@loaders.gl/schema": "3.1.0-alpha.3"
+    "@loaders.gl/gis": "3.1.0-beta.2",
+    "@loaders.gl/loader-utils": "3.1.0-beta.2",
+    "@loaders.gl/schema": "3.1.0-beta.2"
   },
-  "gitHead": "68e1c443d1b63aa2515436a7411ed0a029b42c15"
+  "gitHead": "90f487e7b3f15c554d57c92497d3a12d71676818"
 }