@hestia-earth/utils 0.12.3 → 0.12.5

package/dist/boolean.d.ts

@@ -1 +1 @@
-export declare const isBoolean: (value: string) => boolean;
+export declare const isBoolean: (value: string | boolean) => boolean;

package/dist/boolean.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBoolean = void 0;
-var isBoolean = function (value) { return value.toLowerCase() === 'true' || value.toLowerCase() === 'false'; };
+var isBoolean = function (value) {
+    return typeof value === 'boolean' || value.toLowerCase() === 'true' || value.toLowerCase() === 'false';
+};
 exports.isBoolean = isBoolean;

package/dist/term.d.ts

@@ -1,16 +1,16 @@
-export declare const arrayValue: (values?: any[], isAverage?: boolean) => number;
+export declare type propertyValueType = string | number | boolean | null;
+export declare const arrayValue: (values?: propertyValueType[], isAverage?: boolean) => string | number | boolean;
 /**
  * Calculate the final value of a property.
  *
- * @param value The value as an array or a string/number.
+ * @param value The value as an array or a string/number/boolean.
  * @param termId Optional - us if the term should handle an array in a specific way.
- * @returns The value as a number.
  */
-export declare const propertyValue: (value: string | number | (string | number)[], termId?: string) => number;
+export declare const propertyValue: (value: propertyValueType | propertyValueType[], termId?: string) => propertyValueType;
 /**
  * Checks if the value is empty or if the property value is empty.
  *
  * @param value
  * @returns
  */
-export declare const emptyValue: (value: any, termId?: string) => boolean;
+export declare const emptyValue: (value: propertyValueType, termId?: string) => boolean;

package/dist/term.js

@@ -3,30 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyValue = exports.propertyValue = exports.arrayValue = void 0;
 var glossary_1 = require("@hestia-earth/glossary");
 var utils_1 = require("./utils");
+var number_1 = require("./number");
+var boolean_1 = require("./boolean");
 var arrayValue = function (values, isAverage) {
     if (values === void 0) { values = []; }
     if (isAverage === void 0) { isAverage = false; }
-    return values.every(utils_1.isEmpty)
+    var filteredValues = values.filter(function (v) { return !utils_1.isEmpty(v); });
+    return filteredValues.length === 0
         ? null
-        : values
-            .filter(function (v) { return typeof v !== 'undefined'; })
-            .reduce(function (prev, curr) { return prev + (utils_1.isEmpty(curr) ? 0 : parseFloat("" + curr)); }, 0) /
-            (isAverage ? values.filter(function (v) { return !utils_1.isEmpty(v); }).length : 1);
+        : filteredValues.every(number_1.isNumber)
+            ? filteredValues
+                .filter(function (v) { return typeof v !== 'undefined'; })
+                .reduce(function (prev, curr) { return prev + parseFloat("" + curr); }, 0) / (isAverage ? filteredValues.length : 1)
+            : filteredValues.every(boolean_1.isBoolean)
+                ? filteredValues.every(Boolean)
+                : filteredValues.join(';');
 };
 exports.arrayValue = arrayValue;
 /**
  * Calculate the final value of a property.
  *
- * @param value The value as an array or a string/number.
+ * @param value The value as an array or a string/number/boolean.
  * @param termId Optional - us if the term should handle an array in a specific way.
- * @returns The value as a number.
  */
 var propertyValue = function (value, termId) {
-    return typeof value === 'undefined' || value === null
+    return utils_1.isUndefined(value)
         ? null
         : Array.isArray(value)
             ? exports.arrayValue(value, (termId ? glossary_1.getArrayTreatment(termId) : null) === 'mean')
-            : parseFloat("" + value);
+            : number_1.isNumber(value)
+                ? parseFloat("" + value)
+                : value;
 };
 exports.propertyValue = propertyValue;
 /**
@@ -35,5 +42,7 @@ exports.propertyValue = propertyValue;
  * @param value
  * @returns
  */
-var emptyValue = function (value, termId) { return utils_1.isEmpty(value) || isNaN(exports.propertyValue(value, termId)); };
+var emptyValue = function (value, termId) {
+    return utils_1.isEmpty(value) || isNaN(exports.propertyValue(value, termId));
+};
 exports.emptyValue = emptyValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/utils",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "description": "Hestia Utils library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,7 +33,7 @@
   "homepage": "https://gitlab.com/hestia-earth/hestia-utils#readme",
   "devDependencies": {
     "@hestia-earth/eslint-config": "^0.1.0",
-    "@hestia-earth/glossary": "^0.34.0",
+    "@hestia-earth/glossary": "^0.44.0",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^7.0.2",
     "@types/node": "^16.18.59",