@configura/web-api 1.6.0-alpha.0 → 1.6.0-iotest.0

package/dist/productConfiguration/CfgProductConfiguration.js

@@ -27,7 +27,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,13 +35,14 @@ 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* () {
@@ -51,7 +52,7 @@ export class _CfgProductConfigurationInternal {
                 throw Error("Child feature not found");
             }
             features[i] = freshRef;
-            yield this._notifyAllOfChange(bubbleMode);
+            yield this._notifyAllOfChange(bubbleMode, true);
         });
         this.getApiSelection = () => this._features.map((f) => {
             return { code: "!~!", next: f._internal.getApiSelection() };
@@ -70,7 +71,7 @@ export class _CfgProductConfigurationInternal {
             if (change) {
                 yield this._notifyAllOfChange(bubbleToRoot
                     ? ProductConfigurationBubbleMode.ToRoot
-                    : ProductConfigurationBubbleMode.OneLevel);
+                    : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
         });
@@ -102,7 +103,7 @@ export class _CfgProductConfigurationInternal {
             if (change) {
                 yield this._notifyAllOfChange(validate
                     ? ProductConfigurationBubbleMode.Validate
-                    : ProductConfigurationBubbleMode.OneLevel);
+                    : ProductConfigurationBubbleMode.OneLevel, true);
             }
             return change;
         });
@@ -115,7 +116,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;
             }
@@ -146,9 +147,7 @@ export class _CfgProductConfigurationInternal {
                 }
                 stretchReferenceLength.current = referenceLengthWithUnit;
             }
-            if (doNotify) {
-                yield this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot);
-            }
+            yield this._notifyAllOfChange(ProductConfigurationBubbleMode.ToRoot, false);
             return true;
         });
         // Useful debug tool:
@@ -215,23 +214,6 @@ export class _CfgProductConfigurationInternal {
             features[i] = CfgFeature._makeNewRefFrom(featureInternal);
         }
     }
