lib: refactor to use more primordials in internal/encoding.js

RaisinTen · targos · commit 01a71dd3935b · 2021-06-11T09:29:52.000+02:00
PR-URL: #36480 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Pooja D P <Pooja.D.P@ibm.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -4,10 +4,11 @@
 // https://encoding.spec.whatwg.org
 
 const {
- Map,
 ObjectCreate,
 ObjectDefineProperties,
 ObjectGetOwnPropertyDescriptors,
+ SafeMap,
+ StringPrototypeSlice,
 Symbol,
 SymbolToStringTag,
 Uint32Array,
@@ -74,7 +75,7 @@ const CONVERTER_FLAGS_IGNORE_BOM = 0x4;
 
 const empty = new Uint8Array(0);
 
-const encodings = new Map([
+const encodings = new SafeMap([
 ['unicode-1-1-utf-8', 'utf-8'],
 ['utf8', 'utf-8'],
 ['utf-8', 'utf-8'],
@@ -309,7 +310,7 @@ function trimAsciiWhitespace(label) {
 label[e - 1] === '\u0020')) {
 e--;
 }
- return label.slice(s, e);
+ return StringPrototypeSlice(label, s, e);
 }
 
 function getEncodingFromLabel(label) {
@@ -504,7 +505,7 @@ function makeTextDecoderJS() {
 // If the very first result in the stream is a BOM, and we are not
 // explicitly told to ignore it, then we discard it.
 if (result[0] === '\ufeff') {
- result = result.slice(1);
+ result = StringPrototypeSlice(result, 1);
 }
 this[kBOMSeen] = true;
 }

-Original file line number
+Diff line change
 // https://encoding.spec.whatwg.org
 const{
 - Map,
  ObjectCreate,
  ObjectDefineProperties,
  ObjectGetOwnPropertyDescriptors,
 + SafeMap,
 + StringPrototypeSlice,
  Symbol,
  SymbolToStringTag,
  Uint32Array,
 constempty=newUint8Array(0);
 -constencodings=newMap([
 +constencodings=newSafeMap([
 ['unicode-1-1-utf-8','utf-8'],
 ['utf8','utf-8'],
 ['utf-8','utf-8'],
 label[e-1]==='\u0020')){
 e--;
+}
 -returnlabel.slice(s,e);
 +returnStringPrototypeSlice(label,s,e);
+}
 functiongetEncodingFromLabel(label){
 // If the very first result in the stream is a BOM, and we are not
 // explicitly told to ignore it, then we discard it.
 if(result[0]==='\ufeff'){
 -result=result.slice(1);
 +result=StringPrototypeSlice(result,1);
+}
 this[kBOMSeen]=true;
+}