querystring: refactor to use more primordials

PR-URL: #36315
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: aduh95

lib/internal/querystring.js

@@ -3,13 +3,19 @@
 const{
  Array,
  Int8Array,
+ NumberPrototypeToString,
+ StringPrototypeCharCodeAt,
+ StringPrototypeSlice,
+ StringPrototypeToUpperCase,
 }=primordials;
 
 const{ERR_INVALID_URI}=require('internal/errors').codes;
 
 consthexTable=newArray(256);
 for(leti=0;i<256;++i)
-hexTable[i]='%'+((i<16 ? '0' : '')+i.toString(16)).toUpperCase();
+hexTable[i]='%'+
+StringPrototypeToUpperCase((i<16 ? '0' : '')+
+NumberPrototypeToString(i,16));
 
 constisHexTable=newInt8Array([
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,// 0 - 15
@@ -41,25 +47,25 @@ function encodeStr(str, noEscapeTable, hexTable) {
 
  outer:
 for(;i<len;i++){
-letc=str.charCodeAt(i);
+letc=StringPrototypeCharCodeAt(str,i);
 
 // ASCII
 while(c<0x80){
 if(noEscapeTable[c]!==1){
 if(lastPos<i)
-out+=str.slice(lastPos,i);
+out+=StringPrototypeSlice(str,lastPos,i);
 lastPos=i+1;
 out+=hexTable[c];
 }
 
 if(++i===len)
 break outer;
 
-c=str.charCodeAt(i);
+c=StringPrototypeCharCodeAt(str,i);
 }
 
 if(lastPos<i)
-out+=str.slice(lastPos,i);
+out+=StringPrototypeSlice(str,lastPos,i);
 
 // Multi-byte characters ...
 if(c<0x800){
@@ -84,7 +90,7 @@ function encodeStr(str, noEscapeTable, hexTable) {
 if(i>=len)
 thrownewERR_INVALID_URI();
 
-constc2=str.charCodeAt(i)&0x3FF;
+constc2=StringPrototypeCharCodeAt(str,i)&0x3FF;
 
 lastPos=i+1;
 c=0x10000+(((c&0x3FF)<<10)|c2);
@@ -96,7 +102,7 @@ function encodeStr(str, noEscapeTable, hexTable) {
 if(lastPos===0)
 returnstr;
 if(lastPos<len)
-returnout+str.slice(lastPos);
+returnout+StringPrototypeSlice(str,lastPos);
 returnout;
 }
 

lib/querystring.js

@@ -32,6 +32,8 @@ const {
  ObjectCreate,
  ObjectKeys,
  String,
+ StringPrototypeCharCodeAt,
+ StringPrototypeSlice,
 }=primordials;
 
 const{ Buffer }=require('buffer');
@@ -86,20 +88,20 @@ function unescapeBuffer(s, decodeSpaces) {
 // Flag to know if some hex chars have been decoded
 lethasHex=false;
 while(index<s.length){
-currentChar=s.charCodeAt(index);
+currentChar=StringPrototypeCharCodeAt(s,index);
 if(currentChar===43/* '+' */&&decodeSpaces){
 out[outIndex++]=32;// ' '
 index++;
 continue;
 }
 if(currentChar===37/* '%' */&&index<maxLength){
-currentChar=s.charCodeAt(++index);
+currentChar=StringPrototypeCharCodeAt(s,++index);
 hexHigh=unhexTable[currentChar];
 if(!(hexHigh>=0)){
 out[outIndex++]=37;// '%'
 continue;
 }else{
-nextChar=s.charCodeAt(++index);
+nextChar=StringPrototypeCharCodeAt(s,++index);
 hexLow=unhexTable[nextChar];
 if(!(hexLow>=0)){
 out[outIndex++]=37;// '%'
@@ -231,10 +233,10 @@ function stringify(obj, sep, eq, options) {
 
 functioncharCodes(str){
 if(str.length===0)return[];
-if(str.length===1)return[str.charCodeAt(0)];
+if(str.length===1)return[StringPrototypeCharCodeAt(str,0)];
 constret=newArray(str.length);
 for(leti=0;i<str.length;++i)
-ret[i]=str.charCodeAt(i);
+ret[i]=StringPrototypeCharCodeAt(str,i);
 returnret;
 }
 constdefSepCodes=[38];// &
@@ -268,8 +270,8 @@ function parse(qs, sep, eq, options) {
 returnobj;
 }
 
-constsepCodes=(!sep ? defSepCodes : charCodes(sep+''));
-consteqCodes=(!eq ? defEqCodes : charCodes(eq+''));
+constsepCodes=(!sep ? defSepCodes : charCodes(String(sep)));
+consteqCodes=(!eq ? defEqCodes : charCodes(String(eq)));
 constsepLen=sepCodes.length;
 consteqLen=eqCodes.length;
 
@@ -300,7 +302,7 @@ function parse(qs, sep, eq, options) {
 constplusChar=(customDecode ? '%20' : ' ');
 letencodeCheck=0;
 for(leti=0;i<qs.length;++i){
-constcode=qs.charCodeAt(i);
+constcode=StringPrototypeCharCodeAt(qs,i);
 
 // Try matching key/value pair separator (e.g. '&')
 if(code===sepCodes[sepIdx]){
@@ -311,7 +313,7 @@ function parse(qs, sep, eq, options) {
 // We didn't find the (entire) key/value separator
 if(lastPos<end){
 // Treat the substring as part of the key instead of the value
-key+=qs.slice(lastPos,end);
+key+=StringPrototypeSlice(qs,lastPos,end);
 }elseif(key.length===0){
 // We saw an empty substring between separators
 if(--pairs===0)
@@ -321,7 +323,7 @@ function parse(qs, sep, eq, options) {
 continue;
 }
 }elseif(lastPos<end){
-value+=qs.slice(lastPos,end);
+value+=StringPrototypeSlice(qs,lastPos,end);
 }
 
 addKeyVal(obj,key,value,keyEncoded,valEncoded,decode);
@@ -343,7 +345,7 @@ function parse(qs, sep, eq, options) {
 // Key/value separator match!
 constend=i-eqIdx+1;
 if(lastPos<end)
-key+=qs.slice(lastPos,end);
+key+=StringPrototypeSlice(qs,lastPos,end);
 encodeCheck=0;
 lastPos=i+1;
 }
@@ -369,15 +371,15 @@ function parse(qs, sep, eq, options) {
 }
 if(code===43/* + */){
 if(lastPos<i)
-key+=qs.slice(lastPos,i);
+key+=StringPrototypeSlice(qs,lastPos,i);
 key+=plusChar;
 lastPos=i+1;
 continue;
 }
 }
 if(code===43/* + */){
 if(lastPos<i)
-value+=qs.slice(lastPos,i);
+value+=StringPrototypeSlice(qs,lastPos,i);
 value+=plusChar;
 lastPos=i+1;
 }elseif(!valEncoded){
@@ -400,9 +402,9 @@ function parse(qs, sep, eq, options) {
 // Deal with any leftover key or value data
 if(lastPos<qs.length){
 if(eqIdx<eqLen)
-key+=qs.slice(lastPos);
+key+=StringPrototypeSlice(qs,lastPos);
 elseif(sepIdx<sepLen)
-value+=qs.slice(lastPos);
+value+=StringPrototypeSlice(qs,lastPos);
 }elseif(eqIdx===0&&key.length===0){
 // We ended on an empty substring
 returnobj;