Minor tweaks to JSON Parser - gonna need a rewrite methinks

src/utilities/JsonParser.js

@@ -15,7 +15,14 @@ import Singleton from '../abstracts/Singleton';
  */
 export default class JsonParser extends Singleton {
     parse(str) {
-        const jsonString = this.parseString(str);
+        let jsonString;
+
+        try {
+            jsonString = this.parseString(str);
+        } catch (e) {
+            return str;
+        }
+
         return JSON.parse(jsonString);
     }
 
@@ -94,7 +101,7 @@ export default class JsonParser extends Singleton {
         /*
         * object
         */
-        if (str[0] === '{') {
+        if (str[0] === '{' || (this.canBeKeyHead(str[0]) && str.indexOf(':') !== -1)) {
             type = 'needKey';
             key = null;
             result = '{';

tests/utilities/JsonParser.test.js

@@ -0,0 +1,22 @@
+import TestInstance from '../../src/main/Snowboard';
+
+describe('JsonParser utility', () => {
+    beforeEach(() => {
+        document.currentScript.dataset.baseUrl = 'https://example.com';
+        document.currentScript.dataset.assetUrl = 'https://example.com/fixtures/assets/';
+
+        window.Snowboard = new TestInstance();
+    });
+
+    it('parses a null or undefined', () => {
+        expect(Snowboard.jsonParser().parse('null')).toEqual(null);
+        expect(Snowboard.jsonParser().parse('undefined')).toBeUndefined();
+    });
+
+    it('parses a simple string', () => {
+        expect(Snowboard.jsonParser().parse('test')).toEqual('test');
+        expect(Snowboard.jsonParser().parse('"test"')).toEqual('test');
+        expect(Snowboard.jsonParser().parse('"null"')).toEqual('null');
+        expect(Snowboard.jsonParser().parse('\'test\'')).toEqual('test');
+    });
+});