major: deps and codebase maintenance (#18)

* chore: updated tap

* fix: remove deprecation

* feat!: update form-data

Author: Eomm

.github/dependabot.yml

@@ -1,12 +1,13 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: tap
-    versions:
-    - "> 12.7.0"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -2,32 +2,16 @@ name: ci
 
 on:
   push:
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
   pull_request:
-
-env:
-  CI: true
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        node-version: [10, 12, 14, 16]
-        os: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install
-        run: |
-          npm install --ignore-scripts
-
-      - name: Run tests
-        run: |
-          npm test
+    uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
+    with:
+      lint: true

.gitignore

@@ -104,3 +104,4 @@ dist
 .tern-port
 
 package-lock.json
+.vscode/

index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const FormData = require('form-data')
-const querystring = require('querystring')
+const querystring = require('fast-querystring')
 const { Readable } = require('stream')
 
 module.exports = function formMethod (json, opts) {
@@ -13,8 +13,7 @@ module.exports = function formMethod (json, opts) {
 
   const form = new FormData()
   const hasFile = Object.keys(json)
-    .map(unfold.bind(json))
-    .reduce(flatMap, [])
+    .flatMap(unfold.bind(json))
     .reduce((isFile, { k, v }) => {
       const value = getValue(v)
       const options = getOptions(v)
@@ -59,12 +58,3 @@ function unfold (k) {
   }
   return { k, v }
 }
-
-// We need to support node 10 till April 2021
-function flatMap (acc, unfold) {
-  if (Array.isArray(unfold)) {
-    return acc.concat(unfold)
-  }
-  acc.push(unfold)
-  return acc
-}

package.json

@@ -4,10 +4,9 @@
   "description": "Build a form without headache",
   "main": "index.js",
   "scripts": {
-    "unit": "tap -J test/**/*.test.js --cov",
     "lint": "standard",
     "lint:fix": "standard --fix",
-    "test": "npm run lint && npm run unit"
+    "test": "tap test/**/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -36,9 +35,10 @@
     "light-my-request": "^5.0.0",
     "multiparty": "^4.2.1",
     "standard": "^17.0.0",
-    "tap": "^14.10.8"
+    "tap": "^16.3.0"
   },
   "dependencies": {
-    "form-data": "^3.0.0"
+    "fast-querystring": "^1.0.0",
+    "form-data": "^4.0.0"
   }
 }

test/index.test.js

@@ -25,9 +25,9 @@ test('application/x-www-form-urlencoded', t => {
   let payload = ''
   form.payload.on('data', data => { payload += data })
   form.payload.on('end', () => {
-    t.deepEquals(payload, 'field1=value1&field2=value2')
+    t.strictSame(payload, 'field1=value1&field2=value2')
   })
-  t.deepEquals(form.headers, { 'content-type': 'application/x-www-form-urlencoded' })
+  t.strictSame(form.headers, { 'content-type': 'application/x-www-form-urlencoded' })
 })
 
 test('custom data name', t => {
@@ -40,9 +40,9 @@ test('custom data name', t => {
   let payload = ''
   form.body.on('data', data => { payload += data })
   form.body.on('end', () => {
-    t.deepEquals(payload, 'field1=value1&field2=value2')
+    t.strictSame(payload, 'field1=value1&field2=value2')
   })
-  t.deepEquals(form.head, { 'content-type': 'application/x-www-form-urlencoded' })
+  t.strictSame(form.head, { 'content-type': 'application/x-www-form-urlencoded' })
 })
 
 test('application/x-www-form-urlencoded array', t => {
@@ -55,9 +55,9 @@ test('application/x-www-form-urlencoded array', t => {
   let payload = ''
   form.payload.on('data', data => { payload += data })
   form.payload.on('end', () => {
-    t.deepEquals(payload, 'field1=value1&field1=value3&field2=value2')
+    t.strictSame(payload, 'field1=value1&field1=value3&field2=value2')
   })
-  t.deepEquals(form.headers, { 'content-type': 'application/x-www-form-urlencoded' })
+  t.strictSame(form.headers, { 'content-type': 'application/x-www-form-urlencoded' })
 })
 
 test('multipart/form-data', t => {
@@ -73,10 +73,10 @@ test('multipart/form-data', t => {
     const form = new multiparty.Form()
     form.parse(req, function (err, fields, files) {
       t.error(err)
-      t.equals(fields.field1[0], '👌')
-      t.equals(fields.field1[1], 'value1')
-      t.equals(files.field2[0].originalFilename, 'LICENSE')
-      t.equals(fields.field3[0], 'true')
+      t.equal(fields.field1[0], '👌')
+      t.equal(fields.field1[1], 'value1')
+      t.equal(files.field2[0].originalFilename, 'LICENSE')
+      t.equal(fields.field3[0], 'true')
       res.writeHead(200, { 'content-type': req.headers['content-type'] })
       res.end('')
     })
@@ -104,9 +104,9 @@ test('multipart/form-data multiple file', t => {
     const form = new multiparty.Form()
     form.parse(req, function (err, fields, files) {
       t.error(err)
-      t.equals(fields.field1[0], 'a string')
-      t.equals(files.field1[0].originalFilename, 'LICENSE')
-      t.equals(files.field1[1].originalFilename, 'LICENSE')
+      t.equal(fields.field1[0], 'a string')
+      t.equal(files.field1[0].originalFilename, 'LICENSE')
+      t.equal(files.field1[1].originalFilename, 'LICENSE')
       res.writeHead(200, { 'content-type': req.headers['content-type'] })
       res.end('')
     })
@@ -146,14 +146,14 @@ test('multipart/form-data with options', t => {
     const form = new multiparty.Form()
     form.parse(req, function (err, fields, files) {
       t.error(err)
-      t.equals(fields.field1[0], '👌')
-      t.equals(fields.field1[1], 'value1')
-      t.equals(fields.field4[0], 'a string')
-      t.equals(files.field2[0].originalFilename, 'bar.md')
-      t.equals(fs.readFileSync(files.field2[0].path, 'utf-8'), fs.readFileSync('./LICENSE', 'utf-8'))
-      t.equals(fields.field3[0], 'true')
-      t.equals(files.field4[0].originalFilename, 'LICENSE')
-      t.equals(files.field4[1].originalFilename, 'suboption-in-array.md')
+      t.equal(fields.field1[0], '👌')
+      t.equal(fields.field1[1], 'value1')
+      t.equal(fields.field4[0], 'a string')
+      t.equal(files.field2[0].originalFilename, 'bar.md')
+      t.equal(fs.readFileSync(files.field2[0].path, 'utf-8'), fs.readFileSync('./LICENSE', 'utf-8'))
+      t.equal(fields.field3[0], 'true')
+      t.equal(files.field4[0].originalFilename, 'LICENSE')
+      t.equal(files.field4[1].originalFilename, 'suboption-in-array.md')
       res.writeHead(200, { 'content-type': req.headers['content-type'] })
       res.end('')
     })