@hestia-earth/utils - npm Package Compare versions

Comparing version 0.11.6 to 0.11.7

dist/array.js

@@ -31,4 +31,5 @@ "use strict";
 var unique = function (values) {
-    return values.some(function (v) { return typeof v === 'object'; }) ?
-        __spreadArray([], __read(new Set(values.map(function (v) { return JSON.stringify(v); })))).map(function (v) { return JSON.parse(v); }) : __spreadArray([], __read(new Set(values)));
+    return values.some(function (v) { return typeof v === 'object'; })
+        ? __spreadArray([], __read(new Set(values.map(function (v) { return JSON.stringify(v); })))).map(function (v) { return JSON.parse(v); })
+        : __spreadArray([], __read(new Set(values)));
 };
@@ -35,0 +36,0 @@ exports.unique = unique;

dist/form.js

@@ -16,6 +16,8 @@ "use strict";
 var utils_1 = require("./utils");
-var filterParams = function (obj) { return Object.keys(obj).reduce(function (prev, key) {
-    var _a;
-    return (__assign(__assign({}, prev), (utils_1.isUndefined(obj[key]) || obj[key] === '' ? {} : (_a = {}, _a[key] = "" + obj[key], _a))));
-}, {}); };
+var filterParams = function (obj) {
+    return Object.keys(obj).reduce(function (prev, key) {
+        var _a;
+        return (__assign(__assign({}, prev), (utils_1.isUndefined(obj[key]) || obj[key] === '' ? {} : (_a = {}, _a[key] = "" + obj[key], _a))));
+    }, {});
+};
 exports.filterParams = filterParams;

dist/number.js

@@ -29,7 +29,3 @@ "use strict";
     var _a;
-    return [
-        (_a = /^(-)?[\d\.]+((e|e-)[\d]+)?$/.exec("" + n)) === null || _a === void 0 ? void 0 : _a.length,
-        !isNaN(parseFloat("" + n)),
-        isFinite(parseFloat("" + n))
-    ].every(Boolean);
+    return [(_a = /^(-)?[\d\.]+((e|e-)[\d]+)?$/.exec("" + n)) === null || _a === void 0 ? void 0 : _a.length, !isNaN(parseFloat("" + n)), isFinite(parseFloat("" + n))].every(Boolean);
 };
@@ -49,3 +45,3 @@ exports.isNumber = isNumber;
     // handle floating errors like 0.00009999999999999999
-    +("" + mult).replace(/[0]([1-9])\1+/g, function (v) { return "" + (+(v.substring(0, 1)) + 1); }), 
+    +("" + mult).replace(/[0]([1-9])\1+/g, function (v) { return "" + (+v.substring(0, 1) + 1); }), 
     // dividing by 0.00001 will give floating point error
@@ -118,6 +114,6 @@ 0.0001);
         _c[ConvertUnits.m3] = function (value, args) { return value / args.density; },
