nock 11.9.1 → 12.0.2

package/README.md

@@ -113,15 +113,17 @@ The latest version of nock supports all currently maintained Node versions, see
 
 Here is a list of past nock versions with respective node version support
 
-| node | nock      |
-| ---- | --------- |
-| 0.10 | up to 8.x |
-| 0.11 | up to 8.x |
-| 0.12 | up to 8.x |
-| 4    | up to 9.x |
-| 5    | up to 8.x |
-| 7    | up to 9.x |
-| 9    | up to 9.x |
+| node | nock       |
+| ---- | ---------- |
+| 0.10 | up to 8.x  |
+| 0.11 | up to 8.x  |
+| 0.12 | up to 8.x  |
+| 4    | up to 9.x  |
+| 5    | up to 8.x  |
+| 6    | up to 10.x |
+| 7    | up to 9.x  |
+| 8    | up to 11.x |
+| 9    | up to 9.x  |
 
 ## Usage
 
@@ -1154,7 +1156,7 @@ For enabling any real HTTP requests (the default behavior):
 nock.enableNetConnect()
 ```
 
-You could allow real HTTP requests for certain host names by providing a string or a regular expression for the hostname:
+You could allow real HTTP requests for certain host names by providing a string or a regular expression for the hostname, or a function that accepts the hostname and returns true or false:
 
 ```js
 // Using a string
@@ -1163,6 +1165,11 @@ nock.enableNetConnect('amazon.com')
 // Or a RegExp
 nock.enableNetConnect(/(amazon|github)\.com/)
 
+// Or a Function
+nock.enableNetConnect(
+  host => host.includes('amazon.com') || host.includes('github.com')
+)
+
 http.get('http://www.amazon.com/')
 http.get('http://github.com/')
 

package/index.js

