@gooddata/sdk-backend-base 8.13.0-alpha.19 → 8.13.0-alpha.20

package/dist/cachingBackend/index.js

@@ -1,81 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withCaching = exports.RecommendedCachingConfiguration = void 0;
-var tslib_1 = require("tslib");
-var decoratedBackend_1 = require("../decoratedBackend");
-var util_1 = require("@gooddata/util");
-var securitySettings_1 = require("../decoratedBackend/securitySettings");
-var execution_1 = require("../decoratedBackend/execution");
-var catalog_1 = require("../decoratedBackend/catalog");
-var elements_1 = require("../decoratedBackend/elements");
-var json_stable_stringify_1 = tslib_1.__importDefault(require("json-stable-stringify"));
-var compact_1 = tslib_1.__importDefault(require("lodash/compact"));
-var first_1 = tslib_1.__importDefault(require("lodash/first"));
-var flow_1 = tslib_1.__importDefault(require("lodash/flow"));
-var identity_1 = tslib_1.__importDefault(require("lodash/identity"));
-var ts_invariant_1 = tslib_1.__importDefault(require("ts-invariant"));
-var partition_1 = tslib_1.__importDefault(require("lodash/partition"));
-var spark_md5_1 = tslib_1.__importDefault(require("spark-md5"));
-var sdk_model_1 = require("@gooddata/sdk-model");
-var attributes_1 = require("../decoratedBackend/attributes");
-var workspaceSettings_1 = require("../decoratedBackend/workspaceSettings");
+const tslib_1 = require("tslib");
+const decoratedBackend_1 = require("../decoratedBackend");
+const lru_cache_1 = tslib_1.__importDefault(require("lru-cache"));
+const securitySettings_1 = require("../decoratedBackend/securitySettings");
+const execution_1 = require("../decoratedBackend/execution");
+const catalog_1 = require("../decoratedBackend/catalog");
+const elements_1 = require("../decoratedBackend/elements");
+const json_stable_stringify_1 = tslib_1.__importDefault(require("json-stable-stringify"));
+const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
+const first_1 = tslib_1.__importDefault(require("lodash/first"));
+const flow_1 = tslib_1.__importDefault(require("lodash/flow"));
+const identity_1 = tslib_1.__importDefault(require("lodash/identity"));
+const ts_invariant_1 = tslib_1.__importDefault(require("ts-invariant"));
+const partition_1 = tslib_1.__importDefault(require("lodash/partition"));
+const spark_md5_1 = tslib_1.__importDefault(require("spark-md5"));
+const sdk_model_1 = require("@gooddata/sdk-model");
+const attributes_1 = require("../decoratedBackend/attributes");
+const workspaceSettings_1 = require("../decoratedBackend/workspaceSettings");
 //
 // Execution caching
 //
-var WithExecutionCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithExecutionCaching, _super);
-    function WithExecutionCaching(decorated, ctx) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.execute = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var cacheKey, cache, cacheEntry, result, _a;
-            var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        cacheKey = this.fingerprint();
-                        cache = this.ctx.caches.execution;
-                        cacheEntry = cache.get(cacheKey);
-                        if (!cacheEntry) {
-                            result = _super.prototype.execute.call(this)
-                                .then(function (res) {
-                                return new WithExecutionResultCaching(res, _this.createNew, _this.ctx);
-                            })
-                                .catch(function (e) {
-                                cache.delete(cacheKey);
-                                throw e;
-                            });
-                            cacheEntry = { result: result };
-                            cache.set(cacheKey, cacheEntry);
-                        }
-                        _a = DefinitionSanitizingExecutionResult.bind;
-                        return [4 /*yield*/, cacheEntry.result];
-                    case 1: return [2 /*return*/, new (_a.apply(DefinitionSanitizingExecutionResult, [void 0, _b.sent(), this.createNew,
-                            this.definition]))()];
-                }
-            });
-        }); };
-        _this.createNew = function (decorated) {
-            return new WithExecutionCaching(decorated, _this.ctx);
+class WithExecutionCaching extends execution_1.DecoratedPreparedExecution {
+    constructor(decorated, ctx) {
+        super(decorated);
+        this.ctx = ctx;
+        this.execute = async () => {
+            const cacheKey = this.fingerprint();
+            const cache = this.ctx.caches.execution;
+            let cacheEntry = cache.get(cacheKey);
+            if (!cacheEntry) {
+                const result = super
+                    .execute()
+                    .then((res) => {
+                    return new WithExecutionResultCaching(res, this.createNew, this.ctx);
+                })
+                    .catch((e) => {
+                    cache.delete(cacheKey);
+                    throw e;
+                });
+                cacheEntry = { result };
+                cache.set(cacheKey, cacheEntry);
+            }
+            return new DefinitionSanitizingExecutionResult(await cacheEntry.result, this.createNew, this.definition);
+        };
+        this.createNew = (decorated) => {
+            return new WithExecutionCaching(decorated, this.ctx);
         };
-        return _this;
     }
-    return WithExecutionCaching;
-}(execution_1.DecoratedPreparedExecution));
+}
 /**
  * This DataView decorator makes sure that definition used in it is the same as the definition in the result.
  *
  * See the usage of this class in {@link DefinitionSanitizingExecutionResult} for more.
  */
