@loaders.gl/core 3.1.0-alpha.4 → 3.1.0-beta.3

package/dist/es5/lib/loader-utils/get-data.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,10 +8,6 @@ exports.getArrayBufferOrStringFromData = getArrayBufferOrStringFromData;
 exports.getAsyncIterableFromData = getAsyncIterableFromData;
 exports.getReadableStream = getReadableStream;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _loaderUtils = require("@loaders.gl/loader-utils");
 
 var _isType = require("../../javascript-utils/is-type");
@@ -22,7 +16,7 @@ var _makeIterator = require("../../iterators/make-iterator/make-iterator");
 
 var _responseUtils = require("../utils/response-utils");
 
-var ERR_DATA = 'Cannot convert supplied data type';
+const ERR_DATA = 'Cannot convert supplied data type';
 
 function getArrayBufferOrStringFromDataSync(data, loader, options) {
   if (loader.text && typeof data === 'string') {
@@ -34,10 +28,10 @@ function getArrayBufferOrStringFromDataSync(data, loader, options) {
   }
 
   if (data instanceof ArrayBuffer) {
-    var arrayBuffer = data;
+    const arrayBuffer = data;
 
     if (loader.text && !loader.binary) {
-      var textDecoder = new TextDecoder('utf8');
+      const textDecoder = new TextDecoder('utf8');
       return textDecoder.decode(arrayBuffer);
     }
 
@@ -46,259 +40,98 @@ function getArrayBufferOrStringFromDataSync(data, loader, options) {
 
   if (ArrayBuffer.isView(data)) {
     if (loader.text && !loader.binary) {
-      var _textDecoder = new TextDecoder('utf8');
-
-      return _textDecoder.decode(data);
+      const textDecoder = new TextDecoder('utf8');
+      return textDecoder.decode(data);
     }
 
-    var _arrayBuffer = data.buffer;
-    var byteLength = data.byteLength || data.length;
+    let arrayBuffer = data.buffer;
+    const byteLength = data.byteLength || data.length;
 
-    if (data.byteOffset !== 0 || byteLength !== _arrayBuffer.byteLength) {
-      _arrayBuffer = _arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);
+    if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {
+      arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);
     }
 
-    return _arrayBuffer;
+    return arrayBuffer;
   }
 
   throw new Error(ERR_DATA);
 }
 
-function getArrayBufferOrStringFromData(_x, _x2, _x3) {
-  return _getArrayBufferOrStringFromData.apply(this, arguments);
-}
+async function getArrayBufferOrStringFromData(data, loader, options) {
+  const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);
 
-function _getArrayBufferOrStringFromData() {
-  _getArrayBufferOrStringFromData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(data, loader, options) {
-    var isArrayBuffer, response;
-    return _regenerator.default.wrap(function _callee$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);
-
-            if (!(typeof data === 'string' || isArrayBuffer)) {
-              _context3.next = 3;
-              break;
-            }
-
-            return _context3.abrupt("return", getArrayBufferOrStringFromDataSync(data, loader, options));
-
-          case 3:
-            if (!(0, _isType.isBlob)(data)) {
-              _context3.next = 7;
-              break;
-            }
-
-            _context3.next = 6;
-            return (0, _responseUtils.makeResponse)(data);
-
-          case 6:
-            data = _context3.sent;
-
-          case 7:
-            if (!(0, _isType.isResponse)(data)) {
-              _context3.next = 21;
-              break;
-            }
-
-            response = data;
-            _context3.next = 11;
-            return (0, _responseUtils.checkResponse)(response);
-
-          case 11:
-            if (!loader.binary) {
-              _context3.next = 17;
-              break;
-            }
-
-            _context3.next = 14;
-            return response.arrayBuffer();
-
-          case 14:
-            _context3.t0 = _context3.sent;
-            _context3.next = 20;
-            break;
-
-          case 17:
-            _context3.next = 19;
-            return response.text();
-
-          case 19:
-            _context3.t0 = _context3.sent;
-
-          case 20:
-            return _context3.abrupt("return", _context3.t0);
-
-          case 21:
-            if ((0, _isType.isReadableStream)(data)) {
-              data = (0, _makeIterator.makeIterator)(data, options);
-            }
-
-            if (!((0, _isType.isIterable)(data) || (0, _isType.isAsyncIterable)(data))) {
-              _context3.next = 24;
-              break;
-            }
-
-            return _context3.abrupt("return", (0, _loaderUtils.concatenateArrayBuffersAsync)(data));
-
-          case 24:
-            throw new Error(ERR_DATA);
-
-          case 25:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _getArrayBufferOrStringFromData.apply(this, arguments);
-}
+  if (typeof data === 'string' || isArrayBuffer) {
+    return getArrayBufferOrStringFromDataSync(data, loader, options);
+  }
 
-function getAsyncIterableFromData(_x4, _x5) {
-  return _getAsyncIterableFromData.apply(this, arguments);
-}
+  if ((0, _isType.isBlob)(data)) {
+    data = await (0, _responseUtils.makeResponse)(data);
+  }
+
+  if ((0, _isType.isResponse)(data)) {
+    const response = data;
+    await (0, _responseUtils.checkResponse)(response);
+    return loader.binary ? await response.arrayBuffer() : await response.text();
+  }
+
+  if ((0, _isType.isReadableStream)(data)) {
+    data = (0, _makeIterator.makeIterator)(data, options);
+  }
+
+  if ((0, _isType.isIterable)(data) || (0, _isType.isAsyncIterable)(data)) {
+    return (0, _loaderUtils.concatenateArrayBuffersAsync)(data);
+  }
 
-function _getAsyncIterableFromData() {
-  _getAsyncIterableFromData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(data, options) {
-    var response, body;
-    return _regenerator.default.wrap(function _callee2$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            if (!(0, _isType.isIterator)(data)) {
-              _context4.next = 2;
-              break;
-            }
-
-            return _context4.abrupt("return", data);
-
-          case 2:
-            if (!(0, _isType.isResponse)(data)) {
-              _context4.next = 10;
-              break;
-            }
-
-            response = data;
-            _context4.next = 6;
-            return (0, _responseUtils.checkResponse)(response);
-
-          case 6:
-            _context4.next = 8;
-            return response.body;
-
-          case 8:
-            body = _context4.sent;
-            return _context4.abrupt("return", (0, _makeIterator.makeIterator)(body, options));
-
-          case 10:
-            if (!((0, _isType.isBlob)(data) || (0, _isType.isReadableStream)(data))) {
-              _context4.next = 12;
-              break;
-            }
-
-            return _context4.abrupt("return", (0, _makeIterator.makeIterator)(data, options));
-
-          case 12:
-            if (!(0, _isType.isAsyncIterable)(data)) {
-              _context4.next = 14;
-              break;
-            }
-
-            return _context4.abrupt("return", data[Symbol.asyncIterator]());
-
-          case 14:
-            return _context4.abrupt("return", getIterableFromData(data));
-
-          case 15:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _getAsyncIterableFromData.apply(this, arguments);
+  throw new Error(ERR_DATA);
 }
 
-function getReadableStream(_x6) {
-  return _getReadableStream.apply(this, arguments);
+async function getAsyncIterableFromData(data, options) {
+  if ((0, _isType.isIterator)(data)) {
+    return data;
+  }
+
+  if ((0, _isType.isResponse)(data)) {
+    const response = data;
+    await (0, _responseUtils.checkResponse)(response);
+    const body = await response.body;
+    return (0, _makeIterator.makeIterator)(body, options);
+  }
+
+  if ((0, _isType.isBlob)(data) || (0, _isType.isReadableStream)(data)) {
+    return (0, _makeIterator.makeIterator)(data, options);
+  }
+
+  if ((0, _isType.isAsyncIterable)(data)) {
+    return data[Symbol.asyncIterator]();
+  }
+
+  return getIterableFromData(data);
 }
 
-function _getReadableStream() {
-  _getReadableStream = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(data) {
-    var response;
-    return _regenerator.default.wrap(function _callee3$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            if (!(0, _isType.isReadableStream)(data)) {
-              _context5.next = 2;
-              break;
-            }
-
-            return _context5.abrupt("return", data);
-
-          case 2:
-            if (!(0, _isType.isResponse)(data)) {
-              _context5.next = 4;
-              break;
-            }
-
-            return _context5.abrupt("return", data.body);
-
-          case 4:
-            _context5.next = 6;
-            return (0, _responseUtils.makeResponse)(data);
-
-          case 6:
-            response = _context5.sent;
-            return _context5.abrupt("return", response.body);
-
-          case 8:
-          case "end":
-            return _context5.stop();
-        }
-      }
-    }, _callee3);
-  }));
-  return _getReadableStream.apply(this, arguments);
+async function getReadableStream(data) {
+  if ((0, _isType.isReadableStream)(data)) {
+    return data;
+  }
+
+  if ((0, _isType.isResponse)(data)) {
+    return data.body;
+  }
+
+  const response = await (0, _responseUtils.makeResponse)(data);
+  return response.body;
 }
 
 function getIterableFromData(data) {
   if (ArrayBuffer.isView(data)) {
-    return _regenerator.default.mark(function oneChunk() {
-      return _regenerator.default.wrap(function oneChunk$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return data.buffer;
-
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, oneChunk);
-    })();
+    return function* oneChunk() {
+      yield data.buffer;
+    }();
   }
 
   if (data instanceof ArrayBuffer) {
-    return _regenerator.default.mark(function oneChunk() {
-      return _regenerator.default.wrap(function oneChunk$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return data;
-
-            case 2:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, oneChunk);
-    })();
+    return function* oneChunk() {
+      yield data;
+    }();
   }
 
   if ((0, _isType.isIterator)(data)) {

package/dist/es5/lib/loader-utils/get-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/get-data.ts"],"names":["ERR_DATA","getArrayBufferOrStringFromDataSync","data","loader","options","text","buffer","ArrayBuffer","arrayBuffer","binary","textDecoder","TextDecoder","decode","isView","byteLength","length","byteOffset","slice","Error","getArrayBufferOrStringFromData","isArrayBuffer","response","getAsyncIterableFromData","body","Symbol","asyncIterator","getIterableFromData","getReadableStream","oneChunk","iterator"],"mappings":";;;;;;;;;;;;;;;;AAOA;;AACA;;AASA;;AACA;;AAEA,IAAMA,QAAQ,GAAG,mCAAjB;;AAGO,SAASC,kCAAT,CACLC,IADK,EAELC,MAFK,EAGLC,OAHK,EAIiB;AACtB,MAAID,MAAM,CAACE,IAAP,IAAe,OAAOH,IAAP,KAAgB,QAAnC,EAA6C;AAC3C,WAAOA,IAAP;AACD;;AAED,MAAI,sBAASA,IAAT,CAAJ,EAAoB;AAElBA,IAAAA,IAAI,GAAGA,IAAI,CAACI,MAAZ;AACD;;AAED,MAAIJ,IAAI,YAAYK,WAApB,EAAiC;AAC/B,QAAMC,WAAW,GAAGN,IAApB;;AACA,QAAIC,MAAM,CAACE,IAAP,IAAe,CAACF,MAAM,CAACM,MAA3B,EAAmC;AACjC,UAAMC,WAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;AACA,aAAOD,WAAW,CAACE,MAAZ,CAAmBJ,WAAnB,CAAP;AACD;;AACD,WAAOA,WAAP;AACD;;AAGD,MAAID,WAAW,CAACM,MAAZ,CAAmBX,IAAnB,CAAJ,EAA8B;AAE5B,QAAIC,MAAM,CAACE,IAAP,IAAe,CAACF,MAAM,CAACM,MAA3B,EAAmC;AACjC,UAAMC,YAAW,GAAG,IAAIC,WAAJ,CAAgB,MAAhB,CAApB;;AACA,aAAOD,YAAW,CAACE,MAAZ,CAAmBV,IAAnB,CAAP;AACD;;AAED,QAAIM,YAAW,GAAGN,IAAI,CAACI,MAAvB;AAKA,QAAMQ,UAAU,GAAGZ,IAAI,CAACY,UAAL,IAAmBZ,IAAI,CAACa,MAA3C;;AACA,QAAIb,IAAI,CAACc,UAAL,KAAoB,CAApB,IAAyBF,UAAU,KAAKN,YAAW,CAACM,UAAxD,EAAoE;AAElEN,MAAAA,YAAW,GAAGA,YAAW,CAACS,KAAZ,CAAkBf,IAAI,CAACc,UAAvB,EAAmCd,IAAI,CAACc,UAAL,GAAkBF,UAArD,CAAd;AACD;;AACD,WAAON,YAAP;AACD;;AAED,QAAM,IAAIU,KAAJ,CAAUlB,QAAV,CAAN;AACD;;SAGqBmB,8B;;;;;8FAAf,iBACLjB,IADK,EAELC,MAFK,EAGLC,OAHK;AAAA;AAAA;AAAA;AAAA;AAAA;AAKCgB,YAAAA,aALD,GAKiBlB,IAAI,YAAYK,WAAhB,IAA+BA,WAAW,CAACM,MAAZ,CAAmBX,IAAnB,CALhD;;AAAA,kBAMD,OAAOA,IAAP,KAAgB,QAAhB,IAA4BkB,aAN3B;AAAA;AAAA;AAAA;;AAAA,8CAOInB,kCAAkC,CAACC,IAAD,EAA+BC,MAA/B,EAAuCC,OAAvC,CAPtC;;AAAA;AAAA,iBAWD,oBAAOF,IAAP,CAXC;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAYU,iCAAaA,IAAb,CAZV;;AAAA;AAYHA,YAAAA,IAZG;;AAAA;AAAA,iBAeD,wBAAWA,IAAX,CAfC;AAAA;AAAA;AAAA;;AAgBGmB,YAAAA,QAhBH,GAgBcnB,IAhBd;AAAA;AAAA,mBAiBG,kCAAcmB,QAAd,CAjBH;;AAAA;AAAA,iBAkBIlB,MAAM,CAACM,MAlBX;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAkB0BY,QAAQ,CAACb,WAAT,EAlB1B;;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA,mBAkByDa,QAAQ,CAAChB,IAAT,EAlBzD;;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAqBL,gBAAI,8BAAiBH,IAAjB,CAAJ,EAA4B;AAE1BA,cAAAA,IAAI,GAAG,gCAAaA,IAAb,EAAqCE,OAArC,CAAP;AACD;;AAxBI,kBA0BD,wBAAWF,IAAX,KAAoB,6BAAgBA,IAAhB,CA1BnB;AAAA;AAAA;AAAA;;AAAA,8CA4BI,+CAA6BA,IAA7B,CA5BJ;;AAAA;AAAA,kBA+BC,IAAIgB,KAAJ,CAAUlB,QAAV,CA/BD;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;SAkCesB,wB;;;;;wFAAf,kBACLpB,IADK,EAELE,OAFK;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAID,wBAAWF,IAAX,CAJC;AAAA;AAAA;AAAA;;AAAA,8CAKIA,IALJ;;AAAA;AAAA,iBAQD,wBAAWA,IAAX,CARC;AAAA;AAAA;AAAA;;AASGmB,YAAAA,QATH,GAScnB,IATd;AAAA;AAAA,mBAWG,kCAAcmB,QAAd,CAXH;;AAAA;AAAA;AAAA,mBAcgBA,QAAQ,CAACE,IAdzB;;AAAA;AAcGA,YAAAA,IAdH;AAAA,8CAgBI,gCAAaA,IAAb,EAAiDnB,OAAjD,CAhBJ;;AAAA;AAAA,kBAmBD,oBAAOF,IAAP,KAAgB,8BAAiBA,IAAjB,CAnBf;AAAA;AAAA;AAAA;;AAAA,8CAoBI,gCAAaA,IAAb,EAA4CE,OAA5C,CApBJ;;AAAA;AAAA,iBAuBD,6BAAgBF,IAAhB,CAvBC;AAAA;AAAA;AAAA;;AAAA,8CAwBIA,IAAI,CAACsB,MAAM,CAACC,aAAR,CAAJ,EAxBJ;;AAAA;AAAA,8CA2BEC,mBAAmB,CAACxB,IAAD,CA3BrB;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;SA8BeyB,iB;;;;;iFAAf,kBAAiCzB,IAAjC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBACD,8BAAiBA,IAAjB,CADC;AAAA;AAAA;AAAA;;AAAA,8CAEIA,IAFJ;;AAAA;AAAA,iBAID,wBAAWA,IAAX,CAJC;AAAA;AAAA;AAAA;;AAAA,8CAMIA,IAAI,CAACqB,IANT;;AAAA;AAAA;AAAA,mBAQkB,iCAAarB,IAAb,CARlB;;AAAA;AAQCmB,YAAAA,QARD;AAAA,8CAUEA,QAAQ,CAACE,IAVX;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AAeP,SAASG,mBAAT,CAA6BxB,IAA7B,EAAmC;AAEjC,MAAIK,WAAW,CAACM,MAAZ,CAAmBX,IAAnB,CAAJ,EAA8B;AAC5B,WAAO,0BAAC,SAAU0B,QAAV;AAAA;AAAA;AAAA;AAAA;AAAA;AACN,qBAAM1B,IAAI,CAACI,MAAX;;AADM;AAAA;AAAA;AAAA;AAAA;AAAA,SAAUsB,QAAV;AAAA,KAAD,GAAP;AAGD;;AAED,MAAI1B,IAAI,YAAYK,WAApB,EAAiC;AAC/B,WAAO,0BAAC,SAAUqB,QAAV;AAAA;AAAA;AAAA;AAAA;AAAA;AACN,qBAAM1B,IAAN;;AADM;AAAA;AAAA;AAAA;AAAA;AAAA,SAAU0B,QAAV;AAAA,KAAD,GAAP;AAGD;;AAED,MAAI,wBAAW1B,IAAX,CAAJ,EAAsB;AACpB,WAAOA,IAAP;AACD;;AAED,MAAI,wBAAWA,IAAX,CAAJ,EAAsB;AACpB,WAAOA,IAAI,CAACsB,MAAM,CAACK,QAAR,CAAJ,EAAP;AACD;;AAED,QAAM,IAAIX,KAAJ,CAAUlB,QAAV,CAAN;AACD","sourcesContent":["import type {\n  DataType,\n  SyncDataType,\n  BatchableDataType,\n  Loader,\n  LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {\n  isResponse,\n  isReadableStream,\n  isAsyncIterable,\n  isIterable,\n  isIterator,\n  isBlob,\n  isBuffer\n} from '../../javascript-utils/is-type';\nimport {makeIterator} from '../../iterators/make-iterator/make-iterator';\nimport {checkResponse, makeResponse} from '../utils/response-utils';\n\nconst ERR_DATA = 'Cannot convert supplied data type';\n\n// eslint-disable-next-line complexity\nexport function getArrayBufferOrStringFromDataSync(\n  data: SyncDataType,\n  loader: Loader,\n  options: LoaderOptions\n): ArrayBuffer | string {\n  if (loader.text && typeof data === 'string') {\n    return data;\n  }\n\n  if (isBuffer(data)) {\n    // @ts-ignore\n    data = data.buffer;\n  }\n\n  if (data instanceof ArrayBuffer) {\n    const arrayBuffer = data;\n    if (loader.text && !loader.binary) {\n      const textDecoder = new TextDecoder('utf8');\n      return textDecoder.decode(arrayBuffer);\n    }\n    return arrayBuffer;\n  }\n\n  // We may need to handle offsets\n  if (ArrayBuffer.isView(data)) {\n    // TextDecoder is invoked on typed arrays and will handle offsets\n    if (loader.text && !loader.binary) {\n      const textDecoder = new TextDecoder('utf8');\n      return textDecoder.decode(data);\n    }\n\n    let arrayBuffer = data.buffer;\n\n    // Since we are returning the underlying arrayBuffer, we must create a new copy\n    // if this typed array / Buffer is a partial view into the ArryayBuffer\n    // TODO - this is a potentially unnecessary copy\n    const byteLength = data.byteLength || data.length;\n    if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {\n      // console.warn(`loaders.gl copying arraybuffer of length ${byteLength}`);\n      arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);\n    }\n    return arrayBuffer;\n  }\n\n  throw new Error(ERR_DATA);\n}\n\n// Convert async iterator to a promise\nexport async function getArrayBufferOrStringFromData(\n  data: DataType,\n  loader: Loader,\n  options: LoaderOptions\n): Promise<ArrayBuffer | string> {\n  const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);\n  if (typeof data === 'string' || isArrayBuffer) {\n    return getArrayBufferOrStringFromDataSync(data as string | ArrayBuffer, loader, options);\n  }\n\n  // Blobs and files are FileReader compatible\n  if (isBlob(data)) {\n    data = await makeResponse(data);\n  }\n\n  if (isResponse(data)) {\n    const response = data as Response;\n    await checkResponse(response);\n    return loader.binary ? await response.arrayBuffer() : await response.text();\n  }\n\n  if (isReadableStream(data)) {\n    // @ts-expect-error TS2559 options type\n    data = makeIterator(data as ReadableStream, options);\n  }\n\n  if (isIterable(data) || isAsyncIterable(data)) {\n    // Assume arrayBuffer iterator - attempt to concatenate\n    return concatenateArrayBuffersAsync(data as AsyncIterable<ArrayBuffer>);\n  }\n\n  throw new Error(ERR_DATA);\n}\n\nexport async function getAsyncIterableFromData(\n  data: BatchableDataType,\n  options: LoaderOptions\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n  if (isIterator(data)) {\n    return data as AsyncIterable<ArrayBuffer>;\n  }\n\n  if (isResponse(data)) {\n    const response = data as Response;\n    // Note Since this function is not async, we currently can't load error message, just status\n    await checkResponse(response);\n    // TODO - bug in polyfill, body can be a Promise under Node.js\n    // eslint-disable-next-line @typescript-eslint/await-thenable\n    const body = await response.body;\n    // TODO - body can be null?\n    return makeIterator(body as ReadableStream<Uint8Array>, options as any);\n  }\n\n  if (isBlob(data) || isReadableStream(data)) {\n    return makeIterator(data as Blob | ReadableStream, options as any);\n  }\n\n  if (isAsyncIterable(data)) {\n    return data[Symbol.asyncIterator]();\n  }\n\n  return getIterableFromData(data);\n}\n\nexport async function getReadableStream(data: BatchableDataType): Promise<ReadableStream> {\n  if (isReadableStream(data)) {\n    return data as ReadableStream;\n  }\n  if (isResponse(data)) {\n    // @ts-ignore\n    return data.body;\n  }\n  const response = await makeResponse(data);\n  // @ts-ignore\n  return response.body;\n}\n\n// HELPERS\n\nfunction getIterableFromData(data) {\n  // generate an iterator that emits a single chunk\n  if (ArrayBuffer.isView(data)) {\n    return (function* oneChunk() {\n      yield data.buffer;\n    })();\n  }\n\n  if (data instanceof ArrayBuffer) {\n    return (function* oneChunk() {\n      yield data;\n    })();\n  }\n\n  if (isIterator(data)) {\n    return data;\n  }\n\n  if (isIterable(data)) {\n    return data[Symbol.iterator]();\n  }\n\n  throw new Error(ERR_DATA);\n}\n"],"file":"get-data.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/get-data.ts"],"names":["ERR_DATA","getArrayBufferOrStringFromDataSync","data","loader","options","text","buffer","ArrayBuffer","arrayBuffer","binary","textDecoder","TextDecoder","decode","isView","byteLength","length","byteOffset","slice","Error","getArrayBufferOrStringFromData","isArrayBuffer","response","getAsyncIterableFromData","body","Symbol","asyncIterator","getIterableFromData","getReadableStream","oneChunk","iterator"],"mappings":"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","sourcesContent":["import type {\n  DataType,\n  SyncDataType,\n  BatchableDataType,\n  Loader,\n  LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {\n  isResponse,\n  isReadableStream,\n  isAsyncIterable,\n  isIterable,\n  isIterator,\n  isBlob,\n  isBuffer\n} from '../../javascript-utils/is-type';\nimport {makeIterator} from '../../iterators/make-iterator/make-iterator';\nimport {checkResponse, makeResponse} from '../utils/response-utils';\n\nconst ERR_DATA = 'Cannot convert supplied data type';\n\n// eslint-disable-next-line complexity\nexport function getArrayBufferOrStringFromDataSync(\n  data: SyncDataType,\n  loader: Loader,\n  options: LoaderOptions\n): ArrayBuffer | string {\n  if (loader.text && typeof data === 'string') {\n    return data;\n  }\n\n  if (isBuffer(data)) {\n    // @ts-ignore\n    data = data.buffer;\n  }\n\n  if (data instanceof ArrayBuffer) {\n    const arrayBuffer = data;\n    if (loader.text && !loader.binary) {\n      const textDecoder = new TextDecoder('utf8');\n      return textDecoder.decode(arrayBuffer);\n    }\n    return arrayBuffer;\n  }\n\n  // We may need to handle offsets\n  if (ArrayBuffer.isView(data)) {\n    // TextDecoder is invoked on typed arrays and will handle offsets\n    if (loader.text && !loader.binary) {\n      const textDecoder = new TextDecoder('utf8');\n      return textDecoder.decode(data);\n    }\n\n    let arrayBuffer = data.buffer;\n\n    // Since we are returning the underlying arrayBuffer, we must create a new copy\n    // if this typed array / Buffer is a partial view into the ArryayBuffer\n    // TODO - this is a potentially unnecessary copy\n    const byteLength = data.byteLength || data.length;\n    if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {\n      // console.warn(`loaders.gl copying arraybuffer of length ${byteLength}`);\n      arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);\n    }\n    return arrayBuffer;\n  }\n\n  throw new Error(ERR_DATA);\n}\n\n// Convert async iterator to a promise\nexport async function getArrayBufferOrStringFromData(\n  data: DataType,\n  loader: Loader,\n  options: LoaderOptions\n): Promise<ArrayBuffer | string> {\n  const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);\n  if (typeof data === 'string' || isArrayBuffer) {\n    return getArrayBufferOrStringFromDataSync(data as string | ArrayBuffer, loader, options);\n  }\n\n  // Blobs and files are FileReader compatible\n  if (isBlob(data)) {\n    data = await makeResponse(data);\n  }\n\n  if (isResponse(data)) {\n    const response = data as Response;\n    await checkResponse(response);\n    return loader.binary ? await response.arrayBuffer() : await response.text();\n  }\n\n  if (isReadableStream(data)) {\n    // @ts-expect-error TS2559 options type\n    data = makeIterator(data as ReadableStream, options);\n  }\n\n  if (isIterable(data) || isAsyncIterable(data)) {\n    // Assume arrayBuffer iterator - attempt to concatenate\n    return concatenateArrayBuffersAsync(data as AsyncIterable<ArrayBuffer>);\n  }\n\n  throw new Error(ERR_DATA);\n}\n\nexport async function getAsyncIterableFromData(\n  data: BatchableDataType,\n  options: LoaderOptions\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n  if (isIterator(data)) {\n    return data as AsyncIterable<ArrayBuffer>;\n  }\n\n  if (isResponse(data)) {\n    const response = data as Response;\n    // Note Since this function is not async, we currently can't load error message, just status\n    await checkResponse(response);\n    // TODO - bug in polyfill, body can be a Promise under Node.js\n    // eslint-disable-next-line @typescript-eslint/await-thenable\n    const body = await response.body;\n    // TODO - body can be null?\n    return makeIterator(body as ReadableStream<Uint8Array>, options as any);\n  }\n\n  if (isBlob(data) || isReadableStream(data)) {\n    return makeIterator(data as Blob | ReadableStream, options as any);\n  }\n\n  if (isAsyncIterable(data)) {\n    return data[Symbol.asyncIterator]();\n  }\n\n  return getIterableFromData(data);\n}\n\nexport async function getReadableStream(data: BatchableDataType): Promise<ReadableStream> {\n  if (isReadableStream(data)) {\n    return data as ReadableStream;\n  }\n  if (isResponse(data)) {\n    // @ts-ignore\n    return data.body;\n  }\n  const response = await makeResponse(data);\n  // @ts-ignore\n  return response.body;\n}\n\n// HELPERS\n\nfunction getIterableFromData(data) {\n  // generate an iterator that emits a single chunk\n  if (ArrayBuffer.isView(data)) {\n    return (function* oneChunk() {\n      yield data.buffer;\n    })();\n  }\n\n  if (data instanceof ArrayBuffer) {\n    return (function* oneChunk() {\n      yield data;\n    })();\n  }\n\n  if (isIterator(data)) {\n    return data;\n  }\n\n  if (isIterable(data)) {\n    return data[Symbol.iterator]();\n  }\n\n  throw new Error(ERR_DATA);\n}\n"],"file":"get-data.js"}

package/dist/es5/lib/loader-utils/loader-context.js

@@ -1,33 +1,22 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLoaderContext = getLoaderContext;
 exports.getLoadersFromContext = getLoadersFromContext;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _optionUtils = require("./option-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function getLoaderContext(context, options) {
-  var previousContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-
+function getLoaderContext(context, options, previousContext = null) {
   if (previousContext) {
     return previousContext;
   }
 
-  var resolvedContext = _objectSpread({
-    fetch: (0, _optionUtils.getFetchFunction)(options, context)
-  }, context);
+  const resolvedContext = {
+    fetch: (0, _optionUtils.getFetchFunction)(options, context),
+    ...context
+  };
 
   if (!Array.isArray(resolvedContext.loaders)) {
     resolvedContext.loaders = null;
@@ -41,15 +30,15 @@ function getLoadersFromContext(loaders, context) {
     return loaders;
   }
 
-  var candidateLoaders;
+  let candidateLoaders;
 
   if (loaders) {
     candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];
   }
 
   if (context && context.loaders) {
-    var contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];
-    candidateLoaders = candidateLoaders ? [].concat((0, _toConsumableArray2.default)(candidateLoaders), (0, _toConsumableArray2.default)(contextLoaders)) : contextLoaders;
+    const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];
+    candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
   }
 
   return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;

package/dist/es5/lib/loader-utils/loader-context.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/loader-context.ts"],"names":["getLoaderContext","context","options","previousContext","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders","length"],"mappings":";;;;;;;;;;;;;;AACA;;;;;;AAWO,SAASA,gBAAT,CACLC,OADK,EAELC,OAFK,EAIU;AAAA,MADfC,eACe,uEADyB,IACzB;;AAGf,MAAIA,eAAJ,EAAqB;AACnB,WAAOA,eAAP;AACD;;AAED,MAAMC,eAA8B;AAClCC,IAAAA,KAAK,EAAE,mCAAiBH,OAAjB,EAA0BD,OAA1B;AAD2B,KAE/BA,OAF+B,CAApC;;AAMA,MAAI,CAACK,KAAK,CAACC,OAAN,CAAcH,eAAe,CAACI,OAA9B,CAAL,EAA6C;AAC3CJ,IAAAA,eAAe,CAACI,OAAhB,GAA0B,IAA1B;AACD;;AAED,SAAOJ,eAAP;AACD;;AAGM,SAASK,qBAAT,CACLD,OADK,EAELP,OAFK,EAGL;AAEA,MAAI,CAACA,OAAD,IAAYO,OAAZ,IAAuB,CAACF,KAAK,CAACC,OAAN,CAAcC,OAAd,CAA5B,EAAoD;AAClD,WAAOA,OAAP;AACD;;AAGD,MAAIE,gBAAJ;;AACA,MAAIF,OAAJ,EAAa;AACXE,IAAAA,gBAAgB,GAAGJ,KAAK,CAACC,OAAN,CAAcC,OAAd,IAAyBA,OAAzB,GAAmC,CAACA,OAAD,CAAtD;AACD;;AACD,MAAIP,OAAO,IAAIA,OAAO,CAACO,OAAvB,EAAgC;AAC9B,QAAMG,cAAc,GAAGL,KAAK,CAACC,OAAN,CAAcN,OAAO,CAACO,OAAtB,IAAiCP,OAAO,CAACO,OAAzC,GAAmD,CAACP,OAAO,CAACO,OAAT,CAA1E;AACAE,IAAAA,gBAAgB,GAAGA,gBAAgB,8CAAOA,gBAAP,oCAA4BC,cAA5B,KAA8CA,cAAjF;AACD;;AAED,SAAOD,gBAAgB,IAAIA,gBAAgB,CAACE,MAArC,GAA8CF,gBAA9C,GAAiE,IAAxE;AACD","sourcesContent":["import type {Loader, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport {getFetchFunction} from './option-utils';\n\n/**\n * \"sub\" loaders invoked by other loaders get a \"context\" injected on `this`\n * The context will inject core methods like `parse` and contain information\n * about loaders and options passed in to the top-level `parse` call.\n *\n * @param context\n * @param options\n * @param previousContext\n */\nexport function getLoaderContext(\n  context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>,\n  options?: LoaderOptions,\n  previousContext: LoaderContext | null = null\n): LoaderContext {\n  // For recursive calls, we already have a context\n  // TODO - add any additional loaders to context?\n  if (previousContext) {\n    return previousContext;\n  }\n\n  const resolvedContext: LoaderContext = {\n    fetch: getFetchFunction(options, context),\n    ...context\n  };\n\n  // Recursive loading does not use single loader\n  if (!Array.isArray(resolvedContext.loaders)) {\n    resolvedContext.loaders = null;\n  }\n\n  return resolvedContext;\n}\n\n// eslint-disable-next-line complexity\nexport function getLoadersFromContext(\n  loaders: Loader[] | Loader | undefined,\n  context?: LoaderContext\n) {\n  // A single non-array loader is force selected, but only on top-level (context === null)\n  if (!context && loaders && !Array.isArray(loaders)) {\n    return loaders;\n  }\n\n  // Create a merged list\n  let candidateLoaders;\n  if (loaders) {\n    candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];\n  }\n  if (context && context.loaders) {\n    const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];\n    candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;\n  }\n  // If no loaders, return null to look in globally registered loaders\n  return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;\n}\n"],"file":"loader-context.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/loader-context.ts"],"names":["getLoaderContext","context","options","previousContext","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders","length"],"mappings":";;;;;;;;AACA;;AAWO,SAASA,gBAAT,CACLC,OADK,EAELC,OAFK,EAGLC,eAAqC,GAAG,IAHnC,EAIU;AAGf,MAAIA,eAAJ,EAAqB;AACnB,WAAOA,eAAP;AACD;;AAED,QAAMC,eAA8B,GAAG;AACrCC,IAAAA,KAAK,EAAE,mCAAiBH,OAAjB,EAA0BD,OAA1B,CAD8B;AAErC,OAAGA;AAFkC,GAAvC;;AAMA,MAAI,CAACK,KAAK,CAACC,OAAN,CAAcH,eAAe,CAACI,OAA9B,CAAL,EAA6C;AAC3CJ,IAAAA,eAAe,CAACI,OAAhB,GAA0B,IAA1B;AACD;;AAED,SAAOJ,eAAP;AACD;;AAGM,SAASK,qBAAT,CACLD,OADK,EAELP,OAFK,EAGL;AAEA,MAAI,CAACA,OAAD,IAAYO,OAAZ,IAAuB,CAACF,KAAK,CAACC,OAAN,CAAcC,OAAd,CAA5B,EAAoD;AAClD,WAAOA,OAAP;AACD;;AAGD,MAAIE,gBAAJ;;AACA,MAAIF,OAAJ,EAAa;AACXE,IAAAA,gBAAgB,GAAGJ,KAAK,CAACC,OAAN,CAAcC,OAAd,IAAyBA,OAAzB,GAAmC,CAACA,OAAD,CAAtD;AACD;;AACD,MAAIP,OAAO,IAAIA,OAAO,CAACO,OAAvB,EAAgC;AAC9B,UAAMG,cAAc,GAAGL,KAAK,CAACC,OAAN,CAAcN,OAAO,CAACO,OAAtB,IAAiCP,OAAO,CAACO,OAAzC,GAAmD,CAACP,OAAO,CAACO,OAAT,CAA1E;AACAE,IAAAA,gBAAgB,GAAGA,gBAAgB,GAAG,CAAC,GAAGA,gBAAJ,EAAsB,GAAGC,cAAzB,CAAH,GAA8CA,cAAjF;AACD;;AAED,SAAOD,gBAAgB,IAAIA,gBAAgB,CAACE,MAArC,GAA8CF,gBAA9C,GAAiE,IAAxE;AACD","sourcesContent":["import type {Loader, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport {getFetchFunction} from './option-utils';\n\n/**\n * \"sub\" loaders invoked by other loaders get a \"context\" injected on `this`\n * The context will inject core methods like `parse` and contain information\n * about loaders and options passed in to the top-level `parse` call.\n *\n * @param context\n * @param options\n * @param previousContext\n */\nexport function getLoaderContext(\n  context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>,\n  options?: LoaderOptions,\n  previousContext: LoaderContext | null = null\n): LoaderContext {\n  // For recursive calls, we already have a context\n  // TODO - add any additional loaders to context?\n  if (previousContext) {\n    return previousContext;\n  }\n\n  const resolvedContext: LoaderContext = {\n    fetch: getFetchFunction(options, context),\n    ...context\n  };\n\n  // Recursive loading does not use single loader\n  if (!Array.isArray(resolvedContext.loaders)) {\n    resolvedContext.loaders = null;\n  }\n\n  return resolvedContext;\n}\n\n// eslint-disable-next-line complexity\nexport function getLoadersFromContext(\n  loaders: Loader[] | Loader | undefined,\n  context?: LoaderContext\n) {\n  // A single non-array loader is force selected, but only on top-level (context === null)\n  if (!context && loaders && !Array.isArray(loaders)) {\n    return loaders;\n  }\n\n  // Create a merged list\n  let candidateLoaders;\n  if (loaders) {\n    candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];\n  }\n  if (context && context.loaders) {\n    const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];\n    candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;\n  }\n  // If no loaders, return null to look in globally registered loaders\n  return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;\n}\n"],"file":"loader-context.js"}

package/dist/es5/lib/loader-utils/loggers.js

@@ -9,102 +9,57 @@ exports.ConsoleLog = exports.NullLog = exports.probeLog = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _probe = require("probe.gl");
 
-var probeLog = new _probe.Log({
+const probeLog = new _probe.Log({
   id: 'loaders.gl'
 });
 exports.probeLog = probeLog;
 
-var NullLog = function () {
-  function NullLog() {
-    (0, _classCallCheck2.default)(this, NullLog);
+class NullLog {
+  log() {
+    return () => {};
+  }
+
+  info() {
+    return () => {};
+  }
+
+  warn() {
+    return () => {};
+  }
+
+  error() {
+    return () => {};
   }
 
-  (0, _createClass2.default)(NullLog, [{
-    key: "log",
-    value: function log() {
-      return function () {};
-    }
-  }, {
-    key: "info",
-    value: function info() {
-      return function () {};
-    }
-  }, {
-    key: "warn",
-    value: function warn() {
-      return function () {};
-    }
-  }, {
-    key: "error",
-    value: function error() {
-      return function () {};
-    }
-  }]);
-  return NullLog;
-}();
+}
 
 exports.NullLog = NullLog;
 
-var ConsoleLog = function () {
-  function ConsoleLog() {
-    (0, _classCallCheck2.default)(this, ConsoleLog);
+class ConsoleLog {
+  constructor() {
     (0, _defineProperty2.default)(this, "console", void 0);
     this.console = console;
   }
 
-  (0, _createClass2.default)(ConsoleLog, [{
-    key: "log",
-    value: function log() {
-      var _this$console$log;
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      return (_this$console$log = this.console.log).bind.apply(_this$console$log, [this.console].concat(args));
-    }
-  }, {
-    key: "info",
-    value: function info() {
-      var _this$console$info;
-
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-
-      return (_this$console$info = this.console.info).bind.apply(_this$console$info, [this.console].concat(args));
-    }
-  }, {
-    key: "warn",
-    value: function warn() {
-      var _this$console$warn;
-
-      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-        args[_key3] = arguments[_key3];
-      }
-
-      return (_this$console$warn = this.console.warn).bind.apply(_this$console$warn, [this.console].concat(args));
-    }
-  }, {
-    key: "error",
-    value: function error() {
-      var _this$console$error;
-
-      for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-        args[_key4] = arguments[_key4];
-      }
-
-      return (_this$console$error = this.console.error).bind.apply(_this$console$error, [this.console].concat(args));
-    }
-  }]);
-  return ConsoleLog;
-}();
+  log(...args) {
+    return this.console.log.bind(this.console, ...args);
+  }
+
+  info(...args) {
+    return this.console.info.bind(this.console, ...args);
+  }
+
+  warn(...args) {
+    return this.console.warn.bind(this.console, ...args);
+  }
+
+  error(...args) {
+    return this.console.error.bind(this.console, ...args);
+  }
+
+}
 
 exports.ConsoleLog = ConsoleLog;
 //# sourceMappingURL=loggers.js.map

package/dist/es5/lib/loader-utils/loggers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/loggers.ts"],"names":["probeLog","Log","id","NullLog","ConsoleLog","console","args","log","bind","info","warn","error"],"mappings":";;;;;;;;;;;;;;;AACA;;AAEO,IAAMA,QAAQ,GAAG,IAAIC,UAAJ,CAAQ;AAACC,EAAAA,EAAE,EAAE;AAAL,CAAR,CAAjB;;;IAGMC,O;;;;;;;WACX,eAAM;AACJ,aAAO,YAAM,CAAE,CAAf;AACD;;;WACD,gBAAO;AACL,aAAO,YAAM,CAAE,CAAf;AACD;;;WACD,gBAAO;AACL,aAAO,YAAM,CAAE,CAAf;AACD;;;WACD,iBAAQ;AACN,aAAO,YAAM,CAAE,CAAf;AACD;;;;;;;IAIUC,U;AAGX,wBAAc;AAAA;AAAA;AACZ,SAAKC,OAAL,GAAeA,OAAf;AACD;;;;WACD,eAAa;AAAA;;AAAA,wCAANC,IAAM;AAANA,QAAAA,IAAM;AAAA;;AACX,aAAO,0BAAKD,OAAL,CAAaE,GAAb,EAAiBC,IAAjB,2BAAsB,KAAKH,OAA3B,SAAuCC,IAAvC,EAAP;AACD;;;WACD,gBAAc;AAAA;;AAAA,yCAANA,IAAM;AAANA,QAAAA,IAAM;AAAA;;AACZ,aAAO,2BAAKD,OAAL,CAAaI,IAAb,EAAkBD,IAAlB,4BAAuB,KAAKH,OAA5B,SAAwCC,IAAxC,EAAP;AACD;;;WACD,gBAAc;AAAA;;AAAA,yCAANA,IAAM;AAANA,QAAAA,IAAM;AAAA;;AACZ,aAAO,2BAAKD,OAAL,CAAaK,IAAb,EAAkBF,IAAlB,4BAAuB,KAAKH,OAA5B,SAAwCC,IAAxC,EAAP;AACD;;;WACD,iBAAe;AAAA;;AAAA,yCAANA,IAAM;AAANA,QAAAA,IAAM;AAAA;;AACb,aAAO,4BAAKD,OAAL,CAAaM,KAAb,EAAmBH,IAAnB,6BAAwB,KAAKH,OAA7B,SAAyCC,IAAzC,EAAP;AACD","sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from 'probe.gl';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n  log() {\n    return () => {};\n  }\n  info() {\n    return () => {};\n  }\n  warn() {\n    return () => {};\n  }\n  error() {\n    return () => {};\n  }\n}\n\n// Logs to console\nexport class ConsoleLog {\n  console;\n\n  constructor() {\n    this.console = console; // eslint-disable-line\n  }\n  log(...args) {\n    return this.console.log.bind(this.console, ...args);\n  }\n  info(...args) {\n    return this.console.info.bind(this.console, ...args);\n  }\n  warn(...args) {\n    return this.console.warn.bind(this.console, ...args);\n  }\n  error(...args) {\n    return this.console.error.bind(this.console, ...args);\n  }\n}\n"],"file":"loggers.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/loggers.ts"],"names":["probeLog","Log","id","NullLog","log","info","warn","error","ConsoleLog","constructor","console","args","bind"],"mappings":";;;;;;;;;;;AACA;;AAEO,MAAMA,QAAQ,GAAG,IAAIC,UAAJ,CAAQ;AAACC,EAAAA,EAAE,EAAE;AAAL,CAAR,CAAjB;;;AAGA,MAAMC,OAAN,CAAc;AACnBC,EAAAA,GAAG,GAAG;AACJ,WAAO,MAAM,CAAE,CAAf;AACD;;AACDC,EAAAA,IAAI,GAAG;AACL,WAAO,MAAM,CAAE,CAAf;AACD;;AACDC,EAAAA,IAAI,GAAG;AACL,WAAO,MAAM,CAAE,CAAf;AACD;;AACDC,EAAAA,KAAK,GAAG;AACN,WAAO,MAAM,CAAE,CAAf;AACD;;AAZkB;;;;AAgBd,MAAMC,UAAN,CAAiB;AAGtBC,EAAAA,WAAW,GAAG;AAAA;AACZ,SAAKC,OAAL,GAAeA,OAAf;AACD;;AACDN,EAAAA,GAAG,CAAC,GAAGO,IAAJ,EAAU;AACX,WAAO,KAAKD,OAAL,CAAaN,GAAb,CAAiBQ,IAAjB,CAAsB,KAAKF,OAA3B,EAAoC,GAAGC,IAAvC,CAAP;AACD;;AACDN,EAAAA,IAAI,CAAC,GAAGM,IAAJ,EAAU;AACZ,WAAO,KAAKD,OAAL,CAAaL,IAAb,CAAkBO,IAAlB,CAAuB,KAAKF,OAA5B,EAAqC,GAAGC,IAAxC,CAAP;AACD;;AACDL,EAAAA,IAAI,CAAC,GAAGK,IAAJ,EAAU;AACZ,WAAO,KAAKD,OAAL,CAAaJ,IAAb,CAAkBM,IAAlB,CAAuB,KAAKF,OAA5B,EAAqC,GAAGC,IAAxC,CAAP;AACD;;AACDJ,EAAAA,KAAK,CAAC,GAAGI,IAAJ,EAAU;AACb,WAAO,KAAKD,OAAL,CAAaH,KAAb,CAAmBK,IAAnB,CAAwB,KAAKF,OAA7B,EAAsC,GAAGC,IAAzC,CAAP;AACD;;AAjBqB","sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from 'probe.gl';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n  log() {\n    return () => {};\n  }\n  info() {\n    return () => {};\n  }\n  warn() {\n    return () => {};\n  }\n  error() {\n    return () => {};\n  }\n}\n\n// Logs to console\nexport class ConsoleLog {\n  console;\n\n  constructor() {\n    this.console = console; // eslint-disable-line\n  }\n  log(...args) {\n    return this.console.log.bind(this.console, ...args);\n  }\n  info(...args) {\n    return this.console.info.bind(this.console, ...args);\n  }\n  warn(...args) {\n    return this.console.warn.bind(this.console, ...args);\n  }\n  error(...args) {\n    return this.console.error.bind(this.console, ...args);\n  }\n}\n"],"file":"loggers.js"}