@@ -29,14 +29,7 @@ Object.assign(module.exports, {
   removeInterceptor,
   disableNetConnect,
   enableNetConnect,
-  // TODO-12.x Historically `nock.cleanAll()` has returned the nock global.
-  // The other global methods do not do this, so it's not clear this was
-  // deliberate or is even helpful. This shim is included for backward
-  // compatibility and should be replaced with an alias to `removeAll()`.
-  cleanAll() {
-    removeAll()
-    return module.exports
-  },
+  cleanAll: removeAll,
   abortPendingRequests,
   load,
   loadDefs,

package/lib/back.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const assert = require('assert')
-const _ = require('lodash')
 const recorder = require('./recorder')
 const {
   activate,
@@ -25,13 +24,6 @@ try {
   // do nothing, probably in browser
 }
 
-let mkdirp
-try {
-  mkdirp = require('mkdirp')
-} catch (err) {
-  // do nothing, probably in browser
-}
-
 /**
  * nock the current function with the fixture given
  *
@@ -61,8 +53,7 @@ function Back(fixtureName, options, nockedFn) {
     )
   }
 
-  // TODO-12.x: Replace with `typeof fixtureName === 'string'`.
-  if (!_.isString(fixtureName)) {
+  if (typeof fixtureName !== 'string') {
     throw new Error('Parameter fixtureName must be a string')
   }
 
@@ -178,7 +169,7 @@ const record = {
         typeof outputs === 'string' ? outputs : JSON.stringify(outputs, null, 4)
       debug('recorder outputs:', outputs)
 
-      mkdirp.sync(path.dirname(fixture))
+      fs.mkdirSync(path.dirname(fixture), { recursive: true })
       fs.writeFileSync(fixture, outputs)
     }
   },

package/lib/common.js

@@ -174,8 +174,7 @@ function stringifyRequest(options, body) {
 
 function isContentEncoded(headers) {
   const contentEncoding = headers['content-encoding']
-  // TODO-12.x: Replace with `typeof contentEncoding === 'string'`.
-  return _.isString(contentEncoding) && contentEncoding !== ''
+  return typeof contentEncoding === 'string' && contentEncoding !== ''
 }
 
 function contentEncoding(headers, encoder) {
@@ -364,8 +363,7 @@ function deleteHeadersField(headers, fieldNameToDelete) {
     throw Error('headers must be an object')
   }
 
-  // TODO-12.x: Replace with `typeof fieldNameToDelete !== 'string'`.
-  if (!_.isString(fieldNameToDelete)) {
+  if (typeof fieldNameToDelete !== 'string') {
     throw Error('field name must be a string')
   }
 
@@ -438,16 +436,15 @@ 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:
     case value === undefined:
       value = ''
       break
-    // TODO-12.x: Replace with `typeof value === 'string'`.
-    case _.isString(value):
+    case typeof value === 'string':
       if (stringFormattingFn) {
         value = stringFormattingFn(value)
       }

package/lib/intercept.js

@@ -8,7 +8,6 @@ const { InterceptedRequestRouter } = require('./intercepted_request_router')
 const common = require('./common')
 const { inherits } = require('util')
 const http = require('http')
-const _ = require('lodash')
 const debug = require('debug')('nock.intercept')
 const globalEmitter = require('./global_emitter')
 
@@ -50,13 +49,17 @@ let allowNetConnect
  * @example
  * // Enables real requests for url that matches google and amazon
  * nock.enableNetConnect(/(google|amazon)/);
+ * @example
+ * // Enables real requests for url that includes google
+ * nock.enableNetConnect(host => host.includes('google'));
  */
 function enableNetConnect(matcher) {
-  // TODO-12.x: Replace with `typeof matcher === 'string'`.
-  if (_.isString(matcher)) {
+  if (typeof matcher === 'string') {
     allowNetConnect = new RegExp(matcher)
   } else if (matcher instanceof RegExp) {
     allowNetConnect = matcher
+  } else if (typeof matcher === 'function') {
+    allowNetConnect = { test: matcher }
   } else {
     allowNetConnect = /.*/
   }

package/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') {

package/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,9 +355,10 @@ function define(nockDefs) {
     } else if (nockDef.responseIsBinary) {
       response = Buffer.from(nockDef.response, 'hex')
     } else {
-      response = _.isString(nockDef.response)
-        ? tryJsonParse(nockDef.response)
-        : nockDef.response
+      response =
+        typeof nockDef.response === 'string'
+          ? tryJsonParse(nockDef.response)
+          : nockDef.response
     }
 
     const scope = new Scope(nscope, options)

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "11.9.1",
+  "version": "12.0.2",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "url": "http://github.com/nock/nock/issues"
   },
   "engines": {
-    "node": ">= 8.0"
+    "node": ">= 10.13"
   },
   "main": "./index.js",
   "types": "types",
@@ -25,14 +25,13 @@
     "debug": "^4.1.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.13",
-    "mkdirp": "^0.5.0",
     "propagate": "^2.0.0"
   },
   "devDependencies": {
     "assert-rejects": "^1.0.0",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
-    "dtslint": "^2.0.5",
+    "dtslint": "^3.0.0",
     "eslint": "^6.0.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-config-standard": "^14.0.0",
@@ -41,7 +40,7 @@
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
-    "got": "^9.6.0",
+    "got": "^10.5.2",
     "@sinonjs/fake-timers": "^6.0.0",
     "mocha": "^7.0.1",
     "npm-run-all": "^4.1.5",
@@ -51,7 +50,7 @@
     "request": "^2.83.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^17.0.2",
-    "sinon": "^8.1.1",
+    "sinon": "^9.0.0",
     "sinon-chai": "^3.3.0",
     "superagent": "^5.0.2",
     "tap": "14.6.1"
@@ -64,7 +63,7 @@
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
     "lint:ts": "dtslint types",
     "semantic-release": "semantic-release",
-    "test": "run-p test:mocha test:tap",
+    "test": "run-s test:mocha test:tap",
     "test:coverage": "tap --coverage-report=html && open coverage/lcov-report/index.html",
     "test:mocha": "nyc mocha $(grep -lr '^\\s*it(' tests)",
     "test:tap": "tap --100 --coverage --coverage-report=text ./tests/test_*.js"

package/types/index.d.ts

@@ -21,7 +21,9 @@ declare namespace nock {
   function activeMocks(): string[]
   function removeInterceptor(interceptor: Interceptor | ReqOptions): boolean
   function disableNetConnect(): void
-  function enableNetConnect(matcher?: string | RegExp): void
+  function enableNetConnect(
+    matcher?: string | RegExp | ((host: string) => boolean)
+  ): void
   function load(path: string): Scope[]
   function loadDefs(path: string): Definition[]
   function define(defs: Definition[]): Scope[]
@@ -125,7 +127,6 @@ declare namespace nock {
 
     done(): void
     isDone(): boolean
-    restore(): void
     pendingMocks(): string[]
     activeMocks(): string[]
   }