@open3cl/engine 1.0.5 → 1.0.7

package/utils.js

@@ -287,12 +287,8 @@ export function removeKeyFromJSON(jsonObj, keyToRemove, skipKeys) {
 export function useEnumAsString(jsonObj) {
   for (const key in jsonObj) {
     if (jsonObj.hasOwnProperty(key)) {
-      if (key === 'donnee_entree') {
-        for (const kde in jsonObj[key]) {
-          if (kde.startsWith('enum_')) {
-            jsonObj[key][kde] = jsonObj[key][kde].toString();
-          }
-        }
+      if (key.startsWith('enum_')) {
+        jsonObj[key] = jsonObj[key].toString();
       } else if (typeof jsonObj[key] === 'object') {
         useEnumAsString(jsonObj[key]);
       }
@@ -495,12 +491,12 @@ export function getRange(inputNumber, ranges) {
 
   ranges.sort();
 
-  if (inputNumber < ranges[0]) {
+  if (inputNumber <= ranges[0]) {
     result.push(ranges[0]);
     result.push(ranges[1]);
     return result;
   }
-  if (inputNumber > ranges[ranges.length - 1]) {
+  if (inputNumber >= ranges[ranges.length - 1]) {
     result.push(ranges[ranges.length - 2]);
     result.push(ranges[ranges.length - 1]);
   }

package/utils.spec.js

@@ -1,7 +1,8 @@
 import { convertExpression, getRange, getThicknessFromDescription } from './utils.js';
+import { describe, expect, test } from 'vitest';
 
 describe('Utils unit tests', () => {
-  it.each([
+  test.each([
     [0, null],
     [0, undefined],
     [0, ''],
@@ -13,7 +14,7 @@ describe('Utils unit tests', () => {
     expect(getThicknessFromDescription(description)).toBe(thickness);
   });
 
-  it.each([
+  test.each([
     ['70 < Pn <= 400', '(70 < Pn) && (Pn <= 400)'],
     ['70 < Pn', '70 < Pn'],
     ['Pn <= 400', 'Pn <= 400'],
@@ -25,7 +26,7 @@ describe('Utils unit tests', () => {
     expect(convertExpression(expression)).toBe(expected);
   });
 
-  it.each([
+  test.each([
     [[1, 1.2, 3.4, 5.6], 0.5, [1, 1.2]],
     [[1, 1.2, 3.4, 5.6], 1, [1, 1]],
     [[1, 1.2, 3.4, 5.6], 1.3, [1.2, 3.4]],