Updates
This commit is contained in:
parent
04a56b5bc3
commit
4adb5af430
26
dist/package-shared/utils/numberfy.js
vendored
26
dist/package-shared/utils/numberfy.js
vendored
@ -11,18 +11,40 @@ exports.default = numberfy;
|
|||||||
* numberfy("123.456", 3) // 123.456
|
* numberfy("123.456", 3) // 123.456
|
||||||
*/
|
*/
|
||||||
function numberfy(num, decimals) {
|
function numberfy(num, decimals) {
|
||||||
|
var _a;
|
||||||
try {
|
try {
|
||||||
const numberfiedNum = Number(num);
|
const numberString = String(num)
|
||||||
|
.replace(/[^0-9\.]/g, "")
|
||||||
|
.replace(/\.$/, "");
|
||||||
|
if (!numberString.match(/./))
|
||||||
|
return 0;
|
||||||
|
const existingDecimals = numberString.match(/\./)
|
||||||
|
? (_a = numberString.split(".").pop()) === null || _a === void 0 ? void 0 : _a.length
|
||||||
|
: undefined;
|
||||||
|
const numberfiedNum = Number(numberString);
|
||||||
if (typeof numberfiedNum !== "number")
|
if (typeof numberfiedNum !== "number")
|
||||||
return 0;
|
return 0;
|
||||||
if (isNaN(numberfiedNum))
|
if (isNaN(numberfiedNum))
|
||||||
return 0;
|
return 0;
|
||||||
if (decimals)
|
if (decimals)
|
||||||
return Number(numberfiedNum.toFixed(decimals));
|
return Number(numberfiedNum.toFixed(decimals));
|
||||||
|
if (existingDecimals)
|
||||||
|
return Number(numberfiedNum.toFixed(existingDecimals));
|
||||||
return Math.round(numberfiedNum);
|
return Math.round(numberfiedNum);
|
||||||
}
|
}
|
||||||
catch ( /** @type {any} */error) {
|
catch (error) {
|
||||||
console.log(`Numberfy ERROR: ${error.message}`);
|
console.log(`Numberfy ERROR: ${error.message}`);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// OLD FUNCTION
|
||||||
|
// try {
|
||||||
|
// const numberfiedNum = Number(num);
|
||||||
|
// if (typeof numberfiedNum !== "number") return 0;
|
||||||
|
// if (isNaN(numberfiedNum)) return 0;
|
||||||
|
// if (decimals) return Number(numberfiedNum.toFixed(decimals));
|
||||||
|
// return Math.round(numberfiedNum);
|
||||||
|
// } catch (/** @type {any} */ error: any) {
|
||||||
|
// console.log(`Numberfy ERROR: ${error.message}`);
|
||||||
|
// return 0;
|
||||||
|
// }
|
||||||
|
@ -9,13 +9,40 @@
|
|||||||
*/
|
*/
|
||||||
export default function numberfy(num: any, decimals?: number): number {
|
export default function numberfy(num: any, decimals?: number): number {
|
||||||
try {
|
try {
|
||||||
const numberfiedNum = Number(num);
|
const numberString = String(num)
|
||||||
|
.replace(/[^0-9\.]/g, "")
|
||||||
|
.replace(/\.$/, "");
|
||||||
|
|
||||||
|
if (!numberString.match(/./)) return 0;
|
||||||
|
|
||||||
|
const existingDecimals = numberString.match(/\./)
|
||||||
|
? numberString.split(".").pop()?.length
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
const numberfiedNum = Number(numberString);
|
||||||
|
|
||||||
if (typeof numberfiedNum !== "number") return 0;
|
if (typeof numberfiedNum !== "number") return 0;
|
||||||
if (isNaN(numberfiedNum)) return 0;
|
if (isNaN(numberfiedNum)) return 0;
|
||||||
|
|
||||||
if (decimals) return Number(numberfiedNum.toFixed(decimals));
|
if (decimals) return Number(numberfiedNum.toFixed(decimals));
|
||||||
|
if (existingDecimals)
|
||||||
|
return Number(numberfiedNum.toFixed(existingDecimals));
|
||||||
return Math.round(numberfiedNum);
|
return Math.round(numberfiedNum);
|
||||||
} catch (/** @type {any} */ error: any) {
|
} catch (error: any) {
|
||||||
console.log(`Numberfy ERROR: ${error.message}`);
|
console.log(`Numberfy ERROR: ${error.message}`);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OLD FUNCTION
|
||||||
|
|
||||||
|
// try {
|
||||||
|
// const numberfiedNum = Number(num);
|
||||||
|
// if (typeof numberfiedNum !== "number") return 0;
|
||||||
|
// if (isNaN(numberfiedNum)) return 0;
|
||||||
|
// if (decimals) return Number(numberfiedNum.toFixed(decimals));
|
||||||
|
// return Math.round(numberfiedNum);
|
||||||
|
// } catch (/** @type {any} */ error: any) {
|
||||||
|
// console.log(`Numberfy ERROR: ${error.message}`);
|
||||||
|
// return 0;
|
||||||
|
// }
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/datasquirel",
|
"name": "@moduletrace/datasquirel",
|
||||||
"version": "4.6.0",
|
"version": "4.6.1",
|
||||||
"description": "Cloud-based SQL data management tool",
|
"description": "Cloud-based SQL data management tool",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
Loading…
Reference in New Issue
Block a user