Skip to content

fs: allow overring fs for streams #29083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 9 commits into from
Closed

fs: allow overring fs for streams #29083

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc976ce
fs: allow overring fs for streams
ronag Aug 11, 2019
5123e58
fixup: bad rebase
ronag Oct 15, 2019
3d39786
fixup: linting
ronag Oct 15, 2019
e0cc161
fixup: missing doc refs
ronag Nov 15, 2019
b9f518b
Update doc/api/fs.md
ronag Nov 24, 2019
cdca4b7
WIP
ronag Dec 11, 2019
f3f609a
fixup
ronag Dec 12, 2019
835a02a
fixup
ronag Dec 13, 2019
be60186
fixup: linting
ronag Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup: linting
  • Loading branch information
@ronag
ronag committed Dec 11, 2019
commit 3d39786453f234026df38beee663d2f065e85fcf
31 changes: 22 additions & 9 deletions lib/internal/fs/streams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ const {
} = primordials;

const {
<<<<<<< HEAD
ERR_OUT_OF_RANGE,
ERR_STREAM_DESTROYED
=======
ERR_INVALID_ARG_TYPE,
ERR_OUT_OF_RANGE
>>>>>>> fixup: linting
} = require('internal/errors').codes;
const internalUtil = require('internal/util');
const { validateNumber } = require('internal/validators');
Expand Down Expand Up @@ -80,15 +85,18 @@ function ReadStream(path, options) {
this[kFs] = options.fs || fs;

if (typeof this[kFs].open !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.open', 'function', this[kFs].open);
throw new ERR_INVALID_ARG_TYPE('options.fs.open', 'function',
this[kFs].open);
}

if (typeof this[kFs].read !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.read', 'function', this[kFs].read);
throw new ERR_INVALID_ARG_TYPE('options.fs.read', 'function',
this[kFs].read);
}

if (typeof this[kFs].close !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.close', 'function', this[kFs].close);
throw new ERR_INVALID_ARG_TYPE('options.fs.close', 'function',
this[kFs].close);
}

Readable.call(this, options);
Expand Down Expand Up @@ -294,25 +302,30 @@ function WriteStream(path, options) {
options.emitClose = false;
}

this[kFs] = options.fs || fs;
this[kFs] = options.fs || fs;
if (typeof this[kFs].open !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.open', 'function', this[kFs].open);
throw new ERR_INVALID_ARG_TYPE('options.fs.open', 'function',
this[kFs].open);
}

if (!this[kFs].write && !this[kFs].writev) {
throw new ERR_INVALID_ARG_TYPE('options.fs.write', 'function', this[kFs].write);
throw new ERR_INVALID_ARG_TYPE('options.fs.write', 'function',
this[kFs].write);
}

if (this[kFs].write && typeof this[kFs].write !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.write', 'function', this[kFs].write);
throw new ERR_INVALID_ARG_TYPE('options.fs.write', 'function',
this[kFs].write);
}

if (this[kFs].writev && typeof this[kFs].writev !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.writev', 'function', this[kFs].writev);
throw new ERR_INVALID_ARG_TYPE('options.fs.writev', 'function',
this[kFs].writev);
}

if (typeof this[kFs].close !== 'function') {
throw new ERR_INVALID_ARG_TYPE('options.fs.close', 'function', this[kFs].close);
throw new ERR_INVALID_ARG_TYPE('options.fs.close', 'function',
this[kFs].close);
}

// It's enough to override either, in which case only one will be used.
Expand Down