Catch URIErrors from URL helper functions.

Author: jhorbulyk

src/functions.js

@@ -591,7 +591,19 @@ const functions = (() => {
             return undefined;
         }
 
-        return encodeURIComponent(str);
+        // Catch URIErrors when URI sequence is malformed
+        var returnVal;
+        try {
+            returnVal = encodeURIComponent(str);
+        } catch (e) {
+            throw {
+                code: "D3140",
+                stack: (new Error()).stack,
+                value: str,
+                functionName: "encodeUrlComponent"
+            };
+        }
+        return returnVal;
     }
 
     /**
@@ -605,7 +617,19 @@ const functions = (() => {
             return undefined;
         }
 
-        return encodeURI(str);
+        // Catch URIErrors when URI sequence is malformed
+        var returnVal;
+        try {
+            returnVal = encodeURI(str);
+        } catch (e) {
+            throw {
+                code: "D3140",
+                stack: (new Error()).stack,
+                value: str,
+                functionName: "encodeUrl"
+            };
+        }
+        return returnVal;
     }
 
     /**
@@ -619,7 +643,19 @@ const functions = (() => {
             return undefined;
         }
 
-        return decodeURIComponent(str);
+        // Catch URIErrors when URI sequence is malformed
+        var returnVal;
+        try {
+            returnVal = decodeURIComponent(str);
+        } catch (e) {
+            throw {
+                code: "D3140",
+                stack: (new Error()).stack,
+                value: str,
+                functionName: "decodeUrlComponent"
+            };
+        }
+        return returnVal;
     }
 
     /**
@@ -633,7 +669,19 @@ const functions = (() => {
             return undefined;
         }
 
-        return decodeURI(str);
+        // Catch URIErrors when URI sequence is malformed
+        var returnVal;
+        try {
+            returnVal = decodeURI(str);
+        } catch (e) {
+            throw {
+                code: "D3140",
+                stack: (new Error()).stack,
+                value: str,
+                functionName: "decodeUrl"
+            };
+        }
+        return returnVal;
     }
 
     /**

src/jsonata.js

@@ -1818,7 +1818,8 @@ var jsonata = (function() {
         "D3136": "The date/time picture string is missing specifiers required to parse the timestamp",
         "D3137": "{{{message}}}",
         "D3138": "The $single() function expected exactly 1 matching result.  Instead it matched more.",
-        "D3139": "The $single() function expected exactly 1 matching result.  Instead it matched 0."
+        "D3139": "The $single() function expected exactly 1 matching result.  Instead it matched 0.",
+        "D3140": "Malformed URL passed to ${{{functionName}}}(): {{value}}"
     };
 
     /**

test/test-suite/groups/function-decodeUrl/case002.json

@@ -0,0 +1,9 @@
+{
+    "expr": "$decodeUrl('%E0%A4%A')",
+    "dataset": "dataset5",
+    "bindings": {},
+    "error": {
+        "code": "D3140",
+        "message": "Malformed URL passed to $decodeUrl(): \"%E0%A4%A\""
+    }
+}

test/test-suite/groups/function-decodeUrlComponent/case002.json

@@ -0,0 +1,9 @@
+{
+    "expr": "$decodeUrlComponent('%E0%A4%A')",
+    "dataset": "dataset5",
+    "bindings": {},
+    "error": {
+        "code": "D3140",
+        "message": "Malformed URL passed to $decodeUrlComponent(): \"%E0%A4%A\""
+    }
+}

test/test-suite/groups/function-encodeUrl/case002.json

@@ -0,0 +1,9 @@
+{
+    "expr": "$encodeUrl('\uD800')",
+    "dataset": "dataset5",
+    "bindings": {},
+    "error": {
+        "code": "D3140",
+        "message": "Malformed URL passed to $encodeUrl(): \"\uD800\""
+    }
+}

test/test-suite/groups/function-encodeUrlComponent/case002.json

@@ -0,0 +1,9 @@
+{
+    "expr": "$encodeUrlComponent('\uD800')",
+    "dataset": "dataset5",
+    "bindings": {},
+    "error": {
+        "code": "D3140",
+        "message": "Malformed URL passed to $encodeUrlComponent(): \"\uD800\""
+    }
+}