@configura/web-api 1.3.0-alpha.1 → 1.3.0-alpha.5

package/dist/tests/testData/testDataAdditionalProductInAdditionalProductInProductForTest.js

@@ -12,10 +12,12 @@ import { Collector } from "./collectorForTest";
 import { dummyCatId } from "./dummyProductForTest";
 const A = () => ({
     uuid: "A",
+    unit: "m",
     features: [
         {
             code: "featureA",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -39,6 +41,7 @@ const A = () => ({
         {
             code: "featureX",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -57,6 +60,7 @@ const A = () => ({
         {
             code: "featureNotUsed",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -71,6 +75,7 @@ const A = () => ({
         {
             code: "featureOptionCSelectedAtStart",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -89,6 +94,7 @@ const A = () => ({
         {
             code: "featureSelectMany",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -164,10 +170,12 @@ const A = () => ({
 });
 const B = () => ({
     uuid: "B",
+    unit: "m",
     features: [
         {
             code: "featureI",
             description: "",
+            numericOrder: false,
             options: [
                 { code: "optionI0", description: "" },
                 { code: "optionI1", description: "", featureRefs: [{ code: "featureII" }] },
@@ -176,6 +184,7 @@ const B = () => ({
         {
             code: "featureII",
             description: "",
+            numericOrder: false,
             options: [
                 { code: "optionII0", description: "" },
                 { code: "optionII1", description: "", featureRefs: [{ code: "featureIII" }] },
@@ -184,6 +193,7 @@ const B = () => ({
         {
             code: "featureIII",
             description: "",
+            numericOrder: false,
             options: [
                 { code: "optionIII0", description: "" },
                 { code: "optionIII1", description: "" },
@@ -219,10 +229,12 @@ const B = () => ({
 });
 const C = () => ({
     uuid: "C",
+    unit: "m",
     features: [
         {
             code: "featureC",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -267,6 +279,7 @@ const C = () => ({
 });
 const D = () => ({
     uuid: "D",
+    unit: "m",
     features: [],
     productData: {
         sku: "D",

package/dist/tests/testData/testDataCachedGetProduct.js

@@ -13,10 +13,12 @@ import { dummyCatId } from "./dummyProductForTest.js";
 let prodKeyArray = [];
 const A = () => ({
     uuid: "A",
+    unit: "m",
     features: [
         {
             code: "featureA",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "optionA",
@@ -70,6 +72,7 @@ const A = () => ({
 });
 const B = () => ({
     uuid: "B",
+    unit: "m",
     features: [],
     productData: {
         sku: "B",
@@ -87,6 +90,7 @@ const B = () => ({
 });
 const C = () => ({
     uuid: "C",
+    unit: "m",
     features: [],
     productData: {
         sku: "C",
@@ -103,6 +107,7 @@ const C = () => ({
 });
 const D = () => ({
     uuid: "D",
+    unit: "m",
     features: [],
     productData: {
         sku: "D",
@@ -119,6 +124,7 @@ const D = () => ({
 });
 const E = () => ({
     uuid: "E",
+    unit: "m",
     features: [],
     productData: {
         sku: "E",

package/dist/tests/testData/testDataCachedPostValidate.js

@@ -11,10 +11,12 @@ import { CfgProduct } from "../../CfgProduct.js";
 import { dummyCatId } from "./dummyProductForTest.js";
 const Table = () => ({
     uuid: "Table",
+    unit: "m",
     features: [
         {
             code: "Leg",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "LegA",
@@ -67,10 +69,12 @@ const Table = () => ({
 });
 const LegA = () => ({
     uuid: "LegA",
+    unit: "m",
     features: [
         {
             code: "Color",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "Red",
@@ -115,10 +119,12 @@ const LegA = () => ({
 });
 const LegWheel = () => ({
     uuid: "LegWheel",
+    unit: "m",
     features: [
         {
             code: "Color",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "Red",

package/dist/tests/testData/testDataNoAdditionalProductNoPropagateForTest.js

@@ -4,6 +4,7 @@ export default {
         {
             code: "SIDECHAIR-SHELL-OP",
             description: "Shell Color Options",
+            numericOrder: false,
             mtrlApplications: [{ areas: ["EA-SHELL-PL"] }],
             options: [
                 {
@@ -1114,4 +1115,5 @@ export default {
         },
     },
     uuid: "436293a0-e94c-4091-a138-bc900521ff48",
+    unit: "m",
 };

package/dist/tests/testData/testDataProductAggregatedPrice.js

@@ -11,11 +11,12 @@ import { CfgProduct } from "../../CfgProduct";
 import { dummyCatId } from "./dummyProductForTest";
 const A = () => ({
     uuid: "A",
+    unit: "m",
     features: [
         {
             code: "featureA",
             description: "",
-            options: [
+            numericOrder: false, options: [
                 {
                     code: "optionA",
                     description: "",
@@ -68,6 +69,7 @@ const A = () => ({
 });
 const B = () => ({
     uuid: "B",
+    unit: "m",
     features: [],
     productData: {
         sku: "B",
@@ -85,6 +87,7 @@ const B = () => ({
 });
 const C = () => ({
     uuid: "C",
+    unit: "m",
     features: [],
     productData: {
         sku: "C",
@@ -101,6 +104,7 @@ const C = () => ({
 });
 const D = () => ({
     uuid: "D",
+    unit: "m",
     features: [],
     productData: {
         sku: "D",
@@ -117,6 +121,7 @@ const D = () => ({
 });
 const E = () => ({
     uuid: "E",
+    unit: "m",
     features: [],
     productData: {
         sku: "E",

package/dist/tests/testData/testDataUpcharge.js

@@ -12,10 +12,12 @@ import { Collector } from "./collectorForTest.js";
 import { dummyCatId } from "./dummyProductForTest.js";
 const Prd = () => ({
     uuid: "Prd",
+    unit: "m",
     features: [
         {
             code: "NoUpcharge",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "A",
@@ -36,6 +38,7 @@ const Prd = () => ({
         {
             code: "WithUpcharge",
             description: "",
+            numericOrder: false,
             options: [
                 {
                     code: "A",
@@ -56,6 +59,7 @@ const Prd = () => ({
         {
             code: "WithUpchargeSelectMany",
             description: "",
+            numericOrder: false,
             optional: true,
             options: [
                 {

package/dist/utilitiesCatalogueData.d.ts

@@ -1,4 +1,4 @@
-import { CatalogueParams, Model, Prices, ProductData, ProductResponse, SelectedOption, ValidateResponse } from "./CatalogueAPI";
+import { CatalogueParams, GetProductParams, Model, Prices, ProductData, ProductResponse, SelectedOption, ValidateResponse } from "./CatalogueAPI";
 export declare const makeCatalogueKey: (cat: CatalogueParams) => string;
 export declare const makeProductKey: (cat: CatalogueParams, pKey: string) => string;
 export declare const makeSelOptionsKey: (options: SelectedOption[]) => string;
@@ -9,11 +9,15 @@ export declare type CfgProductData = Omit<ProductData, "models"> & {
 export declare type CfgProductResponse = Omit<ProductResponse, "productData"> & {
     productData: CfgProductData;
 };
+/** This must be kept in sync with ValidateResponse. */
 export declare type CfgValidateResponse = Omit<ValidateResponse, "productData"> & {
     productData: CfgProductData;
 };
 export declare function isModel(arg: any): 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;
 //# sourceMappingURL=utilitiesCatalogueData.d.ts.map

package/dist/utilitiesCatalogueData.js

@@ -17,7 +17,7 @@ export const makeSelOptionsKey = (options) => options.reduce((p, option) => {
 export function isModel(arg) {
     return arg.cid !== undefined && arg.uri !== undefined;
 }
-/// Replace empty strings with "-" for compatibility with the API
+/** Replace empty strings with "-" for compatibility with the API. */
 export function correctDefaultsOnCatalogueParams(catId) {
     // Enterprise, prdCat and vendor have to be set, so we don't try and fix those
     return {
@@ -54,3 +54,11 @@ 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;
+};

package/dist/utilitiesNumericValues.d.ts

@@ -0,0 +1,25 @@
+import { CodeRange } from "./CatalogueAPI";
+export declare class NumericValuesSelection {
+    constructor(rawRanges: CodeRange[]);
+    readonly ranges: (NumericValueRangeDefinition | NumericValueDiscrete)[];
+    includesValue(value: number): boolean;
+    get first(): number;
+    get legend(): string;
+}
+export declare class NumericValueDiscrete {
+    readonly value: number;
+    constructor(value: number);
+    includesValue(value: number): boolean;
+    get first(): number;
+    get legend(): string;
+}
+export declare class NumericValueRangeDefinition {
+    constructor(rawRange: CodeRange);
+    readonly minValue: number;
+    readonly maxValue: number;
+    readonly increment: number | undefined;
+    includesValue(value: number): boolean;
+    get first(): number;
+    get legend(): string;
+}
+//# sourceMappingURL=utilitiesNumericValues.d.ts.map

package/dist/utilitiesNumericValues.js

@@ -0,0 +1,109 @@
+/** Rounds the supplied value to 3 decimal points. */
+function round(v) {
+    return Math.round(v * 1000) / 1000;
+}
+export class NumericValuesSelection {
+    constructor(rawRanges) {
+        if (rawRanges.length === 0) {
+            throw new Error("A numeric values selection must have at least one value");
+        }
+        this.ranges = rawRanges.map((rawRange) => {
+            const { minValue, maxValue } = rawRange;
+            if (minValue === maxValue) {
+                return new NumericValueDiscrete(minValue);
+            }
+            else {
+                return new NumericValueRangeDefinition(rawRange);
+            }
+        });
+    }
+    includesValue(value) {
+        return this.ranges.some((range) => range.includesValue(value));
+    }
+    get first() {
+        return this.ranges[0].first;
+    }
+    get legend() {
+        return this.ranges
+            .sort((l, r) => l.first - r.first)
+            .map((range) => range.legend)
+            .join(", ");
+    }
+}
+export class NumericValueDiscrete {
+    constructor(value) {
+        this.value = value;
+    }
+    includesValue(value) {
+        return value === this.value;
+    }
+    get first() {
+        return this.value;
+    }
+    get legend() {
+        return `${round(this.value)}`;
+    }
+}
+export class NumericValueRangeDefinition {
+    constructor(rawRange) {
+        const { minValue, maxValue, increment } = rawRange;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.increment = increment === 0 ? undefined : increment;
+    }
+    includesValue(value) {
+        const { minValue: start, maxValue: end, increment: step } = this;
+        if (value < start || end < value) {
+            return false;
+        }
+        // TODO: This comparison will often fail due to the fact that all the values used are
+        // base-2 (binary) floating point numbers based on base-10 (decimal) input strings.
+        //
+        // Such calculations are often not 100% accurate as is visible in JS by simply
+        // computing "0.1 + 0.2" which should equal about "0.30000000000000004" != "0.3".
+        //
+        // The easiest workaround is to define an static accuracy, say "6 decimals" and round
+        // everything when comparing. One could also use a scaled version of Number.EPSILON to
+        // dynamically match the precision to the precision of the input numbers.
+        //
+        // Both workarounds share the same problem however; an infinite number of numbers will be
+        // included in the range since an "infinite" number of values will map to the same rounded
+        // actual number.
+        //
+        // The proper fix is probably to use a fixed point mathematics, where we either define a
+        // maximum of say 6 decimals or the number of decimals vary on the number of decimals given
+        // in the JSON for each value.
+        //
+        // This should work given that the input in CatCreator is decimal (human created string) and
+        // both XML and JSON uses string based decimal numbers. One question mark remains however,
+        // and that is how the numbers are stored in CatCreator if you use a db3-file. If it is a
+        // string there as well, everything is dandy. Otherwise we might get problems with rounding
+        // or infinite decimals during the conversions to/from the db3-file.
+        return step === undefined || (value - start) % step === 0;
+    }
+    get first() {
+        return this.minValue;
+    }
+    get legend() {
+        const { minValue, maxValue, increment } = this;
+        if (increment === undefined) {
+            return `[${round(minValue)} ... ${round(maxValue)}]`;
+        }
+        const steps = 1 + Math.floor((maxValue - minValue) / increment);
+        let legend = `[${round(minValue)}`;
+        if (increment !== undefined && 3 <= steps) {
+            legend += `, ${round(minValue + increment)}`;
+        }
+        if (5 <= steps) {
+            legend += " ... ";
+        }
+        else {
+            legend += ", ";
+        }
+        if (4 <= steps) {
+            legend += `${round(minValue + increment * (steps - 2))}, `;
+        }
+        legend += `${round(minValue + increment * (steps - 1))}]`;
+        return legend;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "1.3.0-alpha.1",
+	"version": "1.3.0-alpha.5",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "^1.3.0-alpha.1"
+		"@configura/web-utilities": "^1.3.0-alpha.5"
 	},
-	"gitHead": "b0ef255a9f27f06a00378e09b24a40a840ba4722"
+	"gitHead": "7f22abef2c1047db092c871d9e9eceecbce5831e"
 }