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

package/dist/lib/request-utils/request-scheduler.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const stats_1 = require("@probe.gl/stats");
+const STAT_QUEUED_REQUESTS = 'Queued Requests';
+const STAT_ACTIVE_REQUESTS = 'Active Requests';
+const STAT_CANCELLED_REQUESTS = 'Cancelled Requests';
+const STAT_QUEUED_REQUESTS_EVER = 'Queued Requests Ever';
+const STAT_ACTIVE_REQUESTS_EVER = 'Active Requests Ever';
+const DEFAULT_PROPS = {
+    id: 'request-scheduler',
+    // Specifies if the request scheduler should throttle incoming requests, mainly for comparative testing
+    throttleRequests: true,
+    // The maximum number of simultaneous active requests. Un-throttled requests do not observe this limit.
+    maxRequests: 6
+};
+/**
+ * Used to issue a request, without having them "deeply queued" by the browser.
+ * @todo - Track requests globally, across multiple servers
+ */
+class RequestScheduler {
+    constructor(props = {}) {
+        this.activeRequestCount = 0;
+        /** Tracks the number of active requests and prioritizes/cancels queued requests. */
+        this.requestQueue = [];
+        this.requestMap = new Map();
+        this.deferredUpdate = null;
+        this.props = { ...DEFAULT_PROPS, ...props };
+        // Returns the statistics used by the request scheduler.
+        this.stats = new stats_1.Stats({ id: this.props.id });
+        this.stats.get(STAT_QUEUED_REQUESTS);
+        this.stats.get(STAT_ACTIVE_REQUESTS);
+        this.stats.get(STAT_CANCELLED_REQUESTS);
+        this.stats.get(STAT_QUEUED_REQUESTS_EVER);
+        this.stats.get(STAT_ACTIVE_REQUESTS_EVER);
+    }
+    /**
+     * Called by an application that wants to issue a request, without having it deeply queued by the browser
+     *
+     * When the returned promise resolved, it is OK for the application to issue a request.
+     * The promise resolves to an object that contains a `done` method.
+     * When the application's request has completed (or failed), the application must call the `done` function
+     *
+     * @param handle
+     * @param getPriority will be called when request "slots" open up,
+     *    allowing the caller to update priority or cancel the request
+     *    Highest priority executes first, priority < 0 cancels the request
+     * @returns a promise
+     *   - resolves to a object (with a `done` field) when the request can be issued without queueing,
+     *   - resolves to `null` if the request has been cancelled (by the callback return < 0).
+     *     In this case the application should not issue the request
+     */
+    scheduleRequest(handle, getPriority = () => 0) {
+        // Allows throttling to be disabled
+        if (!this.props.throttleRequests) {
+            return Promise.resolve({ done: () => { } });
+        }
+        // dedupe
+        if (this.requestMap.has(handle)) {
+            return this.requestMap.get(handle);
+        }
+        const request = { handle, priority: 0, getPriority };
+        const promise = new Promise((resolve) => {
+            // @ts-ignore
+            request.resolve = resolve;
+            return request;
+        });
+        this.requestQueue.push(request);
+        this.requestMap.set(handle, promise);
+        this._issueNewRequests();
+        return promise;
+    }
+    // PRIVATE
+    _issueRequest(request) {
+        const { handle, resolve } = request;
+        let isDone = false;
+        const done = () => {
+            // can only be called once
+            if (!isDone) {
+                isDone = true;
+                // Stop tracking a request - it has completed, failed, cancelled etc
+                this.requestMap.delete(handle);
+                this.activeRequestCount--;
+                // A slot just freed up, see if any queued requests are waiting
+                this._issueNewRequests();
+            }
+        };
+        // Track this request
+        this.activeRequestCount++;
+        return resolve ? resolve({ done }) : Promise.resolve({ done });
+    }
+    /** We check requests asynchronously, to prevent multiple updates */
+    _issueNewRequests() {
+        if (!this.deferredUpdate) {
+            this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);
+        }
+    }
+    /** Refresh all requests  */
+    _issueNewRequestsAsync() {
+        // TODO - shouldn't we clear the timeout?
+        this.deferredUpdate = null;
+        const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);
+        if (freeSlots === 0) {
+            return;
+        }
+        this._updateAllRequests();
+        // Resolve pending promises for the top-priority requests
+        for (let i = 0; i < freeSlots; ++i) {
+            const request = this.requestQueue.shift();
+            if (request) {
+                this._issueRequest(request); // eslint-disable-line @typescript-eslint/no-floating-promises
+            }
+        }
+        // Uncomment to debug
+        // console.log(`${freeSlots} free slots, ${this.requestQueue.length} queued requests`);
+    }
+    /** Ensure all requests have updated priorities, and that no longer valid requests are cancelled */
+    _updateAllRequests() {
+        const requestQueue = this.requestQueue;
+        for (let i = 0; i < requestQueue.length; ++i) {
+            const request = requestQueue[i];
+            if (!this._updateRequest(request)) {
+                // Remove the element and make sure to adjust the counter to account for shortened array
+                requestQueue.splice(i, 1);
+                this.requestMap.delete(request.handle);
+                i--;
+            }
+        }
+        // Sort the remaining requests based on priority
+        requestQueue.sort((a, b) => a.priority - b.priority);
+    }
+    /** Update a single request by calling the callback */
+    _updateRequest(request) {
+        request.priority = request.getPriority(request.handle); // eslint-disable-line callback-return
+        // by returning a negative priority, the callback cancels the request
+        if (request.priority < 0) {
+            request.resolve(null);
+            return false;
+        }
+        return true;
+    }
+}
+exports.default = RequestScheduler;

