@configura/web-api 2.0.0-alpha.14 → 2.0.0-alpha.17

package/dist/productConfiguration/CfgProductConfiguration.d.ts

@@ -1,5 +1,5 @@
 import { LengthUnit, LengthValue, Observable, SingleArgCallback } from "@configura/web-utilities";
-import { DtoFeature, DtoFeatureConfiguration, DtoFeatureRef, DtoSelectedOption } from "../CatalogueAPI.js";
+import { DtoFeature, DtoFeatureConf, DtoFeatureRef, DtoSelectedOption } from "../CatalogueAPI.js";
 import { CfgProduct, _CfgProductInternal } from "../CfgProduct.js";
 import { CfgFeature, _CfgFeatureInternal } from "./CfgFeature.js";
 import { ProductConfigurationBubbleMode } from "./CfgOption.js";
@@ -20,6 +20,7 @@ export declare class _CfgProductConfigurationInternal {
     readonly allRawFeatures: DtoFeature[];
     readonly parentProduct: _CfgProductInternal;
     readonly rootProduct: _CfgProductInternal;
+    private readonly _initialRootFeatureRefs;
     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();
@@ -34,10 +35,12 @@ export declare class _CfgProductConfigurationInternal {
     _freshRefDescendants(): void;
     /** Called by child to tell its parent that it has changed. */
     _childHasChanged: (freshRef: CfgFeature, bubbleMode: ProductConfigurationBubbleMode, committed: boolean) => Promise<void>;
-    getDtoConfiguration: (includeExtendedData: boolean) => DtoFeatureConfiguration[];
+    getDtoConf: (includeExtendedData: boolean) => DtoFeatureConf[];
+    getApiSelection: () => DtoSelectedOption[];
     /**
      * When used internally the notifications are taken care off by the caller, but if set from
      * outside we want notifications to bubble all the way to the root.
+     * This method will not cause validation calls. Data is assumed to already be validated.
      */
     setApiSelection: (selectedOptions: DtoSelectedOption[], bubbleToRoot: boolean) => Promise<boolean>;
     structureCompare: (other: _CfgProductConfigurationInternal, strictOrder: boolean, descriptionMatch: boolean) => boolean;
@@ -48,6 +51,12 @@ export declare class _CfgProductConfigurationInternal {
     tryMatchSelection: (other: _CfgProductConfigurationInternal, descriptionMatch: boolean | undefined, validate: boolean) => Promise<boolean>;
     /** Only selected features. */
     _getFeaturesWithCode: (code: string) => _CfgFeatureInternal[];
+    private _hasRootFeaturesChanged;
+    /**
+     * True if what root Features are used is not the same as at initial load.
+     * This means that functional selection has happened.
+     */
+    get hasRootFeaturesChanged(): boolean;
     populateFeatures: (rootFeatureRefs: DtoFeatureRef[]) => void;
     setStretchReferenceLength: (measureParamCode: string, referenceLength: number | undefined, unit: LengthUnit) => Promise<boolean>;
 }
@@ -94,12 +103,6 @@ export declare class CfgProductConfiguration {
      * This method will cause validation calls.
      */
     tryMatchSelection: (other: CfgProductConfiguration, descriptionMatch?: boolean) => Promise<boolean>;
-    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: 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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { compareArrays, count, isEqualLength, isLengthUnit, Observable, toError, toLengthUnit, } from "@configura/web-utilities";
 import { CfgProduct } from "../CfgProduct.js";
-import { convertDtoFeatureConfigurationsToSelOptions } from "../ConfigurationConverter.js";
+import { convertDtoFeatureConfsToSelOptions } from "../ConfigurationConverter.js";
 import { CfgFeature } from "./CfgFeature.js";
 import { ProductConfigurationBubbleMode } from "./CfgOption.js";
 import { syncCfgFeatures } from "./utilitiesProductConfiguration.js";
@@ -20,10 +20,11 @@ import { syncCfgFeatures } from "./utilitiesProductConfiguration.js";
  */
 export class _CfgProductConfigurationInternal {
     constructor(allRawFeatures, // Flat packed. All the features that can appear anyplace in the selection tree.
-    parentProduct, rootProduct) {
+    parentProduct, rootProduct, _initialRootFeatureRefs) {
         this.allRawFeatures = allRawFeatures;
         this.parentProduct = parentProduct;
         this.rootProduct = rootProduct;
+        this._initialRootFeatureRefs = _initialRootFeatureRefs;
         this.key = "~";
         this._rootFeatureRefs = [];
         this._features = [];
@@ -55,10 +56,12 @@ export class _CfgProductConfigurationInternal {
             features[i] = freshRef;
             yield this._notifyAllOfChange(bubbleMode, committed);
         });
-        this.getDtoConfiguration = (includeExtendedData) => this._features.map((f) => f._internal.getDtoConfiguration(includeExtendedData));
+        this.getDtoConf = (includeExtendedData) => this._features.map((f) => f._internal.getDtoConf(includeExtendedData));
+        this.getApiSelection = () => convertDtoFeatureConfsToSelOptions(this.getDtoConf(false), true);
         /**
          * When used internally the notifications are taken care off by the caller, but if set from
          * outside we want notifications to bubble all the way to the root.
+         * This method will not cause validation calls. Data is assumed to already be validated.
          */
         this.setApiSelection = (selectedOptions, bubbleToRoot) => __awaiter(this, void 0, void 0, function* () {
             const featuresLength = this._features.length;
@@ -111,8 +114,10 @@ export class _CfgProductConfigurationInternal {
             agg.push(...feature._internal._getFeaturesWithCode(code));
             return agg;
         }, []);
+        this._hasRootFeaturesChanged = false;
         this.populateFeatures = (rootFeatureRefs) => {
             this._rootFeatureRefs = rootFeatureRefs;
+            this._hasRootFeaturesChanged = !compareArrays(this._initialRootFeatureRefs, rootFeatureRefs, (l, r) => l.code === r.code);
             this._features = syncCfgFeatures(rootFeatureRefs, this._features, this.allRawFeatures, this, this, this.parentProduct, this.rootProduct);
         };
         this.setStretchReferenceLength = (measureParamCode, referenceLength, unit) => __awaiter(this, void 0, void 0, function* () {
@@ -196,7 +201,7 @@ export class _CfgProductConfigurationInternal {
     }
     static _makeUninitialized(rootFeatureRefs, allRawFeatures, // Flat packed. All the features that can appear anyplace in the selection tree.
     parentProduct, rootProduct) {
-        const configuration = new this(allRawFeatures, parentProduct, rootProduct);
+        const configuration = new this(allRawFeatures, parentProduct, rootProduct, rootFeatureRefs);
         configuration.populateFeatures(rootFeatureRefs);
         return configuration;
     }
@@ -215,6 +220,13 @@ export class _CfgProductConfigurationInternal {
             features[i] = CfgFeature._makeNewRefFrom(featureInternal);
         }
     }
+    /**
+     * True if what root Features are used is not the same as at initial load.
+     * This means that functional selection has happened.
+     */
+    get hasRootFeaturesChanged() {
+        return this._hasRootFeaturesChanged;
+    }
 }
 export class CfgProductConfiguration {
     /**
@@ -233,12 +245,6 @@ 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 = () => convertDtoFeatureConfigurationsToSelOptions(this._internal.getDtoConfiguration(false), true);
-        /**
-         * This method does not propagate its selections.
-         * This method will not cause validation calls. Data is assumed to already be validated.
-         */
-        this.setApiSelection = (selectedOptions) => __awaiter(this, void 0, void 0, function* () { return yield this._internal.setApiSelection(selectedOptions, true); });
         /**
          * Set how stretched a certain measure should be measureParamCode is the measure to be
          * stretched referenceLength is a value relative to the initial length of the measure. If the

package/dist/tasks/TaskHandler.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { augmentErrorMessage, Observable } from "@configura/web-utilities";
 import { dtoExportFormatNames, dtoRenderFormatNames, } from "../CatalogueAPI.js";
+import { convertDtoProductConfToV1 } from "../ConfigurationConverter.js";
 import { isExportFormat, isRenderFormat } from "./formats.js";
 export class _TaskHandlerInternal {
     constructor(api) {
@@ -175,7 +176,7 @@ export class Task {
             this.taskHandler.removeTask(this);
         };
         this._productParams = product.prodParams;
-        this._apiSelection = product.getApiSelection();
+        this._apiSelection = convertDtoProductConfToV1(product.getDtoConf());
         if (getPreviewUrl !== undefined) {
             void getPreviewUrl().then((dataUrl) => {
                 this._previewUrl = dataUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "2.0.0-alpha.14",
+	"version": "2.0.0-alpha.17",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "2.0.0-alpha.14"
+		"@configura/web-utilities": "2.0.0-alpha.17"
 	},
-	"gitHead": "b3d0439069dc8cca134143d00fcd2f964525ceca"
+	"gitHead": "7894d44db1eb25eab4affba49513cc56ac83fd75"
 }