nock 12.0.0-beta.1 → 12.0.3

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
 

package/lib/back.js

@@ -24,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
  *
@@ -176,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

@@ -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:

package/lib/intercepted_request_router.js

@@ -142,6 +142,7 @@ class InterceptedRequestRouter {
     debug('req.end')
     const { req } = this
 
+    // handle the different overloaded param signatures
     if (typeof chunk === 'function') {
       callback = chunk
       chunk = null
@@ -150,19 +151,19 @@ class InterceptedRequestRouter {
       encoding = null
     }
 
+    if (typeof callback === 'function') {
+      req.once('finish', callback)
+    }
+
     if (!req.aborted && !this.playbackStarted) {
-      req.write(chunk, encoding, () => {
-        if (typeof callback === 'function') {
-          callback()
-        }
-        this.startPlayback()
-        req.emit('finish')
-        req.emit('end')
-      })
+      req.write(chunk, encoding)
+      this.startPlayback()
     }
     if (req.aborted) {
       this.emitError(new Error('Request aborted'))
     }
+
+    return req
   }
 
   handleFlushHeaders() {
@@ -271,6 +272,11 @@ class InterceptedRequestRouter {
     if (matchedInterceptor) {
       debug('interceptor identified, starting mocking')
 
+      // wait to emit the finish event until we know for sure an Interceptor is going to playback.
+      // otherwise an unmocked request might emit finish twice.
+      req.finished = true
+      req.emit('finish')
+
       playbackInterceptor({
         req,
         socket,

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/playback_interceptor.js

@@ -72,7 +72,7 @@ function selectDefaultHeaders(existingHeaders, defaultHeaders) {
 }
 
 /**
- * Play back an intercepto using the given request and mock response.
+ * Play back an interceptor using the given request and mock response.
  */
 function playbackInterceptor({
   req,

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/lib/socket.js

@@ -13,6 +13,7 @@ module.exports = class Socket extends EventEmitter {
     }
 
     this.bufferSize = 0
+    this.writableLength = 0
     this.writable = true
     this.readable = true
     this.pending = false

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "12.0.0-beta.1",
+  "version": "12.0.3",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -25,14 +25,13 @@
     "debug": "^4.1.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.13",
-    "mkdirp": "^1.0.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

@@ -127,7 +127,6 @@ declare namespace nock {
 
     done(): void
     isDone(): boolean
-    restore(): void
     pendingMocks(): string[]
     activeMocks(): string[]
   }