package/dist/lib/worker-loader-utils/create-loader-worker.d.ts

@@ -0,0 +1,7 @@
+import type { LoaderWithParser } from '../../types';
+/**
+ * Set up a WebWorkerGlobalScope to talk with the main thread
+ * @param loader
+ */
+export declare function createLoaderWorker(loader: LoaderWithParser): void;
+//# sourceMappingURL=create-loader-worker.d.ts.map

package/dist/lib/worker-loader-utils/create-loader-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-loader-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-loader-utils/create-loader-worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAMlD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,QA+B1D"}

package/dist/lib/worker-loader-utils/create-loader-worker.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLoaderWorker = void 0;
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+// import {validateLoaderVersion} from './validate-loader-version';
+let requestId = 0;
+/**
+ * Set up a WebWorkerGlobalScope to talk with the main thread
+ * @param loader
+ */
+function createLoaderWorker(loader) {
+    // Check that we are actually in a worker thread
+    if (typeof self === 'undefined') {
+        return;
+    }
+    worker_utils_1.WorkerBody.onmessage = async (type, payload) => {
+        switch (type) {
+            case 'process':
+                try {
+                    // validateLoaderVersion(loader, data.source.split('@')[1]);
+                    const { input, options = {} } = payload;
+                    const result = await parseData({
+                        loader,
+                        arrayBuffer: input,
+                        options,
+                        context: {
+                            parse: parseOnMainThread
+                        }
+                    });
+                    worker_utils_1.WorkerBody.postMessage('done', { result });
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : '';
+                    worker_utils_1.WorkerBody.postMessage('error', { error: message });
+                }
+                break;
+            default:
+        }
+    };
+}
+exports.createLoaderWorker = createLoaderWorker;
+function parseOnMainThread(arrayBuffer, options) {
+    return new Promise((resolve, reject) => {
+        const id = requestId++;
+        /**
+         */
+        const onMessage = (type, payload) => {
+            if (payload.id !== id) {
+                // not ours
+                return;
+            }
+            switch (type) {
+                case 'done':
+                    worker_utils_1.WorkerBody.removeEventListener(onMessage);
+                    resolve(payload.result);
+                    break;
+                case 'error':
+                    worker_utils_1.WorkerBody.removeEventListener(onMessage);
+                    reject(payload.error);
+                    break;
+                default:
+                // ignore
+            }
+        };
+        worker_utils_1.WorkerBody.addEventListener(onMessage);
+        // Ask the main thread to decode data
+        const payload = { id, input: arrayBuffer, options };
+        worker_utils_1.WorkerBody.postMessage('process', payload);
+    });
+}
+// TODO - Support byteOffset and byteLength (enabling parsing of embedded binaries without copies)
+// TODO - Why not support async loader.parse* funcs here?
+// TODO - Why not reuse a common function instead of reimplementing loader.parse* selection logic? Keeping loader small?
+// TODO - Lack of appropriate parser functions can be detected when we create worker, no need to wait until parse
+async function parseData({ loader, arrayBuffer, options, context }) {
+    let data;
+    let parser;
+    if (loader.parseSync || loader.parse) {
+        data = arrayBuffer;
+        parser = loader.parseSync || loader.parse;
+    }
+    else if (loader.parseTextSync) {
+        const textDecoder = new TextDecoder();
+        data = textDecoder.decode(arrayBuffer);
+        parser = loader.parseTextSync;
+    }
+    else {
+        throw new Error(`Could not load data with ${loader.name} loader`);
+    }
+    // TODO - proper merge in of loader options...
+    options = {
+        ...options,
+        modules: (loader && loader.options && loader.options.modules) || {},
+        worker: false
+    };
+    return await parser(data, { ...options }, context, loader);
+}

