npm - @speckle/objectloader2 - Versions diffs - 2.26.1 → 2.26.3 - Mend

@speckle/objectloader2 2.26.1 → 2.26.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (98) hide show

package/dist/esm/core/objectLoader2Factory.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { DefermentManager, MemoryOnlyDeferment } from '../deferment/defermentManager.js';
 import { getFeatureFlag, ObjectLoader2Flags } from '../types/functions.js';
 import { ObjectLoader2 } from './objectLoader2.js';
 import { IndexedDatabase } from './stages/indexedDatabase.js';
@@ -13,6 +14,7 @@ export class ObjectLoader2Factory {
         });
         const loader = new ObjectLoader2({
             rootId: root.id,
+            deferments: new MemoryOnlyDeferment(records),
             database: new MemoryDatabase({ items: records }),
             downloader: new MemoryDownloader(root.id, records)
         });
@@ -25,10 +27,14 @@ export class ObjectLoader2Factory {
     static createFromUrl(params) {
         const log = ObjectLoader2Factory.getLogger(params.options?.logger);
         let database;
-        if (getFeatureFlag(ObjectLoader2Flags.DEBUG) === 'true') {
+        if (params.options?.debug === true ||
+            getFeatureFlag(ObjectLoader2Flags.DEBUG) === 'true') {
             this.logger('Using DEBUG mode for ObjectLoader2Factory');
         }
-        if (getFeatureFlag(ObjectLoader2Flags.USE_CACHE) === 'true') {
+        const useCache = params.options?.useCache ?? true;
+        const flag = getFeatureFlag(ObjectLoader2Flags.USE_CACHE);
+        const flagAllowsCache = flag !== 'false';
+        if (useCache && flagAllowsCache) {
             database = new IndexedDatabase({
                 indexedDB: params.options?.indexedDB,
                 keyRange: params.options?.keyRange
@@ -40,18 +46,22 @@ export class ObjectLoader2Factory {
             });
             this.logger('Disabled persistent caching for ObjectLoader2.  Using MemoryDatabase');
         }
+        const logger = log || (() => { });
         const loader = new ObjectLoader2({
             rootId: params.objectId,
+            deferments: new DefermentManager(logger),
             downloader: new ServerDownloader({
                 serverUrl: params.serverUrl,
                 streamId: params.streamId,
                 objectId: params.objectId,
                 token: params.token,
                 headers: params.headers,
-                logger: log || (() => { })
+                fetch: params.options?.fetch,
+                attributeMask: params.attributeMask,
+                logger
             }),
             database,
-            logger: log
+            logger
         });
         return loader;
     }

package/dist/esm/core/objectLoader2Factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAAgB~~,~~cAAc~~,EAAE,~~kBAAkB~~,EAAE,MAAM,uBAAuB,CAAA;~~AAExF~~,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACtE,OAAO,gBAAgB,MAAM,8BAA8B,CAAA;~~AAS3D~~,MAAM,OAAO,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAe;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,OAAO,GAAsB,IAAI,GAAG,EAAgB,CAAA;QAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;YAC/B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,QAAQ,EAAE,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAChD,UAAU,EAAE,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;SACnD,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,IAAY;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAW,CAAA;QAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,~~MAOpB~~;QACC,MAAM,GAAG,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAClE,IAAI,QAAQ,CAAA;QACZ,IAAI,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,MAAM,~~EAAE~~,CAAC;~~YACxD~~,IAAI,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAA;QAC1D,CAAC;QACD,IAAI,cAAc,CAAC,kBAAkB,CAAC,SAAS,CAAC,~~KAAK~~,MAAM,EAAE,CAAC;~~YAC5D~~,QAAQ,GAAG,IAAI,eAAe,CAAC;gBAC7B,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS;gBACpC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ;aACnC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,IAAI,cAAc,CAAC;gBAC5B,KAAK,EAAE,IAAI,GAAG,EAAgB;aAC/B,CAAC,CAAA;YACF,IAAI,CAAC,MAAM,CACT,sEAAsE,CACvE,CAAA;QACH,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,gBAAgB,CAAC;gBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,~~MAAM~~,EAAE,~~GAAG~~,~~IAAI,~~CAAC,~~GAAS~~,EAAE,~~GAAE~~,CAAC,~~CAAC~~;~~aAChC~~,CAAC;YACF,QAAQ;YACR,MAAM~~,EAAE,GAAG~~;~~SACZ~~,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,cAA6B;QAC5C,IAAI,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,MAAM,EAAE,CAAC;YACxD,OAAO,cAAc,IAAI,IAAI,CAAC,MAAM,CAAA;QACtC,CAAC;QACD,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,MAAM,CAAC,MAAM,GAAiB,CAAC,CAAU,EAAE,GAAG,cAAyB,EAAE,EAAE;QACzE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,CAAA;IAChD,CAAC,CAAA"}
1	+ {"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACxF,OAAO,EAGL,cAAc,EACd,kBAAkB,EACnB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACtE,OAAO,gBAAgB,MAAM,8BAA8B,CAAA;AAa3D,MAAM,OAAO,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAe;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,OAAO,GAAsB,IAAI,GAAG,EAAgB,CAAA;QAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;YAC/B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,UAAU,EAAE,IAAI,mBAAmB,CAAC,OAAO,CAAC;YAC5C,QAAQ,EAAE,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAChD,UAAU,EAAE,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;SACnD,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,IAAY;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAW,CAAA;QAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAQpB;QACC,MAAM,GAAG,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAClE,IAAI,QAAQ,CAAA;QACZ,IACE,MAAM,CAAC,OAAO,EAAE,KAAK,KAAK,IAAI;YAC9B,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,MAAM,EACnD,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAA;QAC1D,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAA;QACjD,MAAM,IAAI,GAAG,cAAc,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;QACzD,MAAM,eAAe,GAAG,IAAI,KAAK,OAAO,CAAA;QAExC,IAAI,QAAQ,IAAI,eAAe,EAAE,CAAC;YAChC,QAAQ,GAAG,IAAI,eAAe,CAAC;gBAC7B,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS;gBACpC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ;aACnC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,IAAI,cAAc,CAAC;gBAC5B,KAAK,EAAE,IAAI,GAAG,EAAgB;aAC/B,CAAC,CAAA;YACF,IAAI,CAAC,MAAM,CACT,sEAAsE,CACvE,CAAA;QACH,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,IAAK,CAAC,GAAS,EAAE,GAAE,CAAC,CAAkB,CAAA;QACxD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC;YAC/B,MAAM,EAAE,MAAM,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC;YACxC,UAAU,EAAE,IAAI,gBAAgB,CAAC;gBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK;gBAC5B,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,MAAM;aACP,CAAC;YACF,QAAQ;YACR,MAAM;SACP,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,cAA6B;QAC5C,IAAI,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,MAAM,EAAE,CAAC;YACxD,OAAO,cAAc,IAAI,IAAI,CAAC,MAAM,CAAA;QACtC,CAAC;QACD,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,MAAM,CAAC,MAAM,GAAiB,CAAC,CAAU,EAAE,GAAG,cAAyB,EAAE,EAAE;QACzE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,CAAA;IAChD,CAAC,CAAA"}

package/dist/esm/core/objectLoader2Factory.test.d.ts ADDED Viewed

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

package/dist/esm/core/objectLoader2Factory.test.d.ts.map ADDED Viewed

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

package/dist/esm/core/objectLoader2Factory.test.js ADDED Viewed

@@ -0,0 +1,104 @@
+/* eslint-disable camelcase */
+import { describe, it, expect, beforeEach } from 'vitest';
+import { ObjectLoader2Factory } from './objectLoader2Factory.js';
+describe('ObjectLoader2Factory', () => {
+    let testObjects;
+    beforeEach(() => {
+        testObjects = [
+            {
+                id: 'root-id',
+                speckle_type: 'Base',
+                __closure: {
+                    'child-1': 1,
+                    'child-2': 2
+                }
+            },
+            {
+                id: 'child-1',
+                speckle_type: 'Base'
+            },
+            {
+                id: 'child-2',
+                speckle_type: 'Base'
+            }
+        ];
+    });
+    describe('createFromObjects', () => {
+        it('should create ObjectLoader2 from array of objects', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            expect(loader).toBeDefined();
+            // Test that we can get the root object
+            const rootObject = await loader.getRootObject();
+            expect(rootObject?.baseId).toBe('root-id');
+            expect(rootObject?.base?.speckle_type).toBe('Base');
+            await loader.disposeAsync();
+        });
+        it('should use first object as root', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            const rootObject = await loader.getRootObject();
+            expect(rootObject?.baseId).toBe('root-id');
+            expect(rootObject?.base?.__closure).toEqual({
+                'child-1': 1,
+                'child-2': 2
+            });
+            await loader.disposeAsync();
+        });
+        it('should allow iteration over all objects', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            const objects = [];
+            for await (const obj of loader.getObjectIterator()) {
+                objects.push(obj);
+            }
+            expect(objects).toHaveLength(3);
+            expect(objects[0].id).toBe('root-id');
+            await loader.disposeAsync();
+        });
+        it('should get total object count correctly', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            const totalCount = await loader.getTotalObjectCount();
+            expect(totalCount).toBe(3); // root + 2 children
+            await loader.disposeAsync();
+        });
+        it('should handle empty objects array', () => {
+            expect(() => {
+                ObjectLoader2Factory.createFromObjects([]);
+            }).toThrow();
+        });
+        it('should get individual objects by id', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            const rootObj = await loader.getObject({ id: 'root-id' });
+            expect(rootObj.id).toBe('root-id');
+            expect(rootObj.speckle_type).toBe('Base');
+            const child1 = await loader.getObject({ id: 'child-1' });
+            expect(child1.id).toBe('child-1');
+            const child2 = await loader.getObject({ id: 'child-2' });
+            expect(child2.id).toBe('child-2');
+            await loader.disposeAsync();
+        });
+        it('should get individual objects by id that does not exist', async () => {
+            const loader = ObjectLoader2Factory.createFromObjects(testObjects);
+            const rootObj = await loader.getObject({ id: 'root-id' });
+            expect(rootObj.id).toBe('root-id');
+            expect(rootObj.speckle_type).toBe('Base');
+            const getObjectPromise = loader.getObject({ id: 'child-11111' });
+            await expect(getObjectPromise).rejects.toThrow();
+            await loader.disposeAsync();
+        });
+    });
+    describe('createFromJSON', () => {
+        it('should create ObjectLoader2 from JSON string', async () => {
+            const json = JSON.stringify(testObjects);
+            const loader = ObjectLoader2Factory.createFromJSON(json);
+            expect(loader).toBeDefined();
+            const rootObject = await loader.getRootObject();
+            expect(rootObject?.baseId).toBe('root-id');
+            await loader.disposeAsync();
+        });
+        it('should handle invalid JSON', () => {
+            expect(() => {
+                ObjectLoader2Factory.createFromJSON('invalid json');
+            }).toThrow();
+        });
+    });
+});
+//# sourceMappingURL=objectLoader2Factory.test.js.map

