refactor: parse integer phc params

Author: zdm

lib/phc.js

@@ -2,6 +2,7 @@
 
 const NAME_RE = /^[\da-z-]{1,32}$/,
     VALUE_RE = /^[\d+./A-Za-z-]+$/,
+    INTEGER_RE = /^-?(?:0|[1-9]\d*)$/,
     PHC_RE = new RegExp( String.raw`^` +
             String.raw`\$(?<id>[\da-z-]{1,32})` + // id
             String.raw`(?:\$v=(?<version>\d+))?` + // version
@@ -100,7 +101,7 @@ export function toPhc ( { id, version, params, salt, hash, defaultParams, sortPa
     return string;
 }
 
-export function fromPhc ( string, { defaultParams, decodeSalt = true, decodeHash = true } = {} ) {
+export function fromPhc ( string, { defaultParams, decodeNumbers = true, decodeSalt = true, decodeHash = true } = {} ) {
     const match = string.match( PHC_RE );
     if ( !match ) throw "PHC string is not valid";
 
@@ -130,7 +131,13 @@ export function fromPhc ( string, { defaultParams, decodeSalt = true, decodeHash
             }
             else {
                 data.params ??= {};
-                data.params[ name ] = value;
+
+                if ( decodeNumbers && typeof value === "string" && INTEGER_RE.test( value ) ) {
+                    data.params[ name ] = Number.parseInt( value );
+                }
+                else {
+                    data.params[ name ] = value;
+                }
             }
         }
     }
@@ -147,9 +154,14 @@ export function fromPhc ( string, { defaultParams, decodeSalt = true, decodeHash
         for ( const param of match.groups.params.split( "," ) ) {
             const [ name, value ] = param.split( "=" );
 
-            if ( name === "v" ) throw "PHC params are not valid";
+            if ( name === "v" ) continue;
 
-            data.params[ name ] = value;
+            if ( decodeNumbers && INTEGER_RE.test( value ) ) {
+                data.params[ name ] = Number.parseInt( value );
+            }
+            else {
+                data.params[ name ] = value;
+            }
         }
     }