@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
  1. package/dist/commonjs/core/objectLoader2.d.ts.map +1 -1
  2. package/dist/commonjs/core/objectLoader2.js +1 -9
  3. package/dist/commonjs/core/objectLoader2.js.map +1 -1
  4. package/dist/commonjs/core/objectLoader2Factory.d.ts +7 -2
  5. package/dist/commonjs/core/objectLoader2Factory.d.ts.map +1 -1
  6. package/dist/commonjs/core/objectLoader2Factory.js +14 -4
  7. package/dist/commonjs/core/objectLoader2Factory.js.map +1 -1
  8. package/dist/commonjs/core/objectLoader2Factory.test.d.ts +2 -0
  9. package/dist/commonjs/core/objectLoader2Factory.test.d.ts.map +1 -0
  10. package/dist/commonjs/core/objectLoader2Factory.test.js +106 -0
  11. package/dist/commonjs/core/objectLoader2Factory.test.js.map +1 -0
  12. package/dist/commonjs/core/options.d.ts +2 -0
  13. package/dist/commonjs/core/options.d.ts.map +1 -1
  14. package/dist/commonjs/core/stages/cacheReader.d.ts +2 -2
  15. package/dist/commonjs/core/stages/cacheReader.d.ts.map +1 -1
  16. package/dist/commonjs/core/stages/cacheReader.js.map +1 -1
  17. package/dist/commonjs/core/stages/cacheWriter.d.ts +2 -2
  18. package/dist/commonjs/core/stages/cacheWriter.d.ts.map +1 -1
  19. package/dist/commonjs/core/stages/cacheWriter.js +4 -4
  20. package/dist/commonjs/core/stages/cacheWriter.js.map +1 -1
  21. package/dist/commonjs/core/stages/serverDownloader.d.ts +2 -1
  22. package/dist/commonjs/core/stages/serverDownloader.d.ts.map +1 -1
  23. package/dist/commonjs/core/stages/serverDownloader.js +3 -2
  24. package/dist/commonjs/core/stages/serverDownloader.js.map +1 -1
  25. package/dist/commonjs/deferment/defermentManager.d.ts +18 -2
  26. package/dist/commonjs/deferment/defermentManager.d.ts.map +1 -1
  27. package/dist/commonjs/deferment/defermentManager.js +30 -3
  28. package/dist/commonjs/deferment/defermentManager.js.map +1 -1
  29. package/dist/commonjs/deferment/defermentManager.test.js +21 -16
  30. package/dist/commonjs/deferment/defermentManager.test.js.map +1 -1
  31. package/dist/commonjs/queues/batchingQueue.d.ts +2 -2
  32. package/dist/commonjs/queues/batchingQueue.d.ts.map +1 -1
  33. package/dist/commonjs/queues/batchingQueue.dispose.test.js +1 -3
  34. package/dist/commonjs/queues/batchingQueue.dispose.test.js.map +1 -1
  35. package/dist/commonjs/queues/batchingQueue.js +20 -15
  36. package/dist/commonjs/queues/batchingQueue.js.map +1 -1
  37. package/dist/commonjs/queues/batchingQueue.test.js +98 -0
  38. package/dist/commonjs/queues/batchingQueue.test.js.map +1 -1
  39. package/dist/commonjs/types/types.d.ts +5 -0
  40. package/dist/commonjs/types/types.d.ts.map +1 -1
  41. package/dist/esm/core/objectLoader2.d.ts.map +1 -1
  42. package/dist/esm/core/objectLoader2.js +1 -9
  43. package/dist/esm/core/objectLoader2.js.map +1 -1
  44. package/dist/esm/core/objectLoader2Factory.d.ts +7 -2
  45. package/dist/esm/core/objectLoader2Factory.d.ts.map +1 -1
  46. package/dist/esm/core/objectLoader2Factory.js +14 -4
  47. package/dist/esm/core/objectLoader2Factory.js.map +1 -1
  48. package/dist/esm/core/objectLoader2Factory.test.d.ts +2 -0
  49. package/dist/esm/core/objectLoader2Factory.test.d.ts.map +1 -0
  50. package/dist/esm/core/objectLoader2Factory.test.js +104 -0
  51. package/dist/esm/core/objectLoader2Factory.test.js.map +1 -0
  52. package/dist/esm/core/options.d.ts +2 -0
  53. package/dist/esm/core/options.d.ts.map +1 -1
  54. package/dist/esm/core/stages/cacheReader.d.ts +2 -2
  55. package/dist/esm/core/stages/cacheReader.d.ts.map +1 -1
  56. package/dist/esm/core/stages/cacheReader.js.map +1 -1
  57. package/dist/esm/core/stages/cacheWriter.d.ts +2 -2
  58. package/dist/esm/core/stages/cacheWriter.d.ts.map +1 -1
  59. package/dist/esm/core/stages/cacheWriter.js +4 -4
  60. package/dist/esm/core/stages/cacheWriter.js.map +1 -1
  61. package/dist/esm/core/stages/serverDownloader.d.ts +2 -1
  62. package/dist/esm/core/stages/serverDownloader.d.ts.map +1 -1
  63. package/dist/esm/core/stages/serverDownloader.js +3 -2
  64. package/dist/esm/core/stages/serverDownloader.js.map +1 -1
  65. package/dist/esm/deferment/defermentManager.d.ts +18 -2
  66. package/dist/esm/deferment/defermentManager.d.ts.map +1 -1
  67. package/dist/esm/deferment/defermentManager.js +28 -2
  68. package/dist/esm/deferment/defermentManager.js.map +1 -1
  69. package/dist/esm/deferment/defermentManager.test.js +21 -16
  70. package/dist/esm/deferment/defermentManager.test.js.map +1 -1
  71. package/dist/esm/queues/batchingQueue.d.ts +2 -2
  72. package/dist/esm/queues/batchingQueue.d.ts.map +1 -1
  73. package/dist/esm/queues/batchingQueue.dispose.test.js +1 -3
  74. package/dist/esm/queues/batchingQueue.dispose.test.js.map +1 -1
  75. package/dist/esm/queues/batchingQueue.js +20 -15
  76. package/dist/esm/queues/batchingQueue.js.map +1 -1
  77. package/dist/esm/queues/batchingQueue.test.js +98 -0
  78. package/dist/esm/queues/batchingQueue.test.js.map +1 -1
  79. package/dist/esm/types/types.d.ts +5 -0
  80. package/dist/esm/types/types.d.ts.map +1 -1
  81. package/package.json +2 -2
  82. package/src/core/objectLoader2.spec.ts +10 -3
  83. package/src/core/objectLoader2.ts +3 -13
  84. package/src/core/objectLoader2Factory.test.ts +135 -0
  85. package/src/core/objectLoader2Factory.ts +29 -6
  86. package/src/core/options.ts +2 -0
  87. package/src/core/stages/cacheReader.spec.ts +1 -1
  88. package/src/core/stages/cacheReader.ts +3 -3
  89. package/src/core/stages/cacheWriter.spec.ts +1 -1
  90. package/src/core/stages/cacheWriter.ts +5 -5
  91. package/src/core/stages/serverDownloader.spec.ts +122 -0
  92. package/src/core/stages/serverDownloader.ts +7 -4
  93. package/src/deferment/defermentManager.test.ts +21 -16
  94. package/src/deferment/defermentManager.ts +39 -3
  95. package/src/queues/batchingQueue.dispose.test.ts +1 -3
  96. package/src/queues/batchingQueue.test.ts +121 -0
  97. package/src/queues/batchingQueue.ts +21 -19
  98. package/src/types/types.ts +5 -0
