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

package/dist/CfgProduct.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());
-    });
-};
 var _a;
 import { AggregatedLoadingObservable, assert, assertDefined, augmentErrorMessage, compareArrays, count, Observable, toLengthUnit, } from "@configura/web-utilities";
 import { CfgMeasureDefinition } from "./CfgMeasure.js";
@@ -18,11 +9,10 @@ import { SyncGroupsHandler } from "./syncGroups/SyncGroupsHandler.js";
 import { compareCfgProductData, correctDefaultsOnCatalogueParams, isSameCatalogueParams, isSameProductRef, makeProductKey, } from "./utilitiesCatalogueData.js";
 import { CfgProdConfParts, convertDtoProductConfToV1, isAdditionalProductConfiguration, isProductConf, } from "./utilitiesConfiguration.js";
 function completeSettings(incompleteSettings) {
-    var _b, _c;
     return {
-        strictSelectOneSelectionCount: (_b = incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.strictSelectOneSelectionCount) !== null && _b !== void 0 ? _b : false,
-        syncGroupsApplyMode: incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.syncGroupsApplyMode,
-        disableMatchOnDescription: (_c = incompleteSettings === null || incompleteSettings === void 0 ? void 0 : incompleteSettings.disableMatchOnDescription) !== null && _c !== void 0 ? _c : false,
+        strictSelectOneSelectionCount: incompleteSettings?.strictSelectOneSelectionCount ?? false,
+        syncGroupsApplyMode: incompleteSettings?.syncGroupsApplyMode,
+        disableMatchOnDescription: incompleteSettings?.disableMatchOnDescription ?? false,
     };
 }
 /**
@@ -55,7 +45,6 @@ function isDescriptionMatch(l, r) {
  */
 export class _CfgProductInternal {
     constructor(initSuccess, initFail, _productLoaderRaw, prodParams, settings, optional, selected, rootFeatureRefs, rawFeatures, notes, uuid, _rawUnit, _rawProductData, apiSelection, apiConstraints, loadingObservable, parent, root, _additionalProductRef, _syncGroupHandler) {
-        var _b;
         this._productLoaderRaw = _productLoaderRaw;
         this.prodParams = prodParams;
         this.settings = settings;
@@ -72,23 +61,22 @@ export class _CfgProductInternal {
         this.changeObservable = new Observable();
         /** Mark this and its descendants as destroyed and remove all listeners */
         this.destroy = () => {
-            var _b;
             this._destroyed = true;
             this.changeObservable.stopAllListen();
             this.configuration.stopAllListenForChange();
-            for (const additionalProduct of (_b = this.additionalProducts) !== null && _b !== void 0 ? _b : []) {
+            for (const additionalProduct of this.additionalProducts ?? []) {
                 additionalProduct.destroy();
             }
         };
         /**
          * Reset will reset the product to its initial state
          */
-        this.reset = () => __awaiter(this, void 0, void 0, function* () {
+        this.reset = async () => {
             if (this._initialClone !== undefined) {
-                yield this.copyFrom(this._initialClone, true);
+                await this.copyFrom(this._initialClone, true);
             }
-        });
-        this._notifyAllOfChange = (bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        };
+        this._notifyAllOfChange = async (bubbleMode, committed) => {
             if (bubbleMode === CfgProductBubbleMode.Stop) {
                 return;
             }
@@ -96,23 +84,23 @@ export class _CfgProductInternal {
             const freshRef = CfgProduct._makeNewRefFrom(this);
             this.changeObservable.notifyAll({ freshRef, committed });
             if (parent !== undefined) {
-                yield parent._additionalProductHasChanged(freshRef, bubbleMode === CfgProductBubbleMode.OneLevel
+                await parent._additionalProductHasChanged(freshRef, bubbleMode === CfgProductBubbleMode.OneLevel
                     ? CfgProductBubbleMode.Stop
                     : bubbleMode, committed);
             }
-        });
+        };
         /** Called when a child (additional product or the configuration) has changed. */
-        this._childHasChanged = (bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = async (bubbleMode, committed) => {
             if (bubbleMode === CfgProductBubbleMode.ToRootAndBubbleSelected &&
                 this.optional &&
                 !this.selected) {
-                yield this.setSelected(true, bubbleMode, false);
+                await this.setSelected(true, bubbleMode, false);
                 return;
             }
-            yield this._notifyAllOfChange(bubbleMode, committed);
-        });
+            await this._notifyAllOfChange(bubbleMode, committed);
+        };
         /** Called by child to tell its parent that it has changed. */
-        this._additionalProductHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._additionalProductHasChanged = async (freshRef, bubbleMode, committed) => {
             const i = this.additionalProducts.findIndex((a) => a.isBackedBySame(freshRef));
             if (i !== -1) {
                 // Child additional product might not be found. This probably means that propagate
@@ -122,39 +110,38 @@ export class _CfgProductInternal {
                 // C no longer is part of the tree. Odd, but fully permitted.
                 this.additionalProducts[i] = freshRef;
             }
-            yield this._childHasChanged(bubbleMode, committed);
-        });
+            await this._childHasChanged(bubbleMode, committed);
+        };
         /** Called by the configuration to tell its parent that it has changed. */
-        this._configurationHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._configurationHasChanged = async (freshRef, bubbleMode, committed) => {
             this._configuration = freshRef;
             switch (bubbleMode) {
                 case ProductConfigurationBubbleMode.ValidateAndBubbleSelected:
                     // The revalidate call will continue the bubble
-                    yield this._revalidate(CfgProductBubbleMode.ToRootAndBubbleSelected, this._productLoaderRaw, committed);
+                    await this._revalidate(CfgProductBubbleMode.ToRootAndBubbleSelected, this._productLoaderRaw, committed);
                     return;
                 case ProductConfigurationBubbleMode.BubbleSelected:
-                    yield this._childHasChanged(CfgProductBubbleMode.ToRootAndBubbleSelected, committed);
+                    await this._childHasChanged(CfgProductBubbleMode.ToRootAndBubbleSelected, committed);
                     return;
                 case ProductConfigurationBubbleMode.Validate:
                     // The revalidate call will continue the bubble
-                    yield this._revalidate(CfgProductBubbleMode.ToRoot, this._productLoaderRaw, committed);
+                    await this._revalidate(CfgProductBubbleMode.ToRoot, this._productLoaderRaw, committed);
                     return;
                 case ProductConfigurationBubbleMode.ToParentProduct:
                     // Do not continue bubble as we have reached the parent CfgProduct
                     return;
                 case ProductConfigurationBubbleMode.OneLevel:
-                    yield this._childHasChanged(CfgProductBubbleMode.OneLevel, committed);
+                    await this._childHasChanged(CfgProductBubbleMode.OneLevel, committed);
                     return;
                 case ProductConfigurationBubbleMode.Stop:
-                    yield this._childHasChanged(CfgProductBubbleMode.Stop, committed);
+                    await this._childHasChanged(CfgProductBubbleMode.Stop, committed);
                     return;
                 case ProductConfigurationBubbleMode.ToRoot:
-                    yield this._childHasChanged(CfgProductBubbleMode.ToRoot, committed);
+                    await this._childHasChanged(CfgProductBubbleMode.ToRoot, committed);
                     return;
             }
-        });
+        };
         this.getDtoConf = (include) => {
-            var _b;
             const conf = {};
             const features = this.configuration._internal.getDtoConf((include & CfgProdConfParts.ExtendedData) === CfgProdConfParts.ExtendedData);
             if (0 < features.length) {
@@ -168,7 +155,7 @@ export class _CfgProductInternal {
             // so no need to store it for additional products.
             if ((include & CfgProdConfParts.SyncGroupState) === CfgProdConfParts.SyncGroupState &&
                 this.parent === undefined) {
-                conf.syncGroupState = (_b = this.syncGroupHandler) === null || _b === void 0 ? void 0 : _b.getCompactSyncGroupState();
+                conf.syncGroupState = this.syncGroupHandler?.getCompactSyncGroupState();
             }
             const additionalProducts = this.additionalProducts;
             if (0 < additionalProducts.length) {
@@ -185,7 +172,7 @@ export class _CfgProductInternal {
             }
             return conf;
         };
-        this.setDtoConf = (s, doValidate, productLoaderForGroupedLoad) => __awaiter(this, void 0, void 0, function* () {
+        this.setDtoConf = async (s, doValidate, productLoaderForGroupedLoad) => {
             // The DtoProdConf format can contain a sync group state, but
             // not the DtoAdditionalProductConfiguration format. So we apply
             // any passed state here.
@@ -196,15 +183,11 @@ export class _CfgProductInternal {
                     syncGroupHandler.setCompactSyncGroupState(newSyncGroupState);
                 }
             }
-            return yield this.setApiSelection(convertDtoProductConfToV1(s), doValidate, productLoaderForGroupedLoad);
-        });
-        this.setApiSelection = (s, doValidate, productLoaderForGroupedLoad) => __awaiter(this, void 0, void 0, function* () {
-            return yield this._setApiSelectionWithOtherProduct(s, doValidate, productLoaderForGroupedLoad, undefined);
-        });
-        this.copyFrom = (source, doValidate, productLoaderForGroupedLoad) => __awaiter(this, void 0, void 0, function* () {
-            return yield this._setApiSelectionWithOtherProduct(convertDtoProductConfToV1(source.getDtoConf(CfgProdConfParts.NoExtra)), doValidate, productLoaderForGroupedLoad, source);
-        });
-        this._setApiSelectionWithOtherProduct = (productConfiguration, doValidate, productLoaderForGroupedLoad, sourceProduct) => __awaiter(this, void 0, void 0, function* () {
+            return await this.setApiSelection(convertDtoProductConfToV1(s), doValidate, productLoaderForGroupedLoad);
+        };
+        this.setApiSelection = async (s, doValidate, productLoaderForGroupedLoad) => await this._setApiSelectionWithOtherProduct(s, doValidate, productLoaderForGroupedLoad, undefined);
+        this.copyFrom = async (source, doValidate, productLoaderForGroupedLoad) => await this._setApiSelectionWithOtherProduct(convertDtoProductConfToV1(source.getDtoConf(CfgProdConfParts.NoExtra)), doValidate, productLoaderForGroupedLoad, source);
+        this._setApiSelectionWithOtherProduct = async (productConfiguration, doValidate, productLoaderForGroupedLoad, sourceProduct) => {
             // Wrap with cache will make getProduct for this function call use the same server call
             // for the same product with the same params. Used for getProduct (when a new additional
             // product is loaded) and postValidate.
@@ -237,16 +220,16 @@ export class _CfgProductInternal {
                     }
                 }
             }
-            const configurationChange = yield this.configuration._internal.setApiSelection(productConfiguration.selOptions, sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct._rawProductData.partsData.constrOptions, false);
+            const configurationChange = await this.configuration._internal.setApiSelection(productConfiguration.selOptions, sourceProduct?._rawProductData.partsData.constrOptions, false);
             if (configurationChange) {
                 change = true;
             }
             if (this.optional) {
-                if (yield this.setSelected(productConfiguration.selected !== false, CfgProductBubbleMode.Stop, false)) {
+                if (await this.setSelected(productConfiguration.selected !== false, CfgProductBubbleMode.Stop, false)) {
                     change = true;
                 }
             }
-            yield this._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, productConfiguration);
+            await this._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, productConfiguration);
             const apiSelectionAdditionalProducts = productConfiguration.additionalProducts || [];
             const additionalProducts = this.additionalProducts.slice();
             const additionalProductsCount = additionalProducts.length;
@@ -254,11 +237,10 @@ export class _CfgProductInternal {
             if (apiSelectionAdditionalProductsCount !== additionalProductsCount) {
                 throw new Error(`Additional products are not same length. This product: "${this.key}". This product additional products count: ${additionalProductsCount}. Passed apiSelection additional products count: ${apiSelectionAdditionalProductsCount}`);
             }
-            const sourceProductAdditionalProducts = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.additionalProducts;
+            const sourceProductAdditionalProducts = sourceProduct?.additionalProducts;
             assert(!sourceProductAdditionalProducts ||
                 additionalProductsCount === sourceProductAdditionalProducts.length, `Passed sourceProduct does not have the same number of additional products as this.`);
-            if ((yield Promise.all(apiSelectionAdditionalProducts.map((apiSelectionAdditionalProduct) => __awaiter(this, void 0, void 0, function* () {
-                var _c;
+            if ((await Promise.all(apiSelectionAdditionalProducts.map(async (apiSelectionAdditionalProduct) => {
                 const refKey = apiSelectionAdditionalProduct.refKey;
                 assertDefined(refKey, "Additional product api configurations must have refKey.");
                 const i = additionalProducts.findIndex((a) => refKey === a.refKey);
@@ -266,25 +248,25 @@ export class _CfgProductInternal {
                 let sourceProductAdditionalProduct = undefined;
                 if (sourceProductAdditionalProducts !== undefined) {
                     sourceProductAdditionalProduct =
-                        (_c = sourceProductAdditionalProducts.find((a) => refKey === a.refKey)) === null || _c === void 0 ? void 0 : _c._internal;
+                        sourceProductAdditionalProducts.find((a) => refKey === a.refKey)?._internal;
                     assertDefined(sourceProductAdditionalProduct, "Additional product not found in sourceProduct");
                 }
                 const additionalProduct = additionalProducts.splice(i, 1)[0]; // Splicing like this is okay because this is done synchronous. The setCon. is what is async.
-                return yield additionalProduct._internal._setApiSelectionWithOtherProduct(apiSelectionAdditionalProduct, doValidate, productLoaderForGroupedLoad, sourceProductAdditionalProduct);
-            })))).some((b) => b)) {
+                return await additionalProduct._internal._setApiSelectionWithOtherProduct(apiSelectionAdditionalProduct, doValidate, productLoaderForGroupedLoad, sourceProductAdditionalProduct);
+            }))).some((b) => b)) {
                 change = true;
             }
             if (doValidate && configurationChange) {
-                yield this._revalidate(CfgProductBubbleMode.ToRoot, productLoaderForGroupedLoad, true);
+                await this._revalidate(CfgProductBubbleMode.ToRoot, productLoaderForGroupedLoad, true);
             }
             else if (change) {
                 // As setApiSelection is done recursively each level takes care of its own notifications
                 // so we only need to bubble one level to notify this and swap out the reference in the
                 // parent.
-                yield this._notifyAllOfChange(CfgProductBubbleMode.OneLevel, true);
+                await this._notifyAllOfChange(CfgProductBubbleMode.OneLevel, true);
             }
             return change;
-        });
+        };
         this.structureCompare = (other, strictOrder = true, descriptionMatch = false) => {
             if (!this.configuration.structureCompare(other.configuration, strictOrder, descriptionMatch)) {
                 return false;
@@ -292,25 +274,25 @@ export class _CfgProductInternal {
             return compareArrays(this.additionalProducts, other.additionalProducts, (l, r) => (!descriptionMatch || (descriptionMatch && isDescriptionMatch(l, r))) &&
                 l.structureCompare(r, strictOrder, descriptionMatch), !descriptionMatch);
         };
-        this.tryMatchSelection = (other, descriptionMatch = false, // Match on case insensitive description, not code
-        productLoaderForGroupedLoad) => __awaiter(this, void 0, void 0, function* () {
+        this.tryMatchSelection = async (other, descriptionMatch = false, // Match on case insensitive description, not code
+        productLoaderForGroupedLoad) => {
             // wrap with cache will make getProduct for this function call use the same server call
             // for the same product with the same params
             productLoaderForGroupedLoad =
                 productLoaderForGroupedLoad || wrapWithCache(this._productLoaderRaw);
             let change = false;
             if (this.optional && other.optional) {
-                if (yield this.setSelected(other.selected, CfgProductBubbleMode.Stop, false)) {
+                if (await this.setSelected(other.selected, CfgProductBubbleMode.Stop, false)) {
                     change = true;
                 }
             }
-            const configurationChange = yield this.configuration._internal.tryMatchSelection(other.configuration._internal, descriptionMatch, false);
+            const configurationChange = await this.configuration._internal.tryMatchSelection(other.configuration._internal, descriptionMatch, false);
             if (configurationChange) {
                 change = true;
-                yield this._revalidate(CfgProductBubbleMode.ToRootAndBubbleSelected, productLoaderForGroupedLoad, true);
+                await this._revalidate(CfgProductBubbleMode.ToRootAndBubbleSelected, productLoaderForGroupedLoad, true);
             }
             else if (change) {
-                yield this._notifyAllOfChange(CfgProductBubbleMode.ToRootAndBubbleSelected, true);
+                await this._notifyAllOfChange(CfgProductBubbleMode.ToRootAndBubbleSelected, true);
             }
             const thisAdditionalProducts = this.additionalProducts;
             const otherAdditionalProducts = other.additionalProducts;
@@ -342,11 +324,11 @@ export class _CfgProductInternal {
                     promises.push(thisAdditionalProducts[i]._internal.tryMatchSelection(otherAdditionalProducts[i]._internal, descriptionMatch, productLoaderForGroupedLoad));
                 }
             }
-            if ((yield Promise.all(promises)).some((b) => b)) {
+            if ((await Promise.all(promises)).some((b) => b)) {
                 change = true;
             }
             return change;
-        });
+        };
         /** Only features in selected options and selected additional products. */
         this._getDescendantFeaturesWithCode = (code) => this.additionalProducts.reduce((agg, additionalProduct) => {
             if (additionalProduct.selected) {
@@ -359,12 +341,12 @@ export class _CfgProductInternal {
          * product in isolation. The validation result is applied on the configuration. Then additional
          * products are synced (unloaded, loaded etc.) Finally the changes bubble up the tree.
          */
-        this._revalidate = (bubbleMode, productLoader, committed) => __awaiter(this, void 0, void 0, function* () {
+        this._revalidate = async (bubbleMode, productLoader, committed) => {
             const { _configuration: configuration } = this;
             const token = this.loadingObservable.startChildLoading();
             this._revalidateInProgressToken = token;
             try {
-                const response = yield productLoader.postValidate(correctDefaultsOnCatalogueParams(this.prodParams), {
+                const response = await productLoader.postValidate(correctDefaultsOnCatalogueParams(this.prodParams), {
                     selOptions: configuration._internal.getApiSelection(),
                     knownFeatureCodes: configuration.rawFeatures.map((f) => f.code),
                 });
@@ -395,12 +377,12 @@ export class _CfgProductInternal {
                 if (rootFeatureRefs !== undefined) {
                     configuration._internal.populateFeatures(rootFeatureRefs);
                 }
-                yield configuration._internal.setApiSelection(productData.partsData.selOptions || [], productData.partsData.constrOptions, false);
-                yield this._syncAndLoadAdditionalProducts(productLoader, undefined);
+                await configuration._internal.setApiSelection(productData.partsData.selOptions || [], productData.partsData.constrOptions, false);
+                await this._syncAndLoadAdditionalProducts(productLoader, undefined);
                 if (this._destroyed) {
                     return false;
                 }
-                yield this._notifyAllOfChange(bubbleMode, committed);
+                await this._notifyAllOfChange(bubbleMode, committed);
                 return true;
             }
             catch (e) {
@@ -409,12 +391,12 @@ export class _CfgProductInternal {
             finally {
                 this.loadingObservable.stopChildLoading(token);
             }
-        });
+        };
         /**
          * Based on this configuration find what additional products should be shown and not, unload
          * (i.e. destroy) those that should no longer be shown, load the new ones.
          */
-        this._syncAndLoadAdditionalProducts = (productLoaderForGroupedLoad, initialProductConfiguration) => __awaiter(this, void 0, void 0, function* () {
+        this._syncAndLoadAdditionalProducts = async (productLoaderForGroupedLoad, initialProductConfiguration) => {
             const { _productLoaderRaw: productLoaderRaw, rawProductData: productData, configuration, additionalProducts: currentAdditionalProducts, } = this;
             const additionalProductRefs = [
                 ...(productData.additionalProductRefs || []),
@@ -455,20 +437,23 @@ export class _CfgProductInternal {
                 if (additionalProductRefs.length !== 0) {
                     change = true;
                 }
-                const newAdditionalProducts = yield Promise.all(additionalProductRefs.map((p) => (() => __awaiter(this, void 0, void 0, function* () {
-                    var _d;
+                const newAdditionalProducts = await Promise.all(additionalProductRefs.map((p) => (async () => {
                     const additionalProductRef = p.prodRef;
                     const refKey = additionalProductRef.refKey;
-                    const additionalProductInitialProductConfiguration = (_d = initialProductConfiguration === null || initialProductConfiguration === void 0 ? void 0 : initialProductConfiguration.additionalProducts) === null || _d === void 0 ? void 0 : _d.find((aP) => refKey === aP.refKey);
+                    const additionalProductInitialProductConfiguration = initialProductConfiguration?.additionalProducts?.find((aP) => refKey === aP.refKey);
                     if (initialProductConfiguration !== undefined &&
                         additionalProductInitialProductConfiguration === undefined) {
                         console.warn(`Did not find initial product configuration for additional product with refKey ${refKey}`);
                     }
                     return {
                         originalIndex: p.originalIndex,
-                        product: CfgProduct._makeNewRefFrom(yield _CfgProductInternal.make(productLoaderRaw, productLoaderForGroupedLoad, Object.assign(Object.assign({}, additionalProductRef.catId), { lang: this.prodParams.lang, partNumber: additionalProductRef.partNumber }), this.settings, additionalProductRef.optional === true, this.loadingObservable, this, this.root, additionalProductRef, additionalProductInitialProductConfiguration)),
+                        product: CfgProduct._makeNewRefFrom(await _CfgProductInternal.make(productLoaderRaw, productLoaderForGroupedLoad, {
+                            ...additionalProductRef.catId,
+                            lang: this.prodParams.lang,
+                            partNumber: additionalProductRef.partNumber,
+                        }, this.settings, additionalProductRef.optional === true, this.loadingObservable, this, this.root, additionalProductRef, additionalProductInitialProductConfiguration)),
                     };
-                }))()));
+                })()));
                 if (this._destroyed) {
                     return change;
                 }
@@ -480,13 +465,16 @@ export class _CfgProductInternal {
             finally {
                 this.loadingObservable.stopChildLoading(token);
             }
-        });
+        };
         this._setRawProductData = (productData) => {
             this._rawProductData = productData;
             this._clearStretchMeasurements();
         };
-        this.root = root !== null && root !== void 0 ? root : this;
-        this.key = makeProductKey(Object.assign(Object.assign({}, prodParams), { partNumber: (_b = _additionalProductRef === null || _additionalProductRef === void 0 ? void 0 : _additionalProductRef.refKey) !== null && _b !== void 0 ? _b : prodParams.partNumber }));
+        this.root = root ?? this;
+        this.key = makeProductKey({
+            ...prodParams,
+            partNumber: _additionalProductRef?.refKey ?? prodParams.partNumber,
+        });
         this._selected = optional ? selected : undefined;
         this.isAdditionalProduct = _additionalProductRef !== undefined;
         if (notes !== undefined) {
@@ -503,19 +491,16 @@ export class _CfgProductInternal {
      * Providing the parent and root of what you clone as arguments is unwise as it will
      * make changes you do on the clone be propagated up to the original non-clone root product.
      */
-    clone(parent, root) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const product = yield new Promise((initSuccess, initFail) => {
-                var _b;
-                const p = new _CfgProductInternal(() => {
-                    initSuccess(p);
-                }, initFail, this._productLoaderRaw, this.prodParams, this.settings, this.optional, this.selected, this._configuration.rootFeatureRefs, this._configuration.rawFeatures, this._notes.values(), this.uuid, this._rawUnit, this._rawProductData, this.configuration._internal.getApiSelection(), this.configuration._internal.getApiConstrained(), new AggregatedLoadingObservable(), parent, root, this._additionalProductRef, (_b = this._syncGroupHandler) === null || _b === void 0 ? void 0 : _b.clone());
-            });
-            for (const additionalProduct of this.additionalProducts) {
-                product.additionalProducts.push(CfgProduct._makeNewRefFrom(yield additionalProduct._internal.clone(product, root || product)));
-            }
-            return product;
+    async clone(parent, root) {
+        const product = await new Promise((initSuccess, initFail) => {
+            const p = new _CfgProductInternal(() => {
+                initSuccess(p);
+            }, initFail, this._productLoaderRaw, this.prodParams, this.settings, this.optional, this.selected, this._configuration.rootFeatureRefs, this._configuration.rawFeatures, this._notes.values(), this.uuid, this._rawUnit, this._rawProductData, this.configuration._internal.getApiSelection(), this.configuration._internal.getApiConstrained(), new AggregatedLoadingObservable(), parent, root, this._additionalProductRef, this._syncGroupHandler?.clone());
         });
+        for (const additionalProduct of this.additionalProducts) {
+            product.additionalProducts.push(CfgProduct._makeNewRefFrom(await additionalProduct._internal.clone(product, root || product)));
+        }
+        return product;
     }
     /**
      * Internal use. Used when this product is an additional product, and
@@ -556,20 +541,17 @@ export class _CfgProductInternal {
         }
     }
     get notes() {
-        var _b;
-        return this.getNotes((_b = this.rawProductData.noteRefs) !== null && _b !== void 0 ? _b : []);
+        return this.getNotes(this.rawProductData.noteRefs ?? []);
     }
     get miscFiles() {
-        var _b;
-        return (_b = this._rawProductData.miscFiles) !== null && _b !== void 0 ? _b : [];
+        return this._rawProductData.miscFiles ?? [];
     }
     get hasRootFeaturesChanged() {
         return (this._configuration._internal.hasRootFeaturesChanged ||
             this.additionalProducts.some((p) => p._internal.hasRootFeaturesChanged));
     }
     get description() {
-        var _b, _c;
-        return (_c = (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.refDescription) !== null && _c !== void 0 ? _c : this._rawProductData.description;
+        return this._additionalProductRef?.refDescription ?? this._rawProductData.description;
     }
     get rootNodeSources() {
         return this._rawProductData.models;
@@ -587,25 +569,21 @@ export class _CfgProductInternal {
         return this._rawProductData.partsData.prices;
     }
     get measureDefinitions() {
-        var _b;
         if (this._measureDefinitions === undefined) {
-            this._measureDefinitions = ((_b = this._rawProductData.measurements) !== null && _b !== void 0 ? _b : [])
+            this._measureDefinitions = (this._rawProductData.measurements ?? [])
                 .map((m) => CfgMeasureDefinition.make(m))
                 .filter((m) => m !== undefined);
         }
         return this._measureDefinitions;
     }
     get refKey() {
-        var _b;
-        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.refKey;
+        return this._additionalProductRef?.refKey;
     }
     get transform() {
-        var _b;
-        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.transform;
+        return this._additionalProductRef?.transform;
     }
     get anchor() {
-        var _b;
-        return (_b = this._additionalProductRef) === null || _b === void 0 ? void 0 : _b.anchor;
+        return this._additionalProductRef?.anchor;
     }
     /** @throws an error if the actual unit sent by the server was not a LengthUnit */
     get unit() {
@@ -641,34 +619,32 @@ export class _CfgProductInternal {
     get optional() {
         return this._selected !== undefined;
     }
-    setSelected(selected, bubbleMode, interactive) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.optional) {
-                console.warn("This product is not optional. Nothing will happen");
-                return false;
-            }
-            if (this._selected === selected) {
-                return false;
-            }
-            // Vitally important that this happens before the call to reset,
-            // so that the reset won't cause infinite loops
-            this._selected = selected;
-            if (interactive) {
-                if (selected) {
-                    const syncGroupHandler = this.syncGroupHandler;
-                    if (syncGroupHandler !== undefined) {
-                        yield syncGroupHandler.init(this.root, wrapWithCache(this._productLoaderRaw));
-                    }
-                }
-                else {
-                    yield this.reset();
-                    // In case a passed initial configuration has made it reset to selected
-                    this._selected = selected;
+    async setSelected(selected, bubbleMode, interactive) {
+        if (!this.optional) {
+            console.warn("This product is not optional. Nothing will happen");
+            return false;
+        }
+        if (this._selected === selected) {
+            return false;
+        }
+        // Vitally important that this happens before the call to reset,
+        // so that the reset won't cause infinite loops
+        this._selected = selected;
+        if (interactive) {
+            if (selected) {
+                const syncGroupHandler = this.syncGroupHandler;
+                if (syncGroupHandler !== undefined) {
+                    await syncGroupHandler.init(this.root, wrapWithCache(this._productLoaderRaw));
                 }
             }
-            yield this._notifyAllOfChange(bubbleMode, true);
-            return true;
-        });
+            else {
+                await this.reset();
+                // In case a passed initial configuration has made it reset to selected
+                this._selected = selected;
+            }
+        }
+        await this._notifyAllOfChange(bubbleMode, true);
+        return true;
     }
     get configuration() {
         return this._configuration;
@@ -711,8 +687,7 @@ export class _CfgProductInternal {
         return this.root._syncGroupHandler;
     }
     get syncGroupsVerboseLogging() {
-        var _b, _c;
-        return (_c = (_b = this.syncGroupHandler) === null || _b === void 0 ? void 0 : _b.verboseLogging) !== null && _c !== void 0 ? _c : false;
+        return this.syncGroupHandler?.verboseLogging ?? false;
     }
     /**
      * Set to true to get verbose sync state changes logged to the console.
@@ -726,8 +701,8 @@ export class _CfgProductInternal {
     }
 }
 _a = _CfgProductInternal;
-_CfgProductInternal.make = (productLoaderRaw, productLoaderForGroupedLoad, // Used when instantiating the current product
-prodParams, settings, optional, loadingObservable, parent, root, additionalProductRef, initialProductConfiguration) => __awaiter(void 0, void 0, void 0, function* () {
+_CfgProductInternal.make = async (productLoaderRaw, productLoaderForGroupedLoad, // Used when instantiating the current product
+prodParams, settings, optional, loadingObservable, parent, root, additionalProductRef, initialProductConfiguration) => {
     // Wrap with cache will make getProduct for this function call use the same server call
     // for the same product with the same params. Not retained for future calls, only used
     // at this initial load.
@@ -756,39 +731,38 @@ prodParams, settings, optional, loadingObservable, parent, root, additionalProdu
                 initialProductConfigurationV1 = initialProductConfiguration;
             }
         }
-        const productResponse = yield (initialProductConfigurationV1
+        const productResponse = await (initialProductConfigurationV1
             ? productLoaderForGroupedLoad.postValidate(defaultCorrectedProdParams, {
                 knownFeatureCodes: [],
                 selOptions: initialProductConfigurationV1.selOptions,
             })
             : productLoaderForGroupedLoad.getProduct(defaultCorrectedProdParams));
         const { productData, rootFeatureRefs, features: rawFeatures, notes, uuid, unit, } = productResponse;
-        const initiallySelected = !optional || (initialProductConfigurationV1 === null || initialProductConfigurationV1 === void 0 ? void 0 : initialProductConfigurationV1.selected) === true;
-        const product = yield new Promise((initSuccess, initFail) => {
-            var _b;
+        const initiallySelected = !optional || initialProductConfigurationV1?.selected === true;
+        const product = await new Promise((initSuccess, initFail) => {
             const p = new _CfgProductInternal(() => {
                 // We absolutely do not want anyone to assign to this._configuration. So we want that field private.
                 // But we can not set the api selection synchronously. And the product configuration needs "this". So we use this callback.
                 // Feel free to find a nicer more readable solution :)
                 initSuccess(p);
-            }, initFail, productLoaderRaw, prodParams, settings, optional, initiallySelected, rootFeatureRefs !== null && rootFeatureRefs !== void 0 ? rootFeatureRefs : [], rawFeatures, notes === null || notes === void 0 ? void 0 : notes.values(), uuid, unit, productData, (_b = productData.partsData.selOptions) !== null && _b !== void 0 ? _b : [], productData.partsData.constrOptions, loadingObservable, parent, root, additionalProductRef, syncGroupHandler);
+            }, initFail, productLoaderRaw, prodParams, settings, optional, initiallySelected, rootFeatureRefs ?? [], rawFeatures, notes?.values(), uuid, unit, productData, productData.partsData.selOptions ?? [], productData.partsData.constrOptions, loadingObservable, parent, root, additionalProductRef, syncGroupHandler);
         });
-        yield product._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, initialProductConfigurationV1);
-        product._initialClone = yield product.clone();
+        await product._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, initialProductConfigurationV1);
+        product._initialClone = await product.clone();
         if (syncGroupHandler !== undefined && !initialProductConfiguration) {
             // As syncGroupHandler is only set for root product we know that we will init with root.
             // If we have an initialProductConfiguration we do not run init for the syncGroups.
             // The idea with an initial configuration is that the product should look as it did when
             // the configuration was saved. Not running init does that. Also, the DtoProductConf
             // object can contain a sync state which is then used to populate the sync state.
-            yield syncGroupHandler.init(product, productLoaderForGroupedLoad);
+            await syncGroupHandler.init(product, productLoaderForGroupedLoad);
         }
         return product;
     }
     catch (e) {
         throw augmentErrorMessage(e, `Load product request (${prodParams.partNumber}) failure`);
     }
-});
+};
 export class CfgProduct {
     constructor(_internal) {
         this._internal = _internal;
@@ -799,13 +773,13 @@ export class CfgProduct {
          */
         this.destroy = () => this._internal.destroy();
         /** Makes a clone of this. It is disconnected from the original. */
-        this.clone = () => __awaiter(this, void 0, void 0, function* () { return CfgProduct._makeNewRefFrom(yield this._internal.clone()); });
+        this.clone = async () => CfgProduct._makeNewRefFrom(await this._internal.clone());
         /**
          * Only applicable when this product is optional.
          * Setting this does not cause a validation call as toggling an optional additional product is
          *  assumed to always be legal.
          */
-        this.setSelected = (v) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.setSelected(v, CfgProductBubbleMode.ToRootAndBubbleSelected, true); });
+        this.setSelected = async (v) => await this._internal.setSelected(v, CfgProductBubbleMode.ToRootAndBubbleSelected, true);
         /**
          * Experimental. Additional products lacks descriptions or keys that are suitably for structure
          * compare, so we use strict-order when trying to match the additional products. This makes
@@ -819,8 +793,8 @@ export class CfgProduct {
          *  This method does not propagate its selections.
          *  This method will cause validation calls if something change.
          */
-        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); });
+        this.tryMatchSelection = async (other, descriptionMatch = false // Match on case insensitive description, not code
+        ) => await this._internal.tryMatchSelection(other._internal, descriptionMatch);
         /**
          * Gets what selections has been made on the product, recursively including product
          * configuration, optional products and additional products. Used when a full view of all
@@ -836,7 +810,7 @@ export class CfgProduct {
          *                   the right models are loaded.
          * @deprecated setDtoConf uses a newer format.
          */
-        this.setApiSelection = (configuration, doValidate = true) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.setApiSelection(configuration, doValidate); });
+        this.setApiSelection = async (configuration, doValidate = true) => await this._internal.setApiSelection(configuration, doValidate);
         /**
          * A newer alternative version of getApiSelection. This returns the configuration (selections)
          * on the product, recursively including product configuration, optional products and additional
@@ -858,7 +832,7 @@ export class CfgProduct {
          * @param doValidate Makes a server side validation call. These are necessary to ensure that
          *                   the right models are loaded.
          */
-        this.setDtoConf = (configuration, doValidate = true) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.setDtoConf(configuration, doValidate); });
+        this.setDtoConf = async (configuration, doValidate = true) => await this._internal.setDtoConf(configuration, doValidate);
         this.listenForChange = (l) => this._internal.changeObservable.listen(l);
         this.stopListenForChange = (l) => this._internal.changeObservable.stopListen(l);
         this.stopAllListenForChange = () => this._internal.changeObservable.stopAllListen();
@@ -866,10 +840,8 @@ export class CfgProduct {
         this.stopListenForLoading = (l) => this._internal.loadingObservable.stopListen(l);
         this.stopAllListenForLoading = () => this._internal.loadingObservable.stopAllListen();
     }
-    static make(productLoader, prodParams, settings, initialProductConfiguration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._makeNewRefFrom(yield _CfgProductInternal.make(productLoader, undefined, prodParams, completeSettings(settings), false, new AggregatedLoadingObservable(), undefined, undefined, undefined, initialProductConfiguration));
-        });
+    static async make(productLoader, prodParams, settings, initialProductConfiguration) {
+        return this._makeNewRefFrom(await _CfgProductInternal.make(productLoader, undefined, prodParams, completeSettings(settings), false, new AggregatedLoadingObservable(), undefined, undefined, undefined, initialProductConfiguration));
     }
     /**
      * Makes an object wrapping the passed object. This is not a clone method, it is a method to