Fix bug in handling empty query string. (#1)

* Fix bug in query string handling.

* Simplify test.

* Simplify more.

* Ignore .vscode.

Author: Kimmo Sääskilahti

.gitignore

@@ -3,3 +3,4 @@ dist
 *.tgz
 .DS_Store
 .*.swp
+.vscode/

package-lock.json

@@ -193,27 +193,29 @@ function validateRequest(request: HttpRequest): void {
   }
 }
 
+const parseQuery = (searchParams: URLSearchParams): HttpQueryParameters => {
+  const queryMap = new Object();
+  for (const [key, value] of searchParams) {
+    const parameterName = decodeURIComponent(key);
+    const parameterValue = decodeURIComponent(value);
+
+    let existingEntry = queryMap[parameterName] as string[];
+    if (!existingEntry) {
+      existingEntry = new Array<string>();
+      queryMap[parameterName] = existingEntry;
+    }
+    existingEntry.push(parameterValue);
+  }
+  const query = new HttpQueryParameters(
+    queryMap as { string: string | string[] }
+  );
+  return query;
+};
+
 export class HttpRequestBuilder {
   static fromPath(requestData: HttpRequestFromPath): HttpRequest {
     const url = new URL("file://" + requestData.path);
-
-    const queryMap = new Object();
-    const queryString = url.search.substring(1);
-    for (const entry of queryString.split("&")) {
-      const pair = entry.split("=");
-      const parameterName = decodeURIComponent(pair[0]);
-      const parameterValue = decodeURIComponent(pair[1]);
-
-      let existingEntry = queryMap[parameterName] as string[];
-      if (!existingEntry) {
-        existingEntry = new Array<string>();
-        queryMap[parameterName] = existingEntry;
-      }
-      existingEntry.push(parameterValue);
-    }
-    const query = new HttpQueryParameters(
-      queryMap as { string: string | string[] }
-    );
+    const query = parseQuery(url.searchParams);
 
     const request = {
       timestamp: requestData.timestamp ? requestData.timestamp : undefined,

src/index.ts

@@ -81,6 +81,20 @@ test("Building exchange from path", () => {
   expect(count).toBe(2);
 });
 
+test("Building exchange from path with no query parameters", () => {
+  const timestamp = new Date();
+  const request = HttpRequestBuilder.fromPath({
+    timestamp: timestamp,
+    method: HttpMethod.GET,
+    protocol: HttpProtocol.HTTPS,
+    host: "example.com",
+    headers: {},
+    path: "/my/path",
+    body: "request string body"
+  });
+  expect(request.query.toJSON()).toEqual({});
+});
+
 test("Http exchanges from JSON with path", () => {
   const json = `{
     "request": {