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

package/dist/CfgProduct.js

@@ -15,7 +15,7 @@ import { CfgProductConfiguration, _CfgProductConfigurationInternal, } from "./pr
 import { collectAdditionalProductRefs } from "./productConfiguration/utilitiesProductConfiguration.js";
 import { wrapWithCache } from "./productLoader.js";
 import { SyncGroupsHandler } from "./syncGroups/SyncGroupsHandler.js";
-import { comparePricesObjects, correctDefaultsOnCatalogueParams, makeProductKey, } from "./utilitiesCatalogueData.js";
+import { comparePricesObjects, correctDefaultsOnCatalogueParams, isSameProductRef, makeProductKey, } from "./utilitiesCatalogueData.js";
 function completeSettings(incompleteSettings) {
     var _a, _b;
     return {
@@ -357,7 +357,14 @@ export class _CfgProductInternal {
             const additionalProductRefs = [
                 ...(productData.additionalProductRefs || []),
                 ...collectAdditionalProductRefs(configuration),
-            ].map((prodRef, originalIndex) => ({
+            ]
+                .reduce((a, c) => {
+                if (a.every((p) => !isSameProductRef(p, c))) {
+                    a.push(c);
+                }
+                return a;
+            }, [])
+                .map((prodRef, originalIndex) => ({
                 prodRef,
                 originalIndex,
             }));

package/dist/syncGroups/SyncGroupsApplier.js

@@ -104,7 +104,8 @@ class SyncStateOnto {
             // what you did chose should be immediately visible. With SyncGroups the end result
             // is the combination of potentially many different validate calls, and so errors
             // could accumulate and what is cause and effect be hard to know.
-            if (revalidationResults.some((r) => r.wasAborted || !r.requestDidValidate)) {
+            if (!revalidationResults.every((r) => r.requestDidValidate) ||
+                revalidationResults.every((r) => r.wasAborted)) {
                 transaction.abort();
                 return false;
             }

package/dist/utilitiesCatalogueData.d.ts

@@ -1,4 +1,4 @@
-import { CatalogueParams, GetProductParams, Model, PartsData, Prices, ProductData, ProductResponse, SelectedOption, ValidateResponse } from "./CatalogueAPI.js";
+import { AdditionalProductRef, CatalogueParams, GetProductParams, MeasureParam, Model, Orientation, PartsData, Prices, ProductData, ProductResponse, SelectedOption, Transform, ValidateResponse, Vector } from "./CatalogueAPI.js";
 export declare const makeCatalogueKey: (cat: CatalogueParams) => string;
 export declare const makeProductKey: (cat: CatalogueParams, pKey: string) => string;
 export declare const makeSelOptionsKey: (options: SelectedOption[]) => string;
@@ -23,4 +23,10 @@ export declare function recursivelyGetPriceCodeValue(priceCodes: string[], price
 export declare function comparePricesObjects(prices1: Prices | undefined, prices2: Prices | undefined): boolean;
 export declare const decodeCatalogueParams: <T extends CatalogueParams>(params: T) => T;
 export declare const decodeProductParams: <T extends GetProductParams>(params: T) => T;
+export declare function isSameCatalogueParams(left: CatalogueParams, right: CatalogueParams): boolean;
+export declare function isSameVector(left: Vector, right: Vector): boolean;
+export declare function isSameOrientation(left: Orientation, right: Orientation): boolean;
+export declare function isSameAnchor(left: MeasureParam, right: MeasureParam): boolean;
+export declare function isSameTransform(left: Transform, right: Transform): boolean;
+export declare function isSameProductRef(left: AdditionalProductRef, right: AdditionalProductRef): boolean;
 //# sourceMappingURL=utilitiesCatalogueData.d.ts.map

package/dist/utilitiesCatalogueData.js

@@ -62,3 +62,105 @@ export const decodeProductParams = (params) => {
     const decoded = Object.assign(Object.assign({}, decodeCatalogueParams(params)), { partNumber: decodeURIComponent(params.partNumber) });
     return decoded;
 };
+export function isSameCatalogueParams(left, right) {
+    return (left.enterprise === right.enterprise &&
+        left.prdCat === right.prdCat &&
+        left.prdCatVersion === right.prdCatVersion &&
+        left.priceList === right.priceList &&
+        left.vendor === right.vendor);
+}
+export function isSameVector(left, right) {
+    return left.x === right.x && left.y === right.y && left.z === right.z;
+}
+export function isSameOrientation(left, right) {
+    return left.pitch === right.pitch && left.roll === right.roll && left.yaw === right.yaw;
+}
+export function isSameAnchor(left, right) {
+    var _a, _b;
+    if (left.code !== right.code) {
+        return false;
+    }
+    if (left.anchorPoint !== right.anchorPoint) {
+        return false;
+    }
+    const leftMeasurePriorities = (_a = left.measurePriority) !== null && _a !== void 0 ? _a : [];
+    const rightMeasurePriorities = (_b = right.measurePriority) !== null && _b !== void 0 ? _b : [];
+    if (leftMeasurePriorities.length !== rightMeasurePriorities.length) {
+        return false;
+    }
+    if (leftMeasurePriorities.some((p, i) => p.url !== rightMeasurePriorities[i].url)) {
+        return false;
+    }
+    return true;
+}
+export function isSameTransform(left, right) {
+    const leftTransformPos = left.pos;
+    const rightTransformPos = right.pos;
+    const leftTransformRot = left.rot;
+    const rightTransformRot = right.rot;
+    const leftTransformScale = left.scale;
+    const rightTransformScale = right.scale;
+    if ((leftTransformPos === undefined) !== (rightTransformPos === undefined)) {
+        return false;
+    }
+    if ((leftTransformRot === undefined) !== (rightTransformRot === undefined)) {
+        return false;
+    }
+    if ((leftTransformScale === undefined) !== (rightTransformScale === undefined)) {
+        return false;
+    }
+    if (leftTransformPos !== undefined &&
+        rightTransformPos !== undefined &&
+        !isSameVector(leftTransformPos, rightTransformPos)) {
+        return false;
+    }
+    if (leftTransformRot !== undefined &&
+        rightTransformRot !== undefined &&
+        !isSameOrientation(leftTransformRot, rightTransformRot)) {
+        return false;
+    }
+    if (leftTransformScale !== undefined &&
+        rightTransformScale !== undefined &&
+        !isSameVector(leftTransformScale, rightTransformScale)) {
+        return false;
+    }
+    return true;
+}
+export function isSameProductRef(left, right) {
+    if (left.refKey !== right.refKey) {
+        return false;
+    }
+    if (!isSameCatalogueParams(left.catId, right.catId)) {
+        return false;
+    }
+    if (left.partNumber !== right.partNumber) {
+        return false;
+    }
+    if (left.refDescription !== right.refDescription) {
+        return false;
+    }
+    const leftAnchor = left.anchor;
+    const rightAnchor = right.anchor;
+    if ((leftAnchor === undefined) !== (rightAnchor === undefined)) {
+        return false;
+    }
+    if (leftAnchor !== undefined &&
+        rightAnchor !== undefined &&
+        !isSameAnchor(leftAnchor, rightAnchor)) {
+        return false;
+    }
+    const leftTransform = left.transform;
+    const rightTransform = right.transform;
+    if ((leftTransform === undefined) !== (rightTransform === undefined)) {
+        return false;
+    }
+    if (leftTransform !== undefined &&
+        rightTransform !== undefined &&
+        !isSameTransform(leftTransform, rightTransform)) {
+        return false;
+    }
+    if (left.optional !== right.optional) {
+        return false;
+    }
+    return true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "1.6.0-alpha.0",
+	"version": "1.6.1-alpha.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.1-alpha.0"
 	},
-	"gitHead": "f099cebca376c87c4743a8e9b1c4f1ceaee0c888"
+	"gitHead": "aa99963ec2c2e4ab4ef1795e7ad6204fef31da75"
 }