feat(extract-url): Finalize URL extraction

Author: hypery2k

spec/urlhandler.common.spec.js

@@ -0,0 +1,37 @@
+import {
+  extractAppURL
+} from '../urlhandler.common';
+
+
+describe('extractAppURL', function () {
+  it('should handle empty url', function () {
+    let url = null;
+    let result = extractAppURL(url);
+    expect(result).toBeNull();
+  });
+  it('should handle empty path and param', function () {
+    let url = 'app://';
+    let result = extractAppURL(url);
+    expect(result.path).toBeNull();
+    expect(result.params.size).toBe(0);
+  });
+  it('should split url into path only', function () {
+    let url = 'app://config';
+    let result = extractAppURL(url);
+    expect(result.path).toBe('config');
+    expect(result.params.size).toBe(0);
+  });
+  it('should split url into path and param', function () {
+    let url = 'app://config?dev=true';
+    let result = extractAppURL(url);
+    expect(result.path).toBe('config');
+    expect(result.params.get('dev')).toBe('true');
+  });
+  it('should split url into path and two params', function () {
+    let url = 'app://config?dev=true&test=abc';
+    let result = extractAppURL(url);
+    expect(result.path).toBe('config');
+    expect(result.params.get('dev')).toBe('true');
+    expect(result.params.get('test')).toBe('abc');
+  });
+});

urlhandler.common.ts

@@ -1,20 +1,33 @@
 import { AppURL, UrlHandlerCallback } from './urlhandler';
 var URL_HANDLER_CB: UrlHandlerCallback;
 
+/**
+ * Extract url string param to a nice object
+ * @param urlParam to parse
+ * @returns AppURL object or null if invalid was used
+ */
 export function extractAppURL(urlParam: any): AppURL {
-    let url = <String>urlParam,
-        params = new Map<String, String>(),
-        path = url.substring(url.indexOf('//') + 2, url.indexOf('?')),
-        parameters = url.substring(url.indexOf('?') + 1).split('&');
-    // create JSON object
-    for (let i = 0, len = parameters.length; i < len; i++) {
-        let paramData = params[i].split('=');
-        params.set(paramData[0], paramData[1] ? paramData[1] : null);
+    if (!!urlParam) {
+        let url = urlParam.toString(),
+            params = new Map<String, String>(),
+            urlWithPath = url.indexOf('//') < url.length - 2,
+            urlWithParams = url.indexOf('?') !== -1,
+            path = urlWithPath ? url.substring(url.indexOf('//') + 2, urlWithParams ? url.indexOf('?') : url.length) : null,
+            parameters = url.substring(url.indexOf('?') + 1).split('&');
+        // create JSON object
+        if (urlWithParams) {
+            for (let i = 0, len = parameters.length; i < len; i++) {
+                let paramData = parameters[i].split('=');
+                params.set(paramData[0], paramData[1] ? paramData[1] : null);
+            }
+        }
+        return {
+            params: params,
+            path: path
+        };
+    } else {
+        return null;
     }
-    return {
-        params: params,
-        path: path
-    };
 }
 
 export function handleOpenURL(handler: UrlHandlerCallback): void {