Skip to content

chore: drop deep-equal devDependency #1353

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: drop deep-equal devDependency #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"xtend": "^4.0.2"
},
"devDependencies": {
"deep-equal": "^2.0.3",
"express": "^4.21.2",
"form-data": "^4.0.2",
"fs-temp": "^1.2.1",
Expand Down
18 changes: 18 additions & 0 deletions test/_util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,21 @@ exports.submitForm = function submitForm (multer, form, cb) {
})
})
}

exports.toNullProtoDeep = function toNullProtoDeep (value) {
if (Array.isArray(value)) {
return value.map(function (item) { return toNullProtoDeep(item) })
}

if (value && typeof value === 'object') {
var out = Object.create(null)

Object.keys(value).forEach(function (key) {
out[key] = toNullProtoDeep(value[key])
})

return out
}

return value
}
13 changes: 6 additions & 7 deletions test/disk-storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-env mocha */

var assert = require('assert')
var deepEqual = require('deep-equal')

var fs = require('fs')
var path = require('path')
Expand Down Expand Up @@ -71,9 +70,9 @@ describe('Disk Storage', function () {
assert.strictEqual(req.body.version, '')
assert.strictEqual(req.body.year, '')

assert(deepEqual(req.body.checkboxfull, ['cb1', 'cb2']))
assert(deepEqual(req.body.checkboxhalfempty, ['cb1', '']))
assert(deepEqual(req.body.checkboxempty, ['', '']))
assert.deepStrictEqual(req.body.checkboxfull, ['cb1', 'cb2'])
assert.deepStrictEqual(req.body.checkboxhalfempty, ['cb1', ''])
assert.deepStrictEqual(req.body.checkboxempty, ['', ''])

assert.strictEqual(req.file.fieldname, 'empty')
assert.strictEqual(req.file.originalname, 'empty.dat')
Expand Down Expand Up @@ -107,7 +106,7 @@ describe('Disk Storage', function () {
util.submitForm(parser, form, function (err, req) {
assert.ifError(err)

assert(deepEqual(req.body, {}))
assert.deepStrictEqual(req.body, util.toNullProtoDeep({}))

assert.strictEqual(req.files.empty[0].fieldname, 'empty')
assert.strictEqual(req.files.empty[0].originalname, 'empty.dat')
Expand Down Expand Up @@ -158,10 +157,10 @@ describe('Disk Storage', function () {
util.submitForm(parser, form, function (err, req) {
assert.strictEqual(err.code, 'LIMIT_UNEXPECTED_FILE')
assert.strictEqual(err.field, 'small0')
assert(deepEqual(err.storageErrors, []))
assert.deepStrictEqual(err.storageErrors, [])

var files = fs.readdirSync(uploadDir)
assert(deepEqual(files, []))
assert.deepStrictEqual(files, [])

done()
})
Expand Down
19 changes: 13 additions & 6 deletions test/fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
/* eslint-env mocha */

var assert = require('assert')
var deepEqual = require('deep-equal')
var stream = require('stream')

var util = require('./_util')
var multer = require('../')
var FormData = require('form-data')
var testData = require('testdata-w3c-json-form')
var rawTestData = require('testdata-w3c-json-form')

var testData = rawTestData.map(function (t) {
return {
name: t.name,
fields: t.fields,
expected: util.toNullProtoDeep(t.expected)
}
})

describe('Fields', function () {
var parser
Expand All @@ -25,7 +32,7 @@ describe('Fields', function () {

util.submitForm(parser, form, function (err, req) {
assert.ifError(err)
assert(deepEqual(req.body, {
assert.deepStrictEqual(req.body, util.toNullProtoDeep({
name: 'Multer',
key: 'value',
abc: 'xyz'
Expand All @@ -49,7 +56,7 @@ describe('Fields', function () {

util.submitForm(parser, form, function (err, req) {
assert.ifError(err)
assert(deepEqual(req.body, {
assert.deepStrictEqual(req.body, util.toNullProtoDeep({
name: 'Multer',
key: '',
abc: '',
Expand Down Expand Up @@ -107,7 +114,7 @@ describe('Fields', function () {

util.submitForm(parser, form, function (err, req) {
assert.ifError(err)
assert(deepEqual(req.body, test.expected))
assert.deepStrictEqual(req.body, test.expected)
done()
})
})
Expand All @@ -122,7 +129,7 @@ describe('Fields', function () {

util.submitForm(parser, form, function (err, req) {
assert.ifError(err)
assert(deepEqual(req.body, {
assert.deepStrictEqual(req.body, util.toNullProtoDeep({
obj: {
0: 'a',
2: 'c',
Expand Down
9 changes: 4 additions & 5 deletions test/memory-storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-env mocha */

var assert = require('assert')
var deepEqual = require('deep-equal')

var util = require('./_util')
var multer = require('../')
Expand Down Expand Up @@ -58,9 +57,9 @@ describe('Memory Storage', function () {
assert.strictEqual(req.body.version, '')
assert.strictEqual(req.body.year, '')

assert(deepEqual(req.body.checkboxfull, ['cb1', 'cb2']))
assert(deepEqual(req.body.checkboxhalfempty, ['cb1', '']))
assert(deepEqual(req.body.checkboxempty, ['', '']))
assert.deepStrictEqual(req.body.checkboxfull, ['cb1', 'cb2'])
assert.deepStrictEqual(req.body.checkboxhalfempty, ['cb1', ''])
assert.deepStrictEqual(req.body.checkboxempty, ['', ''])

assert.strictEqual(req.file.fieldname, 'empty')
assert.strictEqual(req.file.originalname, 'empty.dat')
Expand Down Expand Up @@ -95,7 +94,7 @@ describe('Memory Storage', function () {
util.submitForm(parser, form, function (err, req) {
assert.ifError(err)

assert(deepEqual(req.body, {}))
assert.deepStrictEqual(req.body, util.toNullProtoDeep({}))

assert.strictEqual(req.files.empty[0].fieldname, 'empty')
assert.strictEqual(req.files.empty[0].originalname, 'empty.dat')
Expand Down