bruce-models 7.1.69 → 7.1.70

package/dist/bruce-models.umd.js

@@ -5295,13 +5295,18 @@
                         }
                         const data = yield Promise.all(reqs);
                         // Populate array, while checking for already added types.
+                        // Batched ID requests can overlap.
                         const types = [];
+                        const seenIds = new Set();
                         for (const item of data) {
                             for (const type of item.Items) {
-                                appendInternalAttrSchema(type);
-                                if (!types.find(x => x.ID == type.ID)) {
-                                    types.push(type);
+                                const key = String(type.ID);
+                                if (seenIds.has(key)) {
+                                    continue;
                                 }
+                                seenIds.add(key);
+                                appendInternalAttrSchema(type);
+                                types.push(type);
                             }
                         }
                         res({
@@ -6292,13 +6297,22 @@
                 const reqs = [];
                 if (reqIds.length > 0) {
                     const req = api.POST(url, reqData, exports.Api.PrepReqParams(reqParams));
+                    const itemsById = req.then(data => {
+                        const map = new Map();
+                        for (const item of data.Items) {
+                            const id = String(item.Bruce.ID);
+                            if (!map.has(id)) {
+                                map.set(id, item);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqIds.length; i++) {
                         const entityId = reqIds[i];
                         const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                         const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const data = yield req;
-                                const item = data.Items.find(x => x.Bruce.ID == entityId);
+                                const item = (yield itemsById).get(String(entityId));
                                 res({
                                     entity: item
                                 });
@@ -13188,11 +13202,19 @@
                             rej(e);
                         }
                     }));
+                    const sourcesByKey = prom.then((sources) => {
+                        const map = new Map();
+                        for (const s of sources) {
+                            if (!map.has(s["SourceRecord.Key"])) {
+                                map.set(s["SourceRecord.Key"], s);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqKeys.length; i++) {
                         const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const sources = yield prom;
-                                res(sources.find((s) => s["SourceRecord.Key"] === reqKeys[i]));
+                                res((yield sourcesByKey).get(reqKeys[i]));
                             }
                             catch (e) {
                                 rej(e);
@@ -13452,12 +13474,20 @@
                             rej(e);
                         }
                     }));
+                    const tagsById = prom.then((tags) => {
+                        const map = new Map();
+                        for (const t of tags) {
+                            if (!map.has(t.ID)) {
+                                map.set(t.ID, t);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqIds.length; i++) {
                         const id = reqIds[i];
                         const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const tags = yield prom;
-                                const tag = tags.find((t) => t.ID === id);
+                                const tag = (yield tagsById).get(id);
                                 res({
                                     tag: tag
                                 });
@@ -15772,8 +15802,9 @@
                 }
                 else if (tilesetIds.length > 1) {
                     const tilesets = yield api.GET("ui.tilesets", exports.Api.PrepReqParams(reqParams));
+                    const tilesetIdsSet = new Set(tilesetIds);
                     for (const tileset of tilesets) {
-                        if (tilesetIds.indexOf(tileset.ID) >= 0) {
+                        if (tilesetIdsSet.has(tileset.ID)) {
                             mapping[tileset.ID] = tileset.Type;
                         }
                     }
@@ -19405,7 +19436,7 @@
     })(exports.UrlUtils || (exports.UrlUtils = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "7.1.69";
+    const VERSION = "7.1.70";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;