-        _c[ConvertUnits.L] = function (value, args) { return value / args.density * 1000; },
+        _c[ConvertUnits.L] = function (value, args) { return (value / args.density) * 1000; },
         _c),
     _a[ConvertUnits.L] = (_d = {},
-        _d[ConvertUnits.kg] = function (value, args) { return value * args.density / 1000; },
+        _d[ConvertUnits.kg] = function (value, args) { return (value * args.density) / 1000; },
         _d[ConvertUnits.m3] = function (value) { return value / 1000; },
@@ -132,16 +128,16 @@ _d),
     _a[ConvertUnits.kgP] = (_g = {},
-        _g[ConvertUnits.kgP2O5] = function (value) { return value * (P * 2) / (P * 2 + O * 5); },
-        _g[ConvertUnits.kgPO43] = function (value) { return value * P / ((P + O * 4) * 3); },
+        _g[ConvertUnits.kgP2O5] = function (value) { return (value * (P * 2)) / (P * 2 + O * 5); },
+        _g[ConvertUnits.kgPO43] = function (value) { return (value * P) / ((P + O * 4) * 3); },
         _g),
     _a[ConvertUnits.kgPO43] = (_h = {},
-        _h[ConvertUnits.kgP2O5] = function (value) { return value * ((P + O * 4) * 3) / (P * 2 + O * 5); },
+        _h[ConvertUnits.kgP2O5] = function (value) { return (value * ((P + O * 4) * 3)) / (P * 2 + O * 5); },
         _h),
     _a[ConvertUnits.kgK] = (_j = {},
-        _j[ConvertUnits.kgK2O] = function (value) { return value * (K * 2) / (K * 2 + O); },
+        _j[ConvertUnits.kgK2O] = function (value) { return (value * (K * 2)) / (K * 2 + O); },
         _j),
     _a[ConvertUnits.kgCa] = (_k = {},
-        _k[ConvertUnits.kgCaO] = function (value) { return value * CA / (CA + O); },
+        _k[ConvertUnits.kgCaO] = function (value) { return (value * CA) / (CA + O); },
         _k),
     _a[ConvertUnits.kgCaO] = (_l = {},
-        _l[ConvertUnits.kgCaCO3] = function (value) { return value * (CA + O) / (CA + C + O * 3); },
+        _l[ConvertUnits.kgCaCO3] = function (value) { return (value * (CA + O)) / (CA + C + O * 3); },
         _l),
