@fnmain/number 1.0.0 → 1.2.0

package/dist/index.d.ts

@@ -1,10 +1,14 @@
 type Options = {
     fixed?: number;
+    trimEndZeros?: boolean;
     space?: string;
 };
-export declare function toWan(value: number, { fixed, space }?: Options): string;
-export declare function toYi(value: number, { fixed, space }?: Options): string;
-export declare function toWanYi(value: number, { fixed, space }?: Options): string;
-export declare function toAuto(value: number, { fixed, space }?: Options): string;
-export declare function toPercent(value: number, { fixed, space }?: Options): string;
+export declare function trimTrailingZeros(numberString: string): string;
+export declare function toWan(value: number, { fixed, trimEndZeros, space }?: Options): string;
+export declare function toYi(value: number, { fixed, trimEndZeros, space }?: Options): string;
+export declare function toWanYi(value: number, { fixed, trimEndZeros, space }?: Options): string;
+export declare function toAuto(value: number, { fixed, trimEndZeros, space }?: Options): string;
+export declare function toPercent(value: number, { fixed, trimEndZeros, space }?: Options): string;
+export declare function parseNumber(input: string): number | null;
 export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,IAAI,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAIR;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,GAC5D,MAAM,CAcR;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,MAAM,EACb,EAAE,KAAS,EAAE,YAAoB,EAAE,KAAU,EAAE,GAAE,OAAY,UAK9D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0CxD"}

package/dist/index.js

