Merge branch 'master' into feature/export-and-load-automation-scripts

Author: TwitchBronBron

webviews/src/views/RokuRegistryView/RokuRegistryView.spec.ts

@@ -4,31 +4,45 @@ import { registryView } from './RokuRegistryView';
 describe('RegistryView', () => {
     describe('formatValues', () => {
         it('should convert json into an object with the correct values', () => {
+            const inputValue = 1;
             const input = {
-                a: '{"b": 1}'
+                a: `{"b": ${inputValue}}`
             };
             const result = registryView.formatValues(input);
-            expect(result.a.b).to.equal(1);
+            expect(result.a.b).to.equal(inputValue);
         });
 
         it('should correctly handle multiple levels', () => {
+            const inputValue = 1;
             const input = {
                 a: {
-                    b: '{"c": 1}'
+                    b: `{"c": ${inputValue}}`
                 }
             };
             const result = registryView.formatValues(input);
-            expect(result.a.b.c).to.equal(1);
+            expect(result.a.b.c).to.equal(inputValue);
         });
 
-        it('should return the incoming value if not JSON', () => {
+        it('should not try and convert strings that look like numbers into numbers', () => {
+            const inputValue = '1';
             const input = {
                 a: {
-                    b: 1
+                    b: inputValue
                 }
             };
             const result = registryView.formatValues(input);
-            expect(result.a.b).to.equal(input.a.b);
+            expect(result.a.b).to.equal(inputValue);
+        });
+
+        it('should not try and convert strings that look like booleans into booleans', () => {
+            const inputValue = 'true';
+            const input = {
+                a: {
+                    b: inputValue
+                }
+            };
+            const result = registryView.formatValues(input);
+            expect(result.a.b).to.equal(inputValue);
         });
     });
 });

webviews/src/views/RokuRegistryView/RokuRegistryView.ts

@@ -8,7 +8,11 @@ class RegistryView {
             } else if (typeof values[key] === 'string') {
                 try {
                     // Try and parse it to see if it's json
-                    values[key] = JSON.parse(values[key]);
+                    // Only want to convert with json if not a number or boolean
+                    const result = JSON.parse(values[key]);
+                    if (typeof result !== 'number' && typeof result !== 'boolean') {
+                        values[key] = result;
+                    }
                 } catch (e) {
                     // If we fail we leave it unchanged
                 }