@@ -161,9 +157,9 @@ _a[ConvertUnits.kgCaMg_CO3_2] = (_m = {},
     _a[ConvertUnits.kgCH4] = (_r = {},
-        _r[ConvertUnits.kgCH4C] = function (value) { return value * (C + H * 4) / C; },
+        _r[ConvertUnits.kgCH4C] = function (value) { return (value * (C + H * 4)) / C; },
         _r),
     _a[ConvertUnits.kgCO2] = (_s = {},
-        _s[ConvertUnits.kgCO2C] = function (value) { return value * (C + O * 2) / C; },
+        _s[ConvertUnits.kgCO2C] = function (value) { return (value * (C + O * 2)) / C; },
         _s),
     _a[ConvertUnits.kgNOx] = (_t = {},
-        _t[ConvertUnits.kgNOxN] = function (value) { return value * (N + O) / N; },
+        _t[ConvertUnits.kgNOxN] = function (value) { return (value * (N + O)) / N; },
         _t),
@@ -174,15 +170,15 @@ _a[ConvertUnits.kgN2] = (_u = {},
     _a[ConvertUnits.kgN2O] = (_v = {},
-        _v[ConvertUnits.kgN2ON] = function (value) { return value * (N * 2 + O) / (N * 2); },
+        _v[ConvertUnits.kgN2ON] = function (value) { return (value * (N * 2 + O)) / (N * 2); },
         _v),
     _a[ConvertUnits.kgNO2] = (_w = {},
-        _w[ConvertUnits.kgNO2N] = function (value) { return value * (N + O * 2) / N; },
+        _w[ConvertUnits.kgNO2N] = function (value) { return (value * (N + O * 2)) / N; },
         _w),
     _a[ConvertUnits.kgNO3] = (_x = {},
-        _x[ConvertUnits.kgNO3N] = function (value) { return value * (N + O * 3) / N; },
+        _x[ConvertUnits.kgNO3N] = function (value) { return (value * (N + O * 3)) / N; },
         _x),
     _a[ConvertUnits.kgNH3] = (_y = {},
-        _y[ConvertUnits.kgNH3N] = function (value) { return value * (N + H * 3) / N; },
+        _y[ConvertUnits.kgNH3N] = function (value) { return (value * (N + H * 3)) / N; },
         _y),
     _a[ConvertUnits.kgNH4] = (_z = {},
-        _z[ConvertUnits.kgNH4N] = function (value) { return value * (N + H * 4) / N; },
+        _z[ConvertUnits.kgNH4N] = function (value) { return (value * (N + H * 4)) / N; },
         _z),
@@ -189,0 +185,0 @@ _a);

dist/string.js

@@ -18,3 +18,6 @@ "use strict";
 var keyToLabel = function (key) {
-    return "" + key[0].toUpperCase() + key.replace(/([a-z])([A-Z])/g, '$1 $2').replace(/([_])([a-zA-Z])/g, function (g) { return " " + g[1].toUpperCase(); }).substring(1);
+    return "" + key[0].toUpperCase() + key
+        .replace(/([a-z])([A-Z])/g, '$1 $2')
+        .replace(/([_])([a-zA-Z])/g, function (g) { return " " + g[1].toUpperCase(); })
+        .substring(1);
 };
@@ -21,0 +24,0 @@ exports.keyToLabel = keyToLabel;

dist/term.d.ts

@@ -9,3 +9,3 @@ export declare const arrayValue: (values?: any[], isAverage?: boolean) => number;
  */
-export declare const propertyValue: (value: string | number | ((string | number)[]), termId?: string) => number;
+export declare const propertyValue: (value: string | number | (string | number)[], termId?: string) => number;
 /**
@@ -12,0 +12,0 @@ * Checks if the value is empty or if the property value is empty.

dist/term.js

@@ -11,3 +11,6 @@ "use strict";
         ? 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);
+        : 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);
 };
@@ -14,0 +17,0 @@ exports.arrayValue = arrayValue;

dist/utils.js

@@ -35,7 +35,7 @@ "use strict";
         typeof value === 'undefined' ||
-        (typeof value === 'object' ?
-            (Array.isArray(value) ?
-                !value.length :
-                Object.keys(value).filter(function (key) { return key !== 'type'; }).length < minKeys) :
-            value === '');
+        (typeof value === 'object'
+            ? Array.isArray(value)
+                ? !value.length
+                : Object.keys(value).filter(function (key) { return key !== 'type'; }).length < minKeys
+            : value === '');
 };
@@ -49,3 +49,4 @@ exports.isEmpty = isEmpty;
     return (value === null && !allowNull) ||
-        typeof value === 'undefined' || (typeof value === 'object' && value !== null && !(value instanceof Date) && !Object.keys(value).length);
+        typeof value === 'undefined' ||
+        (typeof value === 'object' && value !== null && !(value instanceof Date) && !Object.keys(value).length);
 };
@@ -52,0 +53,0 @@ exports.isUndefined = isUndefined;

dist/validate-terms.js

@@ -74,16 +74,18 @@ "use strict";
 }());
-var search = function (body) { return new Promise(function (resolve, reject) {
-    var req = https_1.request(API_URL + "/search", {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' }
-    }, function (res) {
-        res.setEncoding(encoding);
-        var data = [];
-        res.on('data', function (chunk) { return data.push(chunk); });
-        res.on('end', function () { return resolve(JSON.parse(data.join(''))); });
-        res.on('error', reject);
+var search = function (body) {
+    return new Promise(function (resolve, reject) {
+        var req = https_1.request(API_URL + "/search", {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' }
+        }, function (res) {
+            res.setEncoding(encoding);
+            var data = [];
+            res.on('data', function (chunk) { return data.push(chunk); });
+            res.on('end', function () { return resolve(JSON.parse(data.join(''))); });
+            res.on('error', reject);
+        });
+        req.write(JSON.stringify(body));
+        req.end();
     });
-    req.write(JSON.stringify(body));
-    req.end();
-}); };
+};
 var recursiveFiles = function (directory) { return __awaiter(void 0, void 0, void 0, function () {
@@ -108,3 +110,5 @@ var _a, _b;
                                 case 3:
-                                    _a = (path_1.join(directory, entry).endsWith("." + (extension || 'jsonld')) ? [path_1.join(directory, entry)] : []);
+                                    _a = path_1.join(directory, entry).endsWith("." + (extension || 'jsonld'))
+                                        ? [path_1.join(directory, entry)]
+                                        : [];
                                     _b.label = 4;
@@ -125,5 +129,5 @@ case 4: return [2 /*return*/, _a];
         var isArray = Array.isArray(value);
