@configura/web-api 2.0.0-alpha.1 → 2.0.0-alpha.4

package/dist/CfgProduct.js

@@ -419,7 +419,7 @@ export class _CfgProductInternal {
             }
         });
         this.root = root !== null && root !== void 0 ? root : this;
-        this.key = makeProductKey(prodParams, (_a = _additionalProductRef === null || _additionalProductRef === void 0 ? void 0 : _additionalProductRef.refKey) !== null && _a !== void 0 ? _a : prodParams.partNumber);
+        this.key = makeProductKey(Object.assign(Object.assign({}, prodParams), { partNumber: (_a = _additionalProductRef === null || _additionalProductRef === void 0 ? void 0 : _additionalProductRef.refKey) !== null && _a !== void 0 ? _a : prodParams.partNumber }));
         this._selected = optional ? selected : undefined;
         this.isAdditionalProduct = parent !== undefined;
         this._configuration = CfgProductConfiguration.make(initSuccess, initFail, rootFeatureRefs, allRawFeatures, apiSelection, this, this.root);

package/dist/io/CfgIOProdConfConnector.d.ts

@@ -1,18 +1,22 @@
 import { DtoAdditionalProductConfiguration, DtoConfProd } from "../CatalogueAPI.js";
 import { CfgProduct, CfgProductChangeNotification } from "../CfgProduct.js";
 import { CfgIOManager } from "./CfgIOManager.js";
+export declare const isCfgProdConfMessage: (data: unknown) => data is CfgProdConfMessageV1 | CfgProdConfMessageV2;
 export declare type CfgProdConfMessageV1 = {
     version: "1.0";
     conf: DtoAdditionalProductConfiguration;
 };
+export declare const isCfgProdConfMessageV1: (data: unknown) => data is CfgProdConfMessageV1;
 export declare type CfgProdConfMessageV2 = {
     version: "2.0";
     conf: DtoConfProd;
 };
+export declare const isCfgProdConfMessageV2: (data: unknown) => data is CfgProdConfMessageV2;
 export declare type CfgProdConfMessage = {
     initial: boolean;
     subMessages: (CfgProdConfMessageV1 | CfgProdConfMessageV2)[];
 };
