drapcode-utility 2.6.1 → 2.6.3
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.
- package/build/utils/rest-client.js +8 -0
- package/build/utils/util.js +42 -9
- package/package.json +1 -1
|
@@ -163,6 +163,14 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
|
|
|
163
163
|
return prepareReturnObject(errorMessage);
|
|
164
164
|
}
|
|
165
165
|
drapcode_logger_1.logger.info(`result.status: ${result?.status}`, { label: projectId });
|
|
166
|
+
if (!result?.data) {
|
|
167
|
+
// In some cases when axios throws error with status 4xx the actual error message is in response.data
|
|
168
|
+
const errResponse = result?.response;
|
|
169
|
+
const errData = errResponse?.data;
|
|
170
|
+
if (errData && Object.keys(errData).length > 0) {
|
|
171
|
+
result.data = errData;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
166
174
|
deleteLocalFiles(isMultipart, toDeleteFiles);
|
|
167
175
|
return prepareReturnObject(result.data, result.status, true, result?.headers);
|
|
168
176
|
}
|
package/build/utils/util.js
CHANGED
|
@@ -1,4 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
@@ -12,7 +45,7 @@ const format_fields_1 = require("../format-fields");
|
|
|
12
45
|
const uuid_1 = require("uuid");
|
|
13
46
|
const voca_1 = __importDefault(require("voca"));
|
|
14
47
|
const numeral_1 = __importDefault(require("numeral"));
|
|
15
|
-
const
|
|
48
|
+
const math = __importStar(require("mathjs"));
|
|
16
49
|
const moment_1 = __importDefault(require("moment"));
|
|
17
50
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
18
51
|
const uuid_2 = require("uuid");
|
|
@@ -935,7 +968,7 @@ const addition = function (formatType, { numbers }) {
|
|
|
935
968
|
}
|
|
936
969
|
numbers = numbers.map((number) => (isNaN(number) ? 0 : number));
|
|
937
970
|
const allNumbers = (0, exports.validateNumbers)(numbers);
|
|
938
|
-
return (0, numeral_1.default)(
|
|
971
|
+
return (0, numeral_1.default)(math.sum(allNumbers)).format(formatType ? formatType : "00.00");
|
|
939
972
|
}
|
|
940
973
|
catch (err) {
|
|
941
974
|
console.log("🚀 ~ file: util.js:89 ~ addition ~ error:", err);
|
|
@@ -946,12 +979,12 @@ exports.addition = addition;
|
|
|
946
979
|
const substraction = function (formatType, { numbers1, numbers2 }) {
|
|
947
980
|
try {
|
|
948
981
|
const actNumber1 = Array.isArray(numbers1)
|
|
949
|
-
?
|
|
982
|
+
? math.sum(...numbers1)
|
|
950
983
|
: numbers1;
|
|
951
984
|
const actNumber2 = Array.isArray(numbers2)
|
|
952
|
-
?
|
|
985
|
+
? math.sum(...numbers2)
|
|
953
986
|
: numbers2;
|
|
954
|
-
return (0, numeral_1.default)(
|
|
987
|
+
return (0, numeral_1.default)(math.subtract(actNumber1, actNumber2)).format(formatType ? formatType : "00.00");
|
|
955
988
|
}
|
|
956
989
|
catch (err) {
|
|
957
990
|
console.log("🚀 ~ file: util.js:202 ~ substraction ~ error:", err);
|
|
@@ -966,7 +999,7 @@ const average = function (formatType, { numbers }) {
|
|
|
966
999
|
}
|
|
967
1000
|
numbers = numbers.map((number) => (isNaN(number) ? 0 : number));
|
|
968
1001
|
const allNumbers = (0, exports.validateNumbers)(numbers);
|
|
969
|
-
return (0, numeral_1.default)(
|
|
1002
|
+
return (0, numeral_1.default)(math.mean(...allNumbers)).format(formatType ? formatType : "00.00");
|
|
970
1003
|
}
|
|
971
1004
|
catch (err) {
|
|
972
1005
|
console.log("🚀 ~ file: util.js:98 ~ average ~ error:", err);
|
|
@@ -981,7 +1014,7 @@ const multiply = function (formatType, { numbers }) {
|
|
|
981
1014
|
}
|
|
982
1015
|
numbers = numbers.map((number) => (isNaN(number) ? 1 : number));
|
|
983
1016
|
const allNumbers = (0, exports.validateNumbers)(numbers);
|
|
984
|
-
return (0, numeral_1.default)(
|
|
1017
|
+
return (0, numeral_1.default)(math.prod(...allNumbers)).format(formatType ? formatType : "00.00");
|
|
985
1018
|
}
|
|
986
1019
|
catch (err) {
|
|
987
1020
|
console.log("🚀 ~ file: util.js:106 ~ multiply ~ error:", err);
|
|
@@ -993,7 +1026,7 @@ const divide = function (formatType, { number1, number2 }) {
|
|
|
993
1026
|
try {
|
|
994
1027
|
const num1 = (0, exports.checkAndConvertNumber)(number1);
|
|
995
1028
|
const num2 = (0, exports.checkAndConvertNumber)(number2);
|
|
996
|
-
return (0, numeral_1.default)(
|
|
1029
|
+
return (0, numeral_1.default)(math.divide(num1, num2)).format(formatType ? formatType : "00.00");
|
|
997
1030
|
}
|
|
998
1031
|
catch (err) {
|
|
999
1032
|
console.log("🚀 ~ file: util.js:114 ~ divide ~ error:", err);
|
|
@@ -1007,7 +1040,7 @@ const evaluateExpression = function (expression, data, user, formatType, envCons
|
|
|
1007
1040
|
: " ";
|
|
1008
1041
|
const replacedExpression = (0, exports.replaceDataValueIntoExpression)(expression, data, user, {}, {}, {}, {}, envConstants, {}, {}, {});
|
|
1009
1042
|
try {
|
|
1010
|
-
return (0, numeral_1.default)(
|
|
1043
|
+
return (0, numeral_1.default)(math.evaluate(replacedExpression)).format(formatType ? formatType : "00.00");
|
|
1011
1044
|
}
|
|
1012
1045
|
catch (err) {
|
|
1013
1046
|
return "";
|