@@ -1 +1 @@
1
- {"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defermentManager.test.js","sourceRoot":"","sources":["../../../src/deferment/defermentManager.test.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,17 @@
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;
12
10
  addAll(keys: string[], items: T[]): void;
11
+ flush(): Promise<void>;
13
12
  get(id: string): T | undefined;
14
13
  count(): number;
15
14
  isDisposed(): boolean;
15
+ isErrored(): boolean;
16
16
  }
17
17
  //# sourceMappingURL=batchingQueue.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AASpD,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC;;gBA8BtB,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;QAC9C,MAAM,CAAC,EAAE,YAAY,CAAA;KACtB;IAOK,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;IA4CxC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAI9B,KAAK,IAAI,MAAM;IAIf,UAAU,IAAI,OAAO;CAOtB"}
1
+ {"version":3,"file":"batchingQueue.d.ts","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC;;gBA8BtB,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;IAsBnC,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;IAqBlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAI9B,KAAK,IAAI,MAAM;IAIf,UAAU,IAAI,OAAO;IAIrB,SAAS,IAAI,OAAO;CAOrB"}
@@ -12,7 +12,7 @@ describe('BatchingQueue disposal', () => {
12
12
  items.forEach((item) => queue.add(item.id, item));
13
13
  expect(queue.count()).toBe(3);
14
14
  await queue.disposeAsync();
15
- expect(processFunction).toHaveBeenCalledWith(items);
15
+ expect(processFunction).toHaveBeenCalled();
16
16
  expect(queue.count()).toBe(0);
17
17
  expect(queue.isDisposed()).toBe(true);
18
18
  });
@@ -38,8 +38,6 @@ describe('BatchingQueue disposal', () => {
38
38
  expect(queue.isDisposed()).toBe(true);
39
39
  resolveProcess();
40
40
  await disposePromise;
41
- expect(processFunction).toHaveBeenCalledTimes(2);
42
- expect(processFunction).toHaveBeenCalledWith(items2);
43
41
  expect(queue.count()).toBe(0);
44
42
  expect(queue.isDisposed()).toBe(true);
45
43
  });
@@ -1 +1 @@
1
- {"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"batchingQueue.dispose.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.dispose.test.ts"],"names":[],"mappings":"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"}
@@ -10,8 +10,8 @@ export default class BatchingQueue {
10
10
  #processFunction;
11
11
  #timeoutId = null;
12
12
  #isProcessing = false;
13
- #logger;
14
- #disposed = false;
13
+ #isDisposed = false;
14
+ #isErrored = false;
15
15
  #batchTimeout;
16
16
  // Helper methods for cross-environment timeout handling
17
17
  #getSetTimeoutFn() {
@@ -34,10 +34,11 @@ export default class BatchingQueue {
34
34
  this.#batchSize = params.batchSize;
35
35
  this.#processFunction = params.processFunction;
36
36
  this.#batchTimeout = params.maxWaitTime;
37
- this.#logger = params.logger || (() => { });
38
37
  }
39
38
  async disposeAsync() {
40
- this.#disposed = true;
39
+ if (this.#isDisposed)
40
+ return;
41
+ this.#isDisposed = true;
41
42
  if (this.#timeoutId) {
42
43
  this.#getClearTimeoutFn()(this.#timeoutId);
43
44
  this.#timeoutId = null;
@@ -49,52 +50,53 @@ export default class BatchingQueue {
49
50
  // After any ongoing flush is completed, there might be items in the queue.
50
51
  // We should flush them.
51
52
  if (this.#queue.size > 0) {
52
- await this.#flush();
53
+ await this.flush();
53
54
  }
54
55
  }
55
56
  add(key, item) {
56
- if (this.#disposed)
57
+ if (this.#isDisposed || this.#isErrored)
57
58
  return;
58
59
  this.#queue.enqueue(key, item);
59
60
  this.#addCheck();
60
61
  }
61
62
  addAll(keys, items) {
62
- if (this.#disposed)
63
+ if (this.#isDisposed || this.#isErrored)
63
64
  return;
64
65
  this.#queue.enqueueAll(keys, items);
65
66
  this.#addCheck();
66
67
  }
67
68
  #addCheck() {
68
- if (this.#disposed)
69
+ if (this.#isDisposed)
69
70
  return;
70
71
  if (this.#queue.size >= this.#batchSize) {
71
72
  // Fire and forget, no need to await
72
73
  // eslint-disable-next-line @typescript-eslint/no-floating-promises
73
- this.#flush();
74
+ this.flush();
74
75
  }
75
76
  else {
76
77
  if (this.#timeoutId) {
77
78
  this.#getClearTimeoutFn()(this.#timeoutId);
78
79
  }
79
80
  // eslint-disable-next-line @typescript-eslint/no-misused-promises
80
- this.#timeoutId = this.#getSetTimeoutFn()(() => this.#flush(), this.#batchTimeout);
81
+ this.#timeoutId = this.#getSetTimeoutFn()(() => this.flush(), this.#batchTimeout);
81
82
  }
82
83
  }
83
- async #flush() {
84
+ async flush() {
84
85
  if (this.#timeoutId) {
85
86
  this.#getClearTimeoutFn()(this.#timeoutId);
86
87
  this.#timeoutId = null;
87
88
  }
88
- if (this.#isProcessing || this.#queue.size === 0) {
89
+ if (this.#isErrored || this.#isProcessing || this.#queue.size === 0) {
89
90
  return;
90
91
  }
91
92
  this.#isProcessing = true;
92
- const batchToProcess = this.#getBatch(this.#batchSize);
93
93
  try {
94
+ const batchToProcess = this.#getBatch(this.#batchSize);
94
95
  await this.#processFunction(batchToProcess);
95
96
  }
96
97
  catch (error) {
97
- this.#logger('Batch processing failed:', error);
98
+ console.error('Batch processing failed:', error);
99
+ this.#isErrored = true;
98
100
  }
99
101
  finally {
100
102
  this.#isProcessing = false;
@@ -108,7 +110,10 @@ export default class BatchingQueue {
108
110
  return this.#queue.size;
109
111
  }
110
112
  isDisposed() {
111
- return this.#disposed;
113
+ return this.#isDisposed;
114
+ }
115
+ isErrored() {
116
+ return this.#isErrored;
112
117
  }
113
118
  #getBatch(batchSize) {
114
119
  return this.#queue.spliceValues(0, Math.min(batchSize, this.#queue.size));
@@ -1 +1 @@
1
- {"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"batchingQueue.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.ts"],"names":[],"mappings":"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"}
@@ -129,5 +129,103 @@ describe('BatchingQueue', () => {
129
129
  await queue.disposeAsync();
130
130
  }
131
131
  });
132
+ test('should handle processFunction throwing an exception during flush and is disposed', async () => {
133
+ const errorMessage = 'Process function failed';
134
+ const processFunction = vi.fn().mockRejectedValue(new Error(errorMessage));
135
+ const queue = new BatchingQueue({
136
+ batchSize: 5,
137
+ maxWaitTime: 1000,
138
+ processFunction
139
+ });
140
+ const items = Array.from({ length: 3 }, (_, i) => ({ id: `item-${i}` }));
141
+ items.forEach((item) => queue.add(item.id, item));
142
+ expect(queue.count()).toBe(3);
143
+ // flush should not throw even if processFunction rejects
144
+ await expect(queue.flush()).resolves.not.toThrow();
145
+ expect(processFunction).toHaveBeenCalled();
146
+ expect(queue.count()).toBe(0);
147
+ expect(queue.isDisposed()).toBe(false);
148
+ expect(queue.isErrored()).toBe(true);
149
+ // Add more items after the exception
150
+ queue.add('key3', { id: `item-3` });
151
+ queue.add('key4', { id: `item-4` });
152
+ // Wait to see if second batch gets processed (it shouldn't due to errored state)
153
+ await new Promise((resolve) => setTimeout(resolve, 200));
154
+ expect(queue.count()).toBe(0); // Items were not added due to errored state
155
+ await queue.disposeAsync();
156
+ });
157
+ test('should drain remaining items when disposed', async () => {
158
+ const processSpy = vi.fn();
159
+ const queue = new BatchingQueue({
160
+ batchSize: 5, // Large batch size to prevent automatic processing
161
+ maxWaitTime: 10000, // Long timeout to prevent timeout-based processing
162
+ processFunction: async (batch) => {
163
+ await new Promise((resolve) => setTimeout(resolve, 10));
164
+ processSpy(batch);
165
+ }
166
+ });
167
+ // Add items that won't trigger automatic processing (less than batch size)
168
+ queue.add('key1', 'item1');
169
+ queue.add('key2', 'item2');
170
+ queue.add('key3', 'item3');
171
+ // Verify items are in queue but haven't been processed yet
172
+ expect(queue.count()).toBe(3);
173
+ expect(processSpy).not.toHaveBeenCalled();
174
+ // Dispose should drain the remaining items
175
+ await queue.disposeAsync();
176
+ // Verify all items were processed during disposal
177
+ expect(processSpy).toHaveBeenCalledTimes(1);
178
+ expect(processSpy).toHaveBeenCalledWith(['item1', 'item2', 'item3']);
179
+ expect(queue.count()).toBe(0);
180
+ expect(queue.isDisposed()).toBe(true);
181
+ });
182
+ test('should drain items even with ongoing processing during dispose', async () => {
183
+ const processSpy = vi.fn();
184
+ let firstBatchStarted = false;
185
+ let allowFirstBatchToComplete = null;
186
+ const queue = new BatchingQueue({
187
+ batchSize: 2,
188
+ maxWaitTime: 100,
189
+ processFunction: async (batch) => {
190
+ processSpy(batch);
191
+ // Make the first batch wait for our signal
192
+ if (!firstBatchStarted) {
193
+ firstBatchStarted = true;
194
+ await new Promise((resolve) => {
195
+ allowFirstBatchToComplete = resolve;
196
+ });
197
+ }
198
+ else {
199
+ // Other batches process normally
200
+ await new Promise((resolve) => setTimeout(resolve, 10));
201
+ }
202
+ }
203
+ });
204
+ // Add first batch that will trigger processing but will be blocked
205
+ queue.add('key1', 'item1');
206
+ queue.add('key2', 'item2');
207
+ // Wait for first batch to start processing and allowFirstBatchToComplete to be assigned
208
+ await new Promise((resolve) => setTimeout(resolve, 50));
209
+ expect(firstBatchStarted).toBe(true);
210
+ expect(processSpy).toHaveBeenCalledTimes(1);
211
+ expect(allowFirstBatchToComplete).not.toBeNull();
212
+ // Add more items while first batch is still processing
213
+ queue.add('key3', 'item3');
214
+ queue.add('key4', 'item4');
215
+ // Verify the additional items are queued
216
+ expect(queue.count()).toBe(2);
217
+ // Start disposal (this should wait for ongoing processing and then drain)
218
+ const disposePromise = queue.disposeAsync();
219
+ // Allow the first batch to complete
220
+ allowFirstBatchToComplete();
221
+ // Wait for disposal to complete
222
+ await disposePromise;
223
+ // Verify all batches were processed
224
+ expect(processSpy).toHaveBeenCalledTimes(2);
225
+ expect(processSpy).toHaveBeenCalledWith(['item1', 'item2']);
226
+ expect(processSpy).toHaveBeenCalledWith(['item3', 'item4']);
227
+ expect(queue.count()).toBe(0);
228
+ expect(queue.isDisposed()).toBe(true);
229
+ });
132
230
  });
133
231
  //# sourceMappingURL=batchingQueue.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"batchingQueue.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"batchingQueue.test.js","sourceRoot":"","sources":["../../../src/queues/batchingQueue.test.ts"],"names":[],"mappings":"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"}
@@ -16,4 +16,9 @@ export interface Reference {
16
16
  export interface DataChunk extends Base {
17
17
  data?: Base[];
18
18
  }
19
+ export type ObjectAttributeMask = {
20
+ include: string[];
21
+ } | {
22
+ exclude: string[];
23
+ } | undefined;
19
24
  //# sourceMappingURL=types.d.ts.map
@@ -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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@speckle/objectloader2",
3
- "version": "2.26.1",
3
+ "version": "2.26.3",
4
4
  "description": "This is an updated objectloader for the Speckle viewer written in typescript",
5
5
  "main": "./dist/commonjs/index.js",
6
6
  "module": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
33
33
  "author": "AEC Systems",
34
34
  "license": "Apache-2.0",
35
35
  "dependencies": {
36
- "@speckle/shared": "^2.26.1"
36
+ "@speckle/shared": "^2.26.3"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@types/lodash": "^4.17.5",
@@ -5,6 +5,7 @@ import { IndexedDatabase } from './stages/indexedDatabase.js'
5
5
  import { IDBFactory, IDBKeyRange } from 'fake-indexeddb'
6
6
  import { MemoryDatabase } from './stages/memory/memoryDatabase.js'
7
7
  import { MemoryDownloader } from './stages/memory/memoryDownloader.js'
8
+ import { DefermentManager } from '../deferment/defermentManager.js'
8
9
 
9
10
  describe('objectloader2', () => {
10
11
  test('can get a root object from cache', async () => {
@@ -17,6 +18,7 @@ describe('objectloader2', () => {
17
18
  const loader = new ObjectLoader2({
18
19
  rootId,
19
20
  downloader,
21
+ deferments: new DefermentManager(() => {}),
20
22
  database: new IndexedDatabase({
21
23
  indexedDB: new IDBFactory(),
22
24
  keyRange: IDBKeyRange
@@ -37,6 +39,7 @@ describe('objectloader2', () => {
37
39
  const loader = new ObjectLoader2({
38
40
  rootId,
39
41
  downloader,
42
+ deferments: new DefermentManager(() => {}),
40
43
  database: new IndexedDatabase({
41
44
  indexedDB: new IDBFactory(),
42
45
  keyRange: IDBKeyRange
@@ -58,6 +61,7 @@ describe('objectloader2', () => {
58
61
  const loader = new ObjectLoader2({
59
62
  rootId,
60
63
  downloader,
64
+ deferments: new DefermentManager(() => {}),
61
65
  database: new IndexedDatabase({
62
66
  indexedDB: new IDBFactory(),
63
67
  keyRange: IDBKeyRange
@@ -97,7 +101,8 @@ describe('objectloader2', () => {
97
101
  const loader = new ObjectLoader2({
98
102
  rootId: root.baseId,
99
103
  downloader: new MemoryDownloader(rootId, records),
100
- database: new MemoryDatabase({ items: records })
104
+ database: new MemoryDatabase({ items: records }),
105
+ deferments: new DefermentManager(() => {})
101
106
  })
102
107
 
103
108
  const r = []
@@ -139,7 +144,8 @@ describe('objectloader2', () => {
139
144
  const loader = new ObjectLoader2({
140
145
  rootId: root.baseId,
141
146
  downloader: new MemoryDownloader(rootId, records),
142
- database: new MemoryDatabase({ items: records })
147
+ database: new MemoryDatabase({ items: records }),
148
+ deferments: new DefermentManager(() => {})
143
149
  })
144
150
  const r = []
145
151
  const obj = loader.getObject({ id: child1.baseId })
@@ -180,7 +186,8 @@ describe('objectloader2', () => {
180
186
  database: new IndexedDatabase({
181
187
  indexedDB: new IDBFactory(),
182
188
  keyRange: IDBKeyRange
183
- })
189
+ }),
190
+ deferments: new DefermentManager(() => {})
184
191
  })
185
192
  const x = await loader.getRootObject()
186
193
  await loader.disposeAsync()
@@ -1,5 +1,4 @@
1
- import { MemoryCache } from '../deferment/MemoryCache.js'
2
- import { DefermentManager } from '../deferment/defermentManager.js'
1
+ import { Deferment } from '../deferment/defermentManager.js'
3
2
  import AggregateQueue from '../queues/aggregateQueue.js'
4
3
  import AsyncGeneratorQueue from '../queues/asyncGeneratorQueue.js'
5
4
  import { CustomLogger, take } from '../types/functions.js'
@@ -23,8 +22,7 @@ export class ObjectLoader2 {
23
22
  #cacheReader: CacheReader
24
23
  #cacheWriter: CacheWriter
25
24
 
26
- #deferments: DefermentManager
27
- #cache: MemoryCache
25
+ #deferments: Deferment
28
26
 
29
27
  #gathered: AsyncGeneratorQueue<Item>
30
28
 
@@ -48,14 +46,7 @@ export class ObjectLoader2 {
48
46
  this.#gathered = new AsyncGeneratorQueue()
49
47
 
50
48
  this.#database = options.database
51
- this.#cache = new MemoryCache(
52
- {
53
- maxSizeInMb: 500, // 500 MB
54
- ttlms: 5_000 // 5 seconds
55
- },
56
- this.#logger
57
- )
58
- this.#deferments = new DefermentManager(this.#cache, this.#logger)
49
+ this.#deferments = options.deferments
59
50
  this.#downloader = options.downloader
60
51
  this.#cacheReader = new CacheReader(
61
52
  this.#database,
@@ -83,7 +74,6 @@ export class ObjectLoader2 {
83
74
  this.#cacheReader.disposeAsync()
84
75
  ])
85
76
  this.#deferments.dispose()
86
- this.#cache.dispose()
87
77
  }
88
78
 
89
79
  async getRootObject(): Promise<Item | undefined> {
@@ -0,0 +1,135 @@
1
+ /* eslint-disable camelcase */
2
+ import { describe, it, expect, beforeEach } from 'vitest'
3
+ import { ObjectLoader2Factory } from './objectLoader2Factory.js'
4
+ import { Base } from '../types/types.js'
5
+
6
+ describe('ObjectLoader2Factory', () => {
7
+ let testObjects: Base[]
8
+
9
+ beforeEach(() => {
10
+ testObjects = [
11
+ {
12
+ id: 'root-id',
13
+ speckle_type: 'Base',
14
+ __closure: {
15
+ 'child-1': 1,
16
+ 'child-2': 2
17
+ }
18
+ },
19
+ {
20
+ id: 'child-1',
21
+ speckle_type: 'Base'
22
+ },
23
+ {
24
+ id: 'child-2',
25
+ speckle_type: 'Base'
26
+ }
27
+ ]
28
+ })
29
+
30
+ describe('createFromObjects', () => {
31
+ it('should create ObjectLoader2 from array of objects', async () => {
32
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
33
+
34
+ expect(loader).toBeDefined()
35
+
36
+ // Test that we can get the root object
37
+ const rootObject = await loader.getRootObject()
38
+ expect(rootObject?.baseId).toBe('root-id')
39
+ expect(rootObject?.base?.speckle_type).toBe('Base')
40
+
41
+ await loader.disposeAsync()
42
+ })
43
+
44
+ it('should use first object as root', async () => {
45
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
46
+
47
+ const rootObject = await loader.getRootObject()
48
+ expect(rootObject?.baseId).toBe('root-id')
49
+ expect(rootObject?.base?.__closure).toEqual({
50
+ 'child-1': 1,
51
+ 'child-2': 2
52
+ })
53
+
54
+ await loader.disposeAsync()
55
+ })
56
+
57
+ it('should allow iteration over all objects', async () => {
58
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
59
+
60
+ const objects: Base[] = []
61
+ for await (const obj of loader.getObjectIterator()) {
62
+ objects.push(obj)
63
+ }
64
+
65
+ expect(objects).toHaveLength(3)
66
+ expect(objects[0].id).toBe('root-id')
67
+
68
+ await loader.disposeAsync()
69
+ })
70
+
71
+ it('should get total object count correctly', async () => {
72
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
73
+
74
+ const totalCount = await loader.getTotalObjectCount()
75
+ expect(totalCount).toBe(3) // root + 2 children
76
+
77
+ await loader.disposeAsync()
78
+ })
79
+
80
+ it('should handle empty objects array', () => {
81
+ expect(() => {
82
+ ObjectLoader2Factory.createFromObjects([])
83
+ }).toThrow()
84
+ })
85
+
86
+ it('should get individual objects by id', async () => {
87
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
88
+
89
+ const rootObj = await loader.getObject({ id: 'root-id' })
90
+ expect(rootObj.id).toBe('root-id')
91
+ expect(rootObj.speckle_type).toBe('Base')
92
+
93
+ const child1 = await loader.getObject({ id: 'child-1' })
94
+ expect(child1.id).toBe('child-1')
95
+
96
+ const child2 = await loader.getObject({ id: 'child-2' })
97
+ expect(child2.id).toBe('child-2')
98
+
99
+ await loader.disposeAsync()
100
+ })
101
+
102
+ it('should get individual objects by id that does not exist', async () => {
103
+ const loader = ObjectLoader2Factory.createFromObjects(testObjects)
104
+
105
+ const rootObj = await loader.getObject({ id: 'root-id' })
106
+ expect(rootObj.id).toBe('root-id')
107
+ expect(rootObj.speckle_type).toBe('Base')
108
+
109
+ const getObjectPromise = loader.getObject({ id: 'child-11111' })
110
+ await expect(getObjectPromise).rejects.toThrow()
111
+
112
+ await loader.disposeAsync()
113
+ })
114
+ })
115
+
116
+ describe('createFromJSON', () => {
117
+ it('should create ObjectLoader2 from JSON string', async () => {
118
+ const json = JSON.stringify(testObjects)
119
+ const loader = ObjectLoader2Factory.createFromJSON(json)
120
+
121
+ expect(loader).toBeDefined()
122
+
123
+ const rootObject = await loader.getRootObject()
124
+ expect(rootObject?.baseId).toBe('root-id')
125
+
126
+ await loader.disposeAsync()
127
+ })
128
+
129
+ it('should handle invalid JSON', () => {
130
+ expect(() => {
131
+ ObjectLoader2Factory.createFromJSON('invalid json')
132
+ }).toThrow()
133
+ })
134
+ })
135
+ })