+export declare const getHighestVersionProdConfMessage: (subMessages: (CfgProdConfMessageV1 | CfgProdConfMessageV2)[]) => CfgProdConfMessageV1 | CfgProdConfMessageV2;
 export declare enum CfgProdConfMessageVersions {
     V1dot0 = 1,
     V2dot0 = 2

package/dist/io/CfgIOProdConfConnector.js

@@ -8,6 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { convertDtoConfProdToV1 } from "../ConfigurationConverter.js";
+export const isCfgProdConfMessage = (data) => typeof data === "object" && data !== null && "version" in data && "conf" in data;
+export const isCfgProdConfMessageV1 = (data) => isCfgProdConfMessage(data) && data.version === "1.0";
+export const isCfgProdConfMessageV2 = (data) => isCfgProdConfMessage(data) && data.version === "2.0";
+export const getHighestVersionProdConfMessage = (subMessages) => subMessages
+    .slice(1)
+    .reduce((a, c) => (a.version < c.version ? c : a), subMessages[0]);
 export var CfgProdConfMessageVersions;
 (function (CfgProdConfMessageVersions) {
     CfgProdConfMessageVersions[CfgProdConfMessageVersions["V1dot0"] = 1] = "V1dot0";
@@ -65,16 +71,14 @@ export class CfgIOProdConfConnector {
                     console.warn(`${STAGE_PROD_CONF_MESSAGE_KEY} message without any submessages. Unexpected.`);
                     return;
                 }
-                const highestVersionMessage = subMessages
-                    .slice(1)
-                    .reduce((a, c) => (a.version < c.version ? c : a), subMessages[0]);
-                switch (highestVersionMessage.version) {
-                    case "1.0":
-                        yield newProduct.setApiSelection(highestVersionMessage.conf, this._doValidate);
-                        return;
-                    case "2.0":
-                        yield newProduct.setDtoConf(highestVersionMessage.conf, this._doValidate);
-                        return;
+                const highestVersionMessage = getHighestVersionProdConfMessage(subMessages);
+                if (isCfgProdConfMessageV1(highestVersionMessage)) {
+                    yield newProduct.setApiSelection(highestVersionMessage.conf, this._doValidate);
+                    return;
+                }
+                if (isCfgProdConfMessageV2(highestVersionMessage)) {
+                    yield newProduct.setDtoConf(highestVersionMessage.conf, this._doValidate);
+                    return;
                 }
                 throw new Error("Unknown message version");
             }));

package/dist/productLoader.js

@@ -21,7 +21,7 @@ import { makeProductKey, makeSelOptionsKey, } from "./utilitiesCatalogueData.js"
  */
 export function wrapWithGetProductCache(getProduct) {
     const cache = new PromiseCache();
-    return (params) => __awaiter(this, void 0, void 0, function* () { return cache.get(makeProductKey(params, params.partNumber), () => getProduct(params)); });
+    return (params) => __awaiter(this, void 0, void 0, function* () { return cache.get(makeProductKey(params), () => getProduct(params)); });
 }
 /**
  * Wraps a postValidate function so that it caches for the time it lives.
@@ -37,7 +37,7 @@ export function wrapWithGetProductCache(getProduct) {
 export function wrapWithPostValidateCache(postValidate) {
     const cache = new PromiseCache();
     return (params, body) => __awaiter(this, void 0, void 0, function* () {
-        return cache.get(`${makeProductKey(params, params.partNumber)}-${makeSelOptionsKey(body.selOptions)}`, () => postValidate(params, body));
+        return cache.get(`${makeProductKey(params)}-${makeSelOptionsKey(body.selOptions)}`, () => postValidate(params, body));
     });
 }
 /** Does both wrapWithGetProductCache and wrapWithPostValidateCache. */

package/dist/utilitiesCatalogueData.d.ts

@@ -1,6 +1,15 @@
 import { DtoAdditionalProductRef, DtoCatalogueParams, DtoCatalogueParamsWithLang, DtoCatalogueParamsWithoutCid, DtoMeasureParam, DtoModel, DtoOrientation, DtoPartsData, DtoPrices, DtoProductData, DtoProductParams, DtoProductParamsWithLang, DtoProductResponse, DtoSelectedOption, DtoTransform, DtoValidateResponse, DtoVector } from "./CatalogueAPI.js";
+/**
+ * Makes a string from the params which can be used as a key in for example React. Language is not respected.
+ */
 export declare const makeCatalogueKey: (cat: DtoCatalogueParams) => string;
-export declare const makeProductKey: (cat: DtoCatalogueParams, pKey: string) => string;
+/**
+ * Makes a string from the params which can be used as a key in for example React. Language is not respected.
+ */
+export declare const makeProductKey: (prod: DtoProductParams) => string;
+/**
+ * Makes a string from selected options, can be used as a key for a selection.
+ */
 export declare const makeSelOptionsKey: (options: DtoSelectedOption[]) => string;
 export declare type RootNodeSource = DtoModel | File;
 export declare type CfgProductData = Omit<Omit<DtoProductData, "models">, "partsData"> & {

package/dist/utilitiesCatalogueData.js

@@ -1,6 +1,15 @@
 import { shallowCompareDictionaries } from "@configura/web-utilities";
+/**
+ * Makes a string from the params which can be used as a key in for example React. Language is not respected.
+ */
 export const makeCatalogueKey = (cat) => `${cat.cid}-${cat.enterprise}-${cat.prdCat}-${cat.prdCatVersion}-${cat.priceList}-${cat.vendor}`;
-export const makeProductKey = (cat, pKey) => `${makeCatalogueKey(cat)}-${pKey}`;
+/**
+ * Makes a string from the params which can be used as a key in for example React. Language is not respected.
+ */
+export const makeProductKey = (prod) => `${makeCatalogueKey(prod)}-${prod.partNumber}`;
+/**
+ * Makes a string from selected options, can be used as a key for a selection.
+ */
 export const makeSelOptionsKey = (options) => options.reduce((p, option) => {
     var _a;
     const { code, numericValue, next } = option;

package/dist/utilitiesCataloguePermission.d.ts

@@ -4,14 +4,20 @@ interface CataloguePermissionByEnterpriseKey {
 }
 export declare const groupAndSortCataloguePermissions: (cataloguePermissions: DtoCataloguePermission[]) => CataloguePermissionByEnterpriseKey;
 export declare const isParamSet: (param: string | undefined) => boolean;
-export declare const createCataloguePermissionsFilter: (cid: number | undefined, enterprise: string | undefined, prdCat: string | undefined, prdCatVersion: string | undefined, priceList: string | undefined, vendor: string | undefined) => (perm: DtoCataloguePermission) => boolean;
+export declare const createCataloguePermissionsFilter: (catParams: Partial<DtoCatalogueParams>) => (perm: DtoCataloguePermission) => boolean;
 /**
  * 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
  * numeric ("1", "4.3", "0.2") they will be numerically compared, otherwise non localized
  * string compare.
  */
-export declare const getPrdCatVersionFromPermissions: (cataloguePermissions: DtoCataloguePermission[], cid: number | undefined, enterprise: string | undefined, prdCat: string | undefined, priceList: string | undefined, vendor: string | undefined) => string | undefined;
+export declare const getPrdCatVersionFromPermissions: (cataloguePermissions: DtoCataloguePermission[], catParams: {
+    cid: number | undefined;
+    enterprise: string | undefined;
+    prdCat: string | undefined;
+    priceList: string | undefined;
+    vendor: string | undefined;
+}) => string | undefined;
 /**
  * Sometimes you will want a missing prdCatVersion to represent "Get the current highest version".
  * This method will, if the prdCatVersion is not set, fetch the highest available from the catalogue

package/dist/utilitiesCataloguePermission.js

@@ -15,24 +15,27 @@ export const groupAndSortCataloguePermissions = (cataloguePermissions) => {
     return cataloguePermissionByEnterpriseKey;
 };
 export const isParamSet = (param) => param !== undefined && param !== "" && param !== "-";
-export const createCataloguePermissionsFilter = (cid, enterprise, prdCat, prdCatVersion, priceList, vendor) => (perm) => (cid === undefined || cid === perm.cid) &&
-    (!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 = (catParams) => {
+    const { cid, enterprise, prdCat, prdCatVersion, vendor, priceList } = catParams;
+    return (perm) => (cid === undefined || cid === perm.cid) &&
+        (!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
  * numeric ("1", "4.3", "0.2") they will be numerically compared, otherwise non localized
  * string compare.
  */
-export const getPrdCatVersionFromPermissions = (cataloguePermissions, cid, enterprise, prdCat, priceList, vendor) => {
-    const filter = createCataloguePermissionsFilter(cid, enterprise, prdCat, "-", priceList, vendor);
+export const getPrdCatVersionFromPermissions = (cataloguePermissions, catParams) => {
+    const filter = createCataloguePermissionsFilter(Object.assign(Object.assign({}, catParams), { prdCatVersion: undefined }));
     const applicablePermissions = cataloguePermissions.filter(filter);
     return applicablePermissions.reduce((pVersion, c) => {
         const cVersion = c.prdCatVersion;
@@ -55,11 +58,11 @@ export const getPrdCatVersionFromPermissions = (cataloguePermissions, cid, enter
  * @param params
  */
 export const getPrdCatVersionOrLatestFromPermissions = (params, cataloguePermissions) => {
-    const { cid, enterprise, prdCat, prdCatVersion, priceList, vendor } = params;
+    const { prdCatVersion } = params;
     if (isParamSet(prdCatVersion)) {
         return prdCatVersion;
     }
-    const highestFoundVersion = getPrdCatVersionFromPermissions(cataloguePermissions, cid, enterprise, prdCat, priceList, vendor);
+    const highestFoundVersion = getPrdCatVersionFromPermissions(cataloguePermissions, params);
     if (highestFoundVersion === undefined) {
         return prdCatVersion;
     }

package/package.json

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