Checking for buffer in inputs prior to decoding

Author: fguitton

lib/TextDecoder-impl.js

@@ -30,8 +30,7 @@ exports.implementation = class TextDecoderImpl {
       // TODO: Implement stream support
     }
     try {
-      // TODO: Implement ignoreBOM support
-      return decode(Buffer.from(input), this._encoding, this._ignoreBOM);
+      return decode(input, this._encoding, this._ignoreBOM);
     } catch (exception) {
       if (this._errorMode === "fatal") {
         throw new TypeError(exception);

lib/whatwg-encoding.js

@@ -13,23 +13,27 @@ exports.labelToName = label => {
 };
 
 // https://encoding.spec.whatwg.org/#decode
-exports.decode = (buffer, fallbackEncodingName, ignoreBOM) => {
+exports.decode = (input, fallbackEncodingName, ignoreBOM) => {
   let encoding = fallbackEncodingName;
   if (!exports.isSupported(encoding)) {
     throw new RangeError(`"${encoding}" is not a supported encoding name`);
   }
 
-  const bomEncoding = exports.getBOMEncoding(buffer);
-  if (!ignoreBOM && bomEncoding !== null) {
+  const bomEncoding = exports.getBOMEncoding(input);
+  if (bomEncoding !== null) {
     encoding = bomEncoding;
   }
 
   // iconv-lite will strip BOMs for us, so no need to do the stuff the spec does
+
   const decodeOptions = {
     stripBOM: !ignoreBOM
   };
 
-  return iconvLite.decode(buffer, encoding, decodeOptions);
+  if (input.buffer !== undefined)
+    return iconvLite.decode(input, encoding, decodeOptions);
+  else
+    return iconvLite.decode(Buffer.from(input), encoding, decodeOptions);
 };
 
 

scripts/get-latest-platform-tests.js

@@ -30,22 +30,48 @@ const targetDir = path.resolve(__dirname, "..", "test", "web-platform-tests");
 
 for (const file of [
   "api-basics.any.js",
+
+  // Missing testharness 'setup' function
   // "api-invalid-label.any.js",
+
   "api-replacement-encodings.any.js",
   "api-surrogates-utf8.any.js",
+
+  // Missing testharness 'createBuffer' function
   // "encodeInto.any.js",
+
+  // Missing testharness 'decode_test' function
   // "replacement-encodings.any.js",
+
   "textdecoder-byte-order-marks.any.js",
+
+  // Missing testharness 'createBuffer' function
   // "textdecoder-copy.any.js",
+
+  // Package 'iconv-lite' does not support 'x-mac-cyrillic'
   // "textdecoder-fatal-single-byte.any.js",
+
+  // Stream support not implemented
   // "textdecoder-fatal-streaming.any.js",
+
   // "textdecoder-fatal.any.js",
+
   "textdecoder-ignorebom.any.js",
+
+  // Infinite looping
   // "textdecoder-labels.any.js",
+
+  // Stream support not implemented
   // "textdecoder-streaming.any.js",
+
   // "textdecoder-utf16-surrogates.any.js"
+
+  // Package 'iconv-lite' does not support 'x-mac-cyrillic', 'ISO-8859-8-I', 'ISO-2022-JP', 'x-user-defined'
   // "textencoder-constructor-non-utf.any.js",
-  // "textencoder-utf16-surrogates.any.js",
+
+  "textencoder-utf16-surrogates.any.js",
+
+  // Missing testharness 'decode_test' function
   // "unsupported-encodings.any.js"
 ]) {
   pipeline(