Merge 71b12b9 into cf5566f

modules/arrow/package.json

@@ -33,7 +33,7 @@
     "build-worker": "webpack --entry ./src/arrow-loader.worker.js --output ./dist/arrow-loader.worker.js --config ../../scripts/worker-webpack-config.js"
   },
   "dependencies": {
-    "@loaders.gl/core": "2.1.0-beta.1",
+    "@loaders.gl/loader-utils": "2.1.0-beta.1",
     "@loaders.gl/tables": "2.1.0-beta.1",
     "apache-arrow": "^0.16.0"
   }

modules/arrow/src/lib/parse-arrow-in-batches.js

@@ -1,5 +1,5 @@
 import {RecordBatchReader} from 'apache-arrow/Arrow.es5.min';
-import {isIterable, isIterator, assert} from '@loaders.gl/core';
+import {assert, isIterable, isIterator} from '@loaders.gl/loader-utils';
 
 export async function parseArrowInBatches(asyncIterator, options) {
   // Creates the appropriate RecordBatchReader subclasses from the input

modules/arrow/test/arrow-loader.spec.js

@@ -2,7 +2,7 @@ import test from 'tape-promise/tape';
 import {validateLoader} from 'test/common/conformance';
 
 import {ArrowLoader, ArrowWorkerLoader} from '@loaders.gl/arrow';
-import {isBrowser, makeStreamIterator, resolvePath} from '@loaders.gl/core';
+import {isBrowser, makeStreamIterator, resolvePath} from '@loaders.gl/loader-utils';
 import {setLoaderOptions, fetchFile, parse, parseInBatches} from '@loaders.gl/core';
 
 // Small Arrow Sample Files

modules/core/src/index.js

@@ -21,6 +21,22 @@ export {encode, encodeSync, encodeInBatches} from './lib/encode';
 export {save, saveSync} from './lib/save';
 
 // "JAVASCRIPT" UTILS
+export {default as toArrayBuffer} from './lib/loader-utils/to-array-buffer';
+
+// EXPERIMENTAL
+export {selectLoader as _selectLoader} from './lib/select-loader';
+
+export {default as _WorkerThread} from './worker-utils/worker-thread';
+export {default as _WorkerFarm} from './worker-utils/worker-farm';
+export {default as _WorkerPool} from './worker-utils/worker-pool';
+
+export {default as _fetchProgress} from './lib/progress/fetch-progress';
+
+// FOR TESTING
+export {_unregisterLoaders} from './lib/register-loaders';
+
+/* DEPRECATED in v2.1, will remove in a future version */
+
 export {
   isPromise,
   isIterable,
@@ -29,39 +45,20 @@ export {
   isFetchResponse,
   isReadableStream,
   isWritableStream
-} from './javascript-utils/is-type';
-
-export {toArrayBuffer} from './javascript-utils/binary-utils';
+} from '@loaders.gl/loader-utils';
 
 // ITERATOR UTILS
-export {makeStreamIterator} from './iterator-utils/stream-iteration';
-
 export {
+  makeStreamIterator,
+  contatenateAsyncIterator,
+  getStreamIterator,
   forEach,
   lineAsyncIterator,
   textDecoderAsyncIterator,
-  numberedLineAsyncIterator
-} from './iterator-utils/async-iteration';
-
-export {makeChunkIterator, concatenateChunksAsync} from './iterator-utils/chunk-iteration';
+  numberedLineAsyncIterator,
+  makeChunkIterator,
+  concatenateChunksAsync
+} from '@loaders.gl/loader-utils';
 
 // CORE UTILS SHARED WITH LOADERS (RE-EXPORTED FROM LOADER-UTILS)
-export {isBrowser, isWorker, self, window, global, document} from '@loaders.gl/loader-utils';
-export {assert} from '@loaders.gl/loader-utils';
 export {setPathPrefix, getPathPrefix, resolvePath} from '@loaders.gl/loader-utils';
