@loaders.gl/core 3.1.3 → 4.0.0-alpha.5

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

@@ -1,129 +1,129 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReadableStream = exports.getAsyncIterableFromData = exports.getArrayBufferOrStringFromData = exports.getArrayBufferOrStringFromDataSync = void 0;
-const loader_utils_1 = require("@loaders.gl/loader-utils");
-const is_type_1 = require("../../javascript-utils/is-type");
-const make_iterator_1 = require("../../iterators/make-iterator/make-iterator");
-const response_utils_1 = require("../utils/response-utils");
+import { concatenateArrayBuffersAsync } from '@loaders.gl/loader-utils';
+import { isResponse, isReadableStream, isAsyncIterable, isIterable, isIterator, isBlob, isBuffer } from '../../javascript-utils/is-type';
+import { makeIterator } from '../../iterators/make-iterator/make-iterator';
+import { checkResponse, makeResponse } from '../utils/response-utils';
 const ERR_DATA = 'Cannot convert supplied data type';
-// eslint-disable-next-line complexity
-function getArrayBufferOrStringFromDataSync(data, loader, options) {
-    if (loader.text && typeof data === 'string') {
-        return data;
-    }
-    if ((0, is_type_1.isBuffer)(data)) {
-        // @ts-ignore
-        data = data.buffer;
-    }
-    if (data instanceof ArrayBuffer) {
-        const arrayBuffer = data;
-        if (loader.text && !loader.binary) {
-            const textDecoder = new TextDecoder('utf8');
-            return textDecoder.decode(arrayBuffer);
-        }
-        return arrayBuffer;
-    }
-    // We may need to handle offsets
-    if (ArrayBuffer.isView(data)) {
-        // TextDecoder is invoked on typed arrays and will handle offsets
-        if (loader.text && !loader.binary) {
-            const textDecoder = new TextDecoder('utf8');
-            return textDecoder.decode(data);
-        }
-        let arrayBuffer = data.buffer;
-        // Since we are returning the underlying arrayBuffer, we must create a new copy
-        // if this typed array / Buffer is a partial view into the ArryayBuffer
-        // TODO - this is a potentially unnecessary copy
-        const byteLength = data.byteLength || data.length;
-        if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {
-            // console.warn(`loaders.gl copying arraybuffer of length ${byteLength}`);
-            arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);
-        }
-        return arrayBuffer;
-    }
-    throw new Error(ERR_DATA);
+export function getArrayBufferOrStringFromDataSync(data, loader, options) {
+  if (loader.text && typeof data === 'string') {
+    return data;
+  }
+
+  if (isBuffer(data)) {
+    data = data.buffer;
+  }
+
+  if (data instanceof ArrayBuffer) {
+    const arrayBuffer = data;
+
+    if (loader.text && !loader.binary) {
+      const textDecoder = new TextDecoder('utf8');
+      return textDecoder.decode(arrayBuffer);
+    }
+
+    return arrayBuffer;
+  }
+
+  if (ArrayBuffer.isView(data)) {
+    if (loader.text && !loader.binary) {
+      const textDecoder = new TextDecoder('utf8');
+      return textDecoder.decode(data);
+    }
+
+    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);
+    }
+
+    return arrayBuffer;
+  }
+
+  throw new Error(ERR_DATA);
 }
