@configura/web-api 2.0.0-alpha.9 → 2.1.0-alpha.0

package/dist/utilitiesNumericValues.js

@@ -44,6 +44,7 @@ export class NumericValueDiscrete {
         return `${round(this.value)}`;
     }
 }
+const ACCEPTABLE_STEP_DEVIATION = 0.0000001;
 export class NumericValueRangeDefinition {
     constructor(rawRange) {
         const { minValue, maxValue, increment } = rawRange;
@@ -56,19 +57,19 @@ export class NumericValueRangeDefinition {
         if (value < start || end < value) {
             return false;
         }
-        // TODO: This comparison will often fail due to the fact that all the values used are
+        // This comparison would 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.
+        // We have used the easiest workaround, to simply be a bit fuzzy with the checks and
+        // allow values that are very, very close to being on a step.
         //
-        // 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.
+        // This workaround comes with two major compromises:
+        // 1. The fuzziness needed depends on how many steps the checked values pass on the way.
+        // 2. An infinite number of numbers will be included in the range since many an "infinite"
+        //    number of values close to each step will map to it.
         //
         // 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
@@ -79,7 +80,11 @@ export class NumericValueRangeDefinition {
         // 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;
+        if (step === undefined) {
+            return true;
+        }
+        const deviation = (value - start) % step;
+        return (deviation < ACCEPTABLE_STEP_DEVIATION || step - deviation < ACCEPTABLE_STEP_DEVIATION);
     }
     get first() {
         return this.minValue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/web-api",
-	"version": "2.0.0-alpha.9",
+	"version": "2.1.0-alpha.0",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@configura/web-utilities": "2.0.0-alpha.9"
+		"@configura/web-utilities": "2.1.0-alpha.0"
 	},
-	"gitHead": "734f4e65f7d3dc9836c5c0321dbe6c36bbfa2531"
+	"gitHead": "883ad6e31a55f05124dd0a6b2047c36ef6e6cea1"
 }

package/dist/ConfigurationConverter.d.ts

@@ -1,5 +0,0 @@
-import { DtoAdditionalProductConfiguration, DtoAdditionalProductConfigurationV2, DtoFeatureConfiguration, DtoProductConfiguration, DtoSelectedOption } from "./CatalogueAPI.js";
-export declare const isDtoConfProdAdditional: (value: DtoProductConfiguration) => value is DtoAdditionalProductConfigurationV2;
-export declare const convertDtoConfProdToV1: (conf: DtoProductConfiguration, silenceWarnings?: boolean) => DtoAdditionalProductConfiguration;
-export declare const convertDtoConfFeaturesToSelOptions: (features: DtoFeatureConfiguration[], silenceWarnings?: boolean) => DtoSelectedOption[];
-//# sourceMappingURL=ConfigurationConverter.d.ts.map

package/dist/ConfigurationConverter.js

@@ -1,72 +0,0 @@
-export const isDtoConfProdAdditional = (value) => "refKey" in value;
-// As this has potential to flood the terminal we only inform once
-let hasInformedAboutProdParams = false;
-let hasInformedAboutGroupCode = false;
-let hasInformedAboutUnit = false;
-export const convertDtoConfProdToV1 = (conf, silenceWarnings = false) => {
-    var _a, _b;
-    if (!silenceWarnings && conf.prodParams !== undefined && !hasInformedAboutProdParams) {
-        hasInformedAboutProdParams = true;
-        console.info("Incoming DtoProductConfiguration contains prodParams. These will be ignored.");
-    }
-    const result = {
-        selOptions: ((_a = conf.features) !== null && _a !== void 0 ? _a : []).map((f) => ({
-            code: "!~!",
-            next: convertDtoConfFeatureToApiSelection(f, silenceWarnings),
-        })),
-        additionalProducts: ((_b = conf.additionalProducts) !== null && _b !== void 0 ? _b : []).map((p) => convertDtoConfProdToV1(p, silenceWarnings)),
-        selected: true,
-    };
-    if (isDtoConfProdAdditional(conf)) {
-        result.refKey = conf.refKey;
-        result.selected = conf.selected;
-    }
-    return result;
-};
-export const convertDtoConfFeaturesToSelOptions = (features, silenceWarnings = false) => (features !== null && features !== void 0 ? features : []).map((f) => ({
-    code: "!~!",
-    next: convertDtoConfFeatureToApiSelection(f, silenceWarnings),
-}));
-const convertDtoConfFeatureToApiSelection = (feature, silenceWarnings) => {
-    const { groupCode, options, unit } = feature;
-    if (!silenceWarnings && groupCode !== undefined && !hasInformedAboutGroupCode) {
-        hasInformedAboutGroupCode = true;
-        console.info("Incoming DtoFeature contains groupCode. It will be ignored.");
-    }
-    if (!silenceWarnings && unit !== undefined && !hasInformedAboutUnit) {
-        hasInformedAboutUnit = true;
-        console.info("Incoming DtoFeature contains a unit. It will be ignored.");
-    }
-    const result = {};
-    for (const option of (options !== null && options !== void 0 ? options : []).filter((o) => o.selected)) {
-        result[option.code] = convertDtoConfOptionToSelectedOption(option, silenceWarnings);
-    }
-    return result;
-};
-const convertDtoConfOptionToSelectedOption = (option, silenceWarnings) => {
-    const { features, code, numericValue } = option;
-    const selectionTrees = (features !== null && features !== void 0 ? features : []).map((f) => convertDtoConfFeatureToApiSelection(f, silenceWarnings));
-    const mergedSelectionTree = {};
-    let anyItems = false;
-    for (const selectionTree of selectionTrees) {
-        if (selectionTree === undefined) {
-            continue;
-        }
-        for (const key of Object.keys(selectionTree)) {
-            if (mergedSelectionTree[key] !== undefined) {
-                console.warn(`The key (${key}) is already used in the selection tree. Option code: "${code}".`);
-                continue;
-            }
-            mergedSelectionTree[key] = selectionTree[key];
-            anyItems = true;
-        }
-    }
-    const selectedOption = {
-        code,
-        numericValue,
-    };
-    if (anyItems) {
-        selectedOption.next = mergedSelectionTree;
-    }
-    return selectedOption;
-};