package/dist/lib/worker-loader-utils/parse-with-worker.d.ts

@@ -0,0 +1,15 @@
+import type { Loader, LoaderOptions, LoaderContext } from '../../types';
+/**
+ * Determines if a loader can parse with worker
+ * @param loader
+ * @param options
+ */
+export declare function canParseWithWorker(loader: Loader, options?: LoaderOptions): boolean | "" | undefined;
+/**
+ * this function expects that the worker function sends certain messages,
+ * this can be automated if the worker is wrapper by a call to createLoaderWorker in @loaders.gl/loader-utils.
+ */
+export declare function parseWithWorker(loader: Loader, data: any, options?: LoaderOptions, context?: LoaderContext, parseOnMainThread?: (arrayBuffer: ArrayBuffer, options: {
+    [key: string]: any;
+}) => Promise<void>): Promise<any>;
+//# sourceMappingURL=parse-with-worker.d.ts.map

package/dist/lib/worker-loader-utils/parse-with-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-with-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-loader-utils/parse-with-worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAGtE;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,4BAMzE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,EACvB,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,gBA2B/F"}

package/dist/lib/worker-loader-utils/parse-with-worker.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWithWorker = exports.canParseWithWorker = void 0;
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+/**
+ * Determines if a loader can parse with worker
+ * @param loader
+ * @param options
+ */
+function canParseWithWorker(loader, options) {
+    if (!worker_utils_1.WorkerFarm.isSupported()) {
+        return false;
+    }
+    return loader.worker && options?.worker;
+}
+exports.canParseWithWorker = canParseWithWorker;
+/**
+ * this function expects that the worker function sends certain messages,
+ * this can be automated if the worker is wrapper by a call to createLoaderWorker in @loaders.gl/loader-utils.
+ */
+async function parseWithWorker(loader, data, options, context, parseOnMainThread) {
+    const name = loader.id; // TODO
+    const url = (0, worker_utils_1.getWorkerURL)(loader, options);
+    const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm(options);
+    const workerPool = workerFarm.getWorkerPool({ name, url });
+    // options.log object contains functions which cannot be transferred
+    // TODO - decide how to handle logging on workers
+    options = JSON.parse(JSON.stringify(options));
+    const job = await workerPool.startJob('process-on-worker', 
+    // @ts-expect-error
+    onMessage.bind(null, parseOnMainThread) // eslint-disable-line @typescript-eslint/no-misused-promises
+    );
+    job.postMessage('process', {
+        // @ts-ignore
+        input: data,
+        options
+    });
+    const result = await job.result;
+    // TODO - what is going on here?
+    return await result.result;
+}
+exports.parseWithWorker = parseWithWorker;
+/**
+ * Handle worker's responses to the main thread
+ * @param job
+ * @param type
+ * @param payload
+ */
+async function onMessage(parseOnMainThread, job, type, payload) {
+    switch (type) {
+        case 'done':
+            job.done(payload);
+            break;
+        case 'error':
+            job.error(new Error(payload.error));
+            break;
+        case 'process':
+            // Worker is asking for main thread to parseO
+            const { id, input, options } = payload;
+            try {
+                const result = await parseOnMainThread(input, options);
+                job.postMessage('done', { id, result });
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : 'unknown error';
+                job.postMessage('error', { id, error: message });
+            }
+            break;
+        default:
+            // eslint-disable-next-line
+            console.warn(`parse-with-worker unknown message ${type}`);
+    }
+}