-
-// EXPERIMENTAL
-export {selectLoader as _selectLoader} from './lib/select-loader';
-
-export {default as _WorkerThread} from './worker-utils/worker-thread';
-export {default as _WorkerFarm} from './worker-utils/worker-farm';
-export {default as _WorkerPool} from './worker-utils/worker-pool';
-
-export {default as _fetchProgress} from './lib/progress/fetch-progress';
-
-// FOR TESTING
-export {_unregisterLoaders} from './lib/register-loaders';
-
-// DEPRECATED in v2.1
-export {concatenateChunksAsync as contatenateAsyncIterator} from './iterator-utils/chunk-iteration';
-export {makeStreamIterator as getStreamIterator} from './iterator-utils/stream-iteration';

modules/core/src/lib/fetch/fetch-file.js

@@ -1,6 +1,5 @@
 /* global fetch */
-import {resolvePath} from '@loaders.gl/loader-utils';
-import {isFileReadable} from '../../javascript-utils/is-type';
+import {resolvePath, isFileReadable} from '@loaders.gl/loader-utils';
 import fetchFileReadable from './fetch-file.browser';
 import {getErrorMessageFromResponse} from './fetch-error-message';
 

modules/core/src/lib/load.js

@@ -1,4 +1,4 @@
-import {isFileReadable} from '../javascript-utils/is-type';
+import {isFileReadable} from '@loaders.gl/loader-utils';
 import {fetchFile} from './fetch/fetch-file';
 import {isLoaderObject} from './loader-utils/normalize-loader';
 

modules/core/src/lib/loader-utils/get-data.js

@@ -6,10 +6,10 @@ import {
   isIterable,
   isIterator,
   isFileReadable,
-  isBuffer
-} from '../../javascript-utils/is-type';
-import {makeStreamIterator} from '../../iterator-utils/stream-iteration';
-import {concatenateChunksAsync} from '../../iterator-utils/chunk-iteration';
+  isBuffer,
+  makeStreamIterator,
+  concatenateChunksAsync
+} from '@loaders.gl/loader-utils';
 import fetchFileReadable from '../fetch/fetch-file.browser';
 import {checkFetchResponseStatus, checkFetchResponseStatusSync} from './check-errors';
 

modules/core/src/lib/loader-utils/parse-with-worker.js

@@ -1,6 +1,6 @@
 // __VERSION__ is injected by babel-plugin-version-inline
 /* global __VERSION__ */
-import {toArrayBuffer} from '../../javascript-utils/binary-utils';
+import toArrayBuffer from './to-array-buffer';
 import WorkerFarm from '../../worker-utils/worker-farm';
 import {getTransferList} from '@loaders.gl/loader-utils';
 import {parse} from '../parse';

modules/core/src/javascript-utils/binary-utils.js → modules/core/src/lib/loader-utils/to-array-buffer.js

@@ -1,8 +1,8 @@
 /* global TextEncoder */
 import {assert} from '@loaders.gl/loader-utils';
-import {toArrayBuffer as bufferToArrayBuffer} from '../node/utils/to-array-buffer.node';
+import {toArrayBuffer as bufferToArrayBuffer} from '../../node/utils/to-array-buffer.node';
 