@@ -1,33 +1,93 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = void 0;
-function toWan(value, { fixed = 0, space = "" } = {}) {
-    return (value / 10000).toFixed(fixed) + space + "万";
+exports.parseNumber = exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = exports.trimTrailingZeros = void 0;
+function trimTrailingZeros(numberString) {
+    // Check if the string contains a decimal point
+    if (numberString.includes(".")) {
+        // Remove trailing zeros after a decimal point and the decimal point if necessary
+        return numberString.replace(/(\.\d*?[1-9])0+$|\.0*$/, "$1");
+    }
+    // Return the original string if there is no decimal point
+    return numberString;
+}
+exports.trimTrailingZeros = trimTrailingZeros;
+function toWan(value, { fixed = 2, trimEndZeros = false, space = "" } = {}) {
+    let ret = (value / 10000).toFixed(fixed);
+    ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+    return ret + space + "万";
 }
 exports.toWan = toWan;
-function toYi(value, { fixed = 0, space = "" } = {}) {
-    return (value / 100000000).toFixed(fixed) + space + "亿";
+function toYi(value, { fixed = 2, trimEndZeros = false, space = "" } = {}) {
+    let ret = (value / 100000000).toFixed(fixed);
+    ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+    return ret + space + "亿";
 }
 exports.toYi = toYi;
-function toWanYi(value, { fixed = 0, space = "" } = {}) {
-    return (value / 1000000000000).toFixed(fixed) + space + "万亿";
+function toWanYi(value, { fixed = 2, trimEndZeros = false, space = "" } = {}) {
+    let ret = (value / 1000000000000).toFixed(fixed);
+    ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+    return ret + space + "万亿";
 }
 exports.toWanYi = toWanYi;
-function toAuto(value, { fixed = 0, space = "" } = {}) {
+function toAuto(value, { fixed = 2, trimEndZeros = false, space = "" } = {}) {
     const abs = Math.abs(value);
     if (abs < 10000) {
-        return value.toString();
+        let ret = value.toString();
+        ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+        return ret;
     }
     if (abs < 100000000) {
-        return toWan(value, { fixed, space });
+        return toWan(value, { fixed, trimEndZeros, space });
     }
     if (abs < 1000000000000) {
-        return toYi(value, { fixed, space });
+        return toYi(value, { fixed, trimEndZeros, space });
     }
-    return toWanYi(value, { fixed, space });
+    return toWanYi(value, { fixed, trimEndZeros, space });
 }
 exports.toAuto = toAuto;
-function toPercent(value, { fixed = 0, space = "" } = {}) {
-    return (value * 100).toFixed(fixed) + space + "%";
+function toPercent(value, { fixed = 2, trimEndZeros = false, space = "" } = {}) {
+    let ret = (value * 100).toFixed(fixed);
+    ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+    return ret + space + "%";
 }
 exports.toPercent = toPercent;
+function parseNumber(input) {
+    // Remove whitespace
+    input = input.trim();
+    // Define a helper function to handle suffixes
+    const handleSuffix = (number, suffix) => {
+        switch (suffix.toLowerCase()) {
+            case "k":
+                return number * 1e3;
+            case "m":
+                return number * 1e6;
+            case "g":
+                return number * 1e9;
+            case "t":
+                return number * 1e12;
+            default:
+                return number;
+        }
+    };
+    // Check for percentage
+    if (input.endsWith("%")) {
+        const number = parseFloat(input.slice(0, -1));
+        return isNaN(number) ? null : number / 100;
+    }
+    // Check for per mille
+    if (input.endsWith("‰")) {
+        const number = parseFloat(input.slice(0, -1));
+        return isNaN(number) ? null : number / 1000;
+    }
+    // Check for suffixes (k, m, g, t)
+    const suffixMatch = input.match(/([kmgKMGtT])$/);
+    if (suffixMatch) {
+        const number = parseFloat(input.slice(0, -1));
+        return isNaN(number) ? null : handleSuffix(number, suffixMatch[0]);
+    }
+    // Check for scientific notation and other formats
+    const number = parseFloat(input);
+    return isNaN(number) ? null : number;
+}
+exports.parseNumber = parseNumber;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/test.d.ts

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":""}

package/dist/test.js

@@ -8,5 +8,18 @@ console.log((0, index_1.toAuto)(1234, { fixed: 1 }));
 console.log((0, index_1.toAuto)(12345, { fixed: 1 }));
 console.log((0, index_1.toAuto)(123456789, { fixed: 2, space: " " }));
 console.log((0, index_1.toAuto)(12.3 * 10000 * 10000 * 10000, { fixed: 1, space: " " }));
+console.log((0, index_1.toAuto)(1.2, { fixed: 4, trimEndZeros: true }));
 console.log((0, index_1.toPercent)(0.1234, { fixed: 1, space: " " }));
-console.log((0, index_1.toPercent)(1.234));
+console.log((0, index_1.toPercent)(1.23456, { trimEndZeros: true }));
+console.log((0, index_1.toPercent)(1.9, { fixed: 4, trimEndZeros: true }));
+// Example usage
+console.log((0, index_1.parseNumber)("50%")); // 0.5
+console.log((0, index_1.parseNumber)("1e3")); // 1000
+console.log((0, index_1.parseNumber)("  123  ")); // 123
+console.log((0, index_1.parseNumber)("100‰")); // 0.1
+console.log((0, index_1.parseNumber)("5k")); // 5000
+console.log((0, index_1.parseNumber)("3M")); // 3000000
+console.log((0, index_1.parseNumber)("2G")); // 2000000000
+console.log((0, index_1.parseNumber)("1t")); // 1000000000000
+console.log((0, index_1.parseNumber)("abc")); // null
+//# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,mCAAyD;AAEzD,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,CAAC,CAAC;AAC1B,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC,CAAC;AAC3B,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,SAAS,CAAC,CAAC,CAAC;AAE/B,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACxC,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzC,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACzD,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AAC5E,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE3D,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAS,EAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACzD,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACxD,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAS,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAE9D,gBAAgB;AAChB,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;AACvC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO;AACxC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM;AAC3C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;AACxC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO;AACvC,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU;AAC1C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa;AAC7C,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB;AAChD,OAAO,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO"}

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@fnmain/number",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "number utils",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node dist/test.js"
+    "test": "tsc && node dist/test.js"
   },
   "author": "DC",
   "license": "MIT",
+  "files": [
+    "dist",
+    "src"
+  ],
   "devDependencies": {
     "@types/node": "^20.8.3",
     "typescript": "^5.2.2"

package/src/index.ts

@@ -1,34 +1,114 @@
 type Options = {
   fixed?: number;
+  trimEndZeros?: boolean;
   space?: string;
 };
 
-export function toWan(value: number, { fixed = 0, space = "" }: Options = {}): string {
-  return (value / 10000).toFixed(fixed) + space + "万";
+export function trimTrailingZeros(numberString: string): string {
+  // Check if the string contains a decimal point
+  if (numberString.includes(".")) {
+    // Remove trailing zeros after a decimal point and the decimal point if necessary
+    return numberString.replace(/(\.\d*?[1-9])0+$|\.0*$/, "$1");
+  }
+  // Return the original string if there is no decimal point
+  return numberString;
+}
+
+export function toWan(
+  value: number,
+  { fixed = 2, trimEndZeros = false, space = "" }: Options = {}
+): string {
+  let ret = (value / 10000).toFixed(fixed);
+  ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+  return ret + space + "万";
 }
 
-export function toYi(value: number, { fixed = 0, space = "" }: Options = {}): string {
-  return (value / 100000000).toFixed(fixed) + space + "亿";
+export function toYi(
+  value: number,
+  { fixed = 2, trimEndZeros = false, space = "" }: Options = {}
+): string {
+  let ret = (value / 100000000).toFixed(fixed);
+  ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+  return ret + space + "亿";
 }
 
-export function toWanYi(value: number, { fixed = 0, space = "" }: Options = {}): string {
-  return (value / 1000000000000).toFixed(fixed) + space + "万亿";
+export function toWanYi(
+  value: number,
+  { fixed = 2, trimEndZeros = false, space = "" }: Options = {}
+): string {
+  let ret = (value / 1000000000000).toFixed(fixed);
+  ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+  return ret + space + "万亿";
 }
 
-export function toAuto(value: number, { fixed = 0, space = "" }: Options = {}): string {
+export function toAuto(
+  value: number,
+  { fixed = 2, trimEndZeros = false, space = "" }: Options = {}
+): string {
   const abs = Math.abs(value);
   if (abs < 10000) {
-    return value.toString();
+    let ret = value.toString();
+    ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+    return ret;
   }
   if (abs < 100000000) {
-    return toWan(value, { fixed, space });
+    return toWan(value, { fixed, trimEndZeros, space });
   }
   if (abs < 1000000000000) {
-    return toYi(value, { fixed, space });
+    return toYi(value, { fixed, trimEndZeros, space });
   }
-  return toWanYi(value, { fixed, space });
+  return toWanYi(value, { fixed, trimEndZeros, space });
 }
 
-export function toPercent(value: number, { fixed = 0, space = "" }: Options = {}) {
-  return (value * 100).toFixed(fixed) + space + "%";
+export function toPercent(
+  value: number,
+  { fixed = 2, trimEndZeros = false, space = "" }: Options = {}
+) {
+  let ret = (value * 100).toFixed(fixed);
+  ret = trimEndZeros ? trimTrailingZeros(ret) : ret;
+  return ret + space + "%";
+}
+
+export function parseNumber(input: string): number | null {
+  // Remove whitespace
+  input = input.trim();
+
+  // Define a helper function to handle suffixes
+  const handleSuffix = (number: number, suffix: string): number => {
+    switch (suffix.toLowerCase()) {
+      case "k":
+        return number * 1e3;
+      case "m":
+        return number * 1e6;
+      case "g":
+        return number * 1e9;
+      case "t":
+        return number * 1e12;
+      default:
+        return number;
+    }
+  };
+
+  // Check for percentage
+  if (input.endsWith("%")) {
+    const number = parseFloat(input.slice(0, -1));
+    return isNaN(number) ? null : number / 100;
+  }
+
+  // Check for per mille
+  if (input.endsWith("‰")) {
+    const number = parseFloat(input.slice(0, -1));
+    return isNaN(number) ? null : number / 1000;
+  }
+
+  // Check for suffixes (k, m, g, t)
+  const suffixMatch = input.match(/([kmgKMGtT])$/);
+  if (suffixMatch) {
+    const number = parseFloat(input.slice(0, -1));
+    return isNaN(number) ? null : handleSuffix(number, suffixMatch[0]);
+  }
+
+  // Check for scientific notation and other formats
+  const number = parseFloat(input);
+  return isNaN(number) ? null : number;
 }

package/src/test.ts

@@ -1,4 +1,4 @@
-import { toAuto, toPercent } from "./index";
+import { parseNumber, toAuto, toPercent } from "./index";
 
 console.log(toAuto(1234));
 console.log(toAuto(12345));
@@ -8,6 +8,19 @@ console.log(toAuto(1234, { fixed: 1 }));
 console.log(toAuto(12345, { fixed: 1 }));
 console.log(toAuto(123456789, { fixed: 2, space: " " }));
 console.log(toAuto(12.3 * 10000 * 10000 * 10000, { fixed: 1, space: " " }));
+console.log(toAuto(1.2, { fixed: 4, trimEndZeros: true }));
 
 console.log(toPercent(0.1234, { fixed: 1, space: " " }));
-console.log(toPercent(1.234));
+console.log(toPercent(1.23456, { trimEndZeros: true }));
+console.log(toPercent(1.9, { fixed: 4, trimEndZeros: true }));
+
+// Example usage
+console.log(parseNumber("50%")); // 0.5
+console.log(parseNumber("1e3")); // 1000
+console.log(parseNumber("  123  ")); // 123
+console.log(parseNumber("100‰")); // 0.1
+console.log(parseNumber("5k")); // 5000
+console.log(parseNumber("3M")); // 3000000
+console.log(parseNumber("2G")); // 2000000000
+console.log(parseNumber("1t")); // 1000000000000
+console.log(parseNumber("abc")); // null

package/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
-    "outDir": "./dist",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "declaration": true
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules"]
-}