Move SafeString unwrapping to common.js

Author: Nathan Booker

helpers/json.js

@@ -1,11 +1,9 @@
 'use strict';
-const SafeString = require('handlebars').SafeString;
+const common = require('./lib/common.js');
 
 const factory = () => {
     return function(data) {
-        if (data instanceof SafeString) {
-            data = data.toString();
-        }
+        data = common.unwrapIfSafeString(data);
         return JSON.stringify(data);
     };
 };

helpers/lib/common.js

@@ -1,5 +1,6 @@
 'use strict';
 const URL = require('url').URL;
+const SafeString = require('handlebars').SafeString;
 
 function isValidURL(val) {
     try {
@@ -10,6 +11,14 @@ function isValidURL(val) {
     }
 }
 
+function unwrapIfSafeString(val) {
+    if (val instanceof SafeString) {
+        val = val.toString();
+    }
+    return val;
+}
+
 module.exports = {
     isValidURL,
+    unwrapIfSafeString
 };

helpers/setURLQueryParam.js

@@ -6,15 +6,9 @@ const SafeString = require('handlebars').SafeString;
 
 const factory = () => {
     return function(string, key, value) {
-        if (string instanceof SafeString) {
-            string = string.toString();
-        }
-        if (key instanceof SafeString) {
-            key = key.toString();
-        }
-        if (value instanceof SafeString) {
-            value = value.toString();
-        }
+        string = common.unwrapIfSafeString(string);
+        key = common.unwrapIfSafeString(key);
+        value = common.unwrapIfSafeString(value);
         if (!utils.isString(string) || !common.isValidURL(string)){
             throw new TypeError("Invalid URL passed to setURLQueryParam");
         } else if (!utils.isString(key)){

helpers/stripQuerystring.js

@@ -1,12 +1,10 @@
 'use strict';
-const SafeString = require('handlebars').SafeString;
 const utils = require('handlebars-utils');
+const common = require('./lib/common.js');
 
 const factory = () => {
     return function(url) {
-        if (url instanceof SafeString) {
-            url = url.toString();
-        }
+        url = common.unwrapIfSafeString(url);
         if (utils.isString(url)) {
             return url.split('?')[0];
         }