-var DefinitionSanitizingDataView = /** @class */ (function (_super) {
-    tslib_1.__extends(DefinitionSanitizingDataView, _super);
-    function DefinitionSanitizingDataView(decorated, result) {
-        var _this = _super.call(this, decorated, result) || this;
-        _this.definition = result.definition;
-        return _this;
+class DefinitionSanitizingDataView extends execution_1.DecoratedDataView {
+    constructor(decorated, result) {
+        super(decorated, result);
+        this.definition = result.definition;
     }
-    return DefinitionSanitizingDataView;
-}(execution_1.DecoratedDataView));
+}
 /**
  * This ExecutionResult decorator makes sure that definitions used throughout the result are set
  * to the definitionOverride provided. This is useful with caching because different definitions may yield
@@ -85,98 +70,75 @@ var DefinitionSanitizingDataView = /** @class */ (function (_super) {
  *
  * See the usage of this class in {@link WithExecutionCaching} for more.
  */
-var DefinitionSanitizingExecutionResult = /** @class */ (function (_super) {
-    tslib_1.__extends(DefinitionSanitizingExecutionResult, _super);
-    function DefinitionSanitizingExecutionResult(decorated, wrapper, definitionOverride) {
-        var _this = _super.call(this, decorated, wrapper) || this;
-        _this.readAll = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this.withSanitizedDefinition;
-                        return [4 /*yield*/, _super.prototype.readAll.call(this)];
-                    case 1: return [2 /*return*/, _a.apply(this, [_b.sent()])];
-                }
-            });
-        }); };
-        _this.readWindow = function (offset, size) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this.withSanitizedDefinition;
-                        return [4 /*yield*/, _super.prototype.readWindow.call(this, offset, size)];
-                    case 1: return [2 /*return*/, _a.apply(this, [_b.sent()])];
-                }
-            });
-        }); };
-        _this.withSanitizedDefinition = function (original) {
-            return new DefinitionSanitizingDataView(original, _this);
+class DefinitionSanitizingExecutionResult extends execution_1.DecoratedExecutionResult {
+    constructor(decorated, wrapper, definitionOverride) {
+        super(decorated, wrapper);
+        this.readAll = async () => {
+            return this.withSanitizedDefinition(await super.readAll());
+        };
+        this.readWindow = async (offset, size) => {
+            return this.withSanitizedDefinition(await super.readWindow(offset, size));
         };
-        _this.definition = definitionOverride;
-        return _this;
+        this.withSanitizedDefinition = (original) => {
+            return new DefinitionSanitizingDataView(original, this);
+        };
+        this.definition = definitionOverride;
     }
-    return DefinitionSanitizingExecutionResult;
-}(execution_1.DecoratedExecutionResult));
+}
 function windowKey(offset, size) {
-    return "o(" + offset.join(",") + ")_s(" + size.join(",") + ")";
+    return `o(${offset.join(",")})_s(${size.join(",")})`;
 }