-export function toArrayBuffer(data) {
+export default function toArrayBuffer(data) {
   if (bufferToArrayBuffer) {
     // TODO - per docs we should just be able to call buffer.buffer, but there are issues
     data = bufferToArrayBuffer(data);

modules/core/src/lib/parse-in-batches.js

@@ -3,7 +3,7 @@ import {mergeOptions} from './loader-utils/merge-options';
 import {getAsyncIteratorFromData} from './loader-utils/get-data';
 import {getLoaderContext} from './loader-utils/get-loader-context';
 import {selectLoader} from './select-loader';
-import {textDecoderAsyncIterator} from '../iterator-utils/async-iteration';
+import {textDecoderAsyncIterator} from '@loaders.gl/loader-utils';
 
 export async function parseInBatches(data, loaders, options, url) {
   // Signature: parseInBatches(data, options, url)

modules/core/src/lib/select-loader.js

@@ -1,6 +1,6 @@
 import {getRegisteredLoaders} from './register-loaders';
 import {normalizeLoader} from './loader-utils/normalize-loader';
-import {isFetchResponse} from '../javascript-utils/is-type';
+import {isFetchResponse} from '@loaders.gl/loader-utils';
 
 const EXT_PATTERN = /\.([^.]+)$/;
 const DATA_URL_PATTERN = /^data:(.*?)(;|,)/;

modules/core/test/index.js

@@ -1,10 +1,5 @@
 import './javascript-utils/text-encoder.spec';
 import './javascript-utils/binary-utils.spec';
-import './javascript-utils/is-type.spec';
-
-import './iterator-utils/chunk-iteration.spec';
-import './iterator-utils/async-iteration.spec';
-import './iterator-utils/stream-iteration.spec';
 
 import './lib/fetch';
 import './lib/loader-utils';

modules/core/test/lib/fetch/fetch-file.browser.spec.js

@@ -1,7 +1,8 @@
 /* global Blob */
 import test from 'tape-promise/tape';
 
-import {isBrowser, fetchFile} from '@loaders.gl/core';
+import {fetchFile} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 
 const TEXT_DATA = 'important content!';
 const JSON_DATA = [{col1: 22, col2: 'abc'}];

modules/core/test/lib/fetch/fetch-file.spec.js

@@ -1,6 +1,7 @@
 import test from 'tape-promise/tape';
 
-import {isBrowser, fetchFile, readFileSync} from '@loaders.gl/core';
+import {fetchFile, readFileSync} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 
 const DATA_URL = 'data:,important content!';
 const BINARY_URL = '@loaders.gl/core/test/data/files/binary-data.bin';

modules/core/test/lib/load.spec.js

@@ -1,6 +1,7 @@
 /* global Blob */
 import test from 'tape-promise/tape';
-import {isBrowser, load, fetchFile, registerLoaders, resolvePath} from '@loaders.gl/core';
+import {load, fetchFile, registerLoaders} from '@loaders.gl/core';
+import {isBrowser, resolvePath} from '@loaders.gl/loader-utils';
 import {JSONLoader} from '@loaders.gl/json';
 
 const JSON_URL = '@loaders.gl/core/test/data/files/basic.json';

modules/core/test/lib/loader-utils/get-data.spec.js

@@ -6,7 +6,7 @@ import {
   getIteratorFromData
 } from '@loaders.gl/core/lib/loader-utils/get-data';
 
-import {isBrowser, isIterator} from '@loaders.gl/core';
+import {isBrowser, isIterator} from '@loaders.gl/loader-utils';
 
 test('parseWithLoader#getArrayBufferOrStringFromDataSync', t => {
   const string = 'line 1\nline 2';

modules/core/test/lib/parse.spec.js

@@ -1,7 +1,8 @@
 /* global Blob */
 import test from 'tape-promise/tape';
 
-import {isBrowser, parse} from '@loaders.gl/core';
+import {parse} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 
 const JSON_DATA = [{col1: 22, col2: 'abc'}];
 

modules/csv/package.json

@@ -30,7 +30,7 @@
     "build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
   },
   "dependencies": {
-    "@loaders.gl/core": "2.1.0-beta.1",
+    "@loaders.gl/loader-utils": "2.1.0-beta.1",
     "@loaders.gl/tables": "2.1.0-beta.1"
   },
   "devDependencies": {

modules/csv/test/csv-loader-arrow.spec.js

@@ -1,5 +1,6 @@
 import test from 'tape-promise/tape';
-import {loadInBatches, isIterator, isAsyncIterable} from '@loaders.gl/core';
+import {loadInBatches} from '@loaders.gl/core';
+import {isIterator, isAsyncIterable} from '@loaders.gl/loader-utils';
 import {CSVLoader} from '@loaders.gl/csv';
 import {ArrowTableBatch} from '@loaders.gl/arrow';
 import {RecordBatch} from 'apache-arrow/Arrow.es5.min';

modules/csv/test/csv-loader.spec.js

@@ -2,7 +2,8 @@ import test from 'tape-promise/tape';
 import {validateLoader} from 'test/common/conformance';
 
 import {CSVLoader} from '@loaders.gl/csv';
-import {load, loadInBatches, fetchFile, isIterator, isAsyncIterable} from '@loaders.gl/core';
+import {load, loadInBatches, fetchFile} from '@loaders.gl/core';
+import {isIterator, isAsyncIterable} from '@loaders.gl/loader-utils';
 import {ColumnarTableBatch} from '@loaders.gl/tables';
 
 // Small CSV Sample Files

modules/csv/test/csv-writer.spec.js

@@ -15,9 +15,6 @@ License: MIT
 import test from 'tape-promise/tape';
 import Papa from '@loaders.gl/csv/libs/papaparse';
 
-// import {isBrowser, load} from '@loaders.gl/core';
-// import {parseAsIterator, parseAsAsyncIterator} from '@loaders.gl/core';
-
 // Tests for Papa.unparse() function (JSON to CSV)
 var UNPARSE_TESTS = [
   {

modules/images/test/image-loader.spec.js

@@ -1,7 +1,8 @@
 import test from 'tape-promise/tape';
 
 import {ImageLoader, isImageTypeSupported, getImageType, getImageData} from '@loaders.gl/images';
-import {isBrowser, load} from '@loaders.gl/core';
+import {load} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 
 import {TEST_CASES, IMAGE_URL, IMAGE_DATA_URL, SVG_DATA_URL} from './lib/test-cases';
 

modules/images/test/image-writer.spec.js

@@ -1,7 +1,7 @@
 import test from 'tape-promise/tape';
-// import {isBrowser, encode, load} from '@loaders.gl/core';
 // import {ImageWriter, ImageLoader} from '@loaders.gl/images';
-import {isBrowser, encode} from '@loaders.gl/core';
+import {encode} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 import {ImageWriter} from '@loaders.gl/images';
 import fs from 'fs';
 import path from 'path';

modules/images/test/lib/test-cases.js

@@ -1,4 +1,4 @@
-import {isBrowser} from '@loaders.gl/core';
+import {isBrowser} from '@loaders.gl/loader-utils';
 
 const CONTENT_BASE = '@loaders.gl/images/test/data';
 

modules/json/test/json-loader.spec.js

@@ -1,5 +1,6 @@
 import test from 'tape-promise/tape';
-import {load, loadInBatches, isIterator, isAsyncIterable} from '@loaders.gl/core';
+import {load, loadInBatches} from '@loaders.gl/core';
+import {isIterator, isAsyncIterable} from '@loaders.gl/loader-utils';
 // import {ColumnarTableBatch} from '@loaders.gl/tables';
 import {JSONLoader} from '@loaders.gl/json';
 

modules/json/test/lib/parser/streaming-json-parser.spec.js

@@ -1,6 +1,7 @@
 /* global TextDecoder */
 import test from 'tape-promise/tape';
-import {fetchFile, makeStreamIterator} from '@loaders.gl/core';
+import {fetchFile} from '@loaders.gl/core';
+import {makeStreamIterator} from '@loaders.gl/loader-utils';
 import StreamingJSONParser from '@loaders.gl/json/lib/parser/streaming-json-parser';
 
 const GEOJSON_PATH = `@loaders.gl/json/test/data/geojson-big.json`;

modules/loader-utils/src/index.js

@@ -47,6 +47,36 @@ export {path};
 export {setPathPrefix, getPathPrefix, resolvePath} from './lib/path-utils/file-aliases';
 export {addAliases as _addAliases} from './lib/path-utils/file-aliases.js';
 
+// "JAVASCRIPT" UTILS
+export {
+  isPromise,
+  isIterable,
+  isAsyncIterable,
+  isIterator,
+  isFileReadable,
+  isFetchResponse,
+  isReadableStream,
+  isWritableStream
+} from './lib/javascript-utils/is-type';
+
+// ITERATOR UTILS
+export {makeStreamIterator} from './lib/iterator-utils/stream-iteration';
+
+export {
+  forEach,
+  lineAsyncIterator,
+  textDecoderAsyncIterator,
+  numberedLineAsyncIterator
+} from './lib/iterator-utils/async-iteration';
+
+export {makeChunkIterator, concatenateChunksAsync} from './lib/iterator-utils/chunk-iteration';
+
+// deprecated
+export {
+  concatenateChunksAsync as contatenateAsyncIterator
+} from './lib/iterator-utils/chunk-iteration';
+export {makeStreamIterator as getStreamIterator} from './lib/iterator-utils/stream-iteration';
+
 // REQUEST UTILS
 export {default as RequestScheduler} from './lib/request-utils/request-scheduler';
 

modules/core/src/iterator-utils/stream-iteration.js → modules/loader-utils/src/lib/iterator-utils/stream-iteration.js

@@ -1,4 +1,4 @@
-import {isBrowser, nodeVersion} from '@loaders.gl/loader-utils';
+import {isBrowser, nodeVersion} from '../env-utils/globals';
 
 export function makeStreamIterator(stream) {
   // Hacky test for node version to ensure we don't call bad polyfills

modules/loader-utils/test/index.js

@@ -6,6 +6,12 @@ import './lib/library-utils/library-utils.spec';
 
 import './lib/path-utils/file-aliases.spec';
 
+import './lib/javascript-utils/is-type.spec';
+
+import './lib/iterator-utils/chunk-iteration.spec';
+import './lib/iterator-utils/async-iteration.spec';
+import './lib/iterator-utils/stream-iteration.spec';
+
 import './lib/request-utils/request-scheduler.spec';
 
 import './categories/mesh/mesh-utils.spec';

modules/core/test/iterator-utils/async-iteration.spec.js → modules/loader-utils/test/lib/iterator-utils/async-iteration.spec.js

@@ -5,9 +5,9 @@ import {
   forEach,
   lineAsyncIterator,
   textDecoderAsyncIterator,
-  textEncoderAsyncIterator,
   numberedLineAsyncIterator
-} from '@loaders.gl/core/iterator-utils/async-iteration';
+} from '@loaders.gl/loader-utils';
+import {textEncoderAsyncIterator} from '@loaders.gl/loader-utils/lib/iterator-utils/async-iteration';
 
 /* global setTimeout */
 const setTimeoutPromise = timeout => new Promise(resolve => setTimeout(resolve, timeout));

modules/core/test/iterator-utils/chunk-iteration.spec.js → modules/loader-utils/test/lib/iterator-utils/chunk-iteration.spec.js

@@ -1,10 +1,7 @@
 import test from 'tape-promise/tape';
 
-import {
-  makeChunkIterator,
-  concatenateChunksAsync
-} from '@loaders.gl/core/iterator-utils/chunk-iteration';
-import {textEncoderAsyncIterator} from '@loaders.gl/core/iterator-utils/async-iteration';
+import {makeChunkIterator, concatenateChunksAsync} from '@loaders.gl/loader-utils';
+import {textEncoderAsyncIterator} from '@loaders.gl/loader-utils/lib/iterator-utils/async-iteration';
 
 /* global setTimeout */
 const setTimeoutPromise = timeout => new Promise(resolve => setTimeout(resolve, timeout));

modules/core/test/iterator-utils/stream-iteration.spec.js → modules/loader-utils/test/lib/iterator-utils/stream-iteration.spec.js

@@ -1,5 +1,6 @@
 import test from 'tape-promise/tape';
-import {fetchFile, makeStreamIterator} from '@loaders.gl/core';
+import {fetchFile} from '@loaders.gl/core';
+import {makeStreamIterator} from '@loaders.gl/loader-utils';
 
 const DATA_URL = '@loaders.gl/draco/test/data/raw-attribute-buffers/lidar-positions.bin';
 

modules/core/test/javascript-utils/is-type.spec.js → modules/loader-utils/test/lib/javascript-utils/is-type.spec.js

@@ -8,7 +8,7 @@ import {
   // isFetchResponse,
   // isReadableStream,
   // isWritableStream
-} from '@loaders.gl/core';
+} from '@loaders.gl/loader-utils';
 
 test('isIterator', t => {
   const TESTS = [