SB: Added more test cases and escape string function

saasquatch · Nov 27, 2019 · 70e2d99 · 70e2d99
1 parent b2c73a3
commit 70e2d99
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/src/serializer.ts b/src/serializer.ts
@@ -3,6 +3,18 @@ import { JsonataASTNode, ObjectUnaryNode, ArrayUnaryNode } from "./types";
 // TODO: Should eventually replace this with types from the `jsonata` package once they're complete.
 type AST = JsonataASTNode;
 
+export function escapeString(name:string){
+  if (
+    /\s/.test(name) 
+    || ["null", "false", "true"].includes(name) 
+    || /^\d/.test(name)
+    || !(/^[a-zA-Z()]+$/.test(name))
+  ) {
+    return "`" + name + "`";
+  }
+  return name;
+}
+
 export default function serializer(node: AST): string {
   if(!node) return undefined;
   if (node.type === "binary") {
@@ -61,10 +73,7 @@ export default function serializer(node: AST): string {
       bind = "@" + index + focus
     }
     let name = node.value;
-    if (/\s/.test(name) || ["null", "false", "true"].includes(name)) {
-      // Escaped for whitespace
-      name = "`" + name + "`";
-    }
+    name = escapeString(name);
     return name + bind + stages;
   } else if (node.type === "filter") {
     return "[" + serializer(node.expr) + "]";

diff --git a/test/features/Serializer.feature b/test/features/Serializer.feature
@@ -36,5 +36,30 @@ Feature: AST Serializer
             | loans@$foo#$bar |
             | loans@$foo      |
             | loans#$bar      |
+            | foo-bar         |
+            | foo+bar         |
+            | foo/bar         |
+            | foo*bar         |
+            | `😊`          |
+            | "foo-bar"       |
+            | "foo+bar"       |
+            | "foo/bar"       |
+            | "foo*bar"       |
+            | "foo-bar"       |
+            | "foo+bar"       |
+            | "foo/bar"       |
+            | "foo*bar"       |
+            | "\""            |
+            | foo_bar         |
+            | `foo_bar`       |
+            | foo1bar         |
+            | foobar1         |
+            | foobar_1        |
+            | `1foobar`       |
+            | `foo-bar`       |
+            | `foo+bar`       |
+            | `foo/bar`       |
+            | `foo*bar`       |
+            | `foobar-1`      |