Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 1 addition & 15 deletions lib/core/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,23 +85,9 @@ function isStream (obj) {
/**
* @param {*} object
* @returns {object is Blob}
* based on https://github.com/node-fetch/fetch-blob/blob/8ab587d34080de94140b54f07168451e7d0b655e/index.js#L229-L241 (MIT License)
*/
function isBlobLike (object) {
if (object === null) {
return false
} else if (object instanceof Blob) {
return true
} else if (typeof object !== 'object') {
return false
} else {
const sTag = object[Symbol.toStringTag]

return (sTag === 'Blob' || sTag === 'File') && (
('stream' in object && typeof object.stream === 'function') ||
('arrayBuffer' in object && typeof object.arrayBuffer === 'function')
)
}
return object instanceof Blob
}

/**
Expand Down
14 changes: 13 additions & 1 deletion test/node-test/validations.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { tspl } = require('@matteo.collina/tspl')

test('validations', async t => {
let client
const p = tspl(t, { plan: 10 })
const p = tspl(t, { plan: 12 })

const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
res.setHeader('content-type', 'text/plain')
Expand Down Expand Up @@ -53,6 +53,18 @@ test('validations', async t => {
p.equal(err.code, 'UND_ERR_INVALID_ARG')
p.equal(err.message, 'body must be a string, a Buffer, a Readable stream, an iterable, or an async iterable')
})

client.request({
path: '/',
method: 'POST',
body: {
[Symbol.toStringTag]: 'Blob',
arrayBuffer: () => {}
}
}, (err, res) => {
p.equal(err.code, 'UND_ERR_INVALID_ARG')
p.equal(err.message, 'body must be a string, a Buffer, a Readable stream, an iterable, or an async iterable')
})
})
})

Expand Down
8 changes: 4 additions & 4 deletions test/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ describe('isBlobLike', () => {
[Symbol.toStringTag]: 'Blob',
stream: () => { }
}
strictEqual(isBlobLike(blobLikeStream), true)
strictEqual(isBlobLike(blobLikeStream), false)
})

test('fileLikeStream', () => {
const fileLikeStream = {
stream: () => { },
[Symbol.toStringTag]: 'File'
}
strictEqual(isBlobLike(fileLikeStream), true)
strictEqual(isBlobLike(fileLikeStream), false)
})

test('fileLikeArrayBuffer', () => {
const blobLikeArrayBuffer = {
[Symbol.toStringTag]: 'Blob',
arrayBuffer: () => { }
}
strictEqual(isBlobLike(blobLikeArrayBuffer), true)
strictEqual(isBlobLike(blobLikeArrayBuffer), false)
})

test('blobLikeArrayBuffer', () => {
const fileLikeArrayBuffer = {
[Symbol.toStringTag]: 'File',
arrayBuffer: () => { }
}
strictEqual(isBlobLike(fileLikeArrayBuffer), true)
strictEqual(isBlobLike(fileLikeArrayBuffer), false)
})

test('string', () => {
Expand Down
Loading