@hestia-earth/utils 0.10.18 → 0.10.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/date.d.ts +1 -0
  2. package/dist/date.js +9 -1
  3. package/dist/number.d.ts +29 -2
  4. package/dist/number.js +86 -2
  5. package/dist/string.js +1 -1
  6. package/package.json +3 -3
package/dist/date.d.ts CHANGED
@@ -4,3 +4,4 @@ export declare const hourMs: number;
4
4
  export declare const dayMs: number;
5
5
  export declare const diffInDays: (date1: Date | string, date2: Date | string) => number;
6
6
  export declare const diffInYears: (date1: Date | string, date2: Date | string) => number;
7
+ export declare const daysBefore: (date?: Date, days?: number) => Date;
package/dist/date.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.diffInYears = exports.diffInDays = exports.dayMs = exports.hourMs = exports.minuteMs = exports.secondMs = void 0;
3
+ exports.daysBefore = exports.diffInYears = exports.diffInDays = exports.dayMs = exports.hourMs = exports.minuteMs = exports.secondMs = void 0;
4
4
  exports.secondMs = 1000;
5
5
  exports.minuteMs = 60 * exports.secondMs;
6
6
  exports.hourMs = 60 * exports.minuteMs;
@@ -14,3 +14,11 @@ var diffInYears = function (date1, date2) {
14
14
  return Math.round((exports.diffInDays(date1, date2) / year) * 10) / 10;
15
15
  };
16
16
  exports.diffInYears = diffInYears;
17
+ var daysBefore = function (date, days) {
18
+ if (date === void 0) { date = new Date(); }
19
+ if (days === void 0) { days = 1; }
20
+ var newDate = new Date(date);
21
+ newDate.setDate(date.getDate() - days);
22
+ return newDate;
23
+ };
24
+ exports.daysBefore = daysBefore;
package/dist/number.d.ts CHANGED
@@ -5,13 +5,40 @@ export declare enum ConvertUnits {
5
5
  kg = "kg",
6
6
  L = "L",
7
7
  MJ = "MJ",
8
- kWh = "kWh"
8
+ kWh = "kWh",
9
+ kgCa = "kg Ca",
10
+ kgCaCO3 = "kg CaCO3",
11
+ kgCaO = "kg CaO",
12
+ kgCH4 = "kg CH4",
13
+ kgCH4C = "kg CH4-C",
14
+ kgCO2 = "kg CO2",
15
+ kgCO2C = "kg CO2-C",
16
+ kgK = "kg K",
17
+ kgK2O = "kg K2O",
18
+ kgMgCO3 = "kg MgCO3",
19
+ kgN2 = "kg N2",
20
+ kgN2N = "kg N2-N",
21
+ kgN2O = "kg N2O",
22
+ kgN2ON = "kg N2O-N",
23
+ kgNH3 = "kg NH3",
24
+ kgNH3N = "kg NH3-N",
25
+ kgNH4 = "kg NH4",
26
+ kgNH4N = "kg NH4-N",
27
+ kgNO2 = "kg NO2",
28
+ kgNO2N = "kg NO2-N",
29
+ kgNO3 = "kg NO3",
30
+ kgNO3N = "kg NO3-N",
31
+ kgNOx = "kg NOx",
32
+ kgNOxN = "kg NOx-N",
33
+ kgP = "kg P",
34
+ kgP2O5 = "kg P2O5",
35
+ kgPO43 = "kg PO43"
9
36
  }
10
37
  export interface IConvertArgs {
11
38
  density?: number;
12
39
  }
