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

package/dist/CfgProduct.d.ts

@@ -2,7 +2,7 @@ import { AggregatedLoadingObservable, LengthUnit, Observable, SingleArgCallback
 import { DtoAdditionalProductConfiguration, DtoAdditionalProductRef, DtoCatalogueParams, DtoMeasureParam, DtoMiscFile, DtoMtrlApplication, DtoNote, DtoPrices, DtoProductConf, DtoProductParamsWithLang, DtoTransform } from "./CatalogueAPI.js";
 import { CfgMeasureDefinition } from "./CfgMeasure.js";
 import { _CfgFeatureInternal } from "./productConfiguration/CfgFeature.js";
-import { ProductConfigurationBubbleMode } from "./productConfiguration/CfgOption.js";
+import { ProductConfigurationBubbleMode, _CfgOptionInternal } from "./productConfiguration/CfgOption.js";
 import { CfgProductConfiguration } from "./productConfiguration/CfgProductConfiguration.js";
 import { ProductLoader } from "./productLoader.js";
 import { SyncGroupsApplyMode } from "./syncGroups/SyncGroupsApplyMode.js";
@@ -102,6 +102,13 @@ export declare class _CfgProductInternal {
     private _configuration;
     private _notes;
     readonly changeObservable: Observable<CfgProductChangeNotification>;
+    /**
+     * The last diff that was generated during the last validate call.
+     *
+     * This is used to keep track of the changes that were made to the
+     * configuration as a result of apply constraints.
+     */
+    private _lastDiff;
     get selected(): boolean;
     readonly isAdditionalProduct: boolean;
     /**
@@ -198,10 +205,22 @@ export declare class _CfgProductInternal {
     tryMatchSelection: (other: _CfgProductInternal, descriptionMatch?: boolean, productLoaderForGroupedLoad?: ProductLoader | undefined) => Promise<boolean>;
     /** Only features in selected options and selected additional products. */
     _getDescendantFeaturesWithCode: (code: string) => _CfgFeatureInternal[];
+    /**
+     * Obtains the differences found in the last validate call.
+     * Used to update the sync group state.
+     *
+     * Removes the diff from the product.
+     */
+    takeDiff(): _CfgOptionInternal[] | undefined;
     private _revalidateInProgressToken;
     /**
-     * Do a validate call for this product. It does not validate additional products, only this
-     * product in isolation. The validation result is applied on the configuration. Then additional
+     * Do a validate call for this product.
+     *
+     * Does not validate additional products, unless application of sync groups
+     * on the result of the validate call results in changes in the additional
+     * product.
+     *
+     * The validation result is applied on the configuration. Then additional
      * products are synced (unloaded, loaded etc.) Finally the changes bubble up the tree.
      */
     _revalidate: (bubbleMode: CfgProductBubbleMode, productLoader: ProductLoader, committed: boolean) => Promise<boolean>;

package/dist/CfgProduct.js

@@ -1,11 +1,12 @@
 var _a;
 import { AggregatedLoadingObservable, assert, assertDefined, augmentErrorMessage, compareArrays, count, Observable, toLengthUnit, } from "@configura/web-utilities";
 import { CfgMeasureDefinition } from "./CfgMeasure.js";
-import { ProductConfigurationBubbleMode } from "./productConfiguration/CfgOption.js";
+import { ProductConfigurationBubbleMode, } from "./productConfiguration/CfgOption.js";
 import { CfgProductConfiguration } from "./productConfiguration/CfgProductConfiguration.js";
 import { collectAdditionalProductRefs } from "./productConfiguration/utilitiesProductConfiguration.js";
 import { wrapWithCache } from "./productLoader.js";
 import { SyncGroupsHandler } from "./syncGroups/SyncGroupsHandler.js";
+import { generateSelectionDiff } from "./syncGroups/SyncGroupsTransaction.js";
 import { compareCfgProductData, correctDefaultsOnCatalogueParams, isSameCatalogueParams, isSameProductRef, makeProductKey, } from "./utilitiesCatalogueData.js";
 import { CfgProdConfParts, convertDtoProductConfToV1, isAdditionalProductConfiguration, isProductConf, } from "./utilitiesConfiguration.js";
 function completeSettings(incompleteSettings) {
@@ -59,6 +60,13 @@ export class _CfgProductInternal {
         this.additionalProducts = [];
         this._notes = new Map();
         this.changeObservable = new Observable();
+        /**
+         * The last diff that was generated during the last validate call.
+         *
+         * This is used to keep track of the changes that were made to the
+         * configuration as a result of apply constraints.
+         */
+        this._lastDiff = undefined;
         /** Mark this and its descendants as destroyed and remove all listeners */
         this.destroy = () => {
             this._destroyed = true;
@@ -229,6 +237,10 @@ export class _CfgProductInternal {
                     change = true;
                 }
             }
+            if (sourceProduct?._lastDiff) {
+                this._lastDiff = sourceProduct._lastDiff;
+                change = true;
+            }
             await this._syncAndLoadAdditionalProducts(productLoaderForGroupedLoad, productConfiguration);
             const apiSelectionAdditionalProducts = productConfiguration.additionalProducts || [];
             const additionalProducts = this.additionalProducts.slice();
@@ -337,8 +349,13 @@ export class _CfgProductInternal {
             return agg;
         }, this._configuration._internal._getFeaturesWithCode(code));
         /**
-         * Do a validate call for this product. It does not validate additional products, only this
-         * product in isolation. The validation result is applied on the configuration. Then additional
+         * Do a validate call for this product.
+         *
+         * Does not validate additional products, unless application of sync groups
+         * on the result of the validate call results in changes in the additional
+         * product.
+         *
+         * 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 = async (bubbleMode, productLoader, committed) => {
@@ -377,7 +394,17 @@ export class _CfgProductInternal {
                 if (rootFeatureRefs !== undefined) {
                     configuration._internal.populateFeatures(rootFeatureRefs);
                 }
+                const originalProduct = await this.clone();
                 await configuration._internal.setApiSelection(productData.partsData.selOptions || [], productData.partsData.constrOptions, false);
+                if (this.parent === undefined) {
+                    const diff = generateSelectionDiff(originalProduct, this);
+                    if (this._lastDiff && diff) {
+                        this._lastDiff.push(...diff);
+                    }
+                    else if (diff) {
+                        this._lastDiff = diff;
+                    }
+                }
                 await this._syncAndLoadAdditionalProducts(productLoader, undefined);
                 if (this._destroyed) {
                     return false;
@@ -699,6 +726,17 @@ export class _CfgProductInternal {
         }
         syncGroupHandler.verboseLogging = v;
     }
+    /**
+     * Obtains the differences found in the last validate call.
+     * Used to update the sync group state.
+     *
+     * Removes the diff from the product.
+     */
+    takeDiff() {
+        const diff = this._lastDiff?.filter((option) => option.selected);
+        this._lastDiff = undefined;
+        return diff;
+    }
 }
 _a = _CfgProductInternal;
 _CfgProductInternal.make = async (productLoaderRaw, productLoaderForGroupedLoad, // Used when instantiating the current product

package/dist/productConfiguration/CfgFeature.js

@@ -1,4 +1,4 @@
-import { Observable, assertDefined, compareArrays, convertLength, count, someMatch, toLengthUnit, } from "@configura/web-utilities";
+import { assertDefined, compareArrays, convertLength, count, Observable, someMatch, toLengthUnit, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
 import { CfgMtrlApplication } from "../material/CfgMtrlApplication.js";
 import { CfgMtrlApplicationSource } from "../material/CfgMtrlApplicationSource.js";
@@ -199,6 +199,11 @@ export class _CfgFeatureInternal {
                                 change = true;
                             }
                         }
+                        // Triggers `pushStretch` when it is a stretch feature
+                        // Fixes https://configura.atlassian.net/browse/WEB-16599
+                        if (this.measureParamCodes?.length) {
+                            change = true;
+                        }
                     }
                     if (selectedIndex === -1) {
                         if (isAllOptionsAffectedByAnySelection) {

package/dist/productConfiguration/CfgOption.js

@@ -1,4 +1,4 @@
-import { Observable, compareArrays, count, } from "@configura/web-utilities";
+import { compareArrays, count, Observable, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
 import { CfgMtrlApplication } from "../material/CfgMtrlApplication.js";
 import { CfgMtrlApplicationSource } from "../material/CfgMtrlApplicationSource.js";

package/dist/syncGroups/SyncGroupsTransaction.d.ts

@@ -1,4 +1,5 @@
 import { _CfgProductInternal } from "../CfgProduct.js";
+import { _CfgOptionInternal } from "../productConfiguration/CfgOption.js";
 import { ProductLoader } from "../productLoader.js";
 import { SyncGroupsApplyMode } from "./SyncGroupsApplyMode.js";
 import { CfgPath } from "./SyncGroupsPathHelper.js";
@@ -91,7 +92,7 @@ export declare class SyncGroupsTransaction {
      * Apply current sync groups on those who wants to listen until there is no more to settle.
      * @returns true if at least one Feature changed selected Option
      */
-    private updateRootProduct;
+    updateRootProduct(productToValidate: _CfgProductInternal | undefined): Promise<boolean>;
     /**
      * Applies the SyncState to the Product and it's AdditionalProducts (sub-products).
      * @param productsToValidate To this all products that will need validation are added.
@@ -149,7 +150,24 @@ export declare class SyncGroupsTransaction {
     private applySelectOneFeature;
     private applySelectManyFeature;
     private applySelectManyOption;
+    /**
+     * Applies the given diff to the transaction's sync state.
+     */
+    applyFromDiff(diffs: _CfgOptionInternal[]): void;
+    /**
+     * Applies the new state for the given option to the transaction's sync state.
+     */
+    private applyNewStateFor;
     private addSyncGroupAffectedForSelectMany;
     private hasSyncGroupAffectedForSelectMany;
 }
+/************************************************************************
+ * Product diffing
+ ************************************************************************/
+/**
+ * Finds all options that have changed in the new product compared to the original product.
+ *
+ * This is used to determine which options need to be updated in the sync state.
+ */
+export declare function generateSelectionDiff(originalProduct: _CfgProductInternal, newProduct: _CfgProductInternal): _CfgOptionInternal[] | null;
 //# sourceMappingURL=SyncGroupsTransaction.d.ts.map

package/dist/syncGroups/SyncGroupsTransaction.js

@@ -153,12 +153,15 @@ export class SyncGroupsTransaction {
             // check here.
             return false;
         }
-        const promises = [];
+        let anyChanges = false;
         for (const product of productsToValidate) {
-            promises.push(product._revalidate(CfgProductBubbleMode.ToRoot, this.productLoader, true));
+            anyChanges =
+                (await product._revalidate(CfgProductBubbleMode.ToRoot, this.productLoader, true)) || anyChanges;
+            const diff = product.takeDiff();
+            if (diff)
+                this.applyFromDiff(diff);
         }
-        const revalidationResults = await Promise.all(promises);
-        if (revalidationResults.every((r) => !r)) {
+        if (!anyChanges) {
             this.close();
             return false;
         }
@@ -486,6 +489,44 @@ export class SyncGroupsTransaction {
         this.syncState.setForSelectMany(syncCode, option.code, optionSelected);
         return true;
     }
+    /**
+     * Applies the given diff to the transaction's sync state.
+     */
+    applyFromDiff(diffs) {
+        for (const diff of diffs) {
+            this.applyNewStateFor(diff);
+        }
+    }
+    /**
+     * Applies the new state for the given option to the transaction's sync state.
+     */
+    applyNewStateFor(option) {
+        const feature = option.parent;
+        const syncCode = feature.getSyncCode("push");
+        if (syncCode === undefined || syncCode === false)
+            return false;
+        switch (feature.selectionType) {
+            case SelectionType.SelectOne: {
+                if (this.affectedSelectOneSyncGroups.has(syncCode)) {
+                    return false;
+                }
+                this.affectedSelectOneSyncGroups.add(syncCode);
+                this.syncState.setForSelectOne(syncCode, option.code);
+                return true;
+            }
+            case SelectionType.SelectMany: {
+                if (this.hasSyncGroupAffectedForSelectMany(syncCode, option)) {
+                    return false;
+                }
+                this.addSyncGroupAffectedForSelectMany(syncCode, option);
+                this.syncState.setForSelectMany(syncCode, option.code, option.selected);
+                return true;
+            }
+            case SelectionType.Group:
+                console.warn("No state to update for group: ", option.code);
+                return false;
+        }
+    }
     addSyncGroupAffectedForSelectMany(syncCode, option) {
         let forSyncCode = this.affectedSelectManySyncGroupsAndOptions.get(syncCode);
         if (forSyncCode === undefined) {
@@ -498,6 +539,58 @@ export class SyncGroupsTransaction {
         return this.affectedSelectManySyncGroupsAndOptions.get(syncCode)?.has(option.code) === true;
     }
 }
+/************************************************************************
+ * Product diffing
+ ************************************************************************/
+/**
+ * Finds all options that have changed in the new product compared to the original product.
+ *
+ * This is used to determine which options need to be updated in the sync state.
+ */
+export function generateSelectionDiff(originalProduct, newProduct) {
+    const diff = generateFeaturesDiff(getFeaturesFromProduct({ initial: originalProduct, target: newProduct }));
+    return diff.length ? diff : null;
+}
+function generateFeaturesDiff(features) {
+    const changed = [];
+    for (const feature of features) {
+        switch (feature.target.selectionType) {
+            case SelectionType.SelectOne: {
+                const option = generateDiffForSelectOne(feature);
+                if (option)
+                    changed.push(option);
+                break;
+            }
+            case SelectionType.SelectMany:
+                changed.push(...generateDiffForSelectMany(feature));
+                break;
+        }
+        for (const option of getSelectedOptions(feature)) {
+            changed.push(...generateFeaturesDiff(getFeaturesFromOption(option)));
+        }
+    }
+    return changed;
+}
+function generateDiffForSelectOne({ initial, target, }) {
+    if (!target.getSyncCode("push"))
+        return null;
+    const selected = target.selectedOptions[0];
+    if (selected && initial?.selectedOptions?.[0]?.code !== selected.code) {
+        return selected._internal;
+    }
+    return null;
+}
+function generateDiffForSelectMany(feature) {
+    const changed = [];
+    if (!feature.target.getSyncCode("push"))
+        return changed;
+    for (const { initial, target } of getOptions(feature)) {
+        if (initial?.selected !== target.selected) {
+            changed.push(target);
+        }
+    }
+    return changed;
+}
 function getAdditionalProducts(product) {
     const initial = product.initial;
     return product.target.additionalProducts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "3.0.0-alpha.2",
+	"version": "3.0.0-alpha.3",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "3.0.0-alpha.2"
+		"@configura/web-utilities": "3.0.0-alpha.3"
 	},
-	"gitHead": "5b72d2813b949b3ccef8f1864382b9153593962b"
+	"gitHead": "4332ed866e78584bfa40bf2d6a3258108dc4093c"
 }