assert: refactor to use more primordials

PR-URL: #36234
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: aduh95

lib/assert.js

@@ -21,16 +21,29 @@
 'use strict';
 
 const{
+ ArrayPrototypeIndexOf,
+ ArrayPrototypeJoin,
+ ArrayPrototypePush,
+ ArrayPrototypeShift,
+ ArrayPrototypeSlice,
  Error,
  ErrorCaptureStackTrace,
+ FunctionPrototypeBind,
+ NumberIsNaN,
  ObjectAssign,
  ObjectIs,
  ObjectKeys,
  ObjectPrototypeIsPrototypeOf,
- Map,
- NumberIsNaN,
+ ReflectApply,
  RegExpPrototypeTest,
+ SafeMap,
  String,
+ StringPrototypeCharCodeAt,
+ StringPrototypeIncludes,
+ StringPrototypeIndexOf,
+ StringPrototypeReplace,
+ StringPrototypeSlice,
+ StringPrototypeSplit,
 }=primordials;
 
 const{ Buffer }=require('buffer');
@@ -52,7 +65,7 @@ const { EOL } = require('internal/constants');
 const{ NativeModule }=require('internal/bootstrap/loaders');
 const{ isError }=require('internal/util');
 
-consterrorCache=newMap();
+consterrorCache=newSafeMap();
 constCallTracker=require('internal/assert/calltracker');
 
 letisDeepEqual;
@@ -81,7 +94,7 @@ const meta = [
 '\\u001e','\\u001f'
 ];
 
-constescapeFn=(str)=>meta[str.charCodeAt(0)];
+constescapeFn=(str)=>meta[StringPrototypeCharCodeAt(str,0)];
 
 letwarned=false;
 
@@ -240,7 +253,7 @@ function parseCode(code, offset) {
 classFields,
 staticClassFeatures
 );
-parseExpressionAt=Parser.parseExpressionAt.bind(Parser);
+parseExpressionAt=FunctionPrototypeBind(Parser.parseExpressionAt,Parser);
 }
 letnode;
 letstart=0;
@@ -265,8 +278,9 @@ function parseCode(code, offset) {
 
 return[
 node.node.start,
-code.slice(node.node.start,node.node.end)
-.replace(escapeSequencesRegExp,escapeFn)
+StringPrototypeReplace(StringPrototypeSlice(code,
+node.node.start,node.node.end),
+escapeSequencesRegExp,escapeFn)
 ];
 }
 
@@ -330,23 +344,24 @@ function getErrMessage(message, fn) {
 decoder.end();
 }else{
 for(leti=0;i<line;i++){
-code=code.slice(code.indexOf('\n')+1);
+code=StringPrototypeSlice(code,
+StringPrototypeIndexOf(code,'\n')+1);
 }
 [column,message]=parseCode(code,column);
 }
 // Always normalize indentation, otherwise the message could look weird.
-if(message.includes('\n')){
+if(StringPrototypeIncludes(message,'\n')){
 if(EOL==='\r\n'){
-message=message.replace(/\r\n/g,'\n');
+message=StringPrototypeReplace(message,/\r\n/g,'\n');
 }
-constframes=message.split('\n');
-message=frames.shift();
+constframes=StringPrototypeSplit(message,'\n');
+message=ArrayPrototypeShift(frames);
 for(constframeofframes){
 letpos=0;
 while(pos<column&&(frame[pos]===' '||frame[pos]==='\t')){
 pos++;
 }
-message+=`\n ${frame.slice(pos)}`;
+message+=`\n ${StringPrototypeSlice(frame,pos)}`;
 }
 }
 message=`The expression evaluated to a falsy value:\n\n ${message}\n`;
@@ -670,7 +685,7 @@ function expectedException(actual, expected, message, fn) {
 // Special handle errors to make sure the name and the message are
 // compared as well.
 if(expectedinstanceofError){
-keys.push('name','message');
+ArrayPrototypePush(keys,'name','message');
 }elseif(keys.length===0){
 thrownewERR_INVALID_ARG_VALUE('error',
 expected,'may not be an empty object');
@@ -713,7 +728,7 @@ function expectedException(actual, expected, message, fn) {
 throwError=true;
 }else{
 // Check validation functions return value.
-constres=expected.call({},actual);
+constres=ReflectApply(expected,{},[actual]);
 if(res!==true){
 if(!message){
 generatedMessage=true;
@@ -858,7 +873,7 @@ function hasMatchingError(actual, expected) {
 if(ObjectPrototypeIsPrototypeOf(Error,expected)){
 returnfalse;
 }
-returnexpected.call({},actual)===true;
+returnReflectApply(expected,{},[actual])===true;
 }
 
 functionexpectsNoError(stackStartFn,actual,error,message){
@@ -959,20 +974,21 @@ assert.ifError = function ifError(err) {
 // This will remove any duplicated frames from the error frames taken
 // from within `ifError` and add the original error frames to the newly
 // created ones.
-consttmp2=origStack.split('\n');
-tmp2.shift();
+consttmp2=StringPrototypeSplit(origStack,'\n');
+ArrayPrototypeShift(tmp2);
 // Filter all frames existing in err.stack.
-lettmp1=newErr.stack.split('\n');
+lettmp1=StringPrototypeSplit(newErr.stack,'\n');
 for(consterrFrameoftmp2){
 // Find the first occurrence of the frame.
-constpos=tmp1.indexOf(errFrame);
+constpos=ArrayPrototypeIndexOf(tmp1,errFrame);
 if(pos!==-1){
 // Only keep new frames.
-tmp1=tmp1.slice(0,pos);
+tmp1=ArrayPrototypeSlice(tmp1,0,pos);
 break;
 }
 }
-newErr.stack=`${tmp1.join('\n')}\n${tmp2.join('\n')}`;
+newErr.stack=
+`${ArrayPrototypeJoin(tmp1,'\n')}\n${ArrayPrototypeJoin(tmp2,'\n')}`;
 }
 
 thrownewErr;