nock 13.3.4 → 13.3.5

package/README.md

@@ -1228,7 +1228,7 @@ The returned call objects have the following properties:
 - `body` - the body of the call, if any
 - `status` - the HTTP status of the reply (e.g. `200`)
 - `response` - the body of the reply which can be a JSON, string, hex string representing binary buffers or an array of such hex strings (when handling `content-encoded` in reply header)
-- `headers` - the headers of the reply
+- `rawHeaders` - the headers of the reply which are formatted as a flat array containing header name and header value pairs (e.g. `['accept', 'application/json', 'set-cookie', 'my-cookie=value']`)
 - `reqheader` - the headers of the request
 
 If you save this as a JSON file, you can load them directly through `nock.load(path)`. Then you can post-process them before using them in the tests. For example, to add request body filtering (shown here fixing timestamps to match the ones captured during recording):

package/lib/common.js

@@ -1,8 +1,6 @@
 'use strict'
 
 const debug = require('debug')('nock.common')
-const isPlainObject = require('lodash/isPlainObject')
-const set = require('lodash/set')
 const timers = require('timers')
 const url = require('url')
 const util = require('util')
@@ -568,17 +566,6 @@ const dataEqual = (expected, actual) => {
   return deepEqual(expected, actual)
 }
 
-/**
- * Converts flat objects whose keys use JSON path notation to nested objects.
- *
- * The input object is not mutated.
- *
- * @example
- * { 'foo[bar][0]': 'baz' } -> { foo: { bar: [ 'baz' ] } }
- */
-const expand = input =>
-  Object.entries(input).reduce((acc, [k, v]) => set(acc, k, v), {})
-
 /**
  * Performs a recursive strict comparison between two values.
  *
@@ -665,10 +652,97 @@ function isRequestDestroyed(req) {
   )
 }
 
+/**
+ * Returns true if the given value is a plain object and not an Array.
+ * @param {*} value
+ * @returns {boolean}
+ */
+function isPlainObject(value) {
+  if (typeof value !== 'object' || value === null) return false
+
+  if (Object.prototype.toString.call(value) !== '[object Object]') return false
+
+  const proto = Object.getPrototypeOf(value)
+  if (proto === null) return true
+
+  const Ctor =
+    Object.prototype.hasOwnProperty.call(proto, 'constructor') &&
+    proto.constructor
+  return (
+    typeof Ctor === 'function' &&
+    Ctor instanceof Ctor &&
+    Function.prototype.call(Ctor) === Function.prototype.call(value)
+  )
+}
+
+const prototypePollutionBlockList = ['__proto__', 'prototype', 'constructor']
+const blocklistFilter = function (part) {
+  return prototypePollutionBlockList.indexOf(part) === -1
+}
+
+/**
+ * Converts flat objects whose keys use JSON path notation to nested objects.
+ *
+ * The input object is not mutated.
+ *
+ * @example
+ * { 'foo[bar][0]': 'baz' } -> { foo: { bar: [ 'baz' ] } }
+ */
+const expand = input => {
+  if (input === undefined || input === null) {
+    return input
+  }
+
+  const keys = Object.keys(input)
+
+  const result = {}
+  let resultPtr = result
+
+  for (let path of keys) {
+    const originalPath = path
+    if (path.indexOf('[') >= 0) {
+      path = path.replace(/\[/g, '.').replace(/]/g, '')
+    }
+
+    const parts = path.split('.')
+
+    const check = parts.filter(blocklistFilter)
+
+    if (check.length !== parts.length) {
+      return undefined
+    }
+    resultPtr = result
+    const lastIndex = parts.length - 1
+
+    for (let i = 0; i < parts.length; ++i) {
+      const part = parts[i]
+      if (i === lastIndex) {
+        if (Array.isArray(resultPtr)) {
+          resultPtr[+part] = input[originalPath]
+        } else {
+          resultPtr[part] = input[originalPath]
+        }
+      } else {
+        if (resultPtr[part] === undefined || resultPtr[part] === null) {
+          const nextPart = parts[i + 1]
+          if (/^\d+$/.test(nextPart)) {
+            resultPtr[part] = []
+          } else {
+            resultPtr[part] = {}
+          }
+        }
+        resultPtr = resultPtr[part]
+      }
+    }
+  }
+  return result
+}
+
 module.exports = {
   contentEncoding,
   dataEqual,
   deleteHeadersField,
+  expand,
   forEachHeader,
   formatQueryValue,
   headersArrayToObject,

package/lib/match_body.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const mapValues = require('lodash/mapValues')
 const querystring = require('querystring')
 
 const common = require('./common')
@@ -62,6 +61,14 @@ module.exports = function matchBody(options, spec, body) {
   return common.dataEqual(spec, body)
 }
 
+function mapValues(object, cb) {
+  const keys = Object.keys(object)
+  for (const key of keys) {
+    object[key] = cb(object[key], key, object)
+  }
+  return object
+}
+
 /**
  * Based on lodash issue discussion
  * https://github.com/lodash/lodash/issues/1244

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.3.4",
+  "version": "13.3.5",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -24,7 +24,6 @@
   "dependencies": {
     "debug": "^4.1.0",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^4.17.21",
     "propagate": "^2.0.0"
   },
   "devDependencies": {
@@ -48,7 +47,7 @@
     "prettier": "3.0.3",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
-    "semantic-release": "^21.0.2",
+    "semantic-release": "^22.0.5",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
     "typescript": "^5.0.4"