-        return isArray ? value.flatMap(getAllTerms) : (value['@type'] === 'Term' ? value : getAllTerms(value));
+        return isArray ? value.flatMap(getAllTerms) : value['@type'] === 'Term' ? value : getAllTerms(value);
     })
-        .filter(function (term) { return (!!term) && (term['@type'] === 'Term') && (!!term['@id'] || !!term.name); });
+        .filter(function (term) { return !!term && term['@type'] === 'Term' && (!!term['@id'] || !!term.name); });
 };
@@ -144,9 +148,12 @@ // search is limited to 1000 parameters
                             bool: {
-                                must: [{
+                                must: [
+                                    {
                                         match: { '@type': 'Term' }
-                                    }],
-                                should: searchedTerms
-                                    .map(function (_a) {
+                                    }
+                                ],
+                                should: searchedTerms.map(function (_a) {
                                     var id = _a["@id"], name = _a.name;
-                                    return ({ match: id ? { '@id.keyword': id } : { 'name.keyword': name } });
+                                    return ({
+                                        match: id ? { '@id.keyword': id } : { 'name.keyword': name }
+                                    });
                                 }),
@@ -191,7 +198,9 @@ minimum_should_match: 1
                 results = _a.sent();
-                return [2 /*return*/, terms.map(function (_a) {
+                return [2 /*return*/, terms
+                        .map(function (_a) {
                         var id = _a["@id"], name = _a.name;
                         var exists = results.find(function (res) { return res['@id'] === id || res.name === name; });
                         return exists ? true : id || name;
-                    }).filter(function (val) { return val !== true; })];
+                    })
+                        .filter(function (val) { return val !== true; })];
         }
@@ -201,14 +210,16 @@ });
 exports.validateTerms = validateTerms;
-var validateFile = function (existingTerms) { return function (_a) {
-    var filepath = _a.filepath, terms = _a.terms;
-    return ({
-        filepath: filepath,
-        missing: terms.map(function (_a) {
-            var id = _a["@id"], name = _a.name;
-            return existingTerms.find(function (res) { return res['@id'] === id || res.name === name; })
-                ? true
-                : id || name;
-        }).filter(function (val) { return val !== true; })
-    });
-}; };
+var validateFile = function (existingTerms) {
+    return function (_a) {
+        var filepath = _a.filepath, terms = _a.terms;
+        return ({
+            filepath: filepath,
+            missing: terms
+                .map(function (_a) {
+                var id = _a["@id"], name = _a.name;
+                return existingTerms.find(function (res) { return res['@id'] === id || res.name === name; }) ? true : id || name;
+            })
+                .filter(function (val) { return val !== true; })
+        });
+    };
+};
 var loadFile = function (filepath) { return __awaiter(void 0, void 0, void 0, function () {
@@ -215,0 +226,0 @@ var _a, _b, _c;

package.json

 {
   "name": "@hestia-earth/utils",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "Hestia Utils library",
@@ -35,7 +35,7 @@ "main": "dist/index.js",
   "devDependencies": {
-    "@hestia-earth/eslint-config": "0.0.4",
-    "@hestia-earth/glossary": "^0.9.0",
+    "@hestia-earth/eslint-config": "^0.1.0",
+    "@hestia-earth/glossary": "^0.34.0",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^14.17.6",
+    "@types/node": "^16.18.59",
     "@types/sinon": "^9.0.11",
@@ -56,3 +56,4 @@ "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@hestia-earth/glossary": ">=0.8.0"
-  }
+  },
+  "prettier": "@hestia-earth/eslint-config/prettier.json"
 }

No alert changes

Improved metrics

Total package byte prevSize

45860

increased by1.07%

Lines of code

1120

increased by1.54%

No dependency changes