@speckle/objectloader2 2.26.0 → 2.26.2
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.
- package/dist/commonjs/core/objectLoader2.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2.js +1 -9
- package/dist/commonjs/core/objectLoader2.js.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.d.ts +7 -2
- package/dist/commonjs/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.js +14 -4
- package/dist/commonjs/core/objectLoader2Factory.js.map +1 -1
- package/dist/commonjs/core/objectLoader2Factory.test.d.ts +2 -0
- package/dist/commonjs/core/objectLoader2Factory.test.d.ts.map +1 -0
- package/dist/commonjs/core/objectLoader2Factory.test.js +106 -0
- package/dist/commonjs/core/objectLoader2Factory.test.js.map +1 -0
- package/dist/commonjs/core/options.d.ts +2 -0
- package/dist/commonjs/core/options.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheReader.d.ts +2 -2
- package/dist/commonjs/core/stages/cacheReader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheReader.js.map +1 -1
- package/dist/commonjs/core/stages/cacheWriter.d.ts +2 -2
- package/dist/commonjs/core/stages/cacheWriter.d.ts.map +1 -1
- package/dist/commonjs/core/stages/cacheWriter.js +4 -4
- package/dist/commonjs/core/stages/cacheWriter.js.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.d.ts +2 -1
- package/dist/commonjs/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/commonjs/core/stages/serverDownloader.js +3 -2
- package/dist/commonjs/core/stages/serverDownloader.js.map +1 -1
- package/dist/commonjs/deferment/defermentManager.d.ts +18 -2
- package/dist/commonjs/deferment/defermentManager.d.ts.map +1 -1
- package/dist/commonjs/deferment/defermentManager.js +30 -3
- package/dist/commonjs/deferment/defermentManager.js.map +1 -1
- package/dist/commonjs/deferment/defermentManager.test.js +11 -11
- package/dist/commonjs/deferment/defermentManager.test.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.d.ts +0 -2
- package/dist/commonjs/queues/batchingQueue.d.ts.map +1 -1
- package/dist/commonjs/queues/batchingQueue.dispose.test.js +1 -3
- package/dist/commonjs/queues/batchingQueue.dispose.test.js.map +1 -1
- package/dist/commonjs/queues/batchingQueue.js +4 -3
- package/dist/commonjs/queues/batchingQueue.js.map +1 -1
- package/dist/commonjs/types/types.d.ts +5 -0
- package/dist/commonjs/types/types.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2.js +1 -9
- package/dist/esm/core/objectLoader2.js.map +1 -1
- package/dist/esm/core/objectLoader2Factory.d.ts +7 -2
- package/dist/esm/core/objectLoader2Factory.d.ts.map +1 -1
- package/dist/esm/core/objectLoader2Factory.js +14 -4
- package/dist/esm/core/objectLoader2Factory.js.map +1 -1
- package/dist/esm/core/objectLoader2Factory.test.d.ts +2 -0
- package/dist/esm/core/objectLoader2Factory.test.d.ts.map +1 -0
- package/dist/esm/core/objectLoader2Factory.test.js +104 -0
- package/dist/esm/core/objectLoader2Factory.test.js.map +1 -0
- package/dist/esm/core/options.d.ts +2 -0
- package/dist/esm/core/options.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheReader.d.ts +2 -2
- package/dist/esm/core/stages/cacheReader.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheReader.js.map +1 -1
- package/dist/esm/core/stages/cacheWriter.d.ts +2 -2
- package/dist/esm/core/stages/cacheWriter.d.ts.map +1 -1
- package/dist/esm/core/stages/cacheWriter.js +4 -4
- package/dist/esm/core/stages/cacheWriter.js.map +1 -1
- package/dist/esm/core/stages/serverDownloader.d.ts +2 -1
- package/dist/esm/core/stages/serverDownloader.d.ts.map +1 -1
- package/dist/esm/core/stages/serverDownloader.js +3 -2
- package/dist/esm/core/stages/serverDownloader.js.map +1 -1
- package/dist/esm/deferment/defermentManager.d.ts +18 -2
- package/dist/esm/deferment/defermentManager.d.ts.map +1 -1
- package/dist/esm/deferment/defermentManager.js +28 -2
- package/dist/esm/deferment/defermentManager.js.map +1 -1
- package/dist/esm/deferment/defermentManager.test.js +11 -11
- package/dist/esm/deferment/defermentManager.test.js.map +1 -1
- package/dist/esm/queues/batchingQueue.d.ts +0 -2
- package/dist/esm/queues/batchingQueue.d.ts.map +1 -1
- package/dist/esm/queues/batchingQueue.dispose.test.js +1 -3
- package/dist/esm/queues/batchingQueue.dispose.test.js.map +1 -1
- package/dist/esm/queues/batchingQueue.js +4 -3
- package/dist/esm/queues/batchingQueue.js.map +1 -1
- package/dist/esm/types/types.d.ts +5 -0
- package/dist/esm/types/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/core/objectLoader2.ts +3 -13
- package/src/core/objectLoader2Factory.test.ts +135 -0
- package/src/core/objectLoader2Factory.ts +29 -6
- package/src/core/options.ts +2 -0
- package/src/core/stages/cacheReader.ts +3 -3
- package/src/core/stages/cacheWriter.ts +5 -5
- package/src/core/stages/serverDownloader.ts +7 -4
- package/src/deferment/defermentManager.test.ts +11 -11
- package/src/deferment/defermentManager.ts +39 -3
- package/src/queues/batchingQueue.dispose.test.ts +1 -3
- package/src/queues/batchingQueue.ts +3 -5
- package/src/types/types.ts +5 -0
|
@@ -9,7 +9,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
9
9
|
get: vitest_1.vi.fn(),
|
|
10
10
|
add: vitest_1.vi.fn()
|
|
11
11
|
};
|
|
12
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
12
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
13
13
|
(0, vitest_1.expect)(defermentManager).toBeDefined();
|
|
14
14
|
});
|
|
15
15
|
(0, vitest_1.describe)('defer', () => {
|
|
@@ -21,7 +21,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
21
21
|
get,
|
|
22
22
|
add
|
|
23
23
|
};
|
|
24
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
24
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
25
25
|
const item = {
|
|
26
26
|
// eslint-disable-next-line camelcase
|
|
27
27
|
base: { id: 'testId', speckle_type: 'Base' },
|
|
@@ -42,7 +42,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
42
42
|
get,
|
|
43
43
|
add
|
|
44
44
|
};
|
|
45
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
45
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
46
46
|
const [promise1, wasInCache1] = defermentManager.defer({ id: 'testId' });
|
|
47
47
|
const [promise2, wasInCache2] = defermentManager.defer({ id: 'testId' });
|
|
48
48
|
(0, vitest_1.expect)(wasInCache1).toBe(false);
|
|
@@ -57,7 +57,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
57
57
|
get,
|
|
58
58
|
add
|
|
59
59
|
};
|
|
60
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
60
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
61
61
|
const [promise, wasInCache] = defermentManager.defer({ id: 'testId' });
|
|
62
62
|
(0, vitest_1.expect)(wasInCache).toBe(false);
|
|
63
63
|
(0, vitest_1.expect)(promise).toBeInstanceOf(Promise);
|
|
@@ -70,7 +70,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
70
70
|
get,
|
|
71
71
|
add
|
|
72
72
|
};
|
|
73
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
73
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
74
74
|
defermentManager.dispose();
|
|
75
75
|
(0, vitest_1.expect)(() => defermentManager.defer({ id: 'testId' })).toThrow('DefermentManager is disposed');
|
|
76
76
|
});
|
|
@@ -84,7 +84,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
84
84
|
get,
|
|
85
85
|
add
|
|
86
86
|
};
|
|
87
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
87
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
88
88
|
const requestItem = vitest_1.vi.fn();
|
|
89
89
|
const [promise] = defermentManager.defer({ id: 'testId' });
|
|
90
90
|
const item = {
|
|
@@ -104,7 +104,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
104
104
|
get,
|
|
105
105
|
add
|
|
106
106
|
};
|
|
107
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
107
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
108
108
|
const requestItem = vitest_1.vi.fn();
|
|
109
109
|
const item = { baseId: 'testId' };
|
|
110
110
|
defermentManager.undefer(item, requestItem);
|
|
@@ -118,7 +118,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
118
118
|
get,
|
|
119
119
|
add
|
|
120
120
|
};
|
|
121
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
121
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
122
122
|
const requestItem = vitest_1.vi.fn();
|
|
123
123
|
const item = {
|
|
124
124
|
// eslint-disable-next-line camelcase
|
|
@@ -141,7 +141,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
141
141
|
get,
|
|
142
142
|
add
|
|
143
143
|
};
|
|
144
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
144
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
145
145
|
const requestItem = vitest_1.vi.fn();
|
|
146
146
|
defermentManager.dispose();
|
|
147
147
|
const item = {
|
|
@@ -161,7 +161,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
161
161
|
get,
|
|
162
162
|
add
|
|
163
163
|
};
|
|
164
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
164
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
165
165
|
void defermentManager.defer({ id: 'testId' });
|
|
166
166
|
defermentManager.dispose();
|
|
167
167
|
// @ts-expect-error - accessing private property for testing
|
|
@@ -175,7 +175,7 @@ const defermentManager_js_1 = require("./defermentManager.js");
|
|
|
175
175
|
get,
|
|
176
176
|
add
|
|
177
177
|
};
|
|
178
|
-
const defermentManager = new defermentManager_js_1.DefermentManager(
|
|
178
|
+
const defermentManager = new defermentManager_js_1.DefermentManager(mockLogger, mockCache);
|
|
179
179
|
defermentManager.dispose();
|
|
180
180
|
// @ts-expect-error - accessing private property for testing
|
|
181
181
|
const outstanding = defermentManager.outstanding;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":";;AAAA,mCAAiD;AACjD,+DAAwD;AAKxD,IAAA,iBAAQ,EAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAA,WAAE,EAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAiB,WAAE,CAAC,EAAE,EAAE,CAAA;QACxC,MAAM,SAAS,GAAG;YAChB,GAAG,EAAE,WAAE,CAAC,EAAE,EAAE;YACZ,GAAG,EAAE,WAAE,CAAC,EAAE,EAAE;SACa,CAAA;QAC3B,MAAM,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { CustomLogger } from '../types/functions.js';
|
|
2
1
|
export default class BatchingQueue<T> {
|
|
3
2
|
#private;
|
|
4
3
|
constructor(params: {
|
|
5
4
|
batchSize: number;
|
|
6
5
|
maxWaitTime: number;
|
|
7
6
|
processFunction: (batch: T[]) => Promise<void>;
|
|
8
|
-
logger?: CustomLogger;
|
|
9
7
|
});
|
|
10
8
|
disposeAsync(): Promise<void>;
|
|
11
9
|
add(key: string, item: T): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC;;gBA6BtB,MAAM,EAAE;QAClB,SAAS,EAAE,MAAM,CAAA;QACjB,WAAW,EAAE,MAAM,CAAA;QACnB,eAAe,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAC/C;IAMK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBnC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAM/B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI;IA8CxC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAI9B,KAAK,IAAI,MAAM;IAIf,UAAU,IAAI,OAAO;CAOtB"}
|
|
@@ -17,7 +17,7 @@ const batchingQueue_js_1 = __importDefault(require("./batchingQueue.js"));
|
|
|
17
17
|
items.forEach((item) => queue.add(item.id, item));
|
|
18
18
|
(0, vitest_1.expect)(queue.count()).toBe(3);
|
|
19
19
|
await queue.disposeAsync();
|
|
20
|
-
(0, vitest_1.expect)(processFunction).
|
|
20
|
+
(0, vitest_1.expect)(processFunction).not.toHaveBeenCalled();
|
|
21
21
|
(0, vitest_1.expect)(queue.count()).toBe(0);
|
|
22
22
|
(0, vitest_1.expect)(queue.isDisposed()).toBe(true);
|
|
23
23
|
});
|
|
@@ -43,8 +43,6 @@ const batchingQueue_js_1 = __importDefault(require("./batchingQueue.js"));
|
|
|
43
43
|
(0, vitest_1.expect)(queue.isDisposed()).toBe(true);
|
|
44
44
|
resolveProcess();
|
|
45
45
|
await disposePromise;
|
|
46
|
-
(0, vitest_1.expect)(processFunction).toHaveBeenCalledTimes(2);
|
|
47
|
-
(0, vitest_1.expect)(processFunction).toHaveBeenCalledWith(items2);
|
|
48
46
|
(0, vitest_1.expect)(queue.count()).toBe(0);
|
|
49
47
|
(0, vitest_1.expect)(queue.isDisposed()).toBe(true);
|
|
50
48
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmD;AACnD,0EAA8C;AAE9C,IAAA,iBAAQ,EAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,eAAe,GAAG,WAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;QAC5D,MAAM,KAAK,GAAG,IAAI,0BAAa,CAAiB;YAC9C,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,IAAI;YACjB,eAAe;SAChB,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACxE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;QAEjD,IAAA,eAAM,EAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE7B,MAAM,KAAK,CAAC,YAAY,EAAE,CAAA;QAE1B,IAAA,eAAM,EAAC,eAAe,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ class BatchingQueue {
|
|
|
15
15
|
#processFunction;
|
|
16
16
|
#timeoutId = null;
|
|
17
17
|
#isProcessing = false;
|
|
18
|
-
#logger;
|
|
19
18
|
#disposed = false;
|
|
20
19
|
#batchTimeout;
|
|
21
20
|
// Helper methods for cross-environment timeout handling
|
|
@@ -39,7 +38,6 @@ class BatchingQueue {
|
|
|
39
38
|
this.#batchSize = params.batchSize;
|
|
40
39
|
this.#processFunction = params.processFunction;
|
|
41
40
|
this.#batchTimeout = params.maxWaitTime;
|
|
42
|
-
this.#logger = params.logger || (() => { });
|
|
43
41
|
}
|
|
44
42
|
async disposeAsync() {
|
|
45
43
|
this.#disposed = true;
|
|
@@ -95,11 +93,14 @@ class BatchingQueue {
|
|
|
95
93
|
}
|
|
96
94
|
this.#isProcessing = true;
|
|
97
95
|
const batchToProcess = this.#getBatch(this.#batchSize);
|
|
96
|
+
if (this.#disposed)
|
|
97
|
+
return;
|
|
98
98
|
try {
|
|
99
99
|
await this.#processFunction(batchToProcess);
|
|
100
100
|
}
|
|
101
101
|
catch (error) {
|
|
102
|
-
|
|
102
|
+
console.error('Batch processing failed:', error);
|
|
103
|
+
this.#disposed = true;
|
|
103
104
|
}
|
|
104
105
|
finally {
|
|
105
106
|
this.#isProcessing = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAU,SAAQ,IAAI;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;CACd"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,SAAU,SAAQ,IAAI;IACrC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;CACd;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACrB;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACrB,SAAS,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectLoader2.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAE,oBAAoB,EAAgB,MAAM,cAAc,CAAA;AAOjE,qBAAa,aAAa;;gBAiBZ,OAAO,EAAE,oBAAoB;IAqCnC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B,aAAa,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAY1C,SAAS,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,cAAc,CAAC,IAAI,CAAC;IA4ChD,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa;IAIxD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;CAGnD"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { MemoryCache } from '../deferment/MemoryCache.js';
|
|
2
|
-
import { DefermentManager } from '../deferment/defermentManager.js';
|
|
3
1
|
import AggregateQueue from '../queues/aggregateQueue.js';
|
|
4
2
|
import AsyncGeneratorQueue from '../queues/asyncGeneratorQueue.js';
|
|
5
3
|
import { take } from '../types/functions.js';
|
|
@@ -16,7 +14,6 @@ export class ObjectLoader2 {
|
|
|
16
14
|
#cacheReader;
|
|
17
15
|
#cacheWriter;
|
|
18
16
|
#deferments;
|
|
19
|
-
#cache;
|
|
20
17
|
#gathered;
|
|
21
18
|
#root = undefined;
|
|
22
19
|
#isRootStored = false;
|
|
@@ -34,11 +31,7 @@ export class ObjectLoader2 {
|
|
|
34
31
|
};
|
|
35
32
|
this.#gathered = new AsyncGeneratorQueue();
|
|
36
33
|
this.#database = options.database;
|
|
37
|
-
this.#
|
|
38
|
-
maxSizeInMb: 500, // 500 MB
|
|
39
|
-
ttlms: 5_000 // 5 seconds
|
|
40
|
-
}, this.#logger);
|
|
41
|
-
this.#deferments = new DefermentManager(this.#cache, this.#logger);
|
|
34
|
+
this.#deferments = options.deferments;
|
|
42
35
|
this.#downloader = options.downloader;
|
|
43
36
|
this.#cacheReader = new CacheReader(this.#database, this.#deferments, this.#logger, cacheOptions);
|
|
44
37
|
this.#cacheReader.initializeQueue(this.#gathered, this.#downloader);
|
|
@@ -54,7 +47,6 @@ export class ObjectLoader2 {
|
|
|
54
47
|
this.#cacheReader.disposeAsync()
|
|
55
48
|
]);
|
|
56
49
|
this.#deferments.dispose();
|
|
57
|
-
this.#cache.dispose();
|
|
58
50
|
}
|
|
59
51
|
async getRootObject() {
|
|
60
52
|
if (!this.#root) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectLoader2.js","sourceRoot":"","sources":["../../../src/core/objectLoader2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CustomLogger } from '../types/functions.js';
|
|
2
|
-
import { Base } from '../types/types.js';
|
|
1
|
+
import { CustomLogger, Fetcher } from '../types/functions.js';
|
|
2
|
+
import { Base, ObjectAttributeMask } from '../types/types.js';
|
|
3
3
|
import { ObjectLoader2 } from './objectLoader2.js';
|
|
4
4
|
export interface ObjectLoader2FactoryOptions {
|
|
5
5
|
keyRange?: {
|
|
@@ -8,6 +8,10 @@ export interface ObjectLoader2FactoryOptions {
|
|
|
8
8
|
upperBound: Function;
|
|
9
9
|
};
|
|
10
10
|
indexedDB?: IDBFactory;
|
|
11
|
+
fetch?: Fetcher;
|
|
12
|
+
attributeMask?: ObjectAttributeMask;
|
|
13
|
+
useCache?: boolean;
|
|
14
|
+
debug?: boolean;
|
|
11
15
|
logger?: CustomLogger;
|
|
12
16
|
}
|
|
13
17
|
export declare class ObjectLoader2Factory {
|
|
@@ -20,6 +24,7 @@ export declare class ObjectLoader2Factory {
|
|
|
20
24
|
token?: string;
|
|
21
25
|
headers?: Headers;
|
|
22
26
|
options?: ObjectLoader2FactoryOptions;
|
|
27
|
+
attributeMask?: ObjectAttributeMask;
|
|
23
28
|
}): ObjectLoader2;
|
|
24
29
|
static getLogger(providedLogger?: CustomLogger): CustomLogger | undefined;
|
|
25
30
|
static logger: CustomLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,OAAO,EAGR,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAMlD,MAAM,WAAW,2BAA2B;IAE1C,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAC;QAAC,UAAU,EAAE,QAAQ,CAAA;KAAE,CAAA;IAC1E,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa;IAexD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAKlD,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE;QAC3B,SAAS,EAAE,MAAM,CAAA;QACjB,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,MAAM,CAAA;QAChB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,OAAO,CAAC,EAAE,2BAA2B,CAAA;QACrC,aAAa,CAAC,EAAE,mBAAmB,CAAA;KACpC,GAAG,aAAa;IA8CjB,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS;IAOzE,MAAM,CAAC,MAAM,EAAE,YAAY,CAE1B;CACF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DefermentManager, MemoryOnlyDeferment } from '../deferment/defermentManager.js';
|
|
1
2
|
import { getFeatureFlag, ObjectLoader2Flags } from '../types/functions.js';
|
|
2
3
|
import { ObjectLoader2 } from './objectLoader2.js';
|
|
3
4
|
import { IndexedDatabase } from './stages/indexedDatabase.js';
|
|
@@ -13,6 +14,7 @@ export class ObjectLoader2Factory {
|
|
|
13
14
|
});
|
|
14
15
|
const loader = new ObjectLoader2({
|
|
15
16
|
rootId: root.id,
|
|
17
|
+
deferments: new MemoryOnlyDeferment(records),
|
|
16
18
|
database: new MemoryDatabase({ items: records }),
|
|
17
19
|
downloader: new MemoryDownloader(root.id, records)
|
|
18
20
|
});
|
|
@@ -25,10 +27,14 @@ export class ObjectLoader2Factory {
|
|
|
25
27
|
static createFromUrl(params) {
|
|
26
28
|
const log = ObjectLoader2Factory.getLogger(params.options?.logger);
|
|
27
29
|
let database;
|
|
28
|
-
if (
|
|
30
|
+
if (params.options?.debug === true ||
|
|
31
|
+
getFeatureFlag(ObjectLoader2Flags.DEBUG) === 'true') {
|
|
29
32
|
this.logger('Using DEBUG mode for ObjectLoader2Factory');
|
|
30
33
|
}
|
|
31
|
-
|
|
34
|
+
const useCache = params.options?.useCache ?? true;
|
|
35
|
+
const flag = getFeatureFlag(ObjectLoader2Flags.USE_CACHE);
|
|
36
|
+
const flagAllowsCache = flag !== 'false';
|
|
37
|
+
if (useCache && flagAllowsCache) {
|
|
32
38
|
database = new IndexedDatabase({
|
|
33
39
|
indexedDB: params.options?.indexedDB,
|
|
34
40
|
keyRange: params.options?.keyRange
|
|
@@ -40,18 +46,22 @@ export class ObjectLoader2Factory {
|
|
|
40
46
|
});
|
|
41
47
|
this.logger('Disabled persistent caching for ObjectLoader2. Using MemoryDatabase');
|
|
42
48
|
}
|
|
49
|
+
const logger = log || (() => { });
|
|
43
50
|
const loader = new ObjectLoader2({
|
|
44
51
|
rootId: params.objectId,
|
|
52
|
+
deferments: new DefermentManager(logger),
|
|
45
53
|
downloader: new ServerDownloader({
|
|
46
54
|
serverUrl: params.serverUrl,
|
|
47
55
|
streamId: params.streamId,
|
|
48
56
|
objectId: params.objectId,
|
|
49
57
|
token: params.token,
|
|
50
58
|
headers: params.headers,
|
|
51
|
-
|
|
59
|
+
fetch: params.options?.fetch,
|
|
60
|
+
attributeMask: params.attributeMask,
|
|
61
|
+
logger
|
|
52
62
|
}),
|
|
53
63
|
database,
|
|
54
|
-
logger
|
|
64
|
+
logger
|
|
55
65
|
});
|
|
56
66
|
return loader;
|
|
57
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectLoader2Factory.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.test.d.ts","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
import { describe, it, expect, beforeEach } from 'vitest';
|
|
3
|
+
import { ObjectLoader2Factory } from './objectLoader2Factory.js';
|
|
4
|
+
describe('ObjectLoader2Factory', () => {
|
|
5
|
+
let testObjects;
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
testObjects = [
|
|
8
|
+
{
|
|
9
|
+
id: 'root-id',
|
|
10
|
+
speckle_type: 'Base',
|
|
11
|
+
__closure: {
|
|
12
|
+
'child-1': 1,
|
|
13
|
+
'child-2': 2
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
id: 'child-1',
|
|
18
|
+
speckle_type: 'Base'
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
id: 'child-2',
|
|
22
|
+
speckle_type: 'Base'
|
|
23
|
+
}
|
|
24
|
+
];
|
|
25
|
+
});
|
|
26
|
+
describe('createFromObjects', () => {
|
|
27
|
+
it('should create ObjectLoader2 from array of objects', async () => {
|
|
28
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
29
|
+
expect(loader).toBeDefined();
|
|
30
|
+
// Test that we can get the root object
|
|
31
|
+
const rootObject = await loader.getRootObject();
|
|
32
|
+
expect(rootObject?.baseId).toBe('root-id');
|
|
33
|
+
expect(rootObject?.base?.speckle_type).toBe('Base');
|
|
34
|
+
await loader.disposeAsync();
|
|
35
|
+
});
|
|
36
|
+
it('should use first object as root', async () => {
|
|
37
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
38
|
+
const rootObject = await loader.getRootObject();
|
|
39
|
+
expect(rootObject?.baseId).toBe('root-id');
|
|
40
|
+
expect(rootObject?.base?.__closure).toEqual({
|
|
41
|
+
'child-1': 1,
|
|
42
|
+
'child-2': 2
|
|
43
|
+
});
|
|
44
|
+
await loader.disposeAsync();
|
|
45
|
+
});
|
|
46
|
+
it('should allow iteration over all objects', async () => {
|
|
47
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
48
|
+
const objects = [];
|
|
49
|
+
for await (const obj of loader.getObjectIterator()) {
|
|
50
|
+
objects.push(obj);
|
|
51
|
+
}
|
|
52
|
+
expect(objects).toHaveLength(3);
|
|
53
|
+
expect(objects[0].id).toBe('root-id');
|
|
54
|
+
await loader.disposeAsync();
|
|
55
|
+
});
|
|
56
|
+
it('should get total object count correctly', async () => {
|
|
57
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
58
|
+
const totalCount = await loader.getTotalObjectCount();
|
|
59
|
+
expect(totalCount).toBe(3); // root + 2 children
|
|
60
|
+
await loader.disposeAsync();
|
|
61
|
+
});
|
|
62
|
+
it('should handle empty objects array', () => {
|
|
63
|
+
expect(() => {
|
|
64
|
+
ObjectLoader2Factory.createFromObjects([]);
|
|
65
|
+
}).toThrow();
|
|
66
|
+
});
|
|
67
|
+
it('should get individual objects by id', async () => {
|
|
68
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
69
|
+
const rootObj = await loader.getObject({ id: 'root-id' });
|
|
70
|
+
expect(rootObj.id).toBe('root-id');
|
|
71
|
+
expect(rootObj.speckle_type).toBe('Base');
|
|
72
|
+
const child1 = await loader.getObject({ id: 'child-1' });
|
|
73
|
+
expect(child1.id).toBe('child-1');
|
|
74
|
+
const child2 = await loader.getObject({ id: 'child-2' });
|
|
75
|
+
expect(child2.id).toBe('child-2');
|
|
76
|
+
await loader.disposeAsync();
|
|
77
|
+
});
|
|
78
|
+
it('should get individual objects by id that does not exist', async () => {
|
|
79
|
+
const loader = ObjectLoader2Factory.createFromObjects(testObjects);
|
|
80
|
+
const rootObj = await loader.getObject({ id: 'root-id' });
|
|
81
|
+
expect(rootObj.id).toBe('root-id');
|
|
82
|
+
expect(rootObj.speckle_type).toBe('Base');
|
|
83
|
+
const getObjectPromise = loader.getObject({ id: 'child-11111' });
|
|
84
|
+
await expect(getObjectPromise).rejects.toThrow();
|
|
85
|
+
await loader.disposeAsync();
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
describe('createFromJSON', () => {
|
|
89
|
+
it('should create ObjectLoader2 from JSON string', async () => {
|
|
90
|
+
const json = JSON.stringify(testObjects);
|
|
91
|
+
const loader = ObjectLoader2Factory.createFromJSON(json);
|
|
92
|
+
expect(loader).toBeDefined();
|
|
93
|
+
const rootObject = await loader.getRootObject();
|
|
94
|
+
expect(rootObject?.baseId).toBe('root-id');
|
|
95
|
+
await loader.disposeAsync();
|
|
96
|
+
});
|
|
97
|
+
it('should handle invalid JSON', () => {
|
|
98
|
+
expect(() => {
|
|
99
|
+
ObjectLoader2Factory.createFromJSON('invalid json');
|
|
100
|
+
}).toThrow();
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
});
|
|
104
|
+
//# sourceMappingURL=objectLoader2Factory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectLoader2Factory.test.js","sourceRoot":"","sources":["../../../src/core/objectLoader2Factory.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { Deferment } from '../deferment/defermentManager.js';
|
|
1
2
|
import { CustomLogger } from '../types/functions.js';
|
|
2
3
|
import { Base } from '../types/types.js';
|
|
3
4
|
import { Downloader, Database } from './interfaces.js';
|
|
4
5
|
export interface ObjectLoader2Options {
|
|
5
6
|
rootId: string;
|
|
7
|
+
deferments: Deferment;
|
|
6
8
|
downloader: Downloader;
|
|
7
9
|
database: Database;
|
|
8
10
|
logger?: CustomLogger;
|
|
@@ -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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Deferment } from '../../deferment/defermentManager.js';
|
|
2
2
|
import Queue from '../../queues/queue.js';
|
|
3
3
|
import { CustomLogger } from '../../types/functions.js';
|
|
4
4
|
import { Item, Base } from '../../types/types.js';
|
|
@@ -6,7 +6,7 @@ import { Database } from '../interfaces.js';
|
|
|
6
6
|
import { CacheOptions } from '../options.js';
|
|
7
7
|
export declare class CacheReader {
|
|
8
8
|
#private;
|
|
9
|
-
constructor(database: Database, defermentManager:
|
|
9
|
+
constructor(database: Database, defermentManager: Deferment, logger: CustomLogger, options: CacheOptions);
|
|
10
10
|
initializeQueue(foundQueue: Queue<Item>, notFoundQueue: Queue<string>): void;
|
|
11
11
|
getObject(params: {
|
|
12
12
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheReader.d.ts","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
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"}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"cacheReader.js","sourceRoot":"","sources":["../../../../src/core/stages/cacheReader.ts"],"names":[],"mappings":"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"}
|