Fix elm string representation parsing when keys are empty strings or …

…contain spaces Closes #23
gicentre · Mar 17, 2019 · 2572105 · 2572105
1 parent 13b7be2
commit 2572105
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/packages/elm-string-representation/src/parse.test.ts b/packages/elm-string-representation/src/parse.test.ts
@@ -107,12 +107,33 @@ export const testCases: Array<{
     },
   },
   {
-    input: ['{ = "test", b = 42 }', '{ b = 42, = "test" }'],
+    input: [
+      '{ = "test", b = 42 }',
+      '{ b = 42, = "test" }',
+      '{  = "test", b = 42 }',
+    ],
     output: {
       "": "test",
       b: 42,
     },
   },
+  {
+    input: ['{ two words = "test", b = 42 }', '{ b = 42, two words = "test" }'],
+    output: {
+      "two words": "test",
+      b: 42,
+    },
+  },
+  {
+    input: [
+      '{ a lot of words = "test", b = 42 }',
+      '{ b = 42, a lot of words = "test" }',
+    ],
+    output: {
+      "a lot of words": "test",
+      b: 42,
+    },
+  },
   {
     input: ["( 1, 2 )", "(1,2)"],
     output: [1, 2],

diff --git a/packages/elm-string-representation/src/parse.ts b/packages/elm-string-representation/src/parse.ts
@@ -38,7 +38,7 @@ export default (text: string): any => {
         chunk
           .replace(/ = True/g, " = true")
           .replace(/ = False/g, " = false")
-          .replace(/(,|{)(| ([$a-zA-Z_0-9]+)) = /g, '$1 "$3": ')
+          .replace(/(,|{)\s*(|([$a-zA-Z_0-9 ]*)\s+)= /g, '$1 "$3": ')
           .replace(/\(/g, "[")
           .replace(/\)/g, "]"),
       );