13
40
  export declare const converters: {
14
- [fromUnit in ConvertUnits]: {
41
+ [fromUnit in ConvertUnits]?: {
15
42
  [toUnit in ConvertUnits]?: (value: number, args: IConvertArgs) => number;
16
43
  };
17
44
  };
package/dist/number.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- var _a, _b, _c, _d, _e, _f;
2
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.convertValue = exports.converters = exports.ConvertUnits = exports.toPrecision = exports.isNumber = void 0;
5
5
  var isNumber = function (n) { return !isNaN(parseFloat("" + n)) && isFinite(parseFloat("" + n)); };
@@ -7,9 +7,17 @@ exports.isNumber = isNumber;
7
7
  var toPrecision = function (n, precision) {
8
8
  if (precision === void 0) { precision = 3; }
9
9
  var mult = Math.pow(10, precision - Math.floor(Math.log(n < 0 ? -n : n) / Math.LN10) - 1);
10
- return n === 0 ? 0 : Math.round(n * mult) / mult;
10
+ var multiplier = +("" + mult).replace(/[0]([1-9])\1+/g, function (v) { return "" + (+(v.substring(0, 1)) + 1); });
11
+ return n === 0 ? 0 : Math.round(n * multiplier) / multiplier;
11
12
  };
12
13
  exports.toPrecision = toPrecision;
14
+ var C = 12.012;
15
+ var CA = 40.078;
16
+ var H = 1.008;
17
+ var K = 39.098;
18
+ var N = 14.007;
19
+ var O = 15.999;
20
+ var P = 30.974;
13
21
  var ConvertUnits;
14
22
  (function (ConvertUnits) {
15
23
  ConvertUnits["m3"] = "m3";
@@ -17,6 +25,33 @@ var ConvertUnits;
17
25
  ConvertUnits["L"] = "L";
18
26
  ConvertUnits["MJ"] = "MJ";
19
27
  ConvertUnits["kWh"] = "kWh";
28
+ ConvertUnits["kgCa"] = "kg Ca";
29
+ ConvertUnits["kgCaCO3"] = "kg CaCO3";
30
+ ConvertUnits["kgCaO"] = "kg CaO";
31
+ ConvertUnits["kgCH4"] = "kg CH4";
32
+ ConvertUnits["kgCH4C"] = "kg CH4-C";
33
+ ConvertUnits["kgCO2"] = "kg CO2";
34
+ ConvertUnits["kgCO2C"] = "kg CO2-C";
35
+ ConvertUnits["kgK"] = "kg K";
36
+ ConvertUnits["kgK2O"] = "kg K2O";
37
+ ConvertUnits["kgMgCO3"] = "kg MgCO3";
38
+ ConvertUnits["kgN2"] = "kg N2";
39
+ ConvertUnits["kgN2N"] = "kg N2-N";
40
+ ConvertUnits["kgN2O"] = "kg N2O";
41
+ ConvertUnits["kgN2ON"] = "kg N2O-N";
42
+ ConvertUnits["kgNH3"] = "kg NH3";
43
+ ConvertUnits["kgNH3N"] = "kg NH3-N";
44
+ ConvertUnits["kgNH4"] = "kg NH4";
45
+ ConvertUnits["kgNH4N"] = "kg NH4-N";
46
+ ConvertUnits["kgNO2"] = "kg NO2";
47
+ ConvertUnits["kgNO2N"] = "kg NO2-N";
48
+ ConvertUnits["kgNO3"] = "kg NO3";
49
+ ConvertUnits["kgNO3N"] = "kg NO3-N";
50
+ ConvertUnits["kgNOx"] = "kg NOx";
51
+ ConvertUnits["kgNOxN"] = "kg NOx-N";
52
+ ConvertUnits["kgP"] = "kg P";
53
+ ConvertUnits["kgP2O5"] = "kg P2O5";
54
+ ConvertUnits["kgPO43"] = "kg PO43";
20
55
  })(ConvertUnits = exports.ConvertUnits || (exports.ConvertUnits = {}));
21
56
  exports.converters = (_a = {},
22
57
  _a[ConvertUnits.m3] = (_b = {},
@@ -37,6 +72,55 @@ exports.converters = (_a = {},
37
72
  _a[ConvertUnits.MJ] = (_f = {},
38
73
  _f[ConvertUnits.kWh] = function (value) { return value / 3.6; },
39
74
  _f),
75
+ _a[ConvertUnits.kgP] = (_g = {},
76
+ _g[ConvertUnits.kgP2O5] = function (value) { return value * (P * 2) / (P * 2 + O * 5); },
77
+ _g[ConvertUnits.kgPO43] = function (value) { return value * P / ((P + O * 4) * 3); },
78
+ _g),
79
+ _a[ConvertUnits.kgPO43] = (_h = {},
80
+ _h[ConvertUnits.kgP2O5] = function (value) { return value * ((P + O * 4) * 3) / (P * 2 + O * 5); },
81
+ _h),
82
+ _a[ConvertUnits.kgK] = (_j = {},
83
+ _j[ConvertUnits.kgK2O] = function (value) { return value * (K * 2) / (K * 2 + O); },
84
+ _j),
85
+ _a[ConvertUnits.kgCa] = (_k = {},
86
+ _k[ConvertUnits.kgCaO] = function (value) { return value * CA / (CA + O); },
87
+ _k),
88
+ _a[ConvertUnits.kgCaO] = (_l = {},
89
+ _l[ConvertUnits.kgCaCO3] = function (value) { return value * (CA + O) / (CA + C + O * 3); },
90
+ _l),
91
+ _a[ConvertUnits.kgCaCO3] = (_m = {},
92
+ _m[ConvertUnits.kgCO2] = function (value) { return value * 0.12; },
93
+ _m),
94
+ _a[ConvertUnits.kgMgCO3] = (_o = {},
95
+ _o[ConvertUnits.kgCO2] = function (value) { return value * 0.13; },
96
+ _o),
97
+ _a[ConvertUnits.kgCH4] = (_p = {},
98
+ _p[ConvertUnits.kgCH4C] = function (value) { return value * (C + H * 4) / C; },
99
+ _p),
100
+ _a[ConvertUnits.kgCO2] = (_q = {},
101
+ _q[ConvertUnits.kgCO2C] = function (value) { return value * (C + O * 2) / C; },
102
+ _q),
103
+ _a[ConvertUnits.kgNOx] = (_r = {},
104
+ _r[ConvertUnits.kgNOxN] = function (value) { return value * (N + O) / N; },
105
+ _r),
106
+ _a[ConvertUnits.kgN2] = (_s = {},
107
+ _s[ConvertUnits.kgN2N] = function (value) { return value * 1; },
108
+ _s),
109
+ _a[ConvertUnits.kgN2O] = (_t = {},
110
+ _t[ConvertUnits.kgN2ON] = function (value) { return value * (N * 2 + O) / (N * 2); },
111
+ _t),
112
+ _a[ConvertUnits.kgNO2] = (_u = {},
113
+ _u[ConvertUnits.kgNO2N] = function (value) { return value * (N + O * 2) / N; },
114
+ _u),
115
+ _a[ConvertUnits.kgNO3] = (_v = {},
116
+ _v[ConvertUnits.kgNO3N] = function (value) { return value * (N + O * 3) / N; },
117
+ _v),
118
+ _a[ConvertUnits.kgNH3] = (_w = {},
119
+ _w[ConvertUnits.kgNH3N] = function (value) { return value * (N + H * 3) / N; },
120
+ _w),
121
+ _a[ConvertUnits.kgNH4] = (_x = {},
122
+ _x[ConvertUnits.kgNH4N] = function (value) { return value * (N + H * 4) / N; },
123
+ _x),
40
124
  _a);
41
125
  var convertValue = function (n, fromUnit, toUnit, args) {
42
126
  return exports.converters[fromUnit][toUnit](n, args);
package/dist/string.js CHANGED
@@ -8,7 +8,7 @@ var ellipsis = function (text, maxlength) {
8
8
  };
9
9
  exports.ellipsis = ellipsis;
10
10
  var keyToLabel = function (key) {
11
- return ("" + key[0].toUpperCase() + key.replace(/([a-z])([A-Z])/g, '$1 $2').substring(1)).replace(/[_-]/g, ' ');
11
+ 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);
12
12
  };
13
13
  exports.keyToLabel = keyToLabel;
14
14
  var toDashCase = function (value) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hestia-earth/utils",
3
- "version": "0.10.18",
3
+ "version": "0.10.21",
4
4
  "description": "Hestia Utils library",
5
5
  "main": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
@@ -32,7 +32,7 @@
32
32
  },
33
33
  "homepage": "https://gitlab.com/hestia-earth/hestia-utils#readme",
34
34
  "devDependencies": {
35
- "@hestia-earth/glossary": "^0.2.5",
35
+ "@hestia-earth/glossary": "^0.3.0",
36
36
  "@types/chai": "^4.2.21",
37
37
  "@types/mocha": "^7.0.2",
38
38
  "@types/node": "^14.17.6",
@@ -50,6 +50,6 @@
50
50
  "typescript": "^4.3.5"
51
51
  },
52
52
  "peerDependencies": {
53
- "@hestia-earth/glossary": "^0.2.5"
53
+ "@hestia-earth/glossary": "^0.3.0"
54
54
  }
55
55
  }