-exports.getArrayBufferOrStringFromDataSync = getArrayBufferOrStringFromDataSync;
-// Convert async iterator to a promise
-async function getArrayBufferOrStringFromData(data, loader, options) {
-    const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);
-    if (typeof data === 'string' || isArrayBuffer) {
-        return getArrayBufferOrStringFromDataSync(data, loader, options);
-    }
-    // Blobs and files are FileReader compatible
-    if ((0, is_type_1.isBlob)(data)) {
-        data = await (0, response_utils_1.makeResponse)(data);
-    }
-    if ((0, is_type_1.isResponse)(data)) {
-        const response = data;
-        await (0, response_utils_1.checkResponse)(response);
-        return loader.binary ? await response.arrayBuffer() : await response.text();
-    }
-    if ((0, is_type_1.isReadableStream)(data)) {
-        // @ts-expect-error TS2559 options type
-        data = (0, make_iterator_1.makeIterator)(data, options);
-    }
-    if ((0, is_type_1.isIterable)(data) || (0, is_type_1.isAsyncIterable)(data)) {
-        // Assume arrayBuffer iterator - attempt to concatenate
-        return (0, loader_utils_1.concatenateArrayBuffersAsync)(data);
-    }
-    throw new Error(ERR_DATA);
+export async function getArrayBufferOrStringFromData(data, loader, options) {
+  const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);
+
+  if (typeof data === 'string' || isArrayBuffer) {
+    return getArrayBufferOrStringFromDataSync(data, loader, options);
+  }
+
+  if (isBlob(data)) {
+    data = await makeResponse(data);
+  }
+
+  if (isResponse(data)) {
+    const response = data;
+    await checkResponse(response);
+    return loader.binary ? await response.arrayBuffer() : await response.text();
+  }
+
+  if (isReadableStream(data)) {
+    data = makeIterator(data, options);
+  }
+
+  if (isIterable(data) || isAsyncIterable(data)) {
+    return concatenateArrayBuffersAsync(data);
+  }
+
+  throw new Error(ERR_DATA);
 }
