strnum 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strnum",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Parse String to Number based on configuration",
   "main": "strnum.js",
   "scripts": {

package/strnum.js

@@ -1,5 +1,5 @@
-const hexRegex = /0x[a-zA-Z0-9]+/;
-const numRegex = /^([\-\+])?(0*)(\.[0-9]+(e\-?[0-9]+)?|[0-9]+(\.[0-9]+(e\-?[0-9]+)?)?)$/;
+const hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;
+const numRegex = /^([\-\+])?(0*)(\.[0-9]+([eE]\-?[0-9]+)?|[0-9]+(\.[0-9]+([eE]\-?[0-9]+)?)?)$/;
 // const octRegex = /0x[a-z0-9]+/;
 // const binRegex = /0x[a-z0-9]+/;
 
@@ -47,4 +47,4 @@ function toNumber(str, options = {}){
     }
 }
 
-module.exports = toNumber
+module.exports = toNumber

package/strnum.test.js

@@ -18,7 +18,7 @@ describe("Should convert all the valid numeric strings to number", () => {
         expect(toNumber("12+12")).toEqual("12+12");
         expect(toNumber("1212+")).toEqual("1212+");
     })
-    it("should parse hexaDecimal values", () => {
+    it("should parse hexadecimal values", () => {
         expect(toNumber("0x2f")).toEqual(47);
         expect(toNumber("-0x2f")).toEqual(-47);
         expect(toNumber("0x2f", { hex :  true})).toEqual(47);
@@ -26,6 +26,12 @@ describe("Should convert all the valid numeric strings to number", () => {
         expect(toNumber("0x2f", { hex :  false})).toEqual("0x2f");
         expect(toNumber("-0x2f", { hex :  false})).toEqual("-0x2f");
     })
+    it("should not parse strings with 0x embedded", () => {
+        expect(toNumber("0xzz")).toEqual("0xzz");
+        expect(toNumber("iweraf0x123qwerqwer")).toEqual("iweraf0x123qwerqwer");
+        expect(toNumber("1230x55")).toEqual("1230x55");
+        expect(toNumber("JVBERi0xLjMNCiXi48")).toEqual("JVBERi0xLjMNCiXi48");
+    })
     it("leading zeros", () => {
         expect(toNumber("06")).toEqual(6);
         expect(toNumber("06", { leadingZeros :  true})).toEqual(6);
@@ -89,6 +95,17 @@ describe("Should convert all the valid numeric strings to number", () => {
         expect(toNumber("1.0e-2")).toEqual(0.01);
     });
 
+    it("scientific notation with upper E", () => {
+        expect(toNumber("01.0E2"  ,  { leadingZeros :  false})).toEqual("01.0E2");
+        expect(toNumber("-01.0E2"  ,  { leadingZeros :  false})).toEqual("-01.0E2");
+        expect(toNumber("01.0E2") ).toEqual(100);
+        expect(toNumber("-01.0E2") ).toEqual(-100);
+        expect(toNumber("1.0E2") ).toEqual(100);
+
+        expect(toNumber("-1.0E2") ).toEqual(-100);
+        expect(toNumber("1.0E-2")).toEqual(0.01);
+    });
+    
     it("should skip matching pattern", () => {
         expect(toNumber("+12", { skipLike: /\+[0-9]{10}/} )).toEqual(12);
         expect(toNumber("12+12", { skipLike: /\+[0-9]{10}/} )).toEqual("12+12");
@@ -103,5 +120,4 @@ describe("Should convert all the valid numeric strings to number", () => {
     it("should ignore sorrounded spaces ", () => {
         expect(toNumber("   +1212   ")).toEqual(1212);
     })
-
-});
+});