From 719d2932c746d3a7d6bcd07913aaf6f655108623 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 8 Aug 2021 11:24:11 -0700
Subject: [PATCH] buffer: add endings option, remove Node.js specific encoding
 option

Signed-off-by: James M Snell <jasnell@gmail.com>
---
 doc/api/buffer.md          |  9 ++++---
 lib/internal/blob.js       | 51 +++++++++++++++++++++++++++++---------
 test/parallel/test-blob.js | 20 ++++++++-------
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/doc/api/buffer.md b/doc/api/buffer.md
index f419be1181a61af..4289b76d52b4624 100644
--- a/doc/api/buffer.md
+++ b/doc/api/buffer.md
@@ -465,8 +465,9 @@ added: v15.7.0
   of string, {ArrayBuffer}, {TypedArray}, {DataView}, or {Blob} objects, or
   any mix of such objects, that will be stored within the `Blob`.
 * `options` {Object}
-  * `encoding` {string} The character encoding to use for string sources.
-    **Default:** `'utf8'`.
+  * `endings` {string} One of either `'transparent'` or `'native'`. When set
+    to `'native'`, line endings in string source parts will be converted to
+    the platform native line-ending as specified by `require('os').EOL`.
   * `type` {string} The Blob content-type. The intent is for `type` to convey
     the MIME media type of the data, however no validation of the type format
     is performed.
@@ -476,7 +477,9 @@ Creates a new `Blob` object containing a concatenation of the given sources.
 {ArrayBuffer}, {TypedArray}, {DataView}, and {Buffer} sources are copied into
 the 'Blob' and can therefore be safely modified after the 'Blob' is created.
 
-String sources are also copied into the `Blob`.
+String sources are encoded as UTF-8 byte sequences and copied into the blob.
+Unmatched surrogate pairs within each string part will be replaced by Unicode
+0xFFFD replacement characters.
 
 ### `blob.arrayBuffer()`
 <!-- YAML
diff --git a/lib/internal/blob.js b/lib/internal/blob.js
index a2d67e205be01a4..95edbe45e1e4b79 100644
--- a/lib/internal/blob.js
+++ b/lib/internal/blob.js
@@ -24,7 +24,10 @@ const {
   getDataObject,
 } = internalBinding('blob');
 
-const { TextDecoder } = require('internal/encoding');
+const {
+  TextDecoder,
+  TextEncoder,
+} = require('internal/encoding');
 
 const {
   makeTransferable,
@@ -48,6 +51,7 @@ const {
   AbortError,
   codes: {
     ERR_INVALID_ARG_TYPE,
+    ERR_INVALID_ARG_VALUE,
     ERR_INVALID_THIS,
     ERR_BUFFER_TOO_LARGE,
   }
@@ -65,10 +69,11 @@ const kArrayBufferPromise = Symbol('kArrayBufferPromise');
 
 const disallowedTypeCharacters = /[^\u{0020}-\u{007E}]/u;
 
-let Buffer;
 let ReadableStream;
 let URL;
+let EOL;
 
+const enc = new TextEncoder();
 
 // Yes, lazy loading is annoying but because of circular
 // references between the url, internal/blob, and buffer
@@ -79,29 +84,35 @@ function lazyURL(id) {
   return new URL(id);
 }
 
-function lazyBuffer() {
-  Buffer ??= require('buffer').Buffer;
-  return Buffer;
-}
-
 function lazyReadableStream(options) {
   ReadableStream ??=
     require('internal/webstreams/readablestream').ReadableStream;
   return new ReadableStream(options);
 }
 
+// TODO(@jasnell): This is annoying but this has to be lazy because
+// requiring the 'os' module too early causes building Node.js to
+// fail with an unknown reference failure.
+function lazyEOL() {
+  EOL ??= require('os').EOL;
+  return EOL;
+}
+
 function isBlob(object) {
   return object?.[kHandle] !== undefined;
 }
 
-function getSource(source, encoding) {
+function getSource(source, endings) {
   if (isBlob(source))
     return [source.size, source[kHandle]];
 
   if (isAnyArrayBuffer(source)) {
     source = new Uint8Array(source);
   } else if (!isArrayBufferView(source)) {
-    source = lazyBuffer().from(`${source}`, encoding);
+    source = `${source}`;
+    if (endings === 'native')
+      source = source.replaceAll(/(\n|\r\n)/g, lazyEOL());
+    source = enc.encode(source);
   }
 
   // We copy into a new Uint8Array because the underlying
@@ -113,6 +124,16 @@ function getSource(source, encoding) {
 }
 
 class Blob {
+  /**
+   * @typedef {string|ArrayBuffer|ArrayBufferView|Blob} SourcePart
+   *
+   * @param {SourcePart[]} [sources]
+   * @param {{
+   *   endings? : string,
+   *   type? : string,
+   * }} options
+   * @returns
+   */
   constructor(sources = [], options = {}) {
     emitExperimentalWarning('buffer.Blob');
     if (sources === null ||
@@ -121,12 +142,18 @@ class Blob {
       throw new ERR_INVALID_ARG_TYPE('sources', 'Iterable', sources);
     }
     validateObject(options, 'options');
-    const { encoding = 'utf8' } = options;
-    let { type = '' } = options;
+    let {
+      type = '',
+      endings = 'transparent',
+    } = options;
+
+    endings = `${endings}`;
+    if (endings !== 'transparent' || endings !== 'native')
+      throw new ERR_INVALID_ARG_VALUE('options.endings', endings);
 
     let length = 0;
     const sources_ = ArrayFrom(sources, (source) => {
-      const { 0: len, 1: src } = getSource(source, encoding);
+      const { 0: len, 1: src } = getSource(source, endings);
       length += len;
       return src;
     });
diff --git a/test/parallel/test-blob.js b/test/parallel/test-blob.js
index b7149048a9faab9..ae74f0aea4b9099 100644
--- a/test/parallel/test-blob.js
+++ b/test/parallel/test-blob.js
@@ -45,15 +45,6 @@ assert.throws(() => new Blob({}), {
   assert.strictEqual(new Blob([], { type: {} }).type, '[object object]');
 }
 
-{
-  const b = new Blob(['616263'], { encoding: 'hex', type: 'foo' });
-  assert.strictEqual(b.size, 3);
-  assert.strictEqual(b.type, 'foo');
-  b.text().then(common.mustCall((text) => {
-    assert.strictEqual(text, 'abc');
-  }));
-}
-
 {
   const b = new Blob([Buffer.from('abc')]);
   assert.strictEqual(b.size, 3);
@@ -216,3 +207,14 @@ assert.throws(() => new Blob({}), {
   res = await reader.read();
   assert(res.done);
 })().then(common.mustCall());
+
+{
+  const b = new Blob(['hello\n'], { endings: 'native' });
+  assert.strictEqual(b.size, 7);
+
+  [1, {}, 'foo'].forEach((endings) => {
+    assert.throws(() => new Blob([], { endings }), {
+      code: 'ERR_INVALID_ARG_VALUE',
+    });
+  });
+}