package/dist/types.d.ts

@@ -0,0 +1,207 @@
+/// <reference types="node" />
+export declare type TypedIntArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Int32Array | Uint32Array;
+export declare type TypedFloatArray = Uint16Array | Float32Array | Float64Array;
+export declare type TypedArray = TypedIntArray | TypedFloatArray;
+export declare type NumericArray = Array<number> | TypedIntArray | TypedFloatArray;
+declare type FetchLike = (url: string, options?: RequestInit) => Promise<Response>;
+export declare type LoaderOptions = {
+    /** fetch options or a custom fetch function */
+    fetch?: typeof fetch | FetchLike | RequestInit | null;
+    /** Do not throw on errors */
+    nothrow?: boolean;
+    /** loader selection, search first for supplied mimeType */
+    mimeType?: string;
+    /** loader selection, provide fallback mimeType is server does not provide */
+    fallbackMimeType?: string;
+    /** loader selection, avoid searching registered loaders */
+    ignoreRegisteredLoaders?: boolean;
+    /** Experimental: Supply a logger to the parser */
+    log?: any;
+    /** Size of each batch. `auto` matches batches to size of incoming chunks */
+    batchSize?: number | 'auto';
+    /** Minimal amount of time between batches */
+    batchDebounceMs?: number;
+    /** Stop loading after a given number of rows (compare SQL limit clause) */
+    limit?: 0;
+    /** Experimental: Stop loading after reaching */
+    _limitMB?: 0;
+    /** Generate metadata batches */
+    metadata?: boolean;
+    /** Transforms to run on incoming batches */
+    transforms?: TransformBatches[];
+    /** CDN load workers from */
+    CDN?: string;
+    /** Set to `false` to disable workers */
+    worker?: boolean;
+    /** Number of concurrent workers (per loader) on desktop browser */
+    maxConcurrency?: number;
+    /** Number of concurrent workers (per loader) on mobile browsers */
+    maxMobileConcurrency?: number;
+    /** Set to `false` to prevent reuse workers */
+    reuseWorkers?: boolean;
+    /** set to 'test' to run worker type */
+    _workerType?: string;
+    /** @deprecated `options.batchType` removed, Use `options.<loader>.type` instead */
+    batchType?: 'row' | 'columnar' | 'arrow';
+    /** @deprecated `options.throw removed`, Use `options.nothrow` instead */
+    throws?: boolean;
+    /** @deprecated `options.dataType` no longer used */
+    dataType?: any;
+    /** @deprecated `options.uri` no longer used */
+    uri?: any;
+    /** @deprecated `options.method` removed. Use `options.fetch.method` */
+    method?: any;
+    /** @deprecated `options.headers` removed. Use `options.fetch.headers` */
+    headers?: any;
+    /** @deprecated `options.body` removed. Use `options.fetch.body` */
+    body?: any;
+    /** @deprecated `options.mode` removed. Use `options.fetch.mode` */
+    mode?: any;
+    /** @deprecated `options.credentials` removed. Use `options.fetch.credentials` */
+    credentials?: any;
+    /** @deprecated `options.cache` removed. Use `options.fetch.cache` */
+    cache?: any;
+    /** @deprecated `options.redirect` removed. Use `options.fetch.redirect` */
+    redirect?: any;
+    /** @deprecated `options.referrer` removed. Use `options.fetch.referrer` */
+    referrer?: any;
+    /** @deprecated `options.referrerPolicy` removed. Use `options.fetch.referrerPolicy` */
+    referrerPolicy?: any;
+    /** @deprecated `options.integrity` removed. Use `options.fetch.integrity` */
+    integrity?: any;
+    /** @deprecated `options.keepalive` removed. Use `options.fetch.keepalive` */
+    keepalive?: any;
+    /** @deprecated `options.signal` removed. Use `options.fetch.signal` */
+    signal?: any;
+    [loaderId: string]: any;
+};
+declare type PreloadOptions = {
+    [key: string]: any;
+};
+/**
+ * A worker loader definition that can be used with `@loaders.gl/core` functions
+ */
+export declare type Loader = {
+    name: string;
+    id: string;
+    module: string;
+    version: string;
+    worker?: string | boolean;
+    options: object;
+    deprecatedOptions?: object;
+    category?: string;
+    extensions: string[];
+    mimeTypes: string[];
+    binary?: boolean;
+    text?: boolean;
+    tests?: (((ArrayBuffer: any) => boolean) | ArrayBuffer | string)[];
+    supported?: boolean;
+    testText?: (string: any) => boolean;
+};
+/**
+ * A "bundled" loader definition that can be used with `@loaders.gl/core` functions
+ * If a worker loader is supported it will also be supported.
+ */
+export declare type LoaderWithParser = Loader & {
+    testText?: (string: any) => boolean;
+    parse: Parse;
+    preload?: Preload;
+    parseSync?: ParseSync;
+    parseText?: ParseText;
+    parseTextSync?: ParseTextSync;
+    parseInBatches?: ParseInBatches;
+    parseFileInBatches?: ParseFileInBatches;
+};
+/** Options for writers */
+export declare type WriterOptions = {};
+/**
+ * A writer definition that can be used with `@loaders.gl/core` functions
+ */
+export declare type Writer = {
+    name: string;
+    id: string;
+    module: string;
+    version: string;
+    options: object;
+    deprecatedOptions?: object;
+    binary?: boolean;
+    extensions?: string[];
+    mimeTypes?: string[];
+    text?: boolean;
+    encode?: Encode;
+    encodeSync?: EncodeSync;
+    encodeInBatches?: EncodeInBatches;
+    encodeURLtoURL?: EncodeURLtoURL;
+    encodeText?: EncodeText;
+};
+export declare type LoaderContext = {
+    loaders?: Loader[] | null;
+    url?: string;
+    fetch: typeof fetch;
+    parse: (arrayBuffer: ArrayBuffer, loaders?: any, options?: LoaderOptions, context?: LoaderContext) => Promise<any>;
+    parseSync?: (arrayBuffer: ArrayBuffer, loaders?: any, options?: LoaderOptions, context?: LoaderContext) => any;
+    parseInBatches?: (iterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, loaders?: any, options?: LoaderOptions, context?: LoaderContext) => AsyncIterable<any> | Promise<AsyncIterable<any>>;
+};
+declare type Parse = (arrayBuffer: ArrayBuffer, options?: LoaderOptions, context?: LoaderContext) => Promise<any>;
+declare type ParseSync = (arrayBuffer: ArrayBuffer, options?: LoaderOptions, context?: LoaderContext) => any;
+declare type ParseText = (text: string, options?: LoaderOptions) => Promise<any>;
+declare type ParseTextSync = (text: string, options?: LoaderOptions) => any;
+declare type ParseInBatches = (iterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options?: LoaderOptions, context?: LoaderContext) => AsyncIterable<any>;
+declare type ParseFileInBatches = (file: Blob, options?: LoaderOptions, context?: LoaderContext) => AsyncIterable<any>;
+declare type Encode = (data: any, options?: WriterOptions) => Promise<ArrayBuffer>;
+declare type EncodeSync = (data: any, options?: WriterOptions) => ArrayBuffer;
+declare type EncodeText = Function;
+declare type EncodeInBatches = Function;
+declare type EncodeURLtoURL = (inputUrl: string, outputUrl: string, options?: WriterOptions) => Promise<string>;
+declare type Preload = (url: string, options?: PreloadOptions) => any;
+export declare type TransformBatches = (asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>) => AsyncIterable<ArrayBuffer>;
+/** Types that can be synchronously parsed */
+export declare type SyncDataType = string | ArrayBuffer;
+/** Types that can be parsed async */
+export declare type DataType = string | ArrayBuffer | File | Blob | Response | ReadableStream | Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>;
+/** Types that can be parsed in batches */
+export declare type BatchableDataType = DataType | Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer> | Promise<AsyncIterable<ArrayBuffer>>;
+/**
+ * A FileSystem interface can encapsulate a FileList, a ZipFile, a GoogleDrive etc.
+ */
+export interface IFileSystem {
+    /**
+     * Return a list of file names
+     * @param dirname directory name. file system root directory if omitted
+     */
+    readdir(dirname?: string, options?: {
+        recursive?: boolean;
+    }): Promise<string[]>;
+    /**
+     * Gets information from a local file from the filesystem
+     * @param filename file name to stat
+     * @param options currently unused
+     * @throws if filename is not in local filesystem
+     */
+    stat(filename: string, options?: object): Promise<{
+        size: number;
+    }>;
+    /**
+     * Fetches a local file from the filesystem (or a URL)
+     * @param filename
+     * @param options
+     */
+    fetch(filename: string, options?: object): Promise<Response>;
+}
+declare type ReadOptions = {
+    buffer?: ArrayBuffer;
+    offset?: number;
+    length?: number;
+    position?: number;
+};
+export interface IRandomAccessReadFileSystem extends IFileSystem {
+    open(path: string, flags: any, mode?: any): Promise<any>;
+    close(fd: any): Promise<void>;
+    fstat(fd: any): Promise<object>;
+    read(fd: any, options?: ReadOptions): Promise<{
+        bytesRead: number;
+        buffer: Buffer;
+    }>;
+}
+export {};
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+// Typed arrays
+Object.defineProperty(exports, "__esModule", { value: true });

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

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

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

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

