refactor: endpoint.options() is now endpoint.merge()

BREAKING CHANGE: endpoint.options() has been renamed to endpoint.merge()

lib/endpoint-with-defaults.js

@@ -1,9 +1,8 @@
 module.exports = endpointWithDefaults
 
-const defaultOptions = require('./default-options')
-const toRequestOptions = require('./to-request-options')
+const merge = require('./merge')
+const parse = require('./parse')
 
 function endpointWithDefaults (defaults, route, options) {
-  const endpointOptions = defaultOptions(defaults, route, options)
-  return toRequestOptions(endpointOptions)
+  return parse(merge(defaults, route, options))
 }

lib/default-options.js → lib/merge.js

@@ -3,7 +3,7 @@ module.exports = defaultOptions
 const merge = require('deepmerge')
 const isPlainObject = require('is-plain-object')
 
-const lowercaseKeys = require('./lowercase-keys')
+const lowercaseKeys = require('./util/lowercase-keys')
 
 function defaultOptions (defaults, route, options) {
   if (typeof route === 'string') {

lib/to-request-options.js → lib/parse.js

@@ -1,9 +1,9 @@
 module.exports = toRequestOptions
 
 const urlTemplate = require('url-template')
-const addQueryParameters = require('./add-query-parameters')
-const extractUrlVariableNames = require('./extract-url-variable-names')
-const omit = require('./omit')
+const addQueryParameters = require('./util/add-query-parameters')
+const extractUrlVariableNames = require('./util/extract-url-variable-names')
+const omit = require('./util/omit')
 
 function toRequestOptions (options) {
   // https://fetch.spec.whatwg.org/#methods

with-defaults.js

@@ -1,20 +1,15 @@
 module.exports = withDefaults
 
-const merge = require('deepmerge')
-const isPlainObject = require('is-plain-object')
-
 const endpointWithDefaults = require('./lib/endpoint-with-defaults')
-const lowercaseKeys = require('./lib/lowercase-keys')
-const optionsWithDefaults = require('./lib/default-options')
-const toRequestOptions = require('./lib/to-request-options')
+const merge = require('./lib/merge')
+const parse = require('./lib/parse')
 
 function withDefaults (oldDefaults, newDefaults) {
-  newDefaults.headers = lowercaseKeys(newDefaults.headers)
-  const DEFAULTS = merge.all([oldDefaults, newDefaults].filter(Boolean), { isMergeableObject: isPlainObject })
-  const endpoint = endpointWithDefaults.bind(null, DEFAULTS)
-  endpoint.DEFAULTS = DEFAULTS
-  endpoint.defaults = withDefaults.bind(null, DEFAULTS)
-  endpoint.options = optionsWithDefaults.bind(null, DEFAULTS)
-  endpoint.parse = toRequestOptions
-  return endpoint
+  const DEFAULTS = merge(oldDefaults, newDefaults)
+  return Object.assign(endpointWithDefaults.bind(null, DEFAULTS), {
+    DEFAULTS,
+    defaults: withDefaults.bind(null, DEFAULTS),
+    merge: merge.bind(null, DEFAULTS),
+    parse
+  })
 }