-var WithExecutionResultCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithExecutionResultCaching, _super);
-    function WithExecutionResultCaching(decorated, wrapper, ctx) {
-        var _this = _super.call(this, decorated, wrapper) || this;
-        _this.ctx = ctx;
-        _this.readAll = function () {
-            if (!_this.allData) {
-                _this.allData = _super.prototype.readAll.call(_this).catch(function (e) {
-                    _this.allData = undefined;
+class WithExecutionResultCaching extends execution_1.DecoratedExecutionResult {
+    constructor(decorated, wrapper, ctx) {
+        super(decorated, wrapper);
+        this.ctx = ctx;
+        this.readAll = () => {
+            if (!this.allData) {
+                this.allData = super.readAll().catch((e) => {
+                    this.allData = undefined;
                     throw e;
                 });
             }
-            return _this.allData;
+            return this.allData;
         };
-        _this.readWindow = function (offset, size) {
-            if (!_this.windows) {
-                return _super.prototype.readWindow.call(_this, offset, size);
+        this.readWindow = (offset, size) => {
+            if (!this.windows) {
+                return super.readWindow(offset, size);
             }
-            var cacheKey = windowKey(offset, size);
-            var window = _this.windows.get(cacheKey);
+            const cacheKey = windowKey(offset, size);
+            let window = this.windows.get(cacheKey);
             if (!window) {
-                window = _super.prototype.readWindow.call(_this, offset, size).catch(function (e) {
-                    if (_this.windows) {
-                        _this.windows.delete(cacheKey);
+                window = super.readWindow(offset, size).catch((e) => {
+                    if (this.windows) {
+                        this.windows.delete(cacheKey);
                     }
                     throw e;
                 });
-                _this.windows.set(cacheKey, window);
+                this.windows.set(cacheKey, window);
             }
             return window;
         };
-        if (cachingEnabled(_this.ctx.config.maxResultWindows)) {
-            _this.windows = new util_1.LRUCache({ maxSize: _this.ctx.config.maxResultWindows });
+        if (cachingEnabled(this.ctx.config.maxResultWindows)) {
+            this.windows = new lru_cache_1.default({ max: this.ctx.config.maxResultWindows });
         }
-        return _this;
     }
-    return WithExecutionResultCaching;
-}(execution_1.DecoratedExecutionResult));
+}
 //
 // Catalog caching
 //
 function optionsKey(options) {
     return json_stable_stringify_1.default(options);
 }
-var WithCatalogCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithCatalogCaching, _super);
-    function WithCatalogCaching(decorated, ctx) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.load = function () {
-            var cache = _this.getOrCreateWorkspaceEntry(_this.workspace).catalogForOptions;
-            var cacheKey = optionsKey(_this.options);
-            var catalog = cache.get(cacheKey);
+class WithCatalogCaching extends catalog_1.DecoratedWorkspaceCatalogFactory {
+    constructor(decorated, ctx) {
+        super(decorated);
+        this.ctx = ctx;
+        this.load = () => {
+            const cache = this.getOrCreateWorkspaceEntry(this.workspace).catalogForOptions;
+            const cacheKey = optionsKey(this.options);
+            let catalog = cache.get(cacheKey);
             if (!catalog) {
-                catalog = _super.prototype.load.call(_this).catch(function (e) {
+                catalog = super.load().catch((e) => {
                     cache.delete(cacheKey);
                     throw e;
                 });
@@ -184,43 +146,40 @@ var WithCatalogCaching = /** @class */ (function (_super) {
             }
             return catalog;
         };
-        _this.createNew = function (decorated) {
-            return new WithCatalogCaching(decorated, _this.ctx);
+        this.createNew = (decorated) => {
+            return new WithCatalogCaching(decorated, this.ctx);
         };
-        _this.getOrCreateWorkspaceEntry = function (workspace) {
-            var cache = _this.ctx.caches.workspaceCatalogs;
-            var cacheEntry = cache.get(workspace);
+        this.getOrCreateWorkspaceEntry = (workspace) => {
+            const cache = this.ctx.caches.workspaceCatalogs;
+            let cacheEntry = cache.get(workspace);
             if (!cacheEntry) {
                 cacheEntry = {
-                    catalogForOptions: new util_1.LRUCache({
-                        maxSize: _this.ctx.config.maxCatalogOptions,
+                    catalogForOptions: new lru_cache_1.default({
+                        max: this.ctx.config.maxCatalogOptions,
                     }),
                 };
                 cache.set(workspace, cacheEntry);
             }
             return cacheEntry;
         };
-        return _this;
     }
-    return WithCatalogCaching;
-}(catalog_1.DecoratedWorkspaceCatalogFactory));
+}
 //
 // Organization security settings caching
 //
 function validUrlInContextKey(url, context) {
-    return context + "_" + json_stable_stringify_1.default(url);
+    return `${context}_${json_stable_stringify_1.default(url)}`;
 }
-var WithSecuritySettingsCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithSecuritySettingsCaching, _super);
-    function WithSecuritySettingsCaching(decorated, ctx) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.isUrlValid = function (url, context) {
-            var cache = _this.getOrCreateSecuritySettingsEntry(_this.scope).valid;
-            var cacheKey = validUrlInContextKey(url, context);
-            var result = cache.get(cacheKey);
+class WithSecuritySettingsCaching extends securitySettings_1.DecoratedSecuritySettingsService {
+    constructor(decorated, ctx) {
+        super(decorated);
+        this.ctx = ctx;
+        this.isUrlValid = (url, context) => {
+            const cache = this.getOrCreateSecuritySettingsEntry(this.scope).valid;
+            const cacheKey = validUrlInContextKey(url, context);
+            let result = cache.get(cacheKey);
             if (!result) {
-                result = _super.prototype.isUrlValid.call(_this, url, context).catch(function (e) {
+                result = super.isUrlValid(url, context).catch((e) => {
                     cache.delete(cacheKey);
                     throw e;
                 });
@@ -228,12 +187,12 @@ var WithSecuritySettingsCaching = /** @class */ (function (_super) {
             }
             return result;
         };
-        _this.isDashboardPluginUrlValid = function (url, workspace) {
-            var scope = "plugins_" + workspace;
-            var cache = _this.getOrCreateSecuritySettingsEntry(scope).valid;
-            var result = cache.get(url);
+        this.isDashboardPluginUrlValid = (url, workspace) => {
+            const scope = `plugins_${workspace}`;
+            const cache = this.getOrCreateSecuritySettingsEntry(scope).valid;
+            let result = cache.get(url);
             if (!result) {
-                result = _super.prototype.isDashboardPluginUrlValid.call(_this, url, workspace).catch(function (e) {
+                result = super.isDashboardPluginUrlValid(url, workspace).catch((e) => {
                     cache.delete(url);
                     throw e;
                 });
@@ -241,36 +200,33 @@ var WithSecuritySettingsCaching = /** @class */ (function (_super) {
             }
             return result;
         };
-        _this.getOrCreateSecuritySettingsEntry = function (scope) {
-            var cache = _this.ctx.caches.securitySettings;
-            var cacheEntry = cache.get(scope);
+        this.getOrCreateSecuritySettingsEntry = (scope) => {
+            const cache = this.ctx.caches.securitySettings;
+            let cacheEntry = cache.get(scope);
             if (!cacheEntry) {
                 cacheEntry = {
-                    valid: new util_1.LRUCache({
-                        maxSize: _this.ctx.config.maxSecuritySettingsOrgUrls,
-                        maxAge: _this.ctx.config.maxSecuritySettingsOrgUrlsAge,
+                    valid: new lru_cache_1.default({
+                        max: this.ctx.config.maxSecuritySettingsOrgUrls,
+                        ttl: this.ctx.config.maxSecuritySettingsOrgUrlsAge,
                     }),
                 };
                 cache.set(scope, cacheEntry);
             }
             return cacheEntry;
         };
-        return _this;
     }
-    return WithSecuritySettingsCaching;
-}(securitySettings_1.DecoratedSecuritySettingsService));
-var WithWorkspaceSettingsCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithWorkspaceSettingsCaching, _super);
-    function WithWorkspaceSettingsCaching(decorated, ctx, workspace) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.workspace = workspace;
-        _this.getSettings = function () {
-            var cache = _this.getOrCreateWorkspaceEntry(_this.workspace).workspaceSettings;
-            var cacheKey = _this.workspace;
-            var workspaceSettings = cache.get(cacheKey);
+}
+class WithWorkspaceSettingsCaching extends workspaceSettings_1.DecoratedWorkspaceSettingsService {
+    constructor(decorated, ctx, workspace) {
+        super(decorated);
+        this.ctx = ctx;
+        this.workspace = workspace;
+        this.getSettings = () => {
+            const cache = this.getOrCreateWorkspaceEntry(this.workspace).workspaceSettings;
+            const cacheKey = this.workspace;
+            let workspaceSettings = cache.get(cacheKey);
             if (!workspaceSettings) {
-                workspaceSettings = _super.prototype.getSettings.call(_this).catch(function (e) {
+                workspaceSettings = super.getSettings().catch((e) => {
                     cache.delete(cacheKey);
                     throw e;
                 });
@@ -278,46 +234,40 @@ var WithWorkspaceSettingsCaching = /** @class */ (function (_super) {
             }
             return workspaceSettings;
         };
-        _this.getOrCreateWorkspaceEntry = function (workspace) {
-            var cache = _this.ctx.caches.workspaceSettings;
-            var cacheEntry = cache.get(workspace);
+        this.getOrCreateWorkspaceEntry = (workspace) => {
+            const cache = this.ctx.caches.workspaceSettings;
+            let cacheEntry = cache.get(workspace);
             if (!cacheEntry) {
                 cacheEntry = {
-                    userWorkspaceSettings: new util_1.LRUCache({
-                        maxSize: _this.ctx.config.maxWorkspaceSettings,
+                    userWorkspaceSettings: new lru_cache_1.default({
+                        max: this.ctx.config.maxWorkspaceSettings,
                     }),
-                    workspaceSettings: new util_1.LRUCache({
-                        maxSize: _this.ctx.config.maxWorkspaceSettings,
+                    workspaceSettings: new lru_cache_1.default({
+                        max: this.ctx.config.maxWorkspaceSettings,
                     }),
                 };
                 cache.set(workspace, cacheEntry);
             }
             return cacheEntry;
         };
-        return _this;
     }
-    WithWorkspaceSettingsCaching.prototype.getSettingsForCurrentUser = function () {
-        var cache = this.getOrCreateWorkspaceEntry(this.workspace).userWorkspaceSettings;
-        var cacheKey = this.workspace; // we assume that the current user does not change over the life span of the backend instance
-        var userWorkspaceSettings = cache.get(cacheKey);
+    getSettingsForCurrentUser() {
+        const cache = this.getOrCreateWorkspaceEntry(this.workspace).userWorkspaceSettings;
+        const cacheKey = this.workspace; // we assume that the current user does not change over the life span of the backend instance
+        let userWorkspaceSettings = cache.get(cacheKey);
         if (!userWorkspaceSettings) {
-            userWorkspaceSettings = _super.prototype.getSettingsForCurrentUser.call(this).catch(function (e) {
+            userWorkspaceSettings = super.getSettingsForCurrentUser().catch((e) => {
                 cache.delete(cacheKey);
                 throw e;
             });
             cache.set(cacheKey, userWorkspaceSettings);
         }
         return userWorkspaceSettings;
-    };
-    WithWorkspaceSettingsCaching.prototype.setLocale = function (locale) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, _super.prototype.setLocale.call(this, locale)];
-            });
-        });
-    };
-    return WithWorkspaceSettingsCaching;
-}(workspaceSettings_1.DecoratedWorkspaceSettingsService));
+    }
+    async setLocale(locale) {
+        return super.setLocale(locale);
+    }
+}
 //
 // Attributes caching
 //
@@ -326,24 +276,24 @@ function refMatchesMdObject(ref, mdObject, type) {
         sdk_model_1.areObjRefsEqual(ref, sdk_model_1.idRef(mdObject.id, type)) ||
         sdk_model_1.areObjRefsEqual(ref, sdk_model_1.uriRef(mdObject.uri)));
 }
-var firstDefined = flow_1.default(compact_1.default, first_1.default);
+const firstDefined = flow_1.default(compact_1.default, first_1.default);
 function elementsCacheKey(ref, settings) {
     return new spark_md5_1.default().append(sdk_model_1.objRefToString(ref)).append(json_stable_stringify_1.default(settings)).end();
 }
 function getOrCreateAttributeCache(ctx, workspace) {
-    var cache = ctx.caches.workspaceAttributes;
-    var cacheEntry = cache.get(workspace);
+    const cache = ctx.caches.workspaceAttributes;
+    let cacheEntry = cache.get(workspace);
     if (!cacheEntry) {
         cacheEntry = {
-            displayForms: new util_1.LRUCache({
-                maxSize: ctx.config.maxAttributeDisplayFormsPerWorkspace,
+            displayForms: new lru_cache_1.default({
+                max: ctx.config.maxAttributeDisplayFormsPerWorkspace,
             }),
-            attributesByDisplayForms: new util_1.LRUCache({
-                maxSize: ctx.config.maxAttributesPerWorkspace,
+            attributesByDisplayForms: new lru_cache_1.default({
+                max: ctx.config.maxAttributesPerWorkspace,
             }),
             attributeElementResults: cachingEnabled(ctx.config.maxAttributeElementResultsPerWorkspace)
-                ? new util_1.LRUCache({
-                    maxSize: ctx.config.maxAttributeElementResultsPerWorkspace,
+                ? new lru_cache_1.default({
+                    max: ctx.config.maxAttributeElementResultsPerWorkspace,
                 })
                 : undefined,
         };
@@ -351,70 +301,59 @@ function getOrCreateAttributeCache(ctx, workspace) {
     }
     return cacheEntry;
 }
-var CachedElementsQuery = /** @class */ (function (_super) {
-    tslib_1.__extends(CachedElementsQuery, _super);
-    function CachedElementsQuery(decorated, ctx, workspace, ref, settings) {
-        if (settings === void 0) { settings = {}; }
-        var _this = _super.call(this, decorated, settings) || this;
-        _this.ctx = ctx;
-        _this.workspace = workspace;
-        _this.ref = ref;
-        _this.query = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var canCache, cache, cacheKey, result;
+class CachedElementsQuery extends elements_1.DecoratedElementsQuery {
+    constructor(decorated, ctx, workspace, ref, settings = {}) {
+        super(decorated, settings);
+        this.ctx = ctx;
+        this.workspace = workspace;
+        this.ref = ref;
+        this.query = async () => {
             var _a;
-            return tslib_1.__generator(this, function (_b) {
-                canCache = !((_a = this.settings.options) === null || _a === void 0 ? void 0 : _a.filter);
-                if (!canCache) {
-                    return [2 /*return*/, _super.prototype.query.call(this)];
-                }
-                cache = getOrCreateAttributeCache(this.ctx, this.workspace).attributeElementResults;
-                ts_invariant_1.default(cache, "inconsistent attribute element cache config");
-                cacheKey = elementsCacheKey(this.ref, this.settings);
-                result = cache.get(cacheKey);
-                if (!result) {
-                    result = _super.prototype.query.call(this).catch(function (e) {
-                        cache.delete(cacheKey);
-                        throw e;
-                    });
-                    cache.set(cacheKey, result);
-                }
-                return [2 /*return*/, result];
-            });
-        }); };
-        return _this;
+            const canCache = !((_a = this.settings.options) === null || _a === void 0 ? void 0 : _a.filter);
+            if (!canCache) {
+                return super.query();
+            }
+            const cache = getOrCreateAttributeCache(this.ctx, this.workspace).attributeElementResults;
+            ts_invariant_1.default(cache, "inconsistent attribute element cache config");
+            const cacheKey = elementsCacheKey(this.ref, this.settings);
+            let result = cache.get(cacheKey);
+            if (!result) {
+                result = super.query().catch((e) => {
+                    cache.delete(cacheKey);
+                    throw e;
+                });
+                cache.set(cacheKey, result);
+            }
+            return result;
+        };
     }
-    CachedElementsQuery.prototype.createNew = function (decorated, settings) {
+    createNew(decorated, settings) {
         return new CachedElementsQuery(decorated, this.ctx, this.workspace, this.ref, settings);
-    };
-    return CachedElementsQuery;
-}(elements_1.DecoratedElementsQuery));
-var CachedElementsQueryFactory = /** @class */ (function (_super) {
-    tslib_1.__extends(CachedElementsQueryFactory, _super);
-    function CachedElementsQueryFactory(decorated, ctx, workspace) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.workspace = workspace;
-        return _this;
     }
-    CachedElementsQueryFactory.prototype.forDisplayForm = function (ref) {
-        var decorated = this.decorated.forDisplayForm(ref);
+}
+class CachedElementsQueryFactory extends elements_1.DecoratedElementsQueryFactory {
+    constructor(decorated, ctx, workspace) {
+        super(decorated);
+        this.ctx = ctx;
+        this.workspace = workspace;
+    }
+    forDisplayForm(ref) {
+        const decorated = this.decorated.forDisplayForm(ref);
         return new CachedElementsQuery(decorated, this.ctx, this.workspace, ref);
-    };
-    return CachedElementsQueryFactory;
-}(elements_1.DecoratedElementsQueryFactory));
-var WithAttributesCaching = /** @class */ (function (_super) {
-    tslib_1.__extends(WithAttributesCaching, _super);
-    function WithAttributesCaching(decorated, ctx, workspace) {
-        var _this = _super.call(this, decorated) || this;
-        _this.ctx = ctx;
-        _this.workspace = workspace;
-        _this.getAttributeDisplayForm = function (ref) {
-            var cache = getOrCreateAttributeCache(_this.ctx, _this.workspace).displayForms;
-            var idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
-            var uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
-            var cacheItem = firstDefined([idCacheKey, uriCacheKey].map(function (key) { return key && cache.get(key); }));
+    }
+}
+class WithAttributesCaching extends attributes_1.DecoratedWorkspaceAttributesService {
+    constructor(decorated, ctx, workspace) {
+        super(decorated);
+        this.ctx = ctx;
+        this.workspace = workspace;
+        this.getAttributeDisplayForm = (ref) => {
+            const cache = getOrCreateAttributeCache(this.ctx, this.workspace).displayForms;
+            const idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
+            const uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
+            let cacheItem = firstDefined([idCacheKey, uriCacheKey].map((key) => key && cache.get(key)));
             if (!cacheItem) {
-                cacheItem = _super.prototype.getAttributeDisplayForm.call(_this, ref).catch(function (e) {
+                cacheItem = super.getAttributeDisplayForm(ref).catch((e) => {
                     if (idCacheKey) {
                         cache.delete(idCacheKey);
                     }
@@ -432,136 +371,121 @@ var WithAttributesCaching = /** @class */ (function (_super) {
             }
             return cacheItem;
         };
-        _this.getAttributeDisplayForms = function (refs) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var cache, refsWithCacheResults, _a, withCacheHits, withoutCacheHits, refsToLoad, _b, alreadyInCache, loadedFromServer, loadedRefs, outputRefs, candidates;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        cache = getOrCreateAttributeCache(this.ctx, this.workspace).displayForms;
-                        refsWithCacheResults = refs.map(function (ref) {
-                            var idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
-                            var uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
-                            var cacheHit = firstDefined([idCacheKey, uriCacheKey].map(function (key) { return key && cache.get(key); }));
-                            return { ref: ref, cacheHit: cacheHit };
-                        });
-                        _a = partition_1.default(refsWithCacheResults, function (_a) {
-                            var cacheHit = _a.cacheHit;
-                            return !!cacheHit;
-                        }), withCacheHits = _a[0], withoutCacheHits = _a[1];
-                        refsToLoad = withoutCacheHits.map(function (item) { return item.ref; });
-                        return [4 /*yield*/, Promise.all([
-                                // await the stuff from cache, we need the data available (we cannot just return the promises)
-                                Promise.all(withCacheHits.map(function (item) { return item.cacheHit; })),
-                                // load items not in cache using the bulk operation
-                                this.decorated.getAttributeDisplayForms(refsToLoad),
-                            ])];
-                    case 1:
-                        _b = _c.sent(), alreadyInCache = _b[0], loadedFromServer = _b[1];
-                        // save newly loaded to cache for future reference
-                        loadedFromServer.forEach(function (loaded) {
-                            var promisifiedResult = Promise.resolve(loaded);
-                            // save the cache item for both types of refs
-                            cache.set(loaded.id, promisifiedResult);
-                            cache.set(loaded.uri, promisifiedResult);
-                        });
-                        loadedRefs = loadedFromServer.map(function (item) { return item.ref; });
-                        outputRefs = this.ctx.capabilities.allowsInconsistentRelations
-                            ? skipMissingReferences(refs, refsToLoad, loadedRefs)
-                            : refs;
-                        candidates = tslib_1.__spreadArrays(loadedFromServer, alreadyInCache);
-                        return [2 /*return*/, outputRefs.map(function (ref) {
-                                var match = candidates.find(function (item) { return refMatchesMdObject(ref, item, "displayForm"); });
-                                // if this bombs, some data got lost in the process
-                                ts_invariant_1.default(match);
-                                return match;
-                            })];
-                }
+        this.getAttributeDisplayForms = async (refs) => {
+            const cache = getOrCreateAttributeCache(this.ctx, this.workspace).displayForms;
+            // grab a reference to the cache results as soon as possible in case they would get evicted while loading the ones with missing data in cache
+            // then would might not be able to call cache.get again and be guaranteed to get the data
+            const refsWithCacheResults = refs.map((ref) => {
+                const idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
+                const uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
+                const cacheHit = firstDefined([idCacheKey, uriCacheKey].map((key) => key && cache.get(key)));
+                return { ref, cacheHit };
             });
-        }); };
-        _this.getAttributeByDisplayForm = function (ref) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var cache, idCacheKey, uriCacheKey, cacheItem;
-            return tslib_1.__generator(this, function (_a) {
-                cache = getOrCreateAttributeCache(this.ctx, this.workspace).attributesByDisplayForms;
-                idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
-                uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
-                cacheItem = firstDefined([idCacheKey, uriCacheKey].map(function (key) { return key && cache.get(key); }));
-                if (!cacheItem) {
-                    // eslint-disable-next-line sonarjs/no-identical-functions
-                    cacheItem = _super.prototype.getAttributeByDisplayForm.call(this, ref).catch(function (e) {
-                        if (idCacheKey) {
-                            cache.delete(idCacheKey);
-                        }
-                        if (uriCacheKey) {
-                            cache.delete(uriCacheKey);
-                        }
-                        throw e;
-                    });
+            const [withCacheHits, withoutCacheHits] = partition_1.default(refsWithCacheResults, ({ cacheHit }) => !!cacheHit);
+            const refsToLoad = withoutCacheHits.map((item) => item.ref);
+            const [alreadyInCache, loadedFromServer] = await Promise.all([
+                // await the stuff from cache, we need the data available (we cannot just return the promises)
+                Promise.all(withCacheHits.map((item) => item.cacheHit)),
+                // load items not in cache using the bulk operation
+                this.decorated.getAttributeDisplayForms(refsToLoad),
+            ]);
+            // save newly loaded to cache for future reference
+            loadedFromServer.forEach((loaded) => {
+                const promisifiedResult = Promise.resolve(loaded);
+                // save the cache item for both types of refs
+                cache.set(loaded.id, promisifiedResult);
+                cache.set(loaded.uri, promisifiedResult);
+            });
+            const loadedRefs = loadedFromServer.map((item) => item.ref);
+            const outputRefs = this.ctx.capabilities.allowsInconsistentRelations
+                ? skipMissingReferences(refs, refsToLoad, loadedRefs)
+                : refs;
+            // reconstruct the original ordering
+            const candidates = [...loadedFromServer, ...alreadyInCache];
+            return outputRefs.map((ref) => {
+                const match = candidates.find((item) => refMatchesMdObject(ref, item, "displayForm"));
+                // if this bombs, some data got lost in the process
+                ts_invariant_1.default(match);
+                return match;
+            });
+        };
+        this.getAttributeByDisplayForm = async (ref) => {
+            const cache = getOrCreateAttributeCache(this.ctx, this.workspace).attributesByDisplayForms;
+            const idCacheKey = sdk_model_1.isIdentifierRef(ref) ? ref.identifier : undefined;
+            const uriCacheKey = sdk_model_1.isUriRef(ref) ? ref.uri : undefined;
+            let cacheItem = firstDefined([idCacheKey, uriCacheKey].map((key) => key && cache.get(key)));
+            if (!cacheItem) {
+                // eslint-disable-next-line sonarjs/no-identical-functions
+                cacheItem = super.getAttributeByDisplayForm(ref).catch((e) => {
                     if (idCacheKey) {
-                        cache.set(idCacheKey, cacheItem);
+                        cache.delete(idCacheKey);
                     }
                     if (uriCacheKey) {
-                        cache.set(uriCacheKey, cacheItem);
+                        cache.delete(uriCacheKey);
                     }
+                    throw e;
+                });
+                if (idCacheKey) {
+                    cache.set(idCacheKey, cacheItem);
                 }
-                return [2 /*return*/, cacheItem];
-            });
-        }); };
-        return _this;
+                if (uriCacheKey) {
+                    cache.set(uriCacheKey, cacheItem);
+                }
+            }
+            return cacheItem;
+        };
     }
-    WithAttributesCaching.prototype.elements = function () {
-        var decorated = this.decorated.elements();
+    elements() {
+        const decorated = this.decorated.elements();
         return cachingEnabled(this.ctx.config.maxAttributeElementResultsPerWorkspace)
             ? new CachedElementsQueryFactory(decorated, this.ctx, this.workspace)
             : decorated;
-    };
-    return WithAttributesCaching;
-}(attributes_1.DecoratedWorkspaceAttributesService));
+    }
+}
 //
 //
 //
 function cachedExecutions(ctx) {
-    return function (original) {
-        return new execution_1.DecoratedExecutionFactory(original, function (execution) { return new WithExecutionCaching(execution, ctx); });
-    };
+    return (original) => new execution_1.DecoratedExecutionFactory(original, (execution) => new WithExecutionCaching(execution, ctx));
 }
 function cachedCatalog(ctx) {
-    return function (original) { return new WithCatalogCaching(original, ctx); };
+    return (original) => new WithCatalogCaching(original, ctx);
 }
 function cachedSecuritySettings(ctx) {
-    return function (original) { return new WithSecuritySettingsCaching(original, ctx); };
+    return (original) => new WithSecuritySettingsCaching(original, ctx);
 }
 function cachedWorkspaceSettings(ctx) {
-    return function (original, workspace) { return new WithWorkspaceSettingsCaching(original, ctx, workspace); };
+    return (original, workspace) => new WithWorkspaceSettingsCaching(original, ctx, workspace);
 }
 function cachedAttributes(ctx) {
-    return function (original, workspace) { return new WithAttributesCaching(original, ctx, workspace); };
+    return (original, workspace) => new WithAttributesCaching(original, ctx, workspace);
 }
 function cachingEnabled(desiredSize) {
     return desiredSize !== undefined && desiredSize > 0;
 }
 function cacheControl(ctx) {
-    var control = {
-        resetExecutions: function () {
+    const control = {
+        resetExecutions: () => {
             var _a;
             (_a = ctx.caches.execution) === null || _a === void 0 ? void 0 : _a.clear();
         },
-        resetCatalogs: function () {
+        resetCatalogs: () => {
             var _a;
             (_a = ctx.caches.workspaceCatalogs) === null || _a === void 0 ? void 0 : _a.clear();
         },
-        resetSecuritySettings: function () {
+        resetSecuritySettings: () => {
             var _a;
             (_a = ctx.caches.securitySettings) === null || _a === void 0 ? void 0 : _a.clear();
         },
-        resetAttributes: function () {
+        resetAttributes: () => {
             var _a;
             (_a = ctx.caches.workspaceAttributes) === null || _a === void 0 ? void 0 : _a.clear();
         },
-        resetWorkspaceSettings: function () {
+        resetWorkspaceSettings: () => {
             var _a;
             (_a = ctx.caches.workspaceSettings) === null || _a === void 0 ? void 0 : _a.clear();
         },
-        resetAll: function () {
+        resetAll: () => {
             control.resetExecutions();
             control.resetCatalogs();
             control.resetSecuritySettings();
@@ -572,7 +496,7 @@ function cacheControl(ctx) {
     return control;
 }
 function assertPositiveOrUndefined(value, valueName) {
-    ts_invariant_1.default(value === undefined || value > 0, valueName + " to cache must be positive or undefined, got: " + value);
+    ts_invariant_1.default(value === undefined || value > 0, `${valueName} to cache must be positive or undefined, got: ${value}`);
 }
 /**
  * These are the recommended settings for the backend caching.
@@ -609,47 +533,47 @@ function withCaching(realBackend, config) {
     assertPositiveOrUndefined(config.maxCatalogOptions, "maxCatalogOptions");
     assertPositiveOrUndefined(config.maxSecuritySettingsOrgUrls, "maxSecuritySettingsOrgUrls");
     assertPositiveOrUndefined(config.maxSecuritySettingsOrgUrlsAge, "maxSecuritySettingsOrgUrlsAge");
-    var execCaching = cachingEnabled(config.maxExecutions);
-    var catalogCaching = cachingEnabled(config.maxCatalogs);
-    var securitySettingsCaching = cachingEnabled(config.maxSecuritySettingsOrgs);
-    var attributeCaching = cachingEnabled(config.maxAttributeWorkspaces);
-    var workspaceSettingsCaching = cachingEnabled(config.maxWorkspaceSettings);
-    var ctx = {
+    const execCaching = cachingEnabled(config.maxExecutions);
+    const catalogCaching = cachingEnabled(config.maxCatalogs);
+    const securitySettingsCaching = cachingEnabled(config.maxSecuritySettingsOrgs);
+    const attributeCaching = cachingEnabled(config.maxAttributeWorkspaces);
+    const workspaceSettingsCaching = cachingEnabled(config.maxWorkspaceSettings);
+    const ctx = {
         caches: {
-            execution: execCaching ? new util_1.LRUCache({ maxSize: config.maxExecutions }) : undefined,
-            workspaceCatalogs: catalogCaching ? new util_1.LRUCache({ maxSize: config.maxCatalogs }) : undefined,
+            execution: execCaching ? new lru_cache_1.default({ max: config.maxExecutions }) : undefined,
+            workspaceCatalogs: catalogCaching ? new lru_cache_1.default({ max: config.maxCatalogs }) : undefined,
             securitySettings: securitySettingsCaching
-                ? new util_1.LRUCache({ maxSize: config.maxSecuritySettingsOrgs })
+                ? new lru_cache_1.default({ max: config.maxSecuritySettingsOrgs })
                 : undefined,
             workspaceAttributes: attributeCaching
-                ? new util_1.LRUCache({ maxSize: config.maxAttributeWorkspaces })
+                ? new lru_cache_1.default({ max: config.maxAttributeWorkspaces })
                 : undefined,
             workspaceSettings: workspaceSettingsCaching
-                ? new util_1.LRUCache({ maxSize: config.maxWorkspaceSettings })
+                ? new lru_cache_1.default({ max: config.maxWorkspaceSettings })
                 : undefined,
         },
-        config: config,
+        config,
         capabilities: realBackend.capabilities,
     };
-    var execution = execCaching ? cachedExecutions(ctx) : identity_1.default;
-    var catalog = catalogCaching ? cachedCatalog(ctx) : identity_1.default;
-    var securitySettings = securitySettingsCaching ? cachedSecuritySettings(ctx) : identity_1.default;
-    var attributes = attributeCaching ? cachedAttributes(ctx) : identity_1.default;
-    var workspaceSettings = workspaceSettingsCaching ? cachedWorkspaceSettings(ctx) : identity_1.default;
+    const execution = execCaching ? cachedExecutions(ctx) : identity_1.default;
+    const catalog = catalogCaching ? cachedCatalog(ctx) : identity_1.default;
+    const securitySettings = securitySettingsCaching ? cachedSecuritySettings(ctx) : identity_1.default;
+    const attributes = attributeCaching ? cachedAttributes(ctx) : identity_1.default;
+    const workspaceSettings = workspaceSettingsCaching ? cachedWorkspaceSettings(ctx) : identity_1.default;
     if (config.onCacheReady) {
         config.onCacheReady(cacheControl(ctx));
     }
     return decoratedBackend_1.decoratedBackend(realBackend, {
-        execution: execution,
-        catalog: catalog,
-        securitySettings: securitySettings,
-        attributes: attributes,
-        workspaceSettings: workspaceSettings,
+        execution,
+        catalog,
+        securitySettings,
+        attributes,
+        workspaceSettings,
     });
 }
 exports.withCaching = withCaching;
 function skipMissingReferences(requestedRefs, refsToLoad, refsLoadedFromServer) {
-    var missingRefs = refsToLoad.filter(function (ref) { return !refsLoadedFromServer.some(function (loadedRef) { return sdk_model_1.areObjRefsEqual(loadedRef, ref); }); });
-    return requestedRefs.filter(function (inputRef) { return !missingRefs.some(function (missingRef) { return sdk_model_1.areObjRefsEqual(missingRef, inputRef); }); });
+    const missingRefs = refsToLoad.filter((ref) => !refsLoadedFromServer.some((loadedRef) => sdk_model_1.areObjRefsEqual(loadedRef, ref)));
+    return requestedRefs.filter((inputRef) => !missingRefs.some((missingRef) => sdk_model_1.areObjRefsEqual(missingRef, inputRef)));
 }
 //# sourceMappingURL=index.js.map