bhttp - npm Package Compare versions

Comparing version 1.2.5 to 1.2.6

CHANGELOG.md

@@ -0,1 +1,7 @@
+## 1.2.6 (February 18, 2020)
+
+Oops, accidentally released 1.2.5 a bit too soon!
+
+* __Patch:__ Fixed some Lodash conversion mistakes
+
 ## 1.2.5 (February 18, 2020)
@@ -2,0 +8,0 @@

lib/bhttp.js

@@ -7,2 +7,10 @@ "use strict"; // FIXME: Force-lowercase user-supplied headers before merging them into the request?
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+
 var urlUtil = require("url");
@@ -95,2 +103,28 @@
 
+function iterateValues(object) {
+  if (object == null) {
+    return [];
+  } else {
+    return Object.values(object);
+  }
+}
+
+function assign() {
+  for (var _len = arguments.length, objects = new Array(_len), _key = 0; _key < _len; _key++) {
+    objects[_key] = arguments[_key];
+  }
+
+  var validObjects = objects.filter(function (object) {
+    return object != null;
+  });
+
+  if (validObjects.length === 0) {
+    return {};
+  } else if (validObjects.length === 1) {
+    return validObjects[0];
+  } else {
+    return Object.assign.apply(Object, _toConsumableArray(validObjects));
+  }
+}
+
 var ofTypes = function ofTypes(obj, types) {
@@ -215,3 +249,3 @@ var match = false;
     var urlOptions = urlUtil.parse(request.url, true);
-    Object.assign(request.options, {
+    assign(request.options, {
       hostname: urlOptions.hostname,
@@ -297,9 +331,9 @@ port: urlOptions.port
 
-    multipart = multipart || Object.values(request.options.formFields).some(function (item) {
+    multipart = multipart || iterateValues(request.options.formFields).some(function (item) {
       return item instanceof Buffer || isStream(item);
     }); // Really, 'files' and 'formFields' are the same thing - they mostly have different names for 1) clarity and 2) multipart detection. We combine them here.
 
-    Object.assign(request.options.formFields, request.options.files); // For a last sanity check, we want to know whether there are any Stream objects in our form data *at all* - these can't be used when encodeJSON is enabled.
+    assign(request.options.formFields, request.options.files); // For a last sanity check, we want to know whether there are any Stream objects in our form data *at all* - these can't be used when encodeJSON is enabled.
 
-    var containsStreams = Object.values(request.options.formFields).some(function (item) {
+    var containsStreams = iterateValues(request.options.formFields).some(function (item) {
       return isStream(item);
@@ -386,3 +420,3 @@ });
           } else {
-            Object.assign(request.options.headers, headers);
+            assign(request.options.headers, headers);
             return Promise.resolve();
@@ -389,0 +423,0 @@ }

package.json

 {
   "name": "bhttp",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A sane HTTP client library for Node.js with Streams2 support.",
@@ -5,0 +5,0 @@ "main": "index.js",

src/bhttp.js

@@ -89,2 +89,22 @@ "use strict";
 
+function iterateValues(object) {
+	if (object == null) {
+		return [];
+	} else {
+		return Object.values(object);
+	}
+}
+
+function assign(...objects) {
+	let validObjects = objects.filter((object) => object != null);
+
+	if (validObjects.length === 0) {
+		return {};
+	} else if (validObjects.length === 1) {
+		return validObjects[0];
+	} else {
+		return Object.assign(...validObjects);
+	}
+}
+
 const ofTypes = function(obj, types) {
@@ -180,3 +200,3 @@ let match = false;
 
-		Object.assign(request.options, {hostname: urlOptions.hostname, port: urlOptions.port});
+		assign(request.options, {hostname: urlOptions.hostname, port: urlOptions.port});
 		request.options.path = urlUtil.format({pathname: urlOptions.pathname, query: request.options.query != null ? request.options.query : urlOptions.query});
@@ -239,9 +259,9 @@ request.protocol = urlOptions.protocol.replace(/:$/, "");
 		// Similarly, if any of the formFields values are either a Stream or a Buffer, we will assume that the form should be sent as multipart.
-		multipart = multipart || Object.values(request.options.formFields).some((item) => item instanceof Buffer || isStream(item));
+		multipart = multipart || iterateValues(request.options.formFields).some((item) => item instanceof Buffer || isStream(item));
 
 		// Really, 'files' and 'formFields' are the same thing - they mostly have different names for 1) clarity and 2) multipart detection. We combine them here.
-		Object.assign(request.options.formFields, request.options.files);
+		assign(request.options.formFields, request.options.files);
 
 		// For a last sanity check, we want to know whether there are any Stream objects in our form data *at all* - these can't be used when encodeJSON is enabled.
-		const containsStreams = Object.values(request.options.formFields).some((item) => isStream(item));
+		const containsStreams = iterateValues(request.options.formFields).some((item) => isStream(item));
 
@@ -304,3 +324,3 @@ if (request.options.encodeJSON && containsStreams) {
 					} else {
-						Object.assign(request.options.headers, headers);
+						assign(request.options.headers, headers);
 						return Promise.resolve();
@@ -307,0 +327,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3167218

increased by0.05%

Lines of code

1542

increased by2.87%

Number of medium maintenance alerts

0

decreased by-100%

Number of medium supply chain risk alerts

5

decreased by-16.67%

No dependency changes