Replace a few more uses of lodash

Ref #1285
nock · Feb 18, 2020 · c8a1bc2 · c8a1bc2
1 parent 61fb7e0
commit c8a1bc2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -436,8 +436,8 @@ function matchStringOrRegexp(target, pattern) {
 function formatQueryValue(key, value, stringFormattingFn) {
   // TODO: Probably refactor code to replace `switch(true)` with `if`/`else`.
   switch (true) {
-    case _.isNumber(value): // fall-through
-    case _.isBoolean(value):
+    case typeof value === 'number': // fall-through
+    case typeof value === 'boolean':
       value = value.toString()
       break
     case value === null:

diff --git a/lib/interceptor.js b/lib/interceptor.js
@@ -102,7 +102,10 @@ module.exports = class Interceptor {
   replyWithError(errorMessage) {
     this.errorMessage = errorMessage
 
-    _.defaults(this.options, this.scope.scopeOptions)
+    this.options = {
+      ...this.scope.scopeOptions,
+      ...this.options,
+    }
 
     this.scope.add(this._key, this)
     return this.scope
@@ -132,7 +135,10 @@ module.exports = class Interceptor {
       }
     }
 
-    _.defaults(this.options, this.scope.scopeOptions)
+    this.options = {
+      ...this.scope.scopeOptions,
+      ...this.options,
+    }
 
     this.rawHeaders = common.headersInputToRawArray(rawHeaders)
 
@@ -557,7 +563,7 @@ module.exports = class Interceptor {
   delay(opts) {
     let headDelay
     let bodyDelay
-    if (_.isNumber(opts)) {
+    if (typeof opts === 'number') {
       headDelay = opts
       bodyDelay = 0
     } else if (typeof opts === 'object') {

diff --git a/lib/scope.js b/lib/scope.js
@@ -7,7 +7,6 @@ const { addInterceptor, isOn } = require('./intercept')
 const common = require('./common')
 const assert = require('assert')
 const url = require('url')
-const _ = require('lodash')
 const debug = require('debug')('nock.scope')
 const { EventEmitter } = require('events')
 const util = require('util')
@@ -184,7 +183,7 @@ class Scope extends EventEmitter {
         }
         return candidate.replace(filteringArguments[0], filteringArguments[1])
       }
-    } else if (_.isFunction(arguments[0])) {
+    } else if (typeof arguments[0] === 'function') {
       return arguments[0]
     }
   }
@@ -356,7 +355,7 @@ function define(nockDefs) {
     } else if (nockDef.responseIsBinary) {
       response = Buffer.from(nockDef.response, 'hex')
     } else {
-      response = _.isString(nockDef.response)
+      response = typeof nockDef.response === 'string'
         ? tryJsonParse(nockDef.response)
         : nockDef.response
     }