@configura/web-api 1.6.1 → 2.0.0-alpha.0

package/dist/productConfiguration/CfgFeature.js

@@ -35,25 +35,25 @@ function getOptionFilter(option1) {
     return (option2) => option2._internal === option1;
 }
 /** Returns a fresh reference for the option at the given index */
-function doFreshRefOptionAtIndex(options, index, beforeNotify) {
+function doFreshRefOptionAtIndex(options, index, committed, beforeNotify) {
     const freshRef = CfgOption._makeNewRefFrom(options[index]._internal);
     options[index] = freshRef;
     if (beforeNotify) {
         beforeNotify(freshRef);
     }
-    freshRef._internal.changeObservable.notifyAll({ freshRef });
+    freshRef._internal.changeObservable.notifyAll({ freshRef, committed });
     return freshRef;
 }
 /**
  * Returns a fresh reference for the given option.
  * @throws Throws an error if the option is not found in options.
  */
-function doFreshRefOption(options, optionInternal, beforeNotify) {
+function doFreshRefOption(options, optionInternal, committed, beforeNotify) {
     const i = options.findIndex(getOptionFilter(optionInternal));
     if (i === -1) {
         throw new Error("Did not find the option in options");
     }
-    return doFreshRefOptionAtIndex(options, i, beforeNotify);
+    return doFreshRefOptionAtIndex(options, i, committed, beforeNotify);
 }
 /**
  * This class is meant to only be used through CfgFeature. It should
@@ -83,17 +83,17 @@ export class _CfgFeatureInternal {
             }
             return yield option.setNumericValue(val, true);
         });
-        this._notifyAllOfChange = (bubbleMode) => __awaiter(this, void 0, void 0, function* () {
+        this._notifyAllOfChange = (bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
             if (bubbleMode === ProductConfigurationBubbleMode.Stop) {
                 return;
             }
-            const parent = this.parent;
             const freshRef = CfgFeature._makeNewRefFrom(this);
-            this.changeObservable.notifyAll({ freshRef });
+            this.changeObservable.notifyAll({ freshRef, committed });
+            const parent = this.parent;
             if (parent !== undefined) {
                 yield parent._childHasChanged(freshRef, bubbleMode === ProductConfigurationBubbleMode.OneLevel
                     ? ProductConfigurationBubbleMode.Stop
-                    : bubbleMode);
+                    : bubbleMode, committed);
             }
         });
         /**
@@ -101,23 +101,30 @@ export class _CfgFeatureInternal {
          * @throws Will throw if options have not yet been generated. This should be impossible
          * as nonexisting children can not call their parent.
          */
-        this._childHasChanged = (childOption, bubbleMode) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = (childOption, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
             const options = this._options;
             if (options === undefined) {
                 throw Error("Child says it changed, but no children has actually been generated");
             }
-            const freshRef = doFreshRefOption(options, childOption);
+            const freshRef = doFreshRefOption(options, childOption, committed);
             const selectedOptions = this._selectedOptions;
             const i = selectedOptions.findIndex(getOptionFilter(childOption));
             if (i !== -1) {
                 selectedOptions[i] = freshRef;
             }
-            yield this._notifyAllOfChange(bubbleMode);
+            yield this._notifyAllOfChange(bubbleMode, committed);
         });
-        this.getApiSelection = () => {
-            const result = {};
-            for (const option of this._selectedOptions) {
-                result[option.code] = option._internal.getApiSelection();
+        this.getDtoConf = (includeExtendedData) => {
+            const result = {
+                code: this.code,
+            };
+            if (includeExtendedData) {
+                result.groupCode = this.groupCode;
+                result.unit = this.unit;
+            }
+            const selectedOptions = this._selectedOptions;
+            if (0 < selectedOptions.length) {
+                result.options = selectedOptions.map((o) => o._internal.getDtoConf(includeExtendedData));
             }
             return result;
         };
@@ -126,6 +133,7 @@ export class _CfgFeatureInternal {
             const isGroup = selectionType === SelectionType.Group;
             const isSelectOne = selectionType === SelectionType.SelectOne;
             const isAllOptionsAffectedByAnySelection = this.isAllOptionsAffectedByAnySelection;
+            const committed = true;
             let options;
             if (apiOptionSelectionMap === undefined) {
                 options = this._options || []; // Already generated children (all or none)
@@ -160,7 +168,7 @@ export class _CfgFeatureInternal {
                             this._selectedOptions.push(option);
                         }
                         else {
-                            doFreshRefOptionAtIndex(options, i, (freshRef) => this._selectedOptions.push(freshRef));
+                            doFreshRefOptionAtIndex(options, i, committed, (freshRef) => this._selectedOptions.push(freshRef));
                         }
                         change = true;
                     }
@@ -169,7 +177,7 @@ export class _CfgFeatureInternal {
                     if (selectedIndex !== -1) {
                         this._selectedOptions.splice(selectedIndex, 1);
                         if (!isAllOptionsAffectedByAnySelection) {
-                            doFreshRefOptionAtIndex(options, i);
+                            doFreshRefOptionAtIndex(options, i, committed);
                         }
                         change = true;
                     }
@@ -192,7 +200,7 @@ export class _CfgFeatureInternal {
             }
             if (change) {
                 if (isAllOptionsAffectedByAnySelection) {
-                    this._freshRefAllOptions();
+                    this._freshRefAllOptions(committed);
                 }
                 if (selectionType === SelectionType.SelectOne) {
                     yield this.pushStretch();
@@ -203,7 +211,7 @@ export class _CfgFeatureInternal {
                 // if multiple descendants are affected by the setApiSelection. Therefore
                 // we use OneLevel to make this feature notify and the parent update its
                 // reference.
-                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.OneLevel);
+                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.OneLevel, committed);
             }
             return change;
         });
@@ -285,7 +293,7 @@ export class _CfgFeatureInternal {
                 // if multiple descendants are affected by the tryMatchSelection. Therefore
                 // we use OneLevel to make this feature notify and the parent update its
                 // reference.
-                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.OneLevel);
+                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
         });
@@ -315,6 +323,7 @@ export class _CfgFeatureInternal {
             const isAllOptionsAffectedByAnySelection = this.isAllOptionsAffectedByAnySelection;
             const index = selectedOptions.findIndex(getOptionFilter(optionInternal));
             const isActualChange = (index === -1) === on;
+            const committed = true;
             if (this.selectionType !== SelectionType.Group) {
                 if (on) {
                     // Calling this.options will populate (generate) all Options if they have not yet
@@ -324,7 +333,7 @@ export class _CfgFeatureInternal {
                         let removeOption = selectedOptions.shift();
                         while (removeOption !== undefined) {
                             if (!isAllOptionsAffectedByAnySelection) {
-                                doFreshRefOption(options, removeOption._internal);
+                                doFreshRefOption(options, removeOption._internal, committed);
                             }
                             removeOption = selectedOptions.shift();
                         }
@@ -333,7 +342,7 @@ export class _CfgFeatureInternal {
                         selectedOptions.push(CfgOption._makeNewRefFrom(optionInternal));
                     }
                     else {
-                        doFreshRefOption(options, optionInternal, (freshRef) => selectedOptions.push(freshRef));
+                        doFreshRefOption(options, optionInternal, committed, (freshRef) => selectedOptions.push(freshRef));
                     }
                     if (this.selectionType === SelectionType.SelectOne) {
                         yield this.pushStretch();
@@ -348,12 +357,12 @@ export class _CfgFeatureInternal {
                         // safely ignore if undefined.
                         const options = this._options;
                         if (options !== undefined) {
-                            doFreshRefOption(options, optionInternal);
+                            doFreshRefOption(options, optionInternal, committed);
                         }
                     }
                 }
                 if (isAllOptionsAffectedByAnySelection) {
-                    this._freshRefAllOptions();
+                    this._freshRefAllOptions(committed);
                 }
             }
             let nextLevelBubbleMode = bubbleMode;
@@ -367,7 +376,7 @@ export class _CfgFeatureInternal {
                     nextLevelBubbleMode = ProductConfigurationBubbleMode.ToRoot;
                 }
             }
-            yield this._notifyAllOfChange(nextLevelBubbleMode);
+            yield this._notifyAllOfChange(nextLevelBubbleMode, committed);
             return isActualChange;
         });
         this.isSelected = (option) => this.selectionType === SelectionType.Group ||
@@ -441,7 +450,7 @@ export class _CfgFeatureInternal {
         return false;
     }
     /**
-     * The MeasureParam class is re-used for different purposes. In Features it is used
+     * The DtoMeasureParam class is re-used for different purposes. In Features it is used
      * to indicate which stretch measures inside Models shall be affected by this state
      * of this Feature. Hence only the code property is used.
      */
@@ -512,14 +521,14 @@ export class _CfgFeatureInternal {
      * Also includes currently selected options.
      * @throws Will throw if options have not yet been generated.
      */
-    _freshRefAllOptions() {
+    _freshRefAllOptions(committed) {
         const options = this._options;
         const selectedOptions = this._selectedOptions;
         if (options === undefined) {
             throw new Error("We expect all options to be generated at freshref");
         }
         for (let i = 0; i < options.length; i++) {
-            doFreshRefOptionAtIndex(options, i, (freshRef) => {
+            doFreshRefOptionAtIndex(options, i, committed, (freshRef) => {
                 const selectedIndex = selectedOptions.findIndex(getOptionFilter(freshRef._internal));
                 if (selectedIndex !== -1) {
                     selectedOptions[selectedIndex] = freshRef;

package/dist/productConfiguration/CfgOption.d.ts

@@ -1,5 +1,5 @@
 import { LengthUnit, Observable, SingleArgCallback } from "@configura/web-utilities";
-import { Feature, Option, SelectedOption } from "../CatalogueAPI.js";
+import { DtoConfOption, DtoFeature, DtoOption, DtoSelectedOption } from "../CatalogueAPI.js";
 import { CfgProduct, _CfgProductInternal } from "../CfgProduct.js";
 import { CfgMtrlApplication } from "../material/CfgMtrlApplication.js";
 import { NumericValuesSelection } from "../utilitiesNumericValues.js";
@@ -7,6 +7,7 @@ import { CfgFeature, _CfgFeatureInternal } from "./CfgFeature.js";
 import { _CfgProductConfigurationInternal } from "./CfgProductConfiguration.js";
 export declare type OptionChangeNotification = {
     freshRef: CfgOption;
+    committed: boolean;
 };
 export declare enum ProductConfigurationBubbleMode {
     /**
@@ -58,13 +59,13 @@ export declare enum ProductConfigurationBubbleMode {
  * the class that should be used and interacted with.
  */
 export declare class _CfgOptionInternal {
-    readonly rawOption: Option;
+    readonly rawOption: DtoOption;
     private readonly allRawFeatures;
     readonly parent: _CfgFeatureInternal;
     readonly parentConfiguration: _CfgProductConfigurationInternal;
     readonly parentProduct: _CfgProductInternal;
     readonly rootProduct: _CfgProductInternal;
-    constructor(rawOption: Option, allRawFeatures: Feature[], siblingHasDuplicateDescription: boolean, parent: _CfgFeatureInternal, parentConfiguration: _CfgProductConfigurationInternal, parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal);
+    constructor(rawOption: DtoOption, allRawFeatures: DtoFeature[], siblingHasDuplicateDescription: boolean, parent: _CfgFeatureInternal, parentConfiguration: _CfgProductConfigurationInternal, parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal);
     private _features;
     private _mtrlApplications;
     readonly key: string;
@@ -87,9 +88,9 @@ export declare class _CfgOptionInternal {
     get priceChangeAtSelectChange(): number | undefined;
     get features(): CfgFeature[];
     /** Called by child to tell its parent that it has changed. */
-    _childHasChanged: (freshRef: CfgFeature, bubbleMode: ProductConfigurationBubbleMode) => Promise<void>;
-    getApiSelection: () => SelectedOption;
-    setApiSelection: (apiOptionSelection: SelectedOption | undefined) => Promise<boolean>;
+    _childHasChanged: (freshRef: CfgFeature, bubbleMode: ProductConfigurationBubbleMode, committed: boolean) => Promise<void>;
+    getDtoConf: (includeExtendedData: boolean) => DtoConfOption;
+    setApiSelection: (apiOptionSelection: DtoSelectedOption | undefined) => Promise<boolean>;
     structureCompare: (other: _CfgOptionInternal, strictOrder?: boolean, descriptionMatch?: boolean) => boolean;
     tryMatchSelection: (other: CfgOption, descriptionMatch?: boolean) => Promise<boolean>;
     keyMatch: (other: _CfgOptionInternal, descriptionMatch?: boolean) => boolean;
@@ -98,7 +99,7 @@ export declare class _CfgOptionInternal {
 }
 export declare class CfgOption {
     readonly _internal: _CfgOptionInternal;
-    static make(rawOption: Option, allRawFeatures: Feature[], siblingHasDuplicateDescription: boolean, parent: _CfgFeatureInternal, parentConfiguration: _CfgProductConfigurationInternal, parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal): CfgOption;
+    static make(rawOption: DtoOption, allRawFeatures: DtoFeature[], siblingHasDuplicateDescription: boolean, parent: _CfgFeatureInternal, parentConfiguration: _CfgProductConfigurationInternal, parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal): CfgOption;
     /**
      * Makes an object wrapping the passed object. This is not a clone method,
      * it is a method to make a new outer reference. Like a shallow copy.
@@ -114,7 +115,7 @@ export declare class CfgOption {
     isBackedBySame: (other: CfgOption) => boolean;
     get parentProduct(): CfgProduct;
     get rootProduct(): CfgProduct;
-    get rawOption(): Option;
+    get rawOption(): DtoOption;
     get key(): string;
     get code(): string;
     get isUseNumericValue(): boolean;

package/dist/productConfiguration/CfgOption.js

@@ -89,7 +89,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) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
             const features = this._features;
             if (features === undefined) {
                 throw Error("Child says it changed, but no children has actually been generated");
@@ -107,40 +107,30 @@ export class _CfgOptionInternal {
                 yield this.parent.selectOption(this, true, bubbleMode);
             }
             else {
-                yield this.parent._childHasChanged(this, bubbleMode);
+                yield this.parent._childHasChanged(this, bubbleMode, committed);
             }
         });
-        this.getApiSelection = () => {
-            const { features, isUseNumericValue, code, numericValue } = this;
-            const selectionTrees = features.map((f) => f._internal.getApiSelection());
-            const mergedSelectionTree = {};
-            let anyItems = false;
-            for (const selectionTree of selectionTrees) {
-                if (selectionTree === undefined) {
-                    continue;
-                }
-                for (const key of Object.keys(selectionTree)) {
-                    if (mergedSelectionTree[key] !== undefined) {
-                        console.warn(`The key (${key}) is already used in the selection tree. Option key: "${this.key}".`);
-                        continue;
-                    }
-                    mergedSelectionTree[key] = selectionTree[key];
-                    anyItems = true;
-                }
-            }
-            if (isUseNumericValue && numericValue === undefined) {
-                throw new Error("numeric Sku feature with option without numeric value");
+        this.getDtoConf = (includeExtendedData) => {
+            const { features, isUseNumericValue, code, selected, numericValue } = this;
+            if (!selected) {
+                throw new Error("Currently only useable on selected options. Selected in the result is for future use.");
             }
-            const selectedOption = {
+            const result = {
                 code,
-                numericValue: isUseNumericValue && numericValue !== undefined
-                    ? { value: numericValue, unit: this.unit }
-                    : undefined,
+                selected, // For future use
             };
-            if (anyItems) {
-                selectedOption.next = mergedSelectionTree;
+            if (isUseNumericValue) {
+                if (numericValue === undefined) {
+                    throw new Error("numeric Sku feature with option without numeric value");
+                }
+                else {
+                    result.numericValue = { value: numericValue, unit: this.unit };
+                }
+            }
+            if (0 < features.length) {
+                result.features = features.map((f) => f._internal.getDtoConf(includeExtendedData));
             }
-            return selectedOption;
+            return result;
         };
         this.setApiSelection = (apiOptionSelection) => __awaiter(this, void 0, void 0, function* () {
             let features;
@@ -241,7 +231,7 @@ export class _CfgOptionInternal {
             }
             else {
                 if (change) {
-                    yield this.parent._childHasChanged(this, ProductConfigurationBubbleMode.OneLevel);
+                    yield this.parent._childHasChanged(this, ProductConfigurationBubbleMode.Stop, false);
                 }
             }
             return change;

package/dist/productConfiguration/CfgProductConfiguration.d.ts

@@ -1,14 +1,11 @@
-import { LengthUnit, Observable, SingleArgCallback } from "@configura/web-utilities";
-import { Feature, FeatureRef, SelectedOption } from "../CatalogueAPI.js";
+import { LengthUnit, LengthValue, Observable, SingleArgCallback } from "@configura/web-utilities";
+import { DtoConfFeature, DtoFeature, DtoFeatureRef, DtoSelectedOption } from "../CatalogueAPI.js";
 import { CfgProduct, _CfgProductInternal } from "../CfgProduct.js";
 import { CfgFeature, _CfgFeatureInternal } from "./CfgFeature.js";
 import { ProductConfigurationBubbleMode } from "./CfgOption.js";
 export declare type ProductConfigurationChangeNotification = {
     freshRef: CfgProductConfiguration;
-};
-export declare type LengthValue = {
-    length: number;
-    unit: LengthUnit;
+    committed: boolean;
 };
 export declare type StretchMap = Map<string, {
     def: LengthValue | undefined;
@@ -20,10 +17,10 @@ export declare type StretchMap = Map<string, {
  * modified. CfgProductConfiguration is the class that should be used and interacted with.
  */
 export declare class _CfgProductConfigurationInternal {
-    readonly allRawFeatures: Feature[];
+    readonly allRawFeatures: DtoFeature[];
     readonly parentProduct: _CfgProductInternal;
     readonly rootProduct: _CfgProductInternal;
-    static _makeUninitialized(rootFeatureRefs: FeatureRef[], allRawFeatures: Feature[], // Flat packed. All the features that can appear anyplace in the selection tree.
+    static _makeUninitialized(rootFeatureRefs: DtoFeatureRef[], allRawFeatures: DtoFeature[], // Flat packed. All the features that can appear anyplace in the selection tree.
     parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal): _CfgProductConfigurationInternal;
     private constructor();
     readonly key = "~";
@@ -31,18 +28,18 @@ export declare class _CfgProductConfigurationInternal {
     private _features;
     readonly stretchReferenceLengthsByMeasureParamCode: StretchMap;
     readonly changeObservable: Observable<ProductConfigurationChangeNotification>;
-    get rootFeatureRefs(): FeatureRef[];
+    get rootFeatureRefs(): DtoFeatureRef[];
     get features(): CfgFeature[];
     private _notifyAllOfChange;
     _freshRefDescendants(): void;
     /** Called by child to tell its parent that it has changed. */
-    _childHasChanged: (freshRef: CfgFeature, bubbleMode: ProductConfigurationBubbleMode) => Promise<void>;
-    getApiSelection: () => SelectedOption[];
+    _childHasChanged: (freshRef: CfgFeature, bubbleMode: ProductConfigurationBubbleMode, committed: boolean) => Promise<void>;
+    getDtoConf: (includeExtendedData: boolean) => DtoConfFeature[];
     /**
      * 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.
      */
-    setApiSelection: (selectedOptions: SelectedOption[], bubbleToRoot: boolean) => Promise<boolean>;
+    setApiSelection: (selectedOptions: DtoSelectedOption[], bubbleToRoot: boolean) => Promise<boolean>;
     structureCompare: (other: _CfgProductConfigurationInternal, strictOrder: boolean, descriptionMatch: boolean) => boolean;
     /**
      * When used internally the notifications are taken care off by the caller, but if set from
@@ -51,8 +48,8 @@ export declare class _CfgProductConfigurationInternal {
     tryMatchSelection: (other: _CfgProductConfigurationInternal, descriptionMatch: boolean | undefined, validate: boolean) => Promise<boolean>;
     /** Only selected features. */
     _getFeaturesWithCode: (code: string) => _CfgFeatureInternal[];
-    populateFeatures: (rootFeatureRefs: FeatureRef[]) => void;
-    setStretchReferenceLength: (measureParamCode: string, referenceLength: number | undefined, unit: LengthUnit, doNotify?: boolean) => Promise<boolean>;
+    populateFeatures: (rootFeatureRefs: DtoFeatureRef[]) => void;
+    setStretchReferenceLength: (measureParamCode: string, referenceLength: number | undefined, unit: LengthUnit) => Promise<boolean>;
 }
 export declare class CfgProductConfiguration {
     readonly _internal: _CfgProductConfigurationInternal;
@@ -61,8 +58,8 @@ export declare class CfgProductConfiguration {
      * CfgProductConfiguration, but is not properly initialized until the initDone-callback
      * has been called.
      */
-    static make(initSuccess: (c: CfgProductConfiguration) => void, initFail: (error: Error) => void, rootFeatureRefs: FeatureRef[], allRawFeatures: Feature[], // Flat packed. All the features that can appear anyplace in the selection tree.
-    apiSelection: SelectedOption[], parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal): CfgProductConfiguration;
+    static make(initSuccess: (c: CfgProductConfiguration) => void, initFail: (error: Error) => void, rootFeatureRefs: DtoFeatureRef[], allRawFeatures: DtoFeature[], // Flat packed. All the features that can appear anyplace in the selection tree.
+    apiSelection: DtoSelectedOption[], parentProduct: _CfgProductInternal, rootProduct: _CfgProductInternal): CfgProductConfiguration;
     /**
      * Makes an object wrapping the passed object. This is not a clone method, it is a method to
      * make a new outer reference. Like a shallow copy.
@@ -85,9 +82,9 @@ export declare class CfgProductConfiguration {
      * product load. What features are actually used is controlled by rootFeatureRefs and what
      * options are selected.
      */
-    get allRawFeatures(): Feature[];
+    get allRawFeatures(): DtoFeature[];
     /** What features are used in the root of this. This can change with new validate calls. */
-    get rootFeatureRefs(): FeatureRef[];
+    get rootFeatureRefs(): DtoFeatureRef[];
     /** The root features at the root of the selection tree. */
     get features(): CfgFeature[];
     structureCompare: (other: CfgProductConfiguration, strictOrder?: boolean, descriptionMatch?: boolean) => boolean;
@@ -97,12 +94,12 @@ export declare class CfgProductConfiguration {
      * This method will cause validation calls.
      */
     tryMatchSelection: (other: CfgProductConfiguration, descriptionMatch?: boolean) => Promise<boolean>;
-    getApiSelection: () => SelectedOption[];
+    getApiSelection: () => DtoSelectedOption[];
     /**
      * This method does not propagate its selections.
      * This method will not cause validation calls. Data is assumed to already be validated.
      */
-    setApiSelection: (selectedOptions: SelectedOption[]) => Promise<boolean>;
+    setApiSelection: (selectedOptions: DtoSelectedOption[]) => Promise<boolean>;
     /**
      * 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/CfgProductConfiguration.js

@@ -7,8 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { compareArrays, count, isLengthUnit, Observable, toError, toLengthUnit, } from "@configura/web-utilities";
+import { compareArrays, count, isEqualLength, isLengthUnit, Observable, toError, toLengthUnit, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
+import { convertDtoConfFeaturesToSelOptions } from "../ConfigurationConverter.js";
 import { CfgFeature } from "./CfgFeature.js";
 import { ProductConfigurationBubbleMode } from "./CfgOption.js";
 import { syncCfgFeatures } from "./utilitiesProductConfiguration.js";
@@ -27,7 +28,7 @@ export class _CfgProductConfigurationInternal {
         this._rootFeatureRefs = [];
         this._features = [];
         this.changeObservable = new Observable();
-        this._notifyAllOfChange = (bubbleMode) => __awaiter(this, void 0, void 0, function* () {
+        this._notifyAllOfChange = (bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
             if (bubbleMode === ProductConfigurationBubbleMode.Stop) {
                 return;
             }
@@ -35,27 +36,26 @@ export class _CfgProductConfigurationInternal {
             const parent = this.parentProduct;
             this.changeObservable.notifyAll({
                 freshRef,
+                committed,
             });
             if (parent === undefined) {
                 return;
             }
             yield parent._configurationHasChanged(freshRef, bubbleMode === ProductConfigurationBubbleMode.OneLevel
                 ? ProductConfigurationBubbleMode.Stop
-                : bubbleMode);
+                : bubbleMode, committed);
         });
         /** Called by child to tell its parent that it has changed. */
-        this._childHasChanged = (freshRef, bubbleMode) => __awaiter(this, void 0, void 0, function* () {
+        this._childHasChanged = (freshRef, bubbleMode, committed) => __awaiter(this, void 0, void 0, function* () {
             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);
-        });
-        this.getApiSelection = () => this._features.map((f) => {
-            return { code: "!~!", next: f._internal.getApiSelection() };
+            yield this._notifyAllOfChange(bubbleMode, committed);
         });
+        this.getDtoConf = (includeExtendedData) => this._features.map((f) => f._internal.getDtoConf(includeExtendedData));
         /**
          * 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.
@@ -70,7 +70,7 @@ export class _CfgProductConfigurationInternal {
             if (change) {
                 yield this._notifyAllOfChange(bubbleToRoot
                     ? ProductConfigurationBubbleMode.ToRoot
-                    : ProductConfigurationBubbleMode.OneLevel);
+                    : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
         });
@@ -102,7 +102,7 @@ export class _CfgProductConfigurationInternal {
             if (change) {
                 yield this._notifyAllOfChange(validate
                     ? ProductConfigurationBubbleMode.Validate
-                    : ProductConfigurationBubbleMode.OneLevel);
+                    : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
         });
@@ -115,7 +115,7 @@ export class _CfgProductConfigurationInternal {
             this._rootFeatureRefs = rootFeatureRefs;
             this._features = syncCfgFeatures(rootFeatureRefs, this._features, this.allRawFeatures, this, this, this.parentProduct, this.rootProduct);
         };
-        this.setStretchReferenceLength = (measureParamCode, referenceLength, unit, doNotify = true) => __awaiter(this, void 0, void 0, function* () {
+        this.setStretchReferenceLength = (measureParamCode, referenceLength, unit) => __awaiter(this, void 0, void 0, function* () {
             if (measureParamCode === "") {
                 return false;
             }
@@ -141,14 +141,12 @@ export class _CfgProductConfigurationInternal {
                 });
             }
             else {
-                if (stretchReferenceLength.current === referenceLengthWithUnit) {
+                if (isEqualLength(stretchReferenceLength.current, referenceLengthWithUnit)) {
                     return false;
                 }
                 stretchReferenceLength.current = referenceLengthWithUnit;
             }
-            if (doNotify) {
-                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot);
-            }
+            yield this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot, false);
             return true;
         });
         /* eslint-disable */
@@ -235,7 +233,7 @@ export class CfgProductConfiguration {
          */
         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.getApiSelection = () => this._internal.getApiSelection();
+        this.getApiSelection = () => convertDtoConfFeaturesToSelOptions(this._internal.getDtoConf(false), true);
         /**
          * This method does not propagate its selections.
          * This method will not cause validation calls. Data is assumed to already be validated.

package/dist/productConfiguration/filters.d.ts

@@ -1,10 +1,10 @@
 import { Filters, Matches } from "@configura/web-utilities";
-import { CatalogueParams, Level, ProductRef } from "../CatalogueAPI.js";
-export declare function applyCatalogueFilters(filters: Filters<CatalogueParams>, catalogues: CatalogueParams[]): [Matches<CatalogueParams>, CatalogueParams[]];
+import { DtoCatalogueParamsWithoutCid, DtoLevel, DtoProductRef } from "../CatalogueAPI.js";
+export declare function applyCatalogueFilters<T extends DtoCatalogueParamsWithoutCid>(filters: Filters<DtoCatalogueParamsWithoutCid>, catalogues: T[]): [Matches<DtoCatalogueParamsWithoutCid>, T[]];
 export interface ProductRefParams {
     partNr: string;
 }
-export declare function applyProductRefFilters(filters: Filters<ProductRefParams>, productRefs: ProductRef[]): [Matches<ProductRefParams>, ProductRef[]];
+export declare function applyProductRefFilters(filters: Filters<ProductRefParams>, productRefs: DtoProductRef[]): [Matches<ProductRefParams>, DtoProductRef[]];
 /**
  * Clones the table of content levels tree.
  * Filters to only include passed products.
@@ -12,5 +12,5 @@ export declare function applyProductRefFilters(filters: Filters<ProductRefParams
  * @param prdRefsFilter Products not in this array are removed
  * @param showEmpty Shall empty levels be shown?
  */
-export declare function cloneFilterSortLevels(levels: Level[], prdRefsFilter: ProductRef[], showEmpty: boolean, doSort?: boolean): Level[] | undefined;
+export declare function cloneFilterSortLevels(levels: DtoLevel[], prdRefsFilter: DtoProductRef[], showEmpty: boolean, doSort?: boolean): DtoLevel[] | undefined;
 //# sourceMappingURL=filters.d.ts.map

package/dist/productConfiguration/productParamsGenerator.d.ts

@@ -1,16 +1,16 @@
 import { Filters } from "@configura/web-utilities";
-import { ApplicationAreasResponse, CatalogueAPI, CatalogueParams } from "../CatalogueAPI.js";
+import { CatalogueAPI, DtoApplicationAreasResponse, DtoCatalogueParams, DtoCatalogueParamsWithLang } from "../CatalogueAPI.js";
 import { CfgProduct, CfgProductSettings } from "../CfgProduct.js";
 import { ProductRefParams } from "./filters.js";
 export interface GeneratedProductConfiguration {
-    applicationAreasResponse: ApplicationAreasResponse;
+    applicationAreasResponse: DtoApplicationAreasResponse;
     catalogueCount: number;
     catalogueIndex: number;
-    catalogueParams: CatalogueParams;
+    catalogueParams: DtoCatalogueParamsWithLang;
     getProductDuration: number;
     product: CfgProduct;
     productCount: number;
     productIndex: number;
 }
-export declare function generateProductConfigurations(api: CatalogueAPI, lang: string, catalogues: CatalogueParams[], filters: Filters<ProductRefParams>, settings?: Partial<CfgProductSettings>): AsyncIterableIterator<GeneratedProductConfiguration | Error>;
+export declare function generateProductConfigurations(api: CatalogueAPI, lang: string, catalogues: DtoCatalogueParams[], filters: Filters<ProductRefParams>, settings?: Partial<CfgProductSettings>): AsyncIterableIterator<GeneratedProductConfiguration | Error>;
 //# sourceMappingURL=productParamsGenerator.d.ts.map

package/dist/productConfiguration/productParamsGenerator.js

@@ -17,19 +17,19 @@ export function generateProductConfigurations(api, lang, catalogues, filters, se
     return __asyncGenerator(this, arguments, function* generateProductConfigurations_1() {
         const catalogueCount = catalogues.length;
         const catalogueEntries = catalogues.entries();
-        for (const [catalogueIndex, catalogueParams] of catalogueEntries) {
-            const params = Object.assign(Object.assign({}, catalogueParams), { lang });
+        for (const [catalogueIndex, catalogueParamsWithoutLang] of catalogueEntries) {
+            const catalogueParams = Object.assign(Object.assign({}, catalogueParamsWithoutLang), { lang });
             try {
                 const [applicationAreasResponse, toc] = yield __await(Promise.all([
-                    api.getApplicationAreas(params),
-                    api.getTocFlat(params),
+                    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();
-                    const product = yield __await(CfgProduct.make(api, lang, params, prdRef.partNr, settings));
+                    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,