package/dist/workers/json-worker.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const create_loader_worker_1 = require("../lib/worker-loader-utils/create-loader-worker");
+const json_loader_1 = require("../json-loader");
+(0, create_loader_worker_1.createLoaderWorker)(json_loader_1.JSONLoader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/loader-utils",
-  "version": "3.1.0-alpha.4",
+  "version": "3.1.0-beta.3",
   "description": "Framework-independent loaders for 3D graphics formats",
   "license": "MIT",
   "publishConfig": {
@@ -17,7 +17,7 @@
     "mesh",
     "point cloud"
   ],
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "main": "dist/es5/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -42,14 +42,11 @@
     "fs": false,
     "util": false
   },
-  "scripts": {
-    "pre-build-disabled": "npm run build-bundle",
-    "build-bundle": "webpack --config ../../scripts/webpack/bundle.js"
-  },
+  "scripts": {},
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/worker-utils": "3.1.0-alpha.4",
+    "@loaders.gl/worker-utils": "3.1.0-beta.3",
     "@probe.gl/stats": "^3.4.0"
   },
-  "gitHead": "e309784af37ef9f3640c7733c7851124c72e1fa3"
+  "gitHead": "3537c382b3ea4e092b24b6f94c3edee72076039c"
 }

package/src/lib/worker-loader-utils/parse-with-worker.ts

