@configura/web-api 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/productConfiguration/CfgOption.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Observable, compareArrays, count, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
 import { CfgMtrlApplication } from "../material/CfgMtrlApplication.js";
@@ -89,7 +80,7 @@ export class _CfgOptionInternal {
         this.rootProduct = rootProduct;
         this.changeObservable = new Observable();
         /** Called by child to tell its parent that it has changed. */
-        this._childHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = async (freshRef, bubbleMode, committed) => {
             const features = this._features;
             if (features === undefined) {
                 throw Error("Child says it changed, but no children has actually been generated");
@@ -104,12 +95,12 @@ export class _CfgOptionInternal {
             if (bubbleMode === ProductConfigurationBubbleMode.ValidateAndBubbleSelected ||
                 bubbleMode === ProductConfigurationBubbleMode.BubbleSelected) {
                 // selectOption takes care of the bubble
-                yield this.parent.selectOption(this, true, bubbleMode);
+                await this.parent.selectOption(this, true, bubbleMode);
             }
             else {
-                yield this.parent._childHasChanged(this, bubbleMode, committed);
+                await this.parent._childHasChanged(this, bubbleMode, committed);
             }
-        });
+        };
         this.getDtoConf = (includeExtendedData) => {
             const { features, isUseNumericValue, code, selected, numericValue } = this;
             if (!selected) {
@@ -138,7 +129,7 @@ export class _CfgOptionInternal {
         // way around. For that reason the get-method above uses the new format, and the set-method
         // below the old format. As these functions are meant to only be used internally this should't
         // cause too much confusion.
-        this.setApiSelection = (apiOptionSelection, apiOptionConstraint) => __awaiter(this, void 0, void 0, function* () {
+        this.setApiSelection = async (apiOptionSelection, apiOptionConstraint) => {
             let change = false;
             const upcharge = this._calculateUpcharge();
             if (this._upcharge !== upcharge) {
@@ -152,16 +143,15 @@ export class _CfgOptionInternal {
             else {
                 features = this.features; // This will generate all children
             }
-            if ((yield Promise.all(features.map((f) => f._internal.setApiSelection(apiOptionSelection ? apiOptionSelection.next : undefined, apiOptionConstraint === null || apiOptionConstraint === void 0 ? void 0 : apiOptionConstraint.next)))).some((b) => b)) {
+            if ((await Promise.all(features.map((f) => f._internal.setApiSelection(apiOptionSelection ? apiOptionSelection.next : undefined, apiOptionConstraint?.next)))).some((b) => b)) {
                 change = true;
             }
             return change;
-        });
+        };
         this.getApiConstrained = (constrOptions) => {
-            var _a;
             const next = {};
             // use _features to avoid populating when the option is not selected
-            for (const feature of (_a = this._features) !== null && _a !== void 0 ? _a : []) {
+            for (const feature of this._features ?? []) {
                 feature._internal.addForApiConstrained(next);
             }
             return {
@@ -173,24 +163,22 @@ export class _CfgOptionInternal {
         };
         this.structureCompare = (other, strictOrder = true, descriptionMatch = false) => this.keyMatch(other, descriptionMatch) &&
             compareArrays(this.features, other.features, (l, r) => l._internal.structureCompare(r._internal, strictOrder, descriptionMatch), strictOrder);
-        this.tryMatchSelection = (other, descriptionMatch = false) => __awaiter(this, void 0, void 0, function* () {
-            return (yield Promise.all(other.features.map((otherF) => (() => __awaiter(this, void 0, void 0, function* () {
-                if (1 <
-                    count(other.features, (item) => item._internal.keyMatch(otherF._internal, descriptionMatch))) {
-                    console.warn("tryMatchSelection will ignore items with same key");
-                    return false;
-                }
-                const toSetFeatures = this.features.filter((f) => f._internal.keyMatch(otherF._internal, descriptionMatch));
-                if (1 < toSetFeatures.length) {
-                    console.warn("tryMatchSelection will ignore items with same key");
-                    return false;
-                }
-                if (toSetFeatures.length === 0) {
-                    return false;
-                }
-                return yield toSetFeatures[0]._internal.tryMatchSelection(otherF._internal, descriptionMatch);
-            }))()))).some((b) => b);
-        });
+        this.tryMatchSelection = async (other, descriptionMatch = false) => (await Promise.all(other.features.map((otherF) => (async () => {
+            if (1 <
+                count(other.features, (item) => item._internal.keyMatch(otherF._internal, descriptionMatch))) {
+                console.warn("tryMatchSelection will ignore items with same key");
+                return false;
+            }
+            const toSetFeatures = this.features.filter((f) => f._internal.keyMatch(otherF._internal, descriptionMatch));
+            if (1 < toSetFeatures.length) {
+                console.warn("tryMatchSelection will ignore items with same key");
+                return false;
+            }
+            if (toSetFeatures.length === 0) {
+                return false;
+            }
+            return await toSetFeatures[0]._internal.tryMatchSelection(otherF._internal, descriptionMatch);
+        })()))).some((b) => b);
         this.keyMatch = (other, descriptionMatch = false) => descriptionMatch
             ? this.description.toLowerCase() === other.description.toLowerCase()
             : this.code === other.code;
@@ -231,12 +219,10 @@ export class _CfgOptionInternal {
         return this.rawOption.code;
     }
     get notes() {
-        var _a;
-        return this.parentProduct.getNotes((_a = this.rawOption.noteRefs) !== null && _a !== void 0 ? _a : []);
+        return this.parentProduct.getNotes(this.rawOption.noteRefs ?? []);
     }
     get miscFiles() {
-        var _a;
-        return (_a = this.rawOption.miscFiles) !== null && _a !== void 0 ? _a : [];
+        return this.rawOption.miscFiles ?? [];
     }
     get isUseNumericValue() {
         return this.parent.isUseNumericValue;
@@ -244,36 +230,34 @@ export class _CfgOptionInternal {
     get numericValue() {
         return this._numericValue;
     }
-    setNumericValue(val, doSelectOption) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isAllowedNumericValue(val)) {
-                throw new Error(`The value ${val} is not allowed. This could be because: 1. There are no allowed ranges defined 2. The Feature is numeric selection and the value does not fit in the allowed values 3. The Feature is not numeric selection and the value is not the first in the allowed ranges.`);
+    async setNumericValue(val, doSelectOption) {
+        if (!this.isAllowedNumericValue(val)) {
+            throw new Error(`The value ${val} is not allowed. This could be because: 1. There are no allowed ranges defined 2. The Feature is numeric selection and the value does not fit in the allowed values 3. The Feature is not numeric selection and the value is not the first in the allowed ranges.`);
+        }
+        let change = false;
+        if (this.isUseNumericValue) {
+            if (this._numericValue !== val) {
+                this._numericValue = val;
+                change = true;
             }
-            let change = false;
-            if (this.isUseNumericValue) {
-                if (this._numericValue !== val) {
-                    this._numericValue = val;
-                    change = true;
-                }
-                // It could be that even though our value did not change some sibling value did, and
-                // this could make it needed to bubble later. Maybe. A bit uncertain about why I did
-                // not put this in the if-statement above //Linus
-                if (yield this.parent.pushStretch()) {
-                    change = true;
-                }
+            // It could be that even though our value did not change some sibling value did, and
+            // this could make it needed to bubble later. Maybe. A bit uncertain about why I did
+            // not put this in the if-statement above //Linus
+            if (await this.parent.pushStretch()) {
+                change = true;
             }
-            if (doSelectOption) {
-                if (yield this.parent.selectOption(this, true, ProductConfigurationBubbleMode.Validate)) {
-                    change = true;
-                }
+        }
+        if (doSelectOption) {
+            if (await this.parent.selectOption(this, true, ProductConfigurationBubbleMode.Validate)) {
+                change = true;
             }
-            else {
-                if (change) {
-                    yield this.parent._childHasChanged(this, ProductConfigurationBubbleMode.Stop, false);
-                }
+        }
+        else {
+            if (change) {
+                await this.parent._childHasChanged(this, ProductConfigurationBubbleMode.Stop, false);
             }
-            return change;
-        });
+        }
+        return change;
     }
     get unit() {
         return this.parent.unit;
@@ -287,6 +271,12 @@ export class _CfgOptionInternal {
     get disabled() {
         return this.parent.isDisabled(this);
     }
+    /**
+     * An option is unresolvable when it is constrained from any possible value.
+     */
+    get unresolvable() {
+        return this.parent.isUnresolvable(this);
+    }
     get selectedChangeInProgress() {
         const syncGroupHandler = this.rootProduct.syncGroupHandler;
         if (syncGroupHandler === undefined) {
@@ -352,8 +342,7 @@ export class _CfgOptionInternal {
      * children until the sync process is complete.
      */
     getFeaturesOutsideSync() {
-        var _a;
-        return (_a = this._features) !== null && _a !== void 0 ? _a : [];
+        return this._features ?? [];
     }
     /**
      * Get the child features that are contained within this option.
@@ -387,16 +376,16 @@ export class CfgOption {
     constructor(_internal) {
         this._internal = _internal;
         this.isBackedBySame = (other) => this._internal === other._internal;
-        this.setNumericValue = (val, doSelectOption) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.setNumericValue(val, doSelectOption); });
+        this.setNumericValue = async (val, doSelectOption) => await this._internal.setNumericValue(val, doSelectOption);
         this.isAllowedNumericValue = (val) => this._internal.isAllowedNumericValue(val);
         /**
          * Selects this Option.
          * Only Options belonging to Features that are "select many" can be deselected.
          * Calling this will cause a validation call to the server.
          */
-        this.setSelected = (on) => __awaiter(this, void 0, void 0, function* () {
-            return yield this._internal.parent.selectOption(this._internal, on, ProductConfigurationBubbleMode.ValidateAndBubbleSelectedAndApplySyncGroups);
-        });
+        this.setSelected = async (on) => {
+            return await this._internal.parent.selectOption(this._internal, on, ProductConfigurationBubbleMode.ValidateAndBubbleSelectedAndApplySyncGroups);
+        };
         this.listenForChange = (l) => this._internal.changeObservable.listen(l);
         this.stopListenForChange = (l) => this._internal.changeObservable.stopListen(l);
     }
@@ -456,6 +445,12 @@ export class CfgOption {
     get disabled() {
         return this._internal.disabled;
     }
+    /**
+     * An option is unresolvable when it is constrained from any possible value.
+     */
+    get unresolvable() {
+        return this._internal.unresolvable;
+    }
     /**
      * Selection state is in progress to be changed. This can be used in GUI
      * to display the state as transitioning, or as already changed.

package/dist/productConfiguration/CfgProductConfiguration.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { compareArrays, count, isEqualLength, isLengthUnit, Observable, toError, toLengthUnit, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
 import { convertDtoFeatureConfsToSelOptions } from "../utilitiesConfiguration.js";
@@ -27,7 +18,7 @@ export class _CfgProductConfigurationInternal {
         this.accumulatedRawFeatures = []; // Flat packed. May be extended in validate calls.
         this._features = [];
         this.changeObservable = new Observable();
-        this._notifyAllOfChange = (bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._notifyAllOfChange = async (bubbleMode, committed) => {
             if (bubbleMode === ProductConfigurationBubbleMode.Stop) {
                 return;
             }
@@ -40,20 +31,20 @@ export class _CfgProductConfigurationInternal {
             if (parent === undefined) {
                 return;
             }
-            yield parent._configurationHasChanged(freshRef, bubbleMode === ProductConfigurationBubbleMode.OneLevel
+            await parent._configurationHasChanged(freshRef, bubbleMode === ProductConfigurationBubbleMode.OneLevel
                 ? ProductConfigurationBubbleMode.Stop
                 : bubbleMode, committed);
-        });
+        };
         /** Called by child to tell its parent that it has changed. */
-        this._childHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = async (freshRef, bubbleMode, committed) => {
             const features = this._features;
             const i = features.findIndex((a) => a.isBackedBySame(freshRef));
             if (i === -1) {
                 throw Error("Child feature not found");
             }
             features[i] = freshRef;
-            yield this._notifyAllOfChange(bubbleMode, committed);
-        });
+            await this._notifyAllOfChange(bubbleMode, committed);
+        };
         this.getDtoConf = (includeExtendedData) => this._features.map((f) => f._internal.getDtoConf(includeExtendedData));
         this.getApiSelection = () => convertDtoFeatureConfsToSelOptions(this.getDtoConf(false), true);
         this.getApiConstrained = () => this._features.map((f) => {
@@ -70,7 +61,7 @@ export class _CfgProductConfigurationInternal {
          * outside we want notifications to bubble all the way to the root.
          * This method will not cause validation calls. Data is assumed to already be validated.
          */
-        this.setApiSelection = (selectedOptions, constrOptions, bubbleToRoot) => __awaiter(this, void 0, void 0, function* () {
+        this.setApiSelection = async (selectedOptions, constrOptions, bubbleToRoot) => {
             const featuresLength = this._features.length;
             const selectedOptionsLength = selectedOptions.length;
             if (featuresLength !== selectedOptionsLength) {
@@ -79,27 +70,24 @@ export class _CfgProductConfigurationInternal {
             if (constrOptions && featuresLength !== constrOptions.length) {
                 throw new Error(`Wrong constraint feature count. Features on this configuration: ${featuresLength}. Passed constraint feature count: ${constrOptions.length}.`);
             }
-            const change = (yield Promise.all(this._features.map((f, i) => {
-                var _a;
-                return f._internal.setApiSelection(selectedOptions[i].next, (_a = (constrOptions !== null && constrOptions !== void 0 ? constrOptions : [])[i]) === null || _a === void 0 ? void 0 : _a.next);
-            }))).some((b) => b);
+            const change = (await Promise.all(this._features.map((f, i) => f._internal.setApiSelection(selectedOptions[i].next, (constrOptions ?? [])[i]?.next)))).some((b) => b);
             if (change) {
-                yield this._notifyAllOfChange(bubbleToRoot
+                await this._notifyAllOfChange(bubbleToRoot
                     ? ProductConfigurationBubbleMode.ToRoot
                     : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
-        });
+        };
         this.structureCompare = (other, strictOrder, descriptionMatch) => compareArrays(this.features, other.features, (l, r) => l._internal.structureCompare(r._internal, strictOrder, descriptionMatch), strictOrder);
         /**
          * When used internally the notifications are taken care off by the caller, but if set from
          * outside we want notifications to bubble all the way to the root.
          */
-        this.tryMatchSelection = (other, descriptionMatch = false, // Match on case insensitive description, not code
-        validate) => __awaiter(this, void 0, void 0, function* () {
+        this.tryMatchSelection = async (other, descriptionMatch = false, // Match on case insensitive description, not code
+        validate) => {
             const thisFeatures = this.features;
             const otherFeatures = other.features;
-            const change = (yield Promise.all(otherFeatures.map((otherF) => (() => __awaiter(this, void 0, void 0, function* () {
+            const change = (await Promise.all(otherFeatures.map((otherF) => (async () => {
                 if (1 <
                     count(otherFeatures, (item) => item._internal.keyMatch(otherF._internal, descriptionMatch))) {
                     console.warn("tryMatchSelection will ignore items with same key");
@@ -113,15 +101,15 @@ export class _CfgProductConfigurationInternal {
                 if (toSetFeatures.length === 0) {
                     return false;
                 }
-                return yield toSetFeatures[0]._internal.tryMatchSelection(otherF._internal, descriptionMatch);
-            }))()))).some((b) => b);
+                return await toSetFeatures[0]._internal.tryMatchSelection(otherF._internal, descriptionMatch);
+            })()))).some((b) => b);
             if (change) {
-                yield this._notifyAllOfChange(validate
+                await this._notifyAllOfChange(validate
                     ? ProductConfigurationBubbleMode.Validate
                     : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
-        });
+        };
         /** Only selected features. */
         this._getFeaturesWithCode = (code) => this._features.reduce((agg, feature) => {
             agg.push(...feature._internal._getFeaturesWithCode(code));
@@ -161,7 +149,7 @@ export class _CfgProductConfigurationInternal {
             this._features = syncCfgFeatures(rootFeatureRefs, this._features, this.accumulatedRawFeatures, this, this, this.parentProduct, this.rootProduct);
             return true;
         };
-        this.setStretchReferenceLength = (measureParamCode, referenceLength, unit) => __awaiter(this, void 0, void 0, function* () {
+        this.setStretchReferenceLength = async (measureParamCode, referenceLength, unit) => {
             if (measureParamCode === "") {
                 return false;
             }
@@ -192,9 +180,9 @@ export class _CfgProductConfigurationInternal {
                 }
                 stretchReferenceLength.current = referenceLengthWithUnit;
             }
-            yield this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot, false);
+            await this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot, false);
             return true;
-        });
+        };
         /* eslint-disable */
         // Useful debug tool:
         if (false) {
@@ -278,8 +266,8 @@ export class CfgProductConfiguration {
          * This method does not propagate its selections.
          * This method will cause validation calls.
          */
-        this.tryMatchSelection = (other, descriptionMatch = false // Match on case insensitive description, not code
-        ) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.tryMatchSelection(other._internal, descriptionMatch, true); });
+        this.tryMatchSelection = async (other, descriptionMatch = false // Match on case insensitive description, not code
+        ) => await this._internal.tryMatchSelection(other._internal, descriptionMatch, true);
         /**
          * Set how stretched a certain measure should be measureParamCode is the measure to be
          * stretched referenceLength is a value relative to the initial length of the measure. If the

package/dist/productConfiguration/productParamsGenerator.js

@@ -1,65 +1,51 @@
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 import { toError } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
 import { applyProductRefFilters } from "./filters.js";
-export function generateProductConfigurations(api, lang, catalogues, filters, settings) {
-    return __asyncGenerator(this, arguments, function* generateProductConfigurations_1() {
-        const catalogueCount = catalogues.length;
-        const catalogueEntries = catalogues.entries();
-        for (const [catalogueIndex, catalogueParamsWithoutLang] of catalogueEntries) {
-            const catalogueParams = Object.assign(Object.assign({}, catalogueParamsWithoutLang), { lang });
-            try {
-                const [applicationAreasResponse, toc] = yield __await(Promise.all([
-                    api.getApplicationAreas(catalogueParams),
-                    api.getTocFlat(catalogueParams),
-                ]));
-                const [, productRefs] = applyProductRefFilters(filters, (toc === null || toc === void 0 ? void 0 : toc.prdRefs) || []);
-                const productCount = productRefs.length;
-                const productEntries = productRefs.entries();
-                for (const [productIndex, prdRef] of productEntries) {
-                    const startTime = performance.now();
-                    try {
-                        const product = yield __await(CfgProduct.make(api, Object.assign(Object.assign({}, catalogueParams), { partNumber: prdRef.partNr }), settings));
-                        const getProductDuration = performance.now() - startTime;
-                        yield yield __await({
-                            applicationAreasResponse,
-                            catalogueCount,
-                            catalogueIndex,
-                            catalogueParams,
-                            getProductDuration,
-                            product,
-                            productCount,
-                            productIndex,
-                        });
-                    }
-                    catch (e) {
-                        const err = e;
-                        // Product load error, for example missing CmSym files.
-                        // Safe to continue loading the next product.
-                        const split = err.message.indexOf(", request ID: ");
-                        if (split > -1) {
-                            // The request ID part of the error from the server is mostly just spam and
-                            // makes it harder to read list of errors, so remove it.
-                            err.message = err.message.slice(0, split);
-                        }
-                        yield yield __await(toError(e));
+export async function* generateProductConfigurations(api, lang, catalogues, filters, settings) {
+    const catalogueCount = catalogues.length;
+    const catalogueEntries = catalogues.entries();
+    for (const [catalogueIndex, catalogueParamsWithoutLang] of catalogueEntries) {
+        const catalogueParams = { ...catalogueParamsWithoutLang, lang };
+        try {
+            const [applicationAreasResponse, toc] = await Promise.all([
+                api.getApplicationAreas(catalogueParams),
+                api.getTocFlat(catalogueParams),
+            ]);
+            const [, productRefs] = applyProductRefFilters(filters, toc?.prdRefs || []);
+            const productCount = productRefs.length;
+            const productEntries = productRefs.entries();
+            for (const [productIndex, prdRef] of productEntries) {
+                const startTime = performance.now();
+                try {
+                    const product = await CfgProduct.make(api, { ...catalogueParams, partNumber: prdRef.partNr }, settings);
+                    const getProductDuration = performance.now() - startTime;
+                    yield {
+                        applicationAreasResponse,
+                        catalogueCount,
+                        catalogueIndex,
+                        catalogueParams,
+                        getProductDuration,
+                        product,
+                        productCount,
+                        productIndex,
+                    };
+                }
+                catch (e) {
+                    const err = e;
+                    // Product load error, for example missing CmSym files.
+                    // Safe to continue loading the next product.
+                    const split = err.message.indexOf(", request ID: ");
+                    if (split > -1) {
+                        // The request ID part of the error from the server is mostly just spam and
+                        // makes it harder to read list of errors, so remove it.
+                        err.message = err.message.slice(0, split);
                     }
+                    yield toError(e);
                 }
             }
-            catch (e) {
-                yield yield __await(toError(e));
-            }
         }
-    });
+        catch (e) {
+            yield toError(e);
+        }
+    }
 }

package/dist/productLoader.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { PromiseCache } from "@configura/web-utilities";
 import { makeProductKey, makeSelOptionsKey, } from "./utilitiesCatalogueData.js";
 /**
@@ -21,7 +12,7 @@ import { makeProductKey, makeSelOptionsKey, } from "./utilitiesCatalogueData.js"
  */
 export function wrapWithGetProductCache(getProduct) {
     const cache = new PromiseCache();
-    return (params) => __awaiter(this, void 0, void 0, function* () { return cache.get(makeProductKey(params), () => getProduct(params)); });
+    return async (params) => cache.get(makeProductKey(params), () => getProduct(params));
 }
 /**
  * Wraps a postValidate function so that it caches for the time it lives.
@@ -36,9 +27,7 @@ export function wrapWithGetProductCache(getProduct) {
  */
 export function wrapWithPostValidateCache(postValidate) {
     const cache = new PromiseCache();
-    return (params, body) => __awaiter(this, void 0, void 0, function* () {
-        return cache.get(`${makeProductKey(params)}-${makeSelOptionsKey(body.selOptions)}-${body.knownFeatureCodes.join(",")}`, () => postValidate(params, body));
-    });
+    return async (params, body) => cache.get(`${makeProductKey(params)}-${makeSelOptionsKey(body.selOptions)}-${body.knownFeatureCodes.join(",")}`, () => postValidate(params, body));
 }
 /** Does both wrapWithGetProductCache and wrapWithPostValidateCache. */
 export function wrapWithCache(loader) {