Replace url node module usage with url-join & URLSearchParams (#17)

Author: Rafael

.gitignore

@@ -4,3 +4,4 @@ node_modules
 package
 package-lock.json
 stipulate-*.tgz
+.idea

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+
+- Replace `url` node module usage with `url-join` & `URLSearchParams`
+
 ## 0.1.0
 
 - Package CommonJS compatible code

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stipulate",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A module extending the Fetch API with some useful default error handling and hooks.",
   "main": "cjs/stipulate.js",
   "module": "src/stipulate.js",
@@ -37,7 +37,8 @@
     "mocha": "~2.5.3"
   },
   "dependencies": {
-    "lodash": "4.x"
+    "lodash": "4.x",
+    "url-join": "^4.0.1"
   },
   "browserify": {
     "transform": [

src/resolve-url.js

@@ -1,16 +1,30 @@
 import _ from 'lodash';
-import url from 'url';
+import urlJoin from 'url-join';
 
 const resolveUrl = function(urlString, query) {
-  const parsedUrl = url.parse(urlString, true);
+  let parsedUrlQuery = {};
+  let urlWithoutParams = urlString;
+  const queryStart = urlString.lastIndexOf('?');
 
-  const mergedQuery = _.defaults({}, query, parsedUrl.query);
+  if (queryStart !== -1){
+    const paramStr = urlString.slice(queryStart);
+    parsedUrlQuery = Object.fromEntries(
+        new URLSearchParams(paramStr)
+    );
+    urlWithoutParams = urlString.slice(0, queryStart);
+  }
+
+  const mergedQuery = _.defaults({}, query, parsedUrlQuery);
   const fullQuery = _.pickBy(mergedQuery, (value) => value);
 
-  delete parsedUrl.search;
-  parsedUrl.query = fullQuery;
+  const searchParams = new URLSearchParams(fullQuery);
+  const searchParamsString = searchParams.toString();
+
+  if (searchParamsString){
+    return urlJoin(urlWithoutParams, `?${searchParamsString}`);
+  }
 
-  return url.format(parsedUrl);
+  return urlWithoutParams;
 };
 
 export default resolveUrl;