@configura/web-api 1.6.1-alpha.7 → 1.6.2

package/dist/tests/testData/testDataUpcharge.js

@@ -10,6 +10,7 @@ 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",
@@ -19,20 +20,9 @@ const Prd = () => ({
             description: "",
             numericOrder: false,
             options: [
-                {
-                    code: "A",
-                    description: "",
-                },
-                {
-                    code: "B",
-                    description: "",
-                    upcharge: undefined,
-                },
-                {
-                    code: "C",
-                    description: "",
-                    upcharge: 0,
-                },
+                letterOptions[0],
+                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
+                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 0 }),
             ],
         },
         {
@@ -40,20 +30,9 @@ const Prd = () => ({
             description: "",
             numericOrder: false,
             options: [
-                {
-                    code: "A",
-                    description: "",
-                },
-                {
-                    code: "B",
-                    description: "",
-                    upcharge: undefined,
-                },
-                {
-                    code: "C",
-                    description: "",
-                    upcharge: 10,
-                },
+                letterOptions[0],
+                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
+                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 10 }),
             ],
         },
         {
@@ -62,20 +41,9 @@ const Prd = () => ({
             numericOrder: false,
             optional: true,
             options: [
-                {
-                    code: "A",
-                    description: "",
-                },
-                {
-                    code: "B",
-                    description: "",
-                    upcharge: undefined,
-                },
-                {
-                    code: "C",
-                    description: "",
-                    upcharge: 10,
-                },
+                letterOptions[0],
+                Object.assign(Object.assign({}, letterOptions[1]), { upcharge: undefined }),
+                Object.assign(Object.assign({}, letterOptions[2]), { upcharge: 10 }),
             ],
         },
     ],
@@ -91,24 +59,24 @@ const Prd = () => ({
                 {
                     code: "!~!",
                     next: {
-                        A: {
-                            code: "A",
+                        [letterOptionCodeA]: {
+                            code: letterOptionCodeA,
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        A: {
-                            code: "A",
+                        [letterOptionCodeA]: {
+                            code: letterOptionCodeA,
                         },
                     },
                 },
                 {
                     code: "!~!",
                     next: {
-                        A: {
-                            code: "A",
+                        [letterOptionCodeA]: {
+                            code: letterOptionCodeA,
                         },
                     },
                 },
@@ -121,7 +89,7 @@ const Prd = () => ({
         { code: "WithUpchargeSelectMany" },
     ],
 });
-const getProduct = (params) => __awaiter(void 0, void 0, void 0, function* () { return Prd(); });
+const getProduct = (params) => Promise.resolve(Prd());
 export const getUpchargeProduct = (testFunc) => __awaiter(void 0, void 0, void 0, function* () {
     const productLoader = {
         getProduct,

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;
@@ -16,11 +16,17 @@ export declare type CfgProductResponse = Omit<ProductResponse, "productData"> &
 export declare type CfgValidateResponse = Omit<ValidateResponse, "productData"> & {
     productData: CfgProductData;
 };
-export declare function isModel(arg: any): arg is Model;
+export declare function isModel(arg: unknown): arg is Model;
 /** Replace empty strings with "-" for compatibility with the API. */
 export declare function correctDefaultsOnCatalogueParams(catId: CatalogueParams): CatalogueParams;
 export declare function recursivelyGetPriceCodeValue(priceCodes: string[], prices: Prices | undefined): number | undefined;
 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

@@ -17,7 +17,7 @@ export const makeSelOptionsKey = (options) => options.reduce((p, option) => {
     return p;
 }, "");
 export function isModel(arg) {
-    return arg.cid !== undefined && arg.uri !== undefined;
+    return typeof arg === "object" && arg !== null && "cid" in arg && "uri" in arg;
 }
 /** Replace empty strings with "-" for compatibility with the API. */
 export function correctDefaultsOnCatalogueParams(catId) {
@@ -56,11 +56,107 @@ export function comparePricesObjects(prices1, prices2) {
     }
     return shallowCompareDictionaries(prices1.values, prices2.values);
 }
-export const decodeCatalogueParams = (params) => {
-    const decoded = Object.assign(Object.assign({}, params), { enterprise: decodeURIComponent(params.enterprise), prdCat: decodeURIComponent(params.prdCat), prdCatVersion: decodeURIComponent(params.prdCatVersion), priceList: decodeURIComponent(params.priceList), vendor: decodeURIComponent(params.vendor) });
-    return decoded;
-};
-export const decodeProductParams = (params) => {
-    const decoded = Object.assign(Object.assign({}, decodeCatalogueParams(params)), { partNumber: decodeURIComponent(params.partNumber) });
-    return decoded;
-};
+export const decodeCatalogueParams = (params) => (Object.assign(Object.assign({}, params), { enterprise: decodeURIComponent(params.enterprise), prdCat: decodeURIComponent(params.prdCat), prdCatVersion: decodeURIComponent(params.prdCatVersion), priceList: decodeURIComponent(params.priceList), vendor: decodeURIComponent(params.vendor) }));
+export const decodeProductParams = (params) => (Object.assign(Object.assign({}, decodeCatalogueParams(params)), { partNumber: decodeURIComponent(params.partNumber) }));
+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 (left.partNumber !== right.partNumber) {
+        return false;
+    }
+    if (!isSameCatalogueParams(left.catId, right.catId)) {
+        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/dist/utilitiesCataloguePermission.d.ts

@@ -33,8 +33,6 @@ export declare const getPrdCatVersionOrLatestFromPermissions: (params: Catalogue
  * @param auth
  * @param params
  */
-export declare const fillMissingPrdCatVersionFromPermissions: <T extends CatalogueParams>(params: T, cataloguePermissions: CataloguePermission[]) => T & {
-    prdCatVersion: string;
-};
+export declare const fillMissingPrdCatVersionFromPermissions: <T extends CatalogueParams>(params: T, cataloguePermissions: CataloguePermission[]) => T;
 export {};
 //# sourceMappingURL=utilitiesCataloguePermission.d.ts.map

package/dist/utilitiesCataloguePermission.js

@@ -15,17 +15,15 @@ export const groupAndSortCataloguePermissions = (cataloguePermissions) => {
     return cataloguePermissionByEnterpriseKey;
 };
 export const isParamSet = (param) => param !== "" && param !== "-";
-export const createCataloguePermissionsFilter = (enterprise, prdCat, prdCatVersion, priceList, vendor) => {
-    return (perm) => (!isParamSet(enterprise) || enterprise === perm.enterprise) &&
-        (!isParamSet(prdCat) || prdCat === perm.prdCat) &&
-        (!isParamSet(prdCatVersion) || prdCatVersion === perm.prdCatVersion) &&
-        (!isParamSet(vendor) ||
-            perm.vendors === undefined ||
-            perm.vendors.some((v) => vendor === v)) &&
-        (!isParamSet(priceList) ||
-            perm.priceLists === undefined ||
-            perm.priceLists.some((p) => priceList === p));
-};
+export const createCataloguePermissionsFilter = (enterprise, prdCat, prdCatVersion, priceList, vendor) => (perm) => (!isParamSet(enterprise) || enterprise === perm.enterprise) &&
+    (!isParamSet(prdCat) || prdCat === perm.prdCat) &&
+    (!isParamSet(prdCatVersion) || prdCatVersion === perm.prdCatVersion) &&
+    (!isParamSet(vendor) ||
+        perm.vendors === undefined ||
+        perm.vendors.some((v) => vendor === v)) &&
+    (!isParamSet(priceList) ||
+        perm.priceLists === undefined ||
+        perm.priceLists.some((p) => priceList === p));
 /**
  * Sometimes you will want to use the latest available prdCatVersion. This method will
  * find the highest prdCatVersion version in the cataloguePermissions. If the versions are
@@ -79,6 +77,4 @@ export const getPrdCatVersionOrLatestFromPermissions = (params, cataloguePermiss
  * @param auth
  * @param params
  */
-export const fillMissingPrdCatVersionFromPermissions = (params, cataloguePermissions) => {
-    return Object.assign(Object.assign({}, params), { prdCatVersion: getPrdCatVersionOrLatestFromPermissions(params, cataloguePermissions) });
-};
+export const fillMissingPrdCatVersionFromPermissions = (params, cataloguePermissions) => (Object.assign(Object.assign({}, params), { prdCatVersion: getPrdCatVersionOrLatestFromPermissions(params, cataloguePermissions) }));

package/package.json

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