-    get path() {
-        return [...this.parentProduct.path, "c"];
-    }
-    getFromPath(path) {
-        path = path.slice();
-        const s = path.shift();
-        switch (s) {
-            case undefined:
-                return this;
-            default:
-                const feature = this.features.find((f) => f.code === s);
-                if (feature === undefined) {
-                    throw new Error(`Feature not found ${s}, ${path.join(", ")}`);
-                }
-                return feature._internal.getFromPath(path);
-        }
-    }
 }
 export class CfgProductConfiguration {
     /**

package/dist/tests/testData/testDataAdditionalProductInAdditionalProductInProductForTest.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { CfgProduct } from "../../CfgProduct.js";
 import { Collector } from "./collectorForTest.js";
 import { dummyCatId } from "./dummyProductForTest.js";
-import { letterOptionCodeA, letterOptionCodeB, letterOptionCodeC, letterOptions, } from "./testDataOptions.js";
 const A = () => ({
     uuid: "A",
     unit: "m",
@@ -20,37 +19,96 @@ const A = () => ({
             description: "",
             numericOrder: false,
             options: [
-                Object.assign(Object.assign({}, letterOptions[0]), { additionalProductRefs: [
+                {
+                    code: "optionA",
+                    description: "",
+                    additionalProductRefs: [
                         { refKey: "C_0", catId: dummyCatId, partNumber: "C" },
                         { refKey: "B_0", catId: dummyCatId, partNumber: "B" },
-                    ] }),
-                letterOptions[1],
-                Object.assign(Object.assign({}, letterOptions[2]), { additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }] }),
+                    ],
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                    additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }],
+                },
             ],
         },
         {
             code: "featureX",
             description: "",
             numericOrder: false,
-            options: [...letterOptions],
+            options: [
+                {
+                    code: "optionA",
+                    description: "",
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                },
+            ],
         },
         {
             code: "featureNotUsed",
             description: "",
             numericOrder: false,
-            options: [...letterOptions],
+            options: [
+                {
+                    code: "optionA",
+                    description: "",
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+            ],
         },
         {
             code: "featureOptionCSelectedAtStart",
             description: "",
             numericOrder: false,
-            options: [...letterOptions],
+            options: [
+                {
+                    code: "optionA",
+                    description: "",
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                },
+            ],
         },
         {
             code: "featureSelectMany",
             description: "",
             numericOrder: false,
-            options: [...letterOptions],
+            options: [
+                {
+                    code: "optionA",
+                    description: "",
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                },
+            ],
         },
     ],
     productData: {
@@ -65,24 +123,24 @@ const A = () => ({
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        optionA: {
+                            code: "optionA",
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeB]: {
-                            code: letterOptionCodeB,
+                        optionB: {
+                            code: "optionB",
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeC]: {
-                            code: letterOptionCodeC,
+                        optionC: {
+                            code: "optionC",
                         },
                     },
                 },
@@ -161,7 +219,20 @@ const C = () => ({
             code: "featureC",
             description: "",
             numericOrder: false,
-            options: [...letterOptions],
+            options: [
+                {
+                    code: "optionA",
+                    description: "",
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                },
+            ],
         },
     ],
     productData: {
@@ -175,8 +246,8 @@ const C = () => ({
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        optionA: {
+                            code: "optionA",
                         },
                     },
                 },
@@ -226,8 +297,8 @@ export const cfgProductTest = (testFunc, prepFunc) => __awaiter(void 0, void 0,
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeC]: {
-                            code: letterOptionCodeC,
+                        optionC: {
+                            code: "optionC",
                         },
                     },
                 },
@@ -236,16 +307,16 @@ export const cfgProductTest = (testFunc, prepFunc) => __awaiter(void 0, void 0,
                 productData.partsData.selOptions.push({
                     code: "!~!",
                     next: {
-                        [letterOptionCodeC]: {
-                            code: letterOptionCodeC,
+                        optionC: {
+                            code: "optionC",
                         },
                     },
                 });
                 productData.partsData.selOptions.push({
                     code: "!~!",
                     next: {
-                        [letterOptionCodeC]: {
-                            code: letterOptionCodeC,
+                        optionC: {
+                            code: "optionC",
                         },
                     },
                 });

package/dist/tests/testData/testDataCachedGetProduct.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { CfgProduct } from "../../CfgProduct.js";
 import { wrapWithGetProductCache } from "../../productLoader.js";
 import { dummyCatId } from "./dummyProductForTest.js";
-import { letterOptionCodeA, letterOptions } from "./testDataOptions.js";
 let prodKeyArray = [];
 const A = () => ({
     uuid: "A",
@@ -21,12 +20,24 @@ const A = () => ({
             description: "",
             numericOrder: false,
             options: [
-                Object.assign(Object.assign({}, letterOptions[0]), { additionalProductRefs: [
+                {
+                    code: "optionA",
+                    description: "",
+                    additionalProductRefs: [
                         { refKey: "C_0", catId: dummyCatId, partNumber: "C" },
                         { refKey: "B_0", catId: dummyCatId, partNumber: "B" },
-                    ] }),
-                Object.assign(Object.assign({}, letterOptions[1]), { additionalProductRefs: [{ refKey: "E", catId: dummyCatId, partNumber: "E" }] }),
-                Object.assign(Object.assign({}, letterOptions[2]), { additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }] }),
+                    ],
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                    additionalProductRefs: [{ refKey: "E", catId: dummyCatId, partNumber: "E" }],
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                    additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }],
+                },
             ],
         },
     ],
@@ -42,8 +53,8 @@ const A = () => ({
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        optionA: {
+                            code: "optionA",
                         },
                     },
                 },
@@ -154,7 +165,7 @@ export const cachedProductLoaderTest = () => __awaiter(void 0, void 0, void 0, f
         getProduct: getTestProduct,
         postValidate: (params, _body) => __awaiter(void 0, void 0, void 0, function* () {
             const productData = (yield getTestProduct(params, true)).productData;
-            let code = letterOptionCodeA;
+            let code = "optionA";
             for (let test in _body.selOptions[0].next) {
                 code = test;
                 break;

package/dist/tests/testData/testDataProductAggregatedPrice.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { CfgProduct } from "../../CfgProduct.js";
 import { dummyCatId } from "./dummyProductForTest.js";
-import { letterOptionCodeA, letterOptionCodeB, letterOptionCodeC, letterOptions, } from "./testDataOptions.js";
 const A = () => ({
     uuid: "A",
     unit: "m",
@@ -19,12 +18,24 @@ const A = () => ({
             description: "",
             numericOrder: false,
             options: [
-                Object.assign(Object.assign({}, letterOptions[0]), { additionalProductRefs: [
+                {
+                    code: "optionA",
+                    description: "",
+                    additionalProductRefs: [
                         { refKey: "C_0", catId: dummyCatId, partNumber: "C" },
                         { refKey: "B_0", catId: dummyCatId, partNumber: "B" },
-                    ] }),
-                Object.assign(Object.assign({}, letterOptions[1]), { additionalProductRefs: [{ refKey: "E", catId: dummyCatId, partNumber: "E" }] }),
-                Object.assign(Object.assign({}, letterOptions[2]), { additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }] }),
+                    ],
+                },
+                {
+                    code: "optionB",
+                    description: "",
+                    additionalProductRefs: [{ refKey: "E", catId: dummyCatId, partNumber: "E" }],
+                },
+                {
+                    code: "optionC",
+                    description: "",
+                    additionalProductRefs: [{ refKey: "D", catId: dummyCatId, partNumber: "D" }],
+                },
             ],
         },
     ],
@@ -40,8 +51,8 @@ const A = () => ({
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        optionA: {
+                            code: "optionA",
                         },
                     },
                 },
@@ -139,13 +150,13 @@ export const getTestProduct = (params) => __awaiter(void 0, void 0, void 0, func
     throw new Error("No such part");
 });
 export function getSelOptions(option) {
-    if (option === letterOptionCodeB) {
+    if (option === "optionB") {
         return [
             {
                 code: "!~!",
                 next: {
-                    [letterOptionCodeB]: {
-                        code: letterOptionCodeB,
+                    optionB: {
+                        code: "optionB",
                     },
                 },
             },
@@ -156,8 +167,8 @@ export function getSelOptions(option) {
             {
                 code: "!~!",
                 next: {
-                    [letterOptionCodeC]: {
-                        code: letterOptionCodeC,
+                    optionC: {
+                        code: "optionC",
                     },
                 },
             },

package/dist/tests/testData/testDataUpcharge.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { CfgProduct } from "../../CfgProduct.js";
 import { Collector } from "./collectorForTest.js";
 import { dummyCatId } from "./dummyProductForTest.js";
-import { letterOptionCodeA, letterOptions } from "./testDataOptions.js";
 const Prd = () => ({
     uuid: "Prd",
     unit: "m",
@@ -20,9 +19,20 @@ const Prd = () => ({
             description: "",
             numericOrder: false,
             options: [
-                letterOptions[0],
-                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
-                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 0 }),
+                {
+                    code: "A",
+                    description: "",
+                },
+                {
+                    code: "B",
+                    description: "",
+                    upcharge: undefined,
+                },
+                {
+                    code: "C",
+                    description: "",
+                    upcharge: 0,
+                },
             ],
         },
         {
@@ -30,9 +40,20 @@ const Prd = () => ({
             description: "",
             numericOrder: false,
             options: [
-                letterOptions[0],
-                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
-                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 10 }),
+                {
+                    code: "A",
+                    description: "",
+                },
+                {
+                    code: "B",
+                    description: "",
+                    upcharge: undefined,
+                },
+                {
+                    code: "C",
+                    description: "",
+                    upcharge: 10,
+                },
             ],
         },
         {
@@ -41,9 +62,20 @@ const Prd = () => ({
             numericOrder: false,
             optional: true,
             options: [
-                letterOptions[0],
-                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
-                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 10 }),
+                {
+                    code: "A",
+                    description: "",
+                },
+                {
+                    code: "B",
+                    description: "",
+                    upcharge: undefined,
+                },
+                {
+                    code: "C",
+                    description: "",
+                    upcharge: 10,
+                },
             ],
         },
     ],
@@ -59,24 +91,24 @@ const Prd = () => ({
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        A: {
+                            code: "A",
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        A: {
+                            code: "A",
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        [letterOptionCodeA]: {
-                            code: letterOptionCodeA,
+                        A: {
+                            code: "A",
                         },
                     },
                 },

package/dist/utilitiesCatalogueData.js

@@ -2,14 +2,15 @@ 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}${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;

package/package.json

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

package/dist/syncGroups/SyncGroupsApplier.d.ts

@@ -1,20 +0,0 @@
-import { SyncGroup } from "../CatalogueAPI.js";
-import { _CfgOptionInternal } from "../productConfiguration/CfgOption.js";
-import { SyncCode } from "./SyncGroupsHandler.js";
-import { SyncGroupsTransaction } from "./SyncGroupsTransaction.js";
-export declare class SyncGroupsApplier {
-    /**
-     * At load of a new product this is used to move it into a synced state
-     */
-    static init(transaction: SyncGroupsTransaction): Promise<boolean>;
-    /**
-     * At an active select of an option this is the entry point
-     */
-    static selectOption(transaction: SyncGroupsTransaction, option: _CfgOptionInternal, on: boolean): Promise<boolean>;
-    /**
-     * @returns undefined if the @syncGroup is undefined, false if
-     * the @mustSupport is not fulfilled or the syncCode if all is ok
-     */
-    static getSyncCode(syncGroup: SyncGroup | undefined, mustSupport: "push" | "pull"): SyncCode | undefined | false;
-}
-//# sourceMappingURL=SyncGroupsApplier.d.ts.map