Merge pull request #5 from strmer15/patch-1

amitguptagwl · web-flow · commit 709df19e95eb · 2021-09-25T13:13:21.000+05:30
Fix the hex regex
diff --git a/strnum.js b/strnum.js
@@ -1,4 +1,4 @@
-const hexRegex = /0x[a-zA-Z0-9]+/;
+const hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;
 const numRegex = /^([\-\+])?(0*)(\.[0-9]+(e\-?[0-9]+)?|[0-9]+(\.[0-9]+(e\-?[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
diff --git a/strnum.test.js b/strnum.test.js
@@ -18,14 +18,20 @@ 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);
         expect(toNumber("-0x2f", { hex :  true})).toEqual(-47);
         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);
@@ -103,5 +109,4 @@ describe("Should convert all the valid numeric strings to number", () => {
     it("should ignore sorrounded spaces ", () => {
         expect(toNumber("   +1212   ")).toEqual(1212);
     })
-
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const hexRegex = /0x[a-zA-Z0-9]+/;`
	`1`	`+const hexRegex = /^[-+]?0x[a-fA-F0-9]+$/;`
`2`	`2`	`const numRegex = /^([\-\+])?(0*)(\.[0-9]+(e\-?[0-9]+)?\|[0-9]+(\.[0-9]+(e\-?[0-9]+)?)?)$/;`
`3`	`3`	`// const octRegex = /0x[a-z0-9]+/;`
`4`	`4`	`// const binRegex = /0x[a-z0-9]+/;`
`@@ -47,4 +47,4 @@ function toNumber(str, options = {}){`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-module.exports = toNumber`
	`50`	`+module.exports = toNumber`