package/dist/esm/core/objectLoader2Factory.test.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/esm/core/options.d.ts CHANGED Viewed

@@ -1,8 +1,10 @@
+import { Deferment } from '../deferment/defermentManager.js';
 import { CustomLogger } from '../types/functions.js';
 import { Base } from '../types/types.js';
 import { Downloader, Database } from './interfaces.js';
 export interface ObjectLoader2Options {
     rootId: string;
+    deferments: Deferment;
     downloader: Downloader;
     database: Database;
     logger?: CustomLogger;

package/dist/esm/core/options.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/core/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd"}
1	+ {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/core/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,SAAS,CAAA;IACrB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd"}

package/dist/esm/core/stages/cacheReader.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DefermentManager } from '../../deferment/defermentManager.js';
+import { Deferment } from '../../deferment/defermentManager.js';
 import Queue from '../../queues/queue.js';
 import { CustomLogger } from '../../types/functions.js';
 import { Item, Base } from '../../types/types.js';
@@ -6,7 +6,7 @@ import { Database } from '../interfaces.js';
 import { CacheOptions } from '../options.js';
 export declare class CacheReader {
     #private;
-    constructor(database: Database, defermentManager: DefermentManager, logger: CustomLogger, options: CacheOptions);
+    constructor(database: Database, defermentManager: Deferment, logger: CustomLogger, options: CacheOptions);
     initializeQueue(foundQueue: Queue<Item>, notFoundQueue: Queue<string>): void;
     getObject(params: {
         id: string;

package/dist/esm/core/stages/cacheReader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheReader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~gBAAgB~~,EAAE,MAAM,qCAAqC,CAAA;~~AAEtE~~,OAAO,KAAK,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAW;;gBAUpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,~~gBAAgB~~,~~EAClC~~,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY;IAQvB,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAK5E,SAAS,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBhD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO7B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAyBhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
1	+ {"version":3,"file":"cacheReader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAE/D,OAAO,KAAK,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAW;;gBAUpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,SAAS,EAC3B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY;IAQvB,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAK5E,SAAS,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBhD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAO7B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAyBhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/dist/esm/core/stages/cacheReader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheReader.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAOzD,MAAM,OAAO,WAAW;IACtB,SAAS,CAAU;IACnB,iBAAiB,~~CAAkB~~;~~IACnC~~,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,UAAU,CAAmC;IAC7C,WAAW,CAAyB;IACpC,cAAc,CAA2B;IAEzC,YACE,QAAkB,EAClB,~~gBAAkC~~,~~EAClC~~,MAAoB,EACpB,OAAqB;QAErB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;IACzB,CAAC;IAED,eAAe,CAAC,UAAuB,EAAE,aAA4B;QACnE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAA;QAC7B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;IACrC,CAAC;IAED,SAAS,CAAC,MAAsB;QAC9B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;QAC9D,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC7B,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,GAAG,IAAI,aAAa,CAAC;gBAClC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB;gBACzC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB;gBAChD,eAAe,EAAE,IAAI,CAAC,aAAa;aACpC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC;IAED,UAAU,CAAC,IAAc;QACvB,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEvB,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,aAAa,GAAG,KAAK,EAAE,KAAe,EAAiB,EAAE;QACvD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;gBAC3B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;YACpE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO,CACV,oBAAoB,KAAK,CAAC,MAAM,UAC9B,WAAW,CAAC,GAAG,EAAE,GAAG,KACtB,YAAY,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CACvC,CAAA;IACH,CAAC,CAAA;IAED,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;IAC7D,CAAC;CACF"}
1	+ {"version":3,"file":"cacheReader.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/stages/cacheWriter.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DefermentManager } from '../../deferment/defermentManager.js';
+import { Deferment } from '../../deferment/defermentManager.js';
 import Queue from '../../queues/queue.js';
 import { CustomLogger } from '../../types/functions.js';
 import { Item } from '../../types/types.js';
@@ -6,7 +6,7 @@ import { Database } from '../interfaces.js';
 import { CacheOptions } from '../options.js';
 export declare class CacheWriter implements Queue<Item> {
     #private;
-    constructor(database: Database, logger: CustomLogger, defermentManager: DefermentManager, options: CacheOptions, requestItem: (id: string) => void);
+    constructor(database: Database, logger: CustomLogger, deferment: Deferment, options: CacheOptions, requestItem: (id: string) => void);
     add(item: Item): void;
     writeAll(items: Item[]): Promise<void>;
     disposeAsync(): Promise<void>;

package/dist/esm/core/stages/cacheWriter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheWriter.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,~~gBAAgB~~,EAAE,MAAM,qCAAqC,CAAA;~~AAEtE~~,OAAO,KAAK,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAY,YAAW,KAAK,CAAC,IAAI,CAAC;;gBAU3C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,~~gBAAgB~~,EAAE,~~gBAAgB~~,~~EAClC~~,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI;IASnC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAcf,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC,IAAI,UAAU,IAAI,OAAO,CAExB;CACF"}
1	+ {"version":3,"file":"cacheWriter.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAE/D,OAAO,KAAK,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,qBAAa,WAAY,YAAW,KAAK,CAAC,IAAI,CAAC;;gBAU3C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI;IASnC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAcf,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC,IAAI,UAAU,IAAI,OAAO,CAExB;CACF"}

package/dist/esm/core/stages/cacheWriter.js CHANGED Viewed

@@ -2,16 +2,16 @@ import BatchingQueue from '../../queues/batchingQueue.js';
 export class CacheWriter {
     #writeQueue;
     #database;
-    #defermentManager;
+    #deferment;
     #requestItem;
     #logger;
     #options;
     #disposed = false;
-    constructor(database, logger, defermentManager, options, requestItem) {
+    constructor(database, logger, deferment, options, requestItem) {
         this.#database = database;
         this.#options = options;
         this.#logger = logger;
-        this.#defermentManager = defermentManager;
+        this.#deferment = deferment;
         this.#requestItem = requestItem;
     }
     add(item) {
@@ -25,7 +25,7 @@ export class CacheWriter {
             });
         }
         this.#writeQueue.add(item.baseId, item);
-        this.#defermentManager.undefer(item, this.#requestItem);
+        this.#deferment.undefer(item, this.#requestItem);
     }
     async writeAll(items) {
         const start = performance.now();

package/dist/esm/core/stages/cacheWriter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAOzD,MAAM,OAAO,WAAW;IACtB,WAAW,CAAiC;IAC5C,SAAS,CAAU;IACnB,~~iBAAiB~~,~~CAAkB~~;~~IACnC~~,YAAY,CAAsB;IAClC,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,GAAG,KAAK,CAAA;IAEjB,YACE,QAAkB,EAClB,MAAoB,EACpB,~~gBAAkC~~,~~EAClC~~,OAAqB,EACrB,WAAiC;QAEjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,~~iBAAiB~~,GAAG,~~gBAAgB~~,CAAA;~~QACzC~~,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC;gBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB;gBAC1C,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB;gBACjD,eAAe,EAAE,KAAK,EAAE,KAAa,EAAiB,EAAE;oBACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC5B,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,~~iBAAiB~~,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;~~IACzD~~,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,CACV,qBAAqB,KAAK,CAAC,MAAM,UAC/B,WAAW,CAAC,GAAG,EAAE,GAAG,KACtB,YAAY,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CACxC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,MAAM,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;CACF"}
1	+ {"version":3,"file":"cacheWriter.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheWriter.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAOzD,MAAM,OAAO,WAAW;IACtB,WAAW,CAAiC;IAC5C,SAAS,CAAU;IACnB,UAAU,CAAW;IACrB,YAAY,CAAsB;IAClC,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,GAAG,KAAK,CAAA;IAEjB,YACE,QAAkB,EAClB,MAAoB,EACpB,SAAoB,EACpB,OAAqB,EACrB,WAAiC;QAEjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC;gBACnC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB;gBAC1C,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB;gBACjD,eAAe,EAAE,KAAK,EAAE,KAAa,EAAiB,EAAE;oBACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC5B,CAAC;aACF,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,CACV,qBAAqB,KAAK,CAAC,MAAM,UAC/B,WAAW,CAAC,GAAG,EAAE,GAAG,KACtB,YAAY,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CACxC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACrB,MAAM,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;CACF"}

package/dist/esm/core/stages/serverDownloader.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import Queue from '../../queues/queue.js';
 import { CustomLogger, Fetcher } from '../../types/functions.js';
-import { Item } from '../../types/types.js';
+import { Item, ObjectAttributeMask } from '../../types/types.js';
 import { Downloader } from '../interfaces.js';
 export interface ServerDownloaderOptions {
     serverUrl: string;
@@ -10,6 +10,7 @@ export interface ServerDownloaderOptions {
     headers?: Headers;
     logger: CustomLogger;
     fetch?: Fetcher;
+    attributeMask?: ObjectAttributeMask;
 }
 export default class ServerDownloader implements Downloader {
     #private;

package/dist/esm/core/stages/serverDownloader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serverDownloader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,uBAAuB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAyB,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;~~AAC3C~~,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;~~CAChB~~;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,UAAU;;gBAiB7C,OAAO,EAAE,uBAAuB;~~IA4B5C~~,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,KAAK,EAAE,MAAM,CAAA;QACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;KAC9B,GAAG,IAAI;IAgBR,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWrB,WAAW,CAAC,WAAW,EAAE,UAAU,GAAG,MAAM;IAWtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,aAAa,CAAC,MAAM,EAAE;QAC1B,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,WAAW,CAAA;KACrB,GAAG,OAAO,CAAC,IAAI,CAAC;~~IA8HX~~,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BtC"}
1	+ {"version":3,"file":"serverDownloader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,uBAAuB,CAAA;AAEzC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAyB,MAAM,0BAA0B,CAAA;AACvF,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;CACpC;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,UAAU;;gBAiB7C,OAAO,EAAE,uBAAuB;IA6B5C,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpB,KAAK,EAAE,MAAM,CAAA;QACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;KAC9B,GAAG,IAAI;IAgBR,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAWrB,WAAW,CAAC,WAAW,EAAE,UAAU,GAAG,MAAM;IAWtC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,aAAa,CAAC,MAAM,EAAE;QAC1B,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,WAAW,CAAA;KACrB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+HX,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BtC"}

package/dist/esm/core/stages/serverDownloader.js CHANGED Viewed

@@ -31,7 +31,7 @@ export default class ServerDownloader {
         if (this.#options.token) {
             this.#headers['Authorization'] = `Bearer ${this.#options.token}`;
         }
-        this.#requestUrlChildren = `${this.#options.serverUrl}/api/getobjects/${this.#options.streamId}`;
+        this.#requestUrlChildren = `${this.#options.serverUrl}/api/v2/projects/${this.#options.streamId}/object-stream/`;
         this.#requestUrlRootObj = `${this.#options.serverUrl}/objects/${this.#options.streamId}/${this.#options.objectId}/single`;
         const encoder = new TextEncoder();
         this.#rawEncoding = encoder.encode(this.#rawString);
@@ -77,11 +77,12 @@ export default class ServerDownloader {
         const { batch, url, headers } = params;
         const start = performance.now();
         this.#logger(`Downloading batch of ${batch.length} items...`);
+        const attributeMask = this.#options.attributeMask;
         const keys = new Set(batch);
         const response = await this.#fetch(url, {
             method: 'POST',
             headers: { ...headers, 'Content-Type': 'application/json' },
-            body: JSON.stringify({ objects: JSON.stringify(batch) })
+            body: JSON.stringify({ objectIds: batch, attributeMask })
         });
         this.#validateResponse(response);
         if (!response.body) {

package/dist/esm/core/stages/serverDownloader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,+BAA+B,CAAA;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAyB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;~~AAcvF~~,MAAM,uBAAuB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,qBAAqB;AAE1F,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,kBAAkB,CAAQ;IAC1B,mBAAmB,CAAQ;IAC3B,QAAQ,CAAa;IACrB,QAAQ,CAAyB;IACjC,MAAM,CAAS;IACf,QAAQ,CAAc;IACtB,MAAM,CAAS;IACf,OAAO,CAAc;IAErB,cAAc,CAAwB;IACtC,QAAQ,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACpD,kBAAkB,GAAG,CAAC,CAAA;IAEtB,UAAU,GAAW,2BAA2B,CAAA;IAChD,YAAY,CAAY;IAExB,YAAY,OAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;QAC7B,IAAI,CAAC,MAAM;YACT,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,EAAqB,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAE9E,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;QAClB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;QAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;QAClE,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,~~mBACnD~~,IAAI,CAAC,QAAQ,CAAC,QAChB,~~EAAE~~,CAAA;~~QACF~~,IAAI,CAAC,kBAAkB,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,YAClD,IAAI,CAAC,QAAQ,CAAC,QAChB,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,SAAS,CAAA;QAEnC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACrD,CAAC;IAED,UAAU,CAAC,MAIV;QACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,cAAc,GAAG,IAAI,aAAa,CAAS;YAC9C,SAAS,EAAE,KAAK,EAAE,sCAAsC;YACxD,WAAW,EAAE,oBAAoB,IAAI,IAAI,EAAE,WAAW;YACtD,eAAe,EAAE,CAAC,KAAe,EAAiB,EAAE,CAClD,IAAI,CAAC,aAAa,CAAC;gBACjB,KAAK;gBACL,GAAG,EAAE,IAAI,CAAC,mBAAmB;gBAC7B,OAAO,EAAE,IAAI,CAAC,QAAQ;aACvB,CAAC;SACL,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAClC,CAAC;IAED;;;;;;MAME;IACF,WAAW,CAAC,WAAuB;QACjC,IAAI,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,UAAU,GAAG,uBAAuB,EAAE,CAAC;YAC/E,wDAAwD;YACxD,IAAI,CAAC,QAAQ,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YACzD,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAA,CAAC,oCAAoC;QAClE,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACrD,IAAI,CAAC,kBAAkB,IAAI,WAAW,CAAC,UAAU,CAAA;QACjD,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,cAAc,EAAE,YAAY,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAInB;QACC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;QAEtC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,IAAI,CAAC,OAAO,CAAC,wBAAwB,KAAK,CAAC,MAAM,WAAW,CAAC,CAAA;QAC7D,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,CAAA;QACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACtC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC3D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,~~OAAO~~,EAAE,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC,KAAK,CAAC,~~EAAE,CAAC;~~SACzD~~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"}
1	+ {"version":3,"file":"serverDownloader.js","sourceRoot":"","sources":["../../../../src/core/stages/serverDownloader.ts"],"names":[],"mappings":"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"}

package/dist/esm/deferment/defermentManager.d.ts CHANGED Viewed

@@ -1,12 +1,28 @@
 import { CustomLogger } from '../types/functions.js';
 import { Item, Base } from '../types/types.js';
 import { MemoryCache } from './MemoryCache.js';
-export declare class DefermentManager {
+export interface Deferment {
+    defer(params: {
+        id: string;
+    }): [Promise<Base>, boolean];
+    undefer(item: Item, requestItem: (id: string) => void): void;
+    dispose(): void;
+}
+export declare class MemoryOnlyDeferment implements Deferment {
+    private items;
+    constructor(items: Map<string, Base>);
+    defer(params: {
+        id: string;
+    }): [Promise<Base>, boolean];
+    undefer(): void;
+    dispose(): void;
+}
+export declare class DefermentManager implements Deferment {
     private outstanding;
     private logger;
     private disposed;
     private cache;
-    constructor(cache: MemoryCache, logger: CustomLogger);
+    constructor(logger: CustomLogger, cache?: MemoryCache);
     defer(params: {
         id: string;
     }): [Promise<Base>, boolean];

package/dist/esm/deferment/defermentManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"defermentManager.d.ts","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,qBAAa,~~gBAAgB~~;~~IAC3B~~,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,KAAK,CAAa;gBAEd,~~KAAK~~,EAAE,~~WAAW~~,EAAE,~~MAAM~~,EAAE,~~YAAY~~;~~IAKpD~~,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAevD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAqB5D,OAAO,IAAI,IAAI;~~CAMhB~~"}
1	+ {"version":3,"file":"defermentManager.d.ts","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;IAC5D,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,qBAAa,mBAAoB,YAAW,SAAS;IACnD,OAAO,CAAC,KAAK,CAAmB;gBAEpB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAGpC,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAOvD,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;CAGhB;AAED,qBAAa,gBAAiB,YAAW,SAAS;IAChD,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,KAAK,CAAa;gBAEd,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,WAAW;IAarD,KAAK,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAevD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAqB5D,OAAO,IAAI,IAAI;CAOhB"}

package/dist/esm/deferment/defermentManager.js CHANGED Viewed

@@ -1,12 +1,37 @@
 import { DeferredBase } from './deferredBase.js';
+import { MemoryCache } from './MemoryCache.js';
+export class MemoryOnlyDeferment {
+    items;
+    constructor(items) {
+        this.items = items;
+    }
+    defer(params) {
+        const item = this.items.get(params.id);
+        if (item) {
+            return [Promise.resolve(item), true];
+        }
+        return [Promise.reject(new Error('Not found in cache: ' + params.id)), false];
+    }
+    undefer() {
+        //no-op
+    }
+    dispose() {
+        //no-op
+    }
+}
 export class DefermentManager {
     outstanding = new Map();
     logger;
     disposed = false;
     cache;
-    constructor(cache, logger) {
-        this.cache = cache;
+    constructor(logger, cache) {
         this.logger = logger;
+        this.cache =
+            cache ||
+                new MemoryCache({
+                    maxSizeInMb: 500, // 500 MB
+                    ttlms: 5_000 // 5 seconds
+                }, logger);
     }
     defer(params) {
         if (this.disposed)
@@ -49,6 +74,7 @@ export class DefermentManager {
         this.disposed = true;
         this.logger('cleared deferments, left', this.outstanding.size);
         this.outstanding.clear();
+        this.cache.dispose();
     }
 }
 //# sourceMappingURL=defermentManager.js.map

package/dist/esm/deferment/defermentManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;~~AAKhD~~,MAAM,OAAO,gBAAgB;IACnB,WAAW,GAA8B,IAAI,GAAG,EAAE,CAAA;IAClD,MAAM,CAAc;IACpB,QAAQ,GAAG,KAAK,CAAA;IAChB,KAAK,CAAa;IAE1B,YAAY,~~KAAkB~~,EAAE,~~MAAoB~~;~~QAClD~~,IAAI,CAAC,~~KAAK~~,GAAG,~~KAAK~~,CAAA;~~QAClB~~,IAAI,CAAC,~~MAAM~~,GAAG,MAAM,CAAA;~~IACtB~~,CAAC;IAED,KAAK,CAAC,MAAsB;QAC1B,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACtC,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE,IAAI,CAAC,CAAA;QAC5C,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACpD,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;QAC5C,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,WAAiC;QACnD,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACtB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAA;YAChD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,WAAW,CAAC,EAAE,CAAC,CAAA;YACjB,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,8CAA8C;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtD,IAAI,YAAY,EAAE,CAAC;YACjB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACxB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAM;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC9D,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;~~IAC1B~~,CAAC;CACF"}
1	+ {"version":3,"file":"defermentManager.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.ts"],"names":[],"mappings":"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"}

package/dist/esm/deferment/defermentManager.test.js CHANGED Viewed

@@ -5,9 +5,10 @@ describe('DefermentManager', () => {
         const mockLogger = vi.fn();
         const mockCache = {
             get: vi.fn(),
-            add: vi.fn()
+            add: vi.fn(),
+            dispose: vi.fn()
         };
-        const defermentManager = new DefermentManager(mockCache, mockLogger);
+        const defermentManager = new DefermentManager(mockLogger, mockCache);
         expect(defermentManager).toBeDefined();
     });
     describe('defer', () => {
@@ -19,7 +20,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const item = {
                 // eslint-disable-next-line camelcase
                 base: { id: 'testId', speckle_type: 'Base' },
@@ -40,7 +41,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const [promise1, wasInCache1] = defermentManager.defer({ id: 'testId' });
             const [promise2, wasInCache2] = defermentManager.defer({ id: 'testId' });
             expect(wasInCache1).toBe(false);
@@ -55,7 +56,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const [promise, wasInCache] = defermentManager.defer({ id: 'testId' });
             expect(wasInCache).toBe(false);
             expect(promise).toBeInstanceOf(Promise);
@@ -66,9 +67,10 @@ describe('DefermentManager', () => {
             const add = vi.fn();
             const mockCache = {
                 get,
-                add
+                add,
+                dispose: vi.fn()
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             defermentManager.dispose();
             expect(() => defermentManager.defer({ id: 'testId' })).toThrow('DefermentManager is disposed');
         });
@@ -82,7 +84,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const requestItem = vi.fn();
             const [promise] = defermentManager.defer({ id: 'testId' });
             const item = {
@@ -102,7 +104,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const requestItem = vi.fn();
             const item = { baseId: 'testId' };
             defermentManager.undefer(item, requestItem);
@@ -116,7 +118,7 @@ describe('DefermentManager', () => {
                 get,
                 add
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const requestItem = vi.fn();
             const item = {
                 // eslint-disable-next-line camelcase
@@ -137,9 +139,10 @@ describe('DefermentManager', () => {
             const add = vi.fn();
             const mockCache = {
                 get,
-                add
+                add,
+                dispose: vi.fn()
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             const requestItem = vi.fn();
             defermentManager.dispose();
             const item = {
@@ -157,9 +160,10 @@ describe('DefermentManager', () => {
             const add = vi.fn();
             const mockCache = {
                 get,
-                add
+                add,
+                dispose: vi.fn()
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             void defermentManager.defer({ id: 'testId' });
             defermentManager.dispose();
             // @ts-expect-error - accessing private property for testing
@@ -171,9 +175,10 @@ describe('DefermentManager', () => {
             const add = vi.fn();
             const mockCache = {
                 get,
-                add
+                add,
+                dispose: vi.fn()
             };
-            const defermentManager = new DefermentManager(mockCache, mockLogger);
+            const defermentManager = new DefermentManager(mockLogger, mockCache);
             defermentManager.dispose();
             // @ts-expect-error - accessing private property for testing
             const outstanding = defermentManager.outstanding;