update!: Remove is-utf8 and change to take encoding as an argument

gulpjs · Apr 9, 2022 · 52ce320 · 52ce320
1 parent 0828305
commit 52ce320
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ var concat = require('concat-stream');
 var removeBOM = require('remove-bom-stream');
 
 fs.createReadStream('utf8-file-with-bom.txt')
-  .pipe(removeBOM())
+  .pipe(removeBOM('utf-8'))
   .pipe(
     concat(function (result) {
       // result won't have a BOM
@@ -28,9 +28,9 @@ fs.createReadStream('utf8-file-with-bom.txt')
 
 ## API
 
-### `removeBOM()`
+### `removeBOM(encoding)`
 
-Returns a `through2` stream that will remove a BOM, given the data is a UTF8 Buffer with a BOM at the beginning. If the data is not UTF8 or does not have a BOM, the data is not changed and this becomes a normal passthrough stream.
+Returns a `through2` stream that will remove a BOM, if the argument `encoding` is `'utf-8'` and the given data is a UTF8 Buffer with a BOM at the beginning. If the `encoding` is not `'utf-8'` or does not have a BOM, the data is not changed and this becomes a normal passthrough stream.
 
 ## License
 

diff --git a/index.js b/index.js
@@ -1,12 +1,14 @@
 'use strict';
 
 var through = require('through2');
-var isUTF8 = require('is-utf8');
 var TextDecoder = require('util').TextDecoder;
 
 var removeBom = new TextDecoder('utf-8', { ignoreBOM: false });
 
-function removeBomStream() {
+function removeBomStream(encoding) {
+  encoding = (encoding || '').toLowerCase();
+  var isUtf8 = (encoding === 'utf-8' || encoding === 'utf8');
+
   var state = 0; // 0:Not removed, -1:In removing, 1:Already removed
   var buffer = Buffer.alloc(0);
 
@@ -17,7 +19,7 @@ function removeBomStream() {
 
     buffer = null;
 
-    if (isUTF8(data)) {
+    if (isUtf8) {
       return removeBom.decode(data);
     }
     return data;

diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "test": "nyc mocha --async-only"
   },
   "dependencies": {
-    "is-utf8": "^0.2.1",
     "through2": "^4.0.2"
   },
   "devDependencies": {

diff --git a/test/index.js b/test/index.js
@@ -24,7 +24,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('utf-8'), concat(assert)],
       done
     );
   });
@@ -33,7 +33,7 @@ describe('removeBomStream', function () {
     var filepath = path.join(__dirname, './fixtures/test.txt');
     var fileContent = fs.readFileSync(filepath, 'utf-8');
 
-    var rmBom = removeBomStream();
+    var rmBom = removeBomStream('utf8');
     var output = '';
     rmBom.on('data', function (d) {
       output += d.toString();
@@ -55,7 +55,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('UTF-8'), concat(assert)],
       done
     );
   });
@@ -73,7 +73,7 @@ describe('removeBomStream', function () {
       [
         fs.createReadStream(filepath),
         chunker(1),
-        removeBomStream(),
+        removeBomStream('UTF8'),
         concat(assert),
       ],
       done
@@ -92,7 +92,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('UTF-8'), concat(assert)],
       done
     );
   });
@@ -101,7 +101,7 @@ describe('removeBomStream', function () {
     var filepath = path.join(__dirname, './fixtures/bom-utf8.txt');
     var fileContent = fs.readFileSync(filepath, 'utf-8');
 
-    var rmBom = removeBomStream();
+    var rmBom = removeBomStream('utf-8');
     var output = '';
     rmBom.on('data', function (d) {
       output += d.toString();
@@ -123,7 +123,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('utf-16be'), concat(assert)],
       done
     );
   });
@@ -138,7 +138,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('utf-16be'), concat(assert)],
       done
     );
   });
@@ -153,7 +153,7 @@ describe('removeBomStream', function () {
     }
 
     pipe(
-      [fs.createReadStream(filepath), removeBomStream(), concat(assert)],
+      [fs.createReadStream(filepath), removeBomStream('utf-16le'), concat(assert)],
       done
     );
   });