Skip to content

Commit

Permalink
Add buffer support to split, join, replace and parse streams
Browse files Browse the repository at this point in the history
  • Loading branch information
Sami Turcotte committed Dec 3, 2018
1 parent 407bb79 commit 63c3681
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "mhysa",
"version": "1.0.0",
"version": "1.0.1",
"description": "Streams and event emitter utils for Node.js",
"keywords": [
"promise",
Expand Down
12 changes: 12 additions & 0 deletions samples/split.js
@@ -0,0 +1,12 @@
const mhysa = require("mhysa");
let stream = mhysa.split(",");

const buf = Buffer.from("a,b,c");
stream.on("data", function(data) {
console.log(data);
});

for (let i = 0; i < buf.length; ++i) {
stream.write(buf.slice(i, i + 1));
}
stream.end();
24 changes: 24 additions & 0 deletions src/index.spec.ts
Expand Up @@ -495,6 +495,30 @@ test.cb("split() splits chunks using the specified separator", t => {
source.push(null);
});

test.cb(
"split() splits utf-8 encoded buffers using the specified separator",
t => {
t.plan(3);
const expectedElements = ["a", "b", "c"];
let i = 0;
const through = split(",");
const buf = Buffer.from("a,b,c");
through
.on("data", element => {
expect(element).to.equal(expectedElements[i]);
i++;
t.pass();
})
.on("error", t.end)
.on("end", t.end);

for (let j = 0; j < buf.length; ++j) {
through.write(buf.slice(j, j + 1));
}
through.end();
},
);

test.cb("join() joins chunks using the specified separator", t => {
t.plan(9);
const source = new Readable({ objectMode: true });
Expand Down
24 changes: 16 additions & 8 deletions src/index.ts
Expand Up @@ -208,8 +208,10 @@ export function split(
return new Transform({
readableObjectMode: true,
writableObjectMode: true,
async transform(chunk: string, encoding, callback) {
const splitted = chunk.split(separator);
transform(chunk: string | Buffer, encoding, callback) {
const asString =
chunk instanceof Buffer ? chunk.toString(encoding) : chunk;
const splitted = asString.split(separator);
if (buffered.length > 0 && splitted.length > 1) {
splitted[0] = buffered.concat(splitted[0]);
buffered = "";
Expand All @@ -233,11 +235,13 @@ export function join(separator: string): NodeJS.ReadWriteStream {
return new Transform({
readableObjectMode: true,
writableObjectMode: true,
async transform(chunk: string, encoding, callback) {
async transform(chunk: string | Buffer, encoding, callback) {
const asString =
chunk instanceof Buffer ? chunk.toString(encoding) : chunk;
if (!isFirstChunk) {
this.push(separator);
}
this.push(chunk);
this.push(asString);
isFirstChunk = false;
callback();
},
Expand All @@ -257,8 +261,10 @@ export function replace(
return new Transform({
readableObjectMode: true,
writableObjectMode: true,
transform(chunk: string, encoding, callback) {
callback(undefined, chunk.replace(searchValue, replaceValue));
transform(chunk: string | Buffer, encoding, callback) {
const asString =
chunk instanceof Buffer ? chunk.toString(encoding) : chunk;
callback(undefined, asString.replace(searchValue, replaceValue));
},
});
}
Expand All @@ -270,10 +276,12 @@ export function parse(): NodeJS.ReadWriteStream {
return new Transform({
readableObjectMode: true,
writableObjectMode: true,
async transform(chunk: string, encoding, callback) {
async transform(chunk: string | Buffer, encoding, callback) {
try {
const asString =
chunk instanceof Buffer ? chunk.toString(encoding) : chunk;
// Using await causes parsing errors to be emitted
callback(undefined, await JSON.parse(chunk));
callback(undefined, await JSON.parse(asString));
} catch (err) {
callback(err);
}
Expand Down

0 comments on commit 63c3681

Please sign in to comment.