fix: remove figgy-pudding

Author: claudiahdz

index.js

@@ -1,21 +1,11 @@
 'use strict'
 
 const fetch = require('npm-registry-fetch')
-const figgyPudding = require('figgy-pudding')
-const getStream = require('get-stream')
 const validate = require('aproba')
 
-const HooksConfig = figgyPudding({
-  package: {},
-  limit: {},
-  offset: {},
-  Promise: {default: () => Promise}
-})
-
 const eu = encodeURIComponent
 const cmd = module.exports = {}
-cmd.add = (name, endpoint, secret, opts) => {
-  opts = HooksConfig(opts)
+cmd.add = (name, endpoint, secret, opts = {}) => {
   validate('SSSO', [name, endpoint, secret, opts])
   let type = 'package'
   if (name.match(/^@[^/]+$/)) {
@@ -25,18 +15,19 @@ cmd.add = (name, endpoint, secret, opts) => {
     type = 'owner'
     name = name.substr(1)
   }
-  return fetch.json('/-/npm/v1/hooks/hook', opts.concat({
+  return fetch.json('/-/npm/v1/hooks/hook', {
+    ...opts,
     method: 'POST',
     body: { type, name, endpoint, secret }
-  }))
+  })
 }
 
-cmd.rm = (id, opts) => {
-  opts = HooksConfig(opts)
+cmd.rm = (id, opts = {}) => {
   validate('SO', [id, opts])
-  return fetch.json(`/-/npm/v1/hooks/hook/${eu(id)}`, opts.concat({
+  return fetch.json(`/-/npm/v1/hooks/hook/${eu(id)}`, {
+    ...opts,
     method: 'DELETE'
-  }, opts)).catch(err => {
+  }).catch(err => {
     if (err.code === 'E404') {
       return null
     } else {
@@ -45,36 +36,35 @@ cmd.rm = (id, opts) => {
   })
 }
 
-cmd.update = (id, endpoint, secret, opts) => {
-  opts = HooksConfig(opts)
+cmd.update = (id, endpoint, secret, opts = {}) => {
   validate('SSSO', [id, endpoint, secret, opts])
-  return fetch.json(`/-/npm/v1/hooks/hook/${eu(id)}`, opts.concat({
+  return fetch.json(`/-/npm/v1/hooks/hook/${eu(id)}`, {
+    ...opts,
     method: 'PUT',
     body: {endpoint, secret}
-  }, opts))
+  })
 }
 
-cmd.find = (id, opts) => {
-  opts = HooksConfig(opts)
+cmd.find = (id, opts = {}) => {
   validate('SO', [id, opts])
   return fetch.json(`/-/npm/v1/hooks/hook/${eu(id)}`, opts)
 }
 
-cmd.ls = (opts) => {
-  return getStream.array(cmd.ls.stream(opts))
+cmd.ls = (opts = {}) => {
+  return cmd.ls.stream(opts).collect()
 }
 
-cmd.ls.stream = (opts) => {
-  opts = HooksConfig(opts)
-  const {package: pkg, limit, offset} = opts
+cmd.ls.stream = (opts = {}) => {
+  const { package: pkg, limit, offset } = opts
   validate('S|Z', [pkg])
   validate('N|Z', [limit])
   validate('N|Z', [offset])
-  return fetch.json.stream('/-/npm/v1/hooks', 'objects.*', opts.concat({
+  return fetch.json.stream('/-/npm/v1/hooks', 'objects.*', {
+    ...opts,
     query: {
       package: pkg,
       limit,
       offset
     }
-  }))
+  })
 }

package-lock.json

@@ -27,7 +27,6 @@
   "license": "ISC",
   "dependencies": {
     "aproba": "^2.0.0",
-    "figgy-pudding": "^3.4.1",
     "get-stream": "^4.0.0",
     "npm-registry-fetch": "^3.8.0"
   },

package.json

@@ -1,15 +1,35 @@
 'use strict'
 
-const figgyPudding = require('figgy-pudding')
+// const figgyPudding = require('figgy-pudding')
 const test = require('tap').test
-const tnock = require('./util/tnock.js')
+const tnock = require('./fixtures/tnock.js')
 
 const hooks = require('../index.js')
 
-const OPTS = figgyPudding({registry: {}})({
+const OPTS = {
   registry: 'https://mock.reg/'
-})
+}
+
 const HOOK_URL = 'https://my.hook.url/'
+const REG = 'https://registry.npmjs.org/'
+
+test('add package hook with no options', t => {
+  const params = {
+    type: 'package',
+    name: 'mypkg',
+    endpoint: HOOK_URL,
+    secret: 'sekrit'
+  }
+  const hook = Object.assign({
+    id: 'deadbeef',
+    status: 'active'
+  }, params)
+  tnock(t, REG)
+    .post('/-/npm/v1/hooks/hook', params)
+    .reply(200, hook)
+  return hooks.add('mypkg', HOOK_URL, 'sekrit')
+    .then(json => t.deepEqual(json, hook))
+})
 
 test('add package hook', t => {
   const params = {
@@ -83,6 +103,14 @@ test('add scope hook', t => {
     .then(json => t.deepEqual(json, hook))
 })
 
+test('rm with no options', t => {
+  tnock(t, REG)
+    .delete('/-/npm/v1/hooks/hook/hithere')
+    .reply(200, {id: 'hithere'})
+  return hooks.rm('hithere')
+    .then(json => t.equal(json.id, 'hithere'))
+})
+
 test('rm', t => {
   tnock(t, OPTS.registry)
     .delete('/-/npm/v1/hooks/hook/hithere')
@@ -109,6 +137,14 @@ test('rm null on other err', t => {
   )
 })
 
+test('find with no options', t => {
+  tnock(t, REG)
+    .get('/-/npm/v1/hooks/hook/hithere')
+    .reply(200, {id: 'hithere'})
+  return hooks.find('hithere')
+    .then(json => t.equal(json.id, 'hithere'))
+})
+
 test('find', t => {
   tnock(t, OPTS.registry)
     .get('/-/npm/v1/hooks/hook/hithere')
@@ -117,6 +153,35 @@ test('find', t => {
     .then(json => t.equal(json.id, 'hithere'))
 })
 
+test('ls', t => {
+  const entries = [
+    {id: 'first'},
+    {id: 'second'},
+    {id: 'third'}
+  ]
+  tnock(t, REG)
+    .get('/-/npm/v1/hooks')
+    .reply(200, {objects: entries})
+  return hooks.ls().then(
+    json => t.deepEqual(json, entries)
+  )
+})
+
+test('ls.stream', t => {
+  const entries = [
+    {id: 'first'},
+    {id: 'second'},
+    {id: 'third'}
+  ]
+  tnock(t, REG)
+    .get('/-/npm/v1/hooks')
+    .reply(200, {objects: entries})
+
+  return hooks.ls.stream().collect().then(
+    json => t.deepEqual(json, entries)
+  )
+})
+
 test('ls', t => {
   const entries = [
     {id: 'first'},
@@ -140,9 +205,10 @@ test('ls package', t => {
   tnock(t, OPTS.registry)
     .get('/-/npm/v1/hooks?package=%40npm%2Fhooks')
     .reply(200, {objects: entries})
-  return hooks.ls(OPTS.concat({
+  return hooks.ls({
+    ...OPTS,
     package: '@npm/hooks'
-  })).then(json => t.deepEqual(json, entries))
+  }).then(json => t.deepEqual(json, entries))
 })
 
 test('ls limit+offset', t => {
@@ -154,10 +220,11 @@ test('ls limit+offset', t => {
   tnock(t, OPTS.registry)
     .get('/-/npm/v1/hooks?limit=10&offset=20')
     .reply(200, {objects: entries})
-  return hooks.ls(OPTS.concat({
+  return hooks.ls({
+    ...OPTS,
     limit: 10,
     offset: 20
-  })).then(json => t.deepEqual(json, entries))
+  }).then(json => t.deepEqual(json, entries))
 })
 
 test('ls package+limit+offset', t => {
@@ -169,11 +236,22 @@ test('ls package+limit+offset', t => {
   tnock(t, OPTS.registry)
     .get('/-/npm/v1/hooks?package=%40npm%2Fhooks&limit=10&offset=20')
     .reply(200, {objects: entries})
-  return hooks.ls(OPTS.concat({
+  return hooks.ls({
+    ...OPTS,
     limit: 10,
     offset: 20,
     package: '@npm/hooks'
-  })).then(json => t.deepEqual(json, entries))
+  }).then(json => t.deepEqual(json, entries))
+})
+test('update with no options', t => {
+  tnock(t, REG)
+    .put('/-/npm/v1/hooks/hook/hi')
+    .reply(200, (uri, body) => body)
+  return hooks.update('hi', HOOK_URL, 'sekrit')
+    .then(json => t.deepEqual(json, {
+      endpoint: HOOK_URL,
+      secret: 'sekrit'
+    }))
 })
 
 test('update', t => {