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

package/dist/syncGroups/SyncGroupsTransaction.d.ts

@@ -1,9 +1,10 @@
-import { CfgPath, _CfgProductInternal } from "../CfgProduct.js";
+import { _CfgProductInternal } from "../CfgProduct.js";
 import { _CfgFeatureInternal } from "../productConfiguration/CfgFeature.js";
 import { _CfgOptionInternal } from "../productConfiguration/CfgOption.js";
 import { ProductLoader } from "../productLoader.js";
 import { SyncGroupsApplyMode } from "./SyncGroupsApplyMode.js";
 import { OptionCode, SyncCode } from "./SyncGroupsHandler.js";
+import { CfgPath } from "./SyncGroupsPathHelper.js";
 import { SyncGroupsState } from "./SyncGroupsState.js";
 /**
  * A transaction is normally limited to one user interaction. Like opening a product or
@@ -21,21 +22,21 @@ export declare class SyncGroupsTransaction {
     static make(syncState: SyncGroupsState, updateMode: SyncGroupsApplyMode, product: _CfgProductInternal, productLoader: ProductLoader, assumeNoStartState: boolean): Promise<SyncGroupsTransaction>;
     /**
      *
-     * @param syncState A clone of the original syncState. Replaces the original syncState if nothing fails and the transaction doesn't get aborted
+     * @param syncState A clone of the original syncState. Replaces the original syncState if nothing fails and the transaction doesn't get cancelled
      * @param updateMode
      * @param productLoader
-     * @param original The product instance that this transaction will be applied on provided nothing fails and the transaction doesn't get aborted
+     * @param original The product instance that this transaction will be applied on provided nothing fails and the transaction doesn't get cancelled
      * @param target A clone of the original product used to apply the configuration changes to
      * @param initial A clone of the original product used to track what the original state was. As a safe measure we do not use originalProduct for this, as it might be changed by someone else
      */
     private constructor();
-    private _aborted;
+    private _closed;
     private affectedSelectOneFeatures;
     private affectedSelectManyOptions;
     private affectedSelectOneSyncGroups;
     private affectedSelectManySyncGroupsAndOptions;
-    get isAborted(): boolean;
-    abort(): void;
+    get isClosed(): boolean;
+    close(): void;
     init(): Promise<boolean>;
     selectOption(optionPath: CfgPath, on: boolean): Promise<boolean>;
     addSelectOneFeatureAffected(feature: _CfgFeatureInternal): void;

package/dist/syncGroups/SyncGroupsTransaction.js

@@ -7,8 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { assert } from "@configura/web-utilities";
 import { SelectionType } from "../productConfiguration/CfgFeature.js";
 import { SyncGroupsApplier } from "./SyncGroupsApplier.js";
+import { SyncGroupsPathHelper } from "./SyncGroupsPathHelper.js";
 /**
  * A transaction is normally limited to one user interaction. Like opening a product or
  * selecting an option. This object is used to keep data for one transaction. In particular
@@ -18,10 +20,10 @@ import { SyncGroupsApplier } from "./SyncGroupsApplier.js";
 export class SyncGroupsTransaction {
     /**
      *
-     * @param syncState A clone of the original syncState. Replaces the original syncState if nothing fails and the transaction doesn't get aborted
+     * @param syncState A clone of the original syncState. Replaces the original syncState if nothing fails and the transaction doesn't get cancelled
      * @param updateMode
      * @param productLoader
-     * @param original The product instance that this transaction will be applied on provided nothing fails and the transaction doesn't get aborted
+     * @param original The product instance that this transaction will be applied on provided nothing fails and the transaction doesn't get cancelled
      * @param target A clone of the original product used to apply the configuration changes to
      * @param initial A clone of the original product used to track what the original state was. As a safe measure we do not use originalProduct for this, as it might be changed by someone else
      */
@@ -32,7 +34,7 @@ export class SyncGroupsTransaction {
         this.original = original;
         this.target = target;
         this.initial = initial;
-        this._aborted = false;
+        this._closed = false;
         this.affectedSelectOneFeatures = new Set();
         this.affectedSelectManyOptions = new Set();
         this.affectedSelectOneSyncGroups = new Set();
@@ -44,11 +46,11 @@ export class SyncGroupsTransaction {
             return t;
         });
     }