@@ -21,7 +21,7 @@ export function canParseWithWorker(loader: Loader, options?: LoaderOptions) {
  */
 export async function parseWithWorker(
   loader: Loader,
-  data,
+  data: any,
   options?: LoaderOptions,
   context?: LoaderContext,
   parseOnMainThread?: (arrayBuffer: ArrayBuffer, options: {[key: string]: any}) => Promise<void>
@@ -38,8 +38,8 @@ export async function parseWithWorker(
 
   const job = await workerPool.startJob(
     'process-on-worker',
-    // eslint-disable-next-line
-    onMessage.bind(null, parseOnMainThread)
+    // @ts-expect-error
+    onMessage.bind(null, parseOnMainThread) // eslint-disable-line @typescript-eslint/no-misused-promises
   );
 
   job.postMessage('process', {
@@ -49,6 +49,7 @@ export async function parseWithWorker(
   });
 
   const result = await job.result;
+  // TODO - what is going on here?
   return await result.result;
 }
 
@@ -59,7 +60,7 @@ export async function parseWithWorker(
  * @param payload
  */
 async function onMessage(
-  parseOnMainThread,
+  parseOnMainThread: (arrayBuffer: ArrayBuffer, options?: {[key: string]: any}) => Promise<void>,
   job: WorkerJob,
   type: WorkerMessageType,
   payload: WorkerMessagePayload
@@ -70,7 +71,7 @@ async function onMessage(
       break;
 
     case 'error':
-      job.error(payload.error);
+      job.error(new Error(payload.error));
       break;
 
     case 'process':