src: remove function hasTextDecoder in encoding.js

chichiwang · MylesBorins · commit ffb4087def25 · 2018-12-26T11:18:44.000-05:00
also... return TextDecoder directly from factories PR-URL: #23625 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -341,22 +341,16 @@ Object.defineProperties(
 value: 'TextEncoder'
 } });
 
-const { hasConverter, TextDecoder } =
+const TextDecoder =
 process.binding('config').hasIntl ?
 makeTextDecoderICU() :
 makeTextDecoderJS();
 
-function hasTextDecoder(encoding = 'utf-8') {
- validateArgument(encoding, 'string', 'encoding', 'string');
- return hasConverter(getEncodingFromLabel(encoding));
-}
-
 function makeTextDecoderICU() {
 const {
 decode: _decode,
 getConverter,
- hasConverter
- } = process.binding('icu');
+ } = internalBinding('icu');
 
 class TextDecoder {
 constructor(encoding = 'utf-8', options = {}) {
@@ -409,7 +403,7 @@ function makeTextDecoderICU() {
 }
 }
 
- return { hasConverter, TextDecoder };
+ return TextDecoder;
 }
 
 function makeTextDecoderJS() {
@@ -497,7 +491,7 @@ function makeTextDecoderJS() {
 }
 }
 
- return { hasConverter, TextDecoder };
+ return TextDecoder;
 }
 
 // Mix in some shared properties.
@@ -552,7 +546,6 @@ function makeTextDecoderJS() {
 
 module.exports = {
 getEncodingFromLabel,
- hasTextDecoder,
 TextDecoder,
 TextEncoder
 };

-Original file line number
+Diff line change
 value: 'TextEncoder'
 }});
 -const{ hasConverter,TextDecoder}=
 +constTextDecoder=
 process.binding('config').hasIntl ?
 makeTextDecoderICU() :
 makeTextDecoderJS();
 -functionhasTextDecoder(encoding='utf-8'){
 -validateArgument(encoding,'string','encoding','string');
 -returnhasConverter(getEncodingFromLabel(encoding));
 -}
+-
 functionmakeTextDecoderICU(){
 const{
 decode: _decode,
  getConverter,
 - hasConverter
 -}=process.binding('icu');
 +}=internalBinding('icu');
 classTextDecoder{
 constructor(encoding='utf-8',options={}){
+}
+}
 -return{ hasConverter,TextDecoder};
 +returnTextDecoder;
+}
 functionmakeTextDecoderJS(){
+}
+}
 -return{ hasConverter,TextDecoder};
 +returnTextDecoder;
+}
 // Mix in some shared properties.
 module.exports={
  getEncodingFromLabel,
 - hasTextDecoder,
  TextDecoder,
  TextEncoder
 };