-    get isAborted() {
-        return this._aborted;
+    get isClosed() {
+        return this._closed;
     }
-    abort() {
-        this._aborted = true;
+    close() {
+        this._closed = true;
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -57,32 +59,24 @@ export class SyncGroupsTransaction {
     }
     selectOption(optionPath, on) {
         return __awaiter(this, void 0, void 0, function* () {
-            const targetOption = this.target.getOptionFromPath(optionPath);
+            const targetOption = SyncGroupsPathHelper.getOptionFromPath(optionPath, this.target);
             return yield SyncGroupsApplier.selectOption(this, targetOption, on);
         });
     }
     addSelectOneFeatureAffected(feature) {
-        if (feature.selectionType !== SelectionType.SelectOne) {
-            throw new Error("Can only be used for SelectOne Feature");
-        }
+        assert(feature.selectionType === SelectionType.SelectOne, "Can only be used for SelectOne Feature");
         this.affectedSelectOneFeatures.add(feature);
     }
     addSelectManyOptionAffected(option) {
-        if (option.parent.selectionType !== SelectionType.SelectMany) {
-            throw new Error("Can only be used for option in SelectMany Feature");
-        }
+        assert(option.parent.selectionType === SelectionType.SelectMany, "Can only be used for option in SelectMany Feature");
         this.affectedSelectManyOptions.add(option);
     }
     hasSelectOneFeatureBeenAffected(feature) {
-        if (feature.selectionType !== SelectionType.SelectOne) {
-            throw new Error("Can only be used for SelectOne Feature");
-        }
+        assert(feature.selectionType === SelectionType.SelectOne, "Can only be used for SelectOne Feature");
         return this.affectedSelectOneFeatures.has(feature);
     }
     hasSelectManyOptionBeenAffected(option) {
-        if (option.parent.selectionType !== SelectionType.SelectMany) {
-            throw new Error("Can only be used for option in SelectMany Feature");
-        }
+        assert(option.parent.selectionType === SelectionType.SelectMany, "Can only be used for option in SelectMany Feature");
         return this.affectedSelectManyOptions.has(option);
     }
     addSyncGroupAffectedForSelectOne(syncCode) {

package/dist/utilitiesCatalogueData.js

@@ -2,14 +2,16 @@ import { shallowCompareDictionaries } from "@configura/web-utilities";
 export const makeCatalogueKey = (cat) => `${cat.enterprise}-${cat.prdCat}-${cat.prdCatVersion}-${cat.priceList}-${cat.vendor}`;
 export const makeProductKey = (cat, pKey) => `${makeCatalogueKey(cat)}-${pKey}`;
 export const makeSelOptionsKey = (options) => options.reduce((p, option) => {
-    const { code, next } = option;
-    p += "_{" + code;
+    var _a;
+    const { code, numericValue, next } = option;
+    p += `_{${code}`;
+    p += numericValue === undefined ? "" : `_${numericValue.value}${(_a = numericValue.unit) !== null && _a !== void 0 ? _a : ""}`;
     if (next === undefined) {
         return p;
     }
     for (const key of Object.keys(next)) {
         const innerOption = next[key];
-        p += "_{" + key + "_" + makeSelOptionsKey([innerOption]) + "_}";
+        p += `_{${key}_${makeSelOptionsKey([innerOption])}_}`;
     }
     p += "_}";
     return p;
@@ -130,10 +132,10 @@ export function isSameProductRef(left, right) {
     if (left.refKey !== right.refKey) {
         return false;
     }
-    if (!isSameCatalogueParams(left.catId, right.catId)) {
+    if (left.partNumber !== right.partNumber) {
         return false;
     }
-    if (left.partNumber !== right.partNumber) {
+    if (!isSameCatalogueParams(left.catId, right.catId)) {
         return false;
     }
     if (left.refDescription !== right.refDescription) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "1.6.1-alpha.0",
+	"version": "1.6.1-alpha.4",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "^1.6.1-alpha.0"
+		"@configura/web-utilities": "1.6.1-alpha.4"
 	},
-	"gitHead": "aa99963ec2c2e4ab4ef1795e7ad6204fef31da75"
+	"gitHead": "e4dc2f02eff0ea5b4b69fa14e3ae456f505b3e58"
 }