@speckle/objectloader2 2.25.9 → 2.26.0

package/src/core/stages/memory/memoryDatabase.ts

@@ -22,7 +22,7 @@ export class MemoryDatabase implements Database {
     return Promise.resolve(found)
   }
 
-  saveBatch({ batch }: { batch: Item[] }): Promise<void> {
+  putAll(batch: Item[]): Promise<void> {
     for (const item of batch) {
       if (!item.baseId || !item.base) {
         throw new Error('Item must have a baseId and base')
@@ -32,7 +32,7 @@ export class MemoryDatabase implements Database {
     return Promise.resolve()
   }
 
-  disposeAsync(): Promise<void> {
-    return Promise.resolve()
+  dispose(): void {
+    this.items.clear()
   }
 }

package/src/core/stages/memory/memoryDownloader.spec.ts

@@ -33,13 +33,13 @@ describe('MemoryDownloader', () => {
   })
 
   it('should add found item to results queue', () => {
-    downloader.initializePool({ results, total: 2 })
+    downloader.initialize({ results, total: 2 })
     downloader.add('id2')
     expect(items).toMatchSnapshot()
   })
 
   it('should throw if added item is missing', () => {
-    downloader.initializePool({ results, total: 2 })
+    downloader.initialize({ results, total: 2 })
     expect(() => downloader.add('missing')).toThrow()
   })
 

package/src/core/stages/memory/memoryDownloader.ts

@@ -11,7 +11,7 @@ export class MemoryDownloader implements Downloader {
     this.#rootId = rootId
     this.#items = items
   }
-  initializePool(params: {
+  initialize(params: {
     results: Queue<Item>
     total: number
     maxDownloadBatchWait?: number

package/src/core/stages/serverDownloader.spec.ts

@@ -16,9 +16,10 @@ describe('downloader', () => {
       streamId: 'streamId',
       objectId: 'objectId',
       token: 'token',
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
-    downloader.initializePool({
+    downloader.initialize({
       results: gathered,
       total: 1,
       maxDownloadBatchWait: 200
@@ -51,9 +52,10 @@ describe('downloader', () => {
       objectId: 'objectId',
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
-    downloader.initializePool({
+    downloader.initialize({
       results: gathered,
       total: 2,
       maxDownloadBatchWait: 200
@@ -95,9 +97,10 @@ describe('downloader', () => {
       objectId: 'objectId',
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
-    downloader.initializePool({
+    downloader.initialize({
       results: gathered,
       total: 3,
       maxDownloadBatchWait: 200
@@ -143,9 +146,10 @@ describe('downloader', () => {
       objectId: 'objectId',
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
-    downloader.initializePool({
+    downloader.initialize({
       results: gathered,
       total: 3,
       maxDownloadBatchWait: 200
@@ -183,7 +187,8 @@ describe('downloader', () => {
       objectId: i.baseId,
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
     await expect(downloader.downloadSingle()).rejects.toThrow()
     await downloader.disposeAsync()
@@ -202,7 +207,8 @@ describe('downloader', () => {
       objectId: i.baseId,
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
     const x = await downloader.downloadSingle()
     expect(x).toMatchSnapshot()
@@ -228,7 +234,8 @@ describe('downloader', () => {
       objectId: i.baseId,
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
     const x = await downloader.downloadSingle()
     expect(x).toMatchSnapshot()
@@ -245,7 +252,8 @@ describe('downloader', () => {
       objectId: 'objectId',
       token: 'token',
 
-      fetch: fetchMocker
+      fetch: fetchMocker,
+      logger: (): void => {}
     })
     await downloader.disposeAsync()
   })

package/src/core/stages/serverDownloader.ts

@@ -1,7 +1,7 @@
-import BatchedPool from '../../queues/batchedPool.js'
+import BatchingQueue from '../../queues/batchingQueue.js'
 import Queue from '../../queues/queue.js'
 import { ObjectLoaderRuntimeError } from '../../types/errors.js'
-import { Fetcher, indexOf, isBase, take } from '../../types/functions.js'
+import { CustomLogger, Fetcher, indexOf, isBase, take } from '../../types/functions.js'
 import { Item } from '../../types/types.js'
 import { Downloader } from '../interfaces.js'
 
@@ -11,6 +11,7 @@ export interface ServerDownloaderOptions {
   objectId: string
   token?: string
   headers?: Headers
+  logger: CustomLogger
   fetch?: Fetcher
 }
 
@@ -24,8 +25,9 @@ export default class ServerDownloader implements Downloader {
   #fetch: Fetcher
   #results?: Queue<Item>
   #total?: number
+  #logger: CustomLogger
 
-  #downloadQueue?: BatchedPool<string>
+  #downloadQueue?: BatchingQueue<string>
   #decoder = new TextDecoder('utf-8', { fatal: true })
   #decodedBytesCount = 0
 
@@ -34,6 +36,7 @@ export default class ServerDownloader implements Downloader {
 
   constructor(options: ServerDownloaderOptions) {
     this.#options = options
+    this.#logger = options.logger
     this.#fetch =
       options.fetch ?? ((...args): Promise<Response> => globalThis.fetch(...args))
 
@@ -59,25 +62,17 @@ export default class ServerDownloader implements Downloader {
     this.#rawEncoding = encoder.encode(this.#rawString)
   }
 
-  #getDownloadCountAndSizes(total: number): number[] {
-    if (total <= 50) {
-      return [total]
-    }
-
-    return [10000, 25000, 10000, 1000]
-  }
-
-  initializePool(params: {
+  initialize(params: {
     results: Queue<Item>
     total: number
     maxDownloadBatchWait?: number
   }): void {
-    const { results, total } = params
+    const { results, total, maxDownloadBatchWait } = params
     this.#results = results
     this.#total = total
-    this.#downloadQueue = new BatchedPool<string>({
-      concurrencyAndSizes: this.#getDownloadCountAndSizes(total),
-      maxWaitTime: params.maxDownloadBatchWait,
+    this.#downloadQueue = new BatchingQueue<string>({
+      batchSize: 15000, // 15k is a good number for most cases
+      maxWaitTime: maxDownloadBatchWait ?? 1000, // 1 second
       processFunction: (batch: string[]): Promise<void> =>
         this.downloadBatch({
           batch,
@@ -87,15 +82,8 @@ export default class ServerDownloader implements Downloader {
     })
   }
 
-  #getPool(): BatchedPool<string> {
-    if (this.#downloadQueue) {
-      return this.#downloadQueue
-    }
-    throw new Error('Download pool is not initialized')
-  }
-
   add(id: string): void {
-    this.#getPool().add(id)
+    this.#downloadQueue?.add(id, id)
   }
 
   /*
@@ -126,6 +114,9 @@ Chrome's behavior: Chrome generally handles larger data sizes without this speci
     headers: HeadersInit
   }): Promise<void> {
     const { batch, url, headers } = params
+
+    const start = performance.now()
+    this.#logger(`Downloading batch of ${batch.length} items...`)
     const keys = new Set<string>(batch)
     const response = await this.#fetch(url, {
       method: 'POST',
@@ -162,6 +153,9 @@ Chrome's behavior: Chrome generally handles larger data sizes without this speci
     if (count >= this.#total!) {
       await this.#results?.disposeAsync() // mark the queue as done
     }
+    this.#logger(
+      `Downloaded batch of ${batch.length} items in ${performance.now() - start}ms`
+    )
   }
 
   async #processArray(

package/src/queues/keyedQueue.test.ts

@@ -0,0 +1,146 @@
+import { describe, it, expect, beforeEach } from 'vitest'
+import KeyedQueue from './keyedQueue.js'
+
+describe('KeyedQueue', () => {
+  let queue: KeyedQueue<string, number>
+
+  beforeEach(() => {
+    queue = new KeyedQueue<string, number>()
+  })
+
+  describe('enqueue', () => {
+    it('should add a key-value pair to the queue', () => {
+      const result = queue.enqueue('key1', 1)
+
+      expect(result).toBe(true)
+      expect(queue.size).toBe(1)
+      expect(queue.get('key1')).toBe(1)
+    })
+
+    it('should return false when trying to add a key that already exists', () => {
+      queue.enqueue('key1', 1)
+      const result = queue.enqueue('key1', 2)
+
+      expect(result).toBe(false)
+      expect(queue.size).toBe(1)
+      expect(queue.get('key1')).toBe(1) // Value should not be updated
+    })
+  })
+
+  describe('enqueueAll', () => {
+    it('should add multiple key-value pairs to the queue', () => {
+      const keys = ['key1', 'key2', 'key3']
+      const values = [1, 2, 3]
+
+      const count = queue.enqueueAll(keys, values)
+
+      expect(count).toBe(3)
+      expect(queue.size).toBe(3)
+      expect(queue.get('key1')).toBe(1)
+      expect(queue.get('key2')).toBe(2)
+      expect(queue.get('key3')).toBe(3)
+    })
+
+    it('should skip keys that already exist and return the count of added items', () => {
+      queue.enqueue('key1', 1)
+
+      const keys = ['key1', 'key2', 'key3']
+      const values = [10, 2, 3]
+
+      const count = queue.enqueueAll(keys, values)
+
+      expect(count).toBe(2)
+      expect(queue.size).toBe(3)
+      expect(queue.get('key1')).toBe(1) // Original value preserved
+      expect(queue.get('key2')).toBe(2)
+      expect(queue.get('key3')).toBe(3)
+    })
+  })
+
+  describe('get', () => {
+    it('should return the value for a given key', () => {
+      queue.enqueue('key1', 1)
+
+      expect(queue.get('key1')).toBe(1)
+    })
+
+    it('should return undefined for a non-existent key', () => {
+      expect(queue.get('nonexistent')).toBeUndefined()
+    })
+  })
+
+  describe('has', () => {
+    it('should return true if the key exists', () => {
+      queue.enqueue('key1', 1)
+
+      expect(queue.has('key1')).toBe(true)
+    })
+
+    it('should return false if the key does not exist', () => {
+      expect(queue.has('nonexistent')).toBe(false)
+    })
+  })
+
+  describe('size', () => {
+    it('should return the number of items in the queue', () => {
+      expect(queue.size).toBe(0)
+
+      queue.enqueue('key1', 1)
+      expect(queue.size).toBe(1)
+
+      queue.enqueue('key2', 2)
+      expect(queue.size).toBe(2)
+    })
+  })
+
+  describe('spliceValues', () => {
+    it('should remove and return values from the queue', () => {
+      queue.enqueue('key1', 1)
+      queue.enqueue('key2', 2)
+      queue.enqueue('key3', 3)
+      queue.enqueue('key4', 4)
+
+      const result = queue.spliceValues(1, 2)
+
+      expect(result).toEqual([2, 3])
+      expect(queue.size).toBe(2)
+      expect(queue.has('key1')).toBe(true)
+      expect(queue.has('key2')).toBe(false)
+      expect(queue.has('key3')).toBe(false)
+      expect(queue.has('key4')).toBe(true)
+    })
+
+    it('should handle splicing at the beginning of the queue', () => {
+      queue.enqueue('key1', 1)
+      queue.enqueue('key2', 2)
+
+      const result = queue.spliceValues(0, 1)
+
+      expect(result).toEqual([1])
+      expect(queue.size).toBe(1)
+      expect(queue.has('key1')).toBe(false)
+      expect(queue.has('key2')).toBe(true)
+    })
+
+    it('should handle splicing at the end of the queue', () => {
+      queue.enqueue('key1', 1)
+      queue.enqueue('key2', 2)
+
+      const result = queue.spliceValues(1, 1)
+
+      expect(result).toEqual([2])
+      expect(queue.size).toBe(1)
+      expect(queue.has('key1')).toBe(true)
+      expect(queue.has('key2')).toBe(false)
+    })
+
+    it('should return an empty array when deleting zero elements', () => {
+      queue.enqueue('key1', 1)
+
+      const result = queue.spliceValues(0, 0)
+
+      expect(result).toEqual([])
+      expect(queue.size).toBe(1)
+    })
+  })
+})

package/dist/commonjs/core/stages/ItemStore.d.ts

@@ -1,37 +0,0 @@
-import { Item } from '../../types/types.js';
-/**
- * A wrapper class for IndexedDB to simplify common database operations.
- */
-export interface ItemStoreOptions {
-    indexedDB?: IDBFactory;
-    keyRange?: {
-        bound: Function;
-        lowerBound: Function;
-        upperBound: Function;
-    };
-}
-export declare class ItemStore {
-    #private;
-    constructor(options: ItemStoreOptions, dbName: string, storeName: string);
-    /**
-     * Initializes the database connection and creates the object store if needed.
-     * This must be called before any other database operations.
-     */
-    init(): Promise<void>;
-    /**
-     * Inserts or updates an array of items in a single transaction.
-     * @param data The array of items to insert.
-     */
-    bulkInsert(data: Item[]): Promise<void>;
-    /**
-     * Retrieves an array of items from the object store based on their IDs.
-     * @param ids The array of IDs to retrieve.
-     */
-    bulkGet(ids: string[]): Promise<(Item | undefined)[]>;
-    /**
-     * Retrieves all items from the object store.
-     */
-    getAll(): Promise<Item[]>;
-    close(): void;
-}
-//# sourceMappingURL=ItemStore.d.ts.map

package/dist/commonjs/core/stages/ItemStore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ItemStore.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/ItemStore.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,QAAQ,CAAA;QACf,UAAU,EAAE,QAAQ,CAAA;QACpB,UAAU,EAAE,QAAQ,CAAA;KACrB,CAAA;CACF;AACD,qBAAa,SAAS;;gBAOR,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMxE;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwE3B;;;OAGG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC;IAmCrD;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAezB,KAAK,IAAI,IAAI;CAKd"}

package/dist/commonjs/core/stages/ItemStore.js

@@ -1,167 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ItemStore = void 0;
-/* eslint-disable @typescript-eslint/no-base-to-string */
-/* eslint-disable @typescript-eslint/prefer-promise-reject-errors */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unsafe-function-type */
-const shared_1 = require("@speckle/shared");
-class ItemStore {
-    #options;
-    #db = undefined;
-    #dbName;
-    #storeName;
-    constructor(options, dbName, storeName) {
-        this.#options = options;
-        this.#dbName = dbName;
-        this.#storeName = storeName;
-    }
-    /**
-     * Initializes the database connection and creates the object store if needed.
-     * This must be called before any other database operations.
-     */
-    async init() {
-        if (this.#db)
-            return;
-        await this.#safariFix();
-        return this.#openDatabase();
-    }
-    /**
-     * Opens the database, and if there's an error, deletes the database and tries again.
-     */
-    async #openDatabase() {
-        const idb = this.#options.indexedDB ?? indexedDB;
-        return new Promise((resolve, reject) => {
-            const request = idb.open(this.#dbName, 1);
-            request.onerror = () => {
-                console.warn(`Failed to open database: ${this.#dbName}, deleting and trying again`);
-                // Delete the database and try again
-                const deleteRequest = idb.deleteDatabase(this.#dbName);
-                deleteRequest.onsuccess = () => {
-                    // Try opening again after deletion
-                    void this.#openDatabase().then(resolve).catch(reject);
-                };
-                deleteRequest.onerror = () => {
-                    reject(`Failed to delete and reopen database: ${this.#dbName}`);
-                };
-            };
-            request.onupgradeneeded = (event) => {
-                const db = event.target.result;
-                if (db.objectStoreNames.contains(this.#storeName)) {
-                    db.deleteObjectStore(this.#storeName);
-                }
-                db.createObjectStore(this.#storeName, { keyPath: 'baseId' });
-            };
-            request.onsuccess = (event) => {
-                this.#db = event.target.result;
-                resolve();
-            };
-        });
-    }
-    #getDB() {
-        if (!this.#db) {
-            throw new Error('Database not initialized. Call init() first.');
-        }
-        return this.#db;
-    }
-    /**
-     * Fixes a Safari bug where IndexedDB requests get lost and never resolve - invoke before you use IndexedDB
-     * @link Credits and more info: https://github.com/jakearchibald/safari-14-idb-fix
-     */
-    async #safariFix() {
-        // No point putting other browsers or older versions of Safari through this mess.
-        if (!(0, shared_1.isSafari)() || !this.#options.indexedDB?.databases)
-            return Promise.resolve();
-        let intervalId;
-        return new Promise((resolve) => {
-            const tryIdb = () => this.#options.indexedDB?.databases().finally(resolve);
-            intervalId = setInterval(() => {
-                void tryIdb();
-            }, 100);
-            void tryIdb();
-        }).finally(() => clearInterval(intervalId));
-    }
-    /**
-     * Inserts or updates an array of items in a single transaction.
-     * @param data The array of items to insert.
-     */
-    bulkInsert(data) {
-        return new Promise((resolve, reject) => {
-            try {
-                const transaction = this.#getDB().transaction(this.#storeName, 'readwrite', {
-                    durability: 'relaxed'
-                });
-                const store = transaction.objectStore(this.#storeName);
-                transaction.onerror = () => {
-                    reject(`Transaction error: ${transaction.error}`);
-                };
-                transaction.oncomplete = () => {
-                    resolve();
-                };
-                data.forEach((item) => store.put(item));
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
-    }
-    /**
-     * Retrieves an array of items from the object store based on their IDs.
-     * @param ids The array of IDs to retrieve.
-     */
-    bulkGet(ids) {
-        return new Promise((resolve, reject) => {
-            if (ids.length === 0) {
-                return resolve([]);
-            }
-            try {
-                const transaction = this.#getDB().transaction(this.#storeName, 'readonly', {
-                    durability: 'relaxed'
-                });
-                const store = transaction.objectStore(this.#storeName);
-                const promises = [];
-                for (const id of ids) {
-                    promises.push(new Promise((resolveGet, rejectGet) => {
-                        const request = store.get(id);
-                        request.onerror = () => rejectGet(`Request error for id ${id}: ${request.error}`);
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                        request.onsuccess = () => resolveGet(request.result);
-                    }));
-                }
-                Promise.all(promises)
-                    .then((results) => {
-                    resolve(results);
-                })
-                    .catch(reject);
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
-    }
-    /**
-     * Retrieves all items from the object store.
-     */
-    getAll() {
-        return new Promise((resolve, reject) => {
-            try {
-                const transaction = this.#getDB().transaction(this.#storeName, 'readonly');
-                const store = transaction.objectStore(this.#storeName);
-                const request = store.getAll();
-                request.onerror = () => reject(`Request error: ${request.error}`);
-                request.onsuccess = () => resolve(request.result);
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
-    }
-    close() {
-        if (!this.#db)
-            return;
-        this.#db.close();
-        this.#db = undefined;
-    }
-}
-exports.ItemStore = ItemStore;
-//# sourceMappingURL=ItemStore.js.map

package/dist/commonjs/core/stages/ItemStore.js.map

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

package/dist/commonjs/queues/batchedPool.d.ts

@@ -1,13 +0,0 @@
-import Queue from './queue.js';
-export default class BatchedPool<T> implements Queue<T> {
-    #private;
-    constructor(params: {
-        concurrencyAndSizes: number[];
-        maxWaitTime?: number;
-        processFunction: (batch: T[]) => Promise<void>;
-    });
-    add(item: T): void;
-    getBatch(batchSize: number): T[];
-    disposeAsync(): Promise<void>;
-}
-//# sourceMappingURL=batchedPool.d.ts.map

package/dist/commonjs/queues/batchedPool.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"batchedPool.d.ts","sourceRoot":"","sources":["../../../src/queues/batchedPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,CAAE,YAAW,KAAK,CAAC,CAAC,CAAC;;gBAUzC,MAAM,EAAE;QAClB,mBAAmB,EAAE,MAAM,EAAE,CAAA;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAC/C;IAOD,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAIlB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE;IAc1B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBpC"}

package/dist/commonjs/queues/batchedPool.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class BatchedPool {
-    #queue = [];
-    #concurrencyAndSizes;
-    #processFunction;
-    #baseInterval;
-    #processingLoop;
-    #disposed = false;
-    constructor(params) {
-        this.#concurrencyAndSizes = params.concurrencyAndSizes;
-        this.#baseInterval = Math.min(params.maxWaitTime ?? 200, 200); // Initial batch time (ms)
-        this.#processFunction = params.processFunction;
-        this.#processingLoop = this.#loop();
-    }
-    add(item) {
-        this.#queue.push(item);
-    }
-    getBatch(batchSize) {
-        return this.#queue.splice(0, Math.min(batchSize, this.#queue.length));
-    }
-    async #runWorker(batchSize) {
-        while (!this.#disposed || this.#queue.length > 0) {
-            if (this.#queue.length > 0) {
-                const batch = this.getBatch(batchSize);
-                await this.#processFunction(batch);
-            }
-            await this.#delay(this.#baseInterval);
-        }
-    }
-    async disposeAsync() {
-        this.#disposed = true;
-        await this.#processingLoop;
-    }
-    async #loop() {
-        // Initialize workers
-        const workers = Array.from(this.#concurrencyAndSizes, (batchSize) => this.#runWorker(batchSize));
-        await Promise.all(workers);
-    }
-    #delay(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
-}
-exports.default = BatchedPool;
-//# sourceMappingURL=batchedPool.js.map

package/dist/commonjs/queues/batchedPool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"batchedPool.js","sourceRoot":"","sources":["../../../src/queues/batchedPool.ts"],"names":[],"mappings":";;AAEA,MAAqB,WAAW;IAC9B,MAAM,GAAQ,EAAE,CAAA;IAChB,oBAAoB,CAAU;IAC9B,gBAAgB,CAA+B;IAE/C,aAAa,CAAQ;IAErB,eAAe,CAAe;IAC9B,SAAS,GAAG,KAAK,CAAA;IAEjB,YAAY,MAIX;QACC,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,mBAAmB,CAAA;QACtD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,0BAA0B;QACxF,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,eAAe,CAAA;QAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,IAAO;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QAChC,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACtC,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YACpC,CAAC;YACD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,MAAM,IAAI,CAAC,eAAe,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,qBAAqB;QACrB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAC1E,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAC3B,CAAA;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,EAAU;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;CACF;AAvDD,8BAuDC"}