-exports.getArrayBufferOrStringFromData = getArrayBufferOrStringFromData;
-async function getAsyncIterableFromData(data, options) {
-    if ((0, is_type_1.isIterator)(data)) {
-        return data;
-    }
-    if ((0, is_type_1.isResponse)(data)) {
-        const response = data;
-        // Note Since this function is not async, we currently can't load error message, just status
-        await (0, response_utils_1.checkResponse)(response);
-        // TODO - bug in polyfill, body can be a Promise under Node.js
-        // eslint-disable-next-line @typescript-eslint/await-thenable
-        const body = await response.body;
-        // TODO - body can be null?
-        return (0, make_iterator_1.makeIterator)(body, options);
-    }
-    if ((0, is_type_1.isBlob)(data) || (0, is_type_1.isReadableStream)(data)) {
-        return (0, make_iterator_1.makeIterator)(data, options);
-    }
-    if ((0, is_type_1.isAsyncIterable)(data)) {
-        return data[Symbol.asyncIterator]();
-    }
-    return getIterableFromData(data);
+export async function getAsyncIterableFromData(data, options) {
+  if (isIterator(data)) {
+    return data;
+  }
+
+  if (isResponse(data)) {
+    const response = data;
+    await checkResponse(response);
+    const body = await response.body;
+    return makeIterator(body, options);
+  }
+
+  if (isBlob(data) || isReadableStream(data)) {
+    return makeIterator(data, options);
+  }
+
+  if (isAsyncIterable(data)) {
+    return data[Symbol.asyncIterator]();
+  }
+
+  return getIterableFromData(data);
 }
-exports.getAsyncIterableFromData = getAsyncIterableFromData;
-async function getReadableStream(data) {
-    if ((0, is_type_1.isReadableStream)(data)) {
-        return data;
-    }
-    if ((0, is_type_1.isResponse)(data)) {
-        // @ts-ignore
-        return data.body;
-    }
-    const response = await (0, response_utils_1.makeResponse)(data);
-    // @ts-ignore
-    return response.body;
+export async function getReadableStream(data) {
+  if (isReadableStream(data)) {
+    return data;
+  }
+
+  if (isResponse(data)) {
+    return data.body;
+  }
+
+  const response = await makeResponse(data);
+  return response.body;
 }
-exports.getReadableStream = getReadableStream;
-// HELPERS
+
 function getIterableFromData(data) {
-    // generate an iterator that emits a single chunk
-    if (ArrayBuffer.isView(data)) {
-        return (function* oneChunk() {
-            yield data.buffer;
-        })();
-    }
-    if (data instanceof ArrayBuffer) {
-        return (function* oneChunk() {
-            yield data;
-        })();
-    }
-    if ((0, is_type_1.isIterator)(data)) {
-        return data;
-    }
-    if ((0, is_type_1.isIterable)(data)) {
-        return data[Symbol.iterator]();
-    }
-    throw new Error(ERR_DATA);
+  if (ArrayBuffer.isView(data)) {
+    return function* oneChunk() {
+      yield data.buffer;
+    }();
+  }
+
+  if (data instanceof ArrayBuffer) {
+    return function* oneChunk() {
+      yield data;
+    }();
+  }
+
+  if (isIterator(data)) {
+    return data;
+  }
+
+  if (isIterable(data)) {
+    return data[Symbol.iterator]();
+  }
+
+  throw new Error(ERR_DATA);
 }
+//# sourceMappingURL=get-data.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/loader-utils/get-data.ts"],"names":["concatenateArrayBuffersAsync","isResponse","isReadableStream","isAsyncIterable","isIterable","isIterator","isBlob","isBuffer","makeIterator","checkResponse","makeResponse","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/lib/loader-utils/loader-context.js

@@ -1,49 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoadersFromContext = exports.getLoaderContext = void 0;
-const option_utils_1 = require("./option-utils");
-/**
- * "sub" loaders invoked by other loaders get a "context" injected on `this`
- * The context will inject core methods like `parse` and contain information
- * about loaders and options passed in to the top-level `parse` call.
- *
- * @param context
- * @param options
- * @param previousContext
- */
-function getLoaderContext(context, options, previousContext = null) {
-    // For recursive calls, we already have a context
-    // TODO - add any additional loaders to context?
-    if (previousContext) {
-        return previousContext;
-    }
-    const resolvedContext = {
-        fetch: (0, option_utils_1.getFetchFunction)(options, context),
-        ...context
-    };
-    // Recursive loading does not use single loader
-    if (!Array.isArray(resolvedContext.loaders)) {
-        resolvedContext.loaders = null;
-    }
-    return resolvedContext;
+import { getFetchFunction } from './option-utils';
+export function getLoaderContext(context, options, previousContext = null) {
+  if (previousContext) {
+    return previousContext;
+  }
+
+  const resolvedContext = {
+    fetch: getFetchFunction(options, context),
+    ...context
+  };
+
+  if (!Array.isArray(resolvedContext.loaders)) {
+    resolvedContext.loaders = null;
+  }
+
+  return resolvedContext;
 }
-exports.getLoaderContext = getLoaderContext;
-// eslint-disable-next-line complexity
-function getLoadersFromContext(loaders, context) {
-    // A single non-array loader is force selected, but only on top-level (context === null)
-    if (!context && loaders && !Array.isArray(loaders)) {
-        return loaders;
-    }
-    // Create a merged list
-    let candidateLoaders;
-    if (loaders) {
-        candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];
-    }
-    if (context && context.loaders) {
-        const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];
-        candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
-    }
-    // If no loaders, return null to look in globally registered loaders
-    return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;
+export function getLoadersFromContext(loaders, context) {
+  if (!context && loaders && !Array.isArray(loaders)) {
+    return loaders;
+  }
+
+  let candidateLoaders;
+
+  if (loaders) {
+    candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];
+  }
+
+  if (context && context.loaders) {
+    const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];
+    candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;
+  }
+
+  return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;
 }
-exports.getLoadersFromContext = getLoadersFromContext;
+//# sourceMappingURL=loader-context.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/loader-utils/loader-context.ts"],"names":["getFetchFunction","getLoaderContext","context","options","previousContext","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders","length"],"mappings":"AACA,SAAQA,gBAAR,QAA+B,gBAA/B;AAWA,OAAO,SAASC,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,EAAEN,gBAAgB,CAACG,OAAD,EAAUD,OAAV,CADc;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;AAGD,OAAO,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/lib/loader-utils/loggers.js

