@xh/hoist 77.0.0-SNAPSHOT.1761095335630 → 77.0.0-SNAPSHOT.1761141053211
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/build/types/data/Store.d.ts +1 -0
- package/data/Store.ts +13 -3
- package/package.json +1 -1
- package/promise/Promise.ts +3 -3
- package/tsconfig.tsbuildinfo +1 -1
package/data/Store.ts
CHANGED
|
@@ -1041,26 +1041,36 @@ export class Store extends HoistBase {
|
|
|
1041
1041
|
return ret;
|
|
1042
1042
|
}
|
|
1043
1043
|
|
|
1044
|
-
private createRecords(
|
|
1044
|
+
private createRecords(
|
|
1045
|
+
rawData: PlainObject[],
|
|
1046
|
+
parent: StoreRecord,
|
|
1047
|
+
recordMap: Map<StoreRecordId, StoreRecord> = new Map(),
|
|
1048
|
+
summaryRecordIds: Set<StoreRecordId> = this.summaryRecordIds
|
|
1049
|
+
) {
|
|
1045
1050
|
const {loadTreeData, loadTreeDataFrom} = this;
|
|
1051
|
+
|
|
1046
1052
|
rawData.forEach(raw => {
|
|
1047
1053
|
const rec = this.createRecord(raw, parent),
|
|
1048
1054
|
{id} = rec;
|
|
1049
1055
|
|
|
1050
1056
|
throwIf(
|
|
1051
|
-
recordMap.has(id) ||
|
|
1057
|
+
recordMap.has(id) || summaryRecordIds.has(id),
|
|
1052
1058
|
`ID ${id} is not unique. Use the 'Store.idSpec' config to resolve a unique ID for each record.`
|
|
1053
1059
|
);
|
|
1054
1060
|
|
|
1055
1061
|
recordMap.set(id, rec);
|
|
1056
1062
|
|
|
1057
1063
|
if (loadTreeData && raw[loadTreeDataFrom]) {
|
|
1058
|
-
this.createRecords(raw[loadTreeDataFrom], rec, recordMap);
|
|
1064
|
+
this.createRecords(raw[loadTreeDataFrom], rec, recordMap, summaryRecordIds);
|
|
1059
1065
|
}
|
|
1060
1066
|
});
|
|
1061
1067
|
return recordMap;
|
|
1062
1068
|
}
|
|
1063
1069
|
|
|
1070
|
+
private get summaryRecordIds(): Set<StoreRecordId> {
|
|
1071
|
+
return new Set(this.summaryRecords?.map(it => it.id) ?? []);
|
|
1072
|
+
}
|
|
1073
|
+
|
|
1064
1074
|
private parseRaw(data: PlainObject): PlainObject {
|
|
1065
1075
|
// a) create/prepare the data object
|
|
1066
1076
|
const ret = Object.create(this._dataDefaults);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xh/hoist",
|
|
3
|
-
"version": "77.0.0-SNAPSHOT.
|
|
3
|
+
"version": "77.0.0-SNAPSHOT.1761141053211",
|
|
4
4
|
"description": "Hoist add-on for building and deploying React Applications.",
|
|
5
5
|
"repository": "github:xh/hoist-react",
|
|
6
6
|
"homepage": "https://xh.io",
|
package/promise/Promise.ts
CHANGED
|
@@ -132,15 +132,15 @@ export function waitFor(
|
|
|
132
132
|
condition: () => boolean,
|
|
133
133
|
{interval = 50, timeout = 5 * SECONDS}: {interval?: number; timeout?: number} = {}
|
|
134
134
|
): Promise<void> {
|
|
135
|
-
if (
|
|
136
|
-
if (
|
|
135
|
+
if (interval <= 0) throw new Error('Invalid interval');
|
|
136
|
+
if (timeout != null && timeout <= 0) throw new Error('Invalid timeout');
|
|
137
137
|
|
|
138
138
|
const startTime = Date.now();
|
|
139
139
|
return new Promise((resolve, reject) => {
|
|
140
140
|
const resolveOnMet = () => {
|
|
141
141
|
if (condition()) {
|
|
142
142
|
resolve();
|
|
143
|
-
} else if (olderThan(startTime, timeout)) {
|
|
143
|
+
} else if (timeout != null && olderThan(startTime, timeout)) {
|
|
144
144
|
reject(Exception.timeout({interval: Date.now() - startTime}));
|
|
145
145
|
} else {
|
|
146
146
|
setTimeout(resolveOnMet, interval);
|