@@ -1,41 +1,48 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleLog = exports.NullLog = exports.probeLog = void 0;
-// probe.gl Log compatible loggers
-const probe_gl_1 = require("probe.gl");
-exports.probeLog = new probe_gl_1.Log({ id: 'loaders.gl' });
-// Logs nothing
-class NullLog {
-    log() {
-        return () => { };
-    }
-    info() {
-        return () => { };
-    }
-    warn() {
-        return () => { };
-    }
-    error() {
-        return () => { };
-    }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { Log } from 'probe.gl';
+export const probeLog = new Log({
+  id: 'loaders.gl'
+});
+export class NullLog {
+  log() {
+    return () => {};
+  }
+
+  info() {
+    return () => {};
+  }
+
+  warn() {
+    return () => {};
+  }
+
+  error() {
+    return () => {};
+  }
+
 }
-exports.NullLog = NullLog;
-// Logs to console
-class ConsoleLog {
-    constructor() {
-        this.console = console; // eslint-disable-line
-    }
-    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);
-    }
+export class ConsoleLog {
+  constructor() {
+    _defineProperty(this, "console", void 0);
+
+    this.console = console;
+  }
+
+  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/lib/loader-utils/loggers.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/loader-utils/loggers.ts"],"names":["Log","probeLog","id","NullLog","log","info","warn","error","ConsoleLog","constructor","console","args","bind"],"mappings":";AACA,SAAQA,GAAR,QAAkB,UAAlB;AAEA,OAAO,MAAMC,QAAQ,GAAG,IAAID,GAAJ,CAAQ;AAACE,EAAAA,EAAE,EAAE;AAAL,CAAR,CAAjB;AAGP,OAAO,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;AAgBrB,OAAO,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"}

package/dist/lib/loader-utils/normalize-loader.js

@@ -1,52 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeLoader = exports.isLoaderObject = void 0;
-const loader_utils_1 = require("@loaders.gl/loader-utils");
-function isLoaderObject(loader) {
-    if (!loader) {
-        return false;
-    }
-    if (Array.isArray(loader)) {
-        loader = loader[0];
-    }
-    const hasExtensions = Array.isArray(loader?.extensions);
-    /* Now handled by types and worker loaders do not have these
-    let hasParser =
-      loader.parseTextSync ||
-      loader.parseSync ||
-      loader.parse ||
-      loader.parseStream || // TODO Remove, Replace with parseInBatches
-      loader.parseInBatches;
-    */
-    return hasExtensions;
+import { assert } from '@loaders.gl/loader-utils';
+export function isLoaderObject(loader) {
+  var _loader;
+
+  if (!loader) {
+    return false;
+  }
+
+  if (Array.isArray(loader)) {
+    loader = loader[0];
+  }
+
+  const hasExtensions = Array.isArray((_loader = loader) === null || _loader === void 0 ? void 0 : _loader.extensions);
+  return hasExtensions;
 }
-exports.isLoaderObject = isLoaderObject;
-function normalizeLoader(loader) {
-    // This error is fairly easy to trigger by mixing up import statements etc
-    // So we make an exception and add a developer error message for this case
-    // To help new users from getting stuck here
-    (0, loader_utils_1.assert)(loader, 'null loader');
-    (0, loader_utils_1.assert)(isLoaderObject(loader), 'invalid loader');
-    // NORMALIZE [LOADER, OPTIONS] => LOADER
-    // If [loader, options], create a new loaders object with options merged in
-    let options;
-    if (Array.isArray(loader)) {
-        options = loader[1];
-        loader = loader[0];
-        loader = {
-            ...loader,
-            options: { ...loader.options, ...options }
-        };
-    }
-    // NORMALIZE text and binary flags
-    // Ensure at least one of text/binary flags are properly set
-    // @ts-expect-error
-    if (loader?.parseTextSync || loader?.parseText) {
-        loader.text = true;
-    }
-    if (!loader.text) {
-        loader.binary = true;
-    }
-    return loader;
+export function normalizeLoader(loader) {
+  var _loader2, _loader3;
+
+  assert(loader, 'null loader');
+  assert(isLoaderObject(loader), 'invalid loader');
+  let options;
+
+  if (Array.isArray(loader)) {
+    options = loader[1];
+    loader = loader[0];
+    loader = { ...loader,
+      options: { ...loader.options,
+        ...options
+      }
+    };
+  }
+
+  if ((_loader2 = loader) !== null && _loader2 !== void 0 && _loader2.parseTextSync || (_loader3 = loader) !== null && _loader3 !== void 0 && _loader3.parseText) {
+    loader.text = true;
+  }
+
+  if (!loader.text) {
+    loader.binary = true;
+  }
+
+  return loader;
 }
-exports.normalizeLoader = normalizeLoader;
+//# sourceMappingURL=normalize-loader.js.map

package/dist/lib/loader-utils/normalize-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/loader-utils/normalize-loader.ts"],"names":["assert","isLoaderObject","loader","Array","isArray","hasExtensions","extensions","normalizeLoader","options","parseTextSync","parseText","text","binary"],"mappings":"AACA,SAAQA,MAAR,QAAqB,0BAArB;AAEA,OAAO,SAASC,cAAT,CAAwBC,MAAxB,EAA+C;AAAA;;AACpD,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AAED,MAAIC,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACD;;AAED,QAAMG,aAAa,GAAGF,KAAK,CAACC,OAAN,YAAcF,MAAd,4CAAc,QAAQI,UAAtB,CAAtB;AAWA,SAAOD,aAAP;AACD;AAED,OAAO,SAASE,eAAT,CAAyBL,MAAzB,EAAiD;AAAA;;AAItDF,EAAAA,MAAM,CAACE,MAAD,EAAS,aAAT,CAAN;AACAF,EAAAA,MAAM,CAACC,cAAc,CAACC,MAAD,CAAf,EAAyB,gBAAzB,CAAN;AAKA,MAAIM,OAAJ;;AACA,MAAIL,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBM,IAAAA,OAAO,GAAGN,MAAM,CAAC,CAAD,CAAhB;AACAA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACAA,IAAAA,MAAM,GAAG,EACP,GAAGA,MADI;AAEPM,MAAAA,OAAO,EAAE,EAAC,GAAGN,MAAM,CAACM,OAAX;AAAoB,WAAGA;AAAvB;AAFF,KAAT;AAID;;AAMD,MAAI,YAAAN,MAAM,UAAN,oCAAQO,aAAR,gBAAyBP,MAAzB,qCAAyB,SAAQQ,SAArC,EAAgD;AAC9CR,IAAAA,MAAM,CAACS,IAAP,GAAc,IAAd;AACD;;AAED,MAAI,CAACT,MAAM,CAACS,IAAZ,EAAkB;AAChBT,IAAAA,MAAM,CAACU,MAAP,GAAgB,IAAhB;AACD;;AAED,SAAOV,MAAP;AACD","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {assert} from '@loaders.gl/loader-utils';\n\nexport function isLoaderObject(loader?: any): boolean {\n  if (!loader) {\n    return false;\n  }\n\n  if (Array.isArray(loader)) {\n    loader = loader[0];\n  }\n\n  const hasExtensions = Array.isArray(loader?.extensions);\n\n  /* Now handled by types and worker loaders do not have these\n  let hasParser =\n    loader.parseTextSync ||\n    loader.parseSync ||\n    loader.parse ||\n    loader.parseStream || // TODO Remove, Replace with parseInBatches\n    loader.parseInBatches;\n  */\n\n  return hasExtensions;\n}\n\nexport function normalizeLoader(loader: Loader): Loader {\n  // This error is fairly easy to trigger by mixing up import statements etc\n  // So we make an exception and add a developer error message for this case\n  // To help new users from getting stuck here\n  assert(loader, 'null loader');\n  assert(isLoaderObject(loader), 'invalid loader');\n\n  // NORMALIZE [LOADER, OPTIONS] => LOADER\n\n  // If [loader, options], create a new loaders object with options merged in\n  let options;\n  if (Array.isArray(loader)) {\n    options = loader[1];\n    loader = loader[0];\n    loader = {\n      ...loader,\n      options: {...loader.options, ...options}\n    };\n  }\n\n  // NORMALIZE text and binary flags\n  // Ensure at least one of text/binary flags are properly set\n\n  // @ts-expect-error\n  if (loader?.parseTextSync || loader?.parseText) {\n    loader.text = true;\n  }\n\n  if (!loader.text) {\n    loader.binary = true;\n  }\n\n  return loader;\n}\n"],"file":"normalize-loader.js"}