From 42b2a349fd612f4fcacc5b35fbffee3c44ed499d Mon Sep 17 00:00:00 2001
From: Patrick Steele-Idem <pnidem@gmail.com>
Date: Tue, 19 Jan 2016 11:04:52 -0700
Subject: [PATCH] Marko v3: Don't put quotes around property name if not
 necessary

---
 compiler/CodeGenerator.js                             | 10 +++++++++-
 compiler/ast/Property.js                              | 11 +++++++++--
 ...criptVarName.js => isValidJavaScriptIdentifier.js} |  2 +-
 test/fixtures/codegen/autotest/literal/expected.js    |  4 ++--
 .../autotest/custom-tag-body-function/expected.js     |  4 ++--
 .../autotest/custom-tag-import-var/expected.js        |  8 ++++----
 .../fixtures/compiler/autotest/custom-tag/expected.js |  2 +-
 .../compiler/autotest/nested-tags/expected.js         | 10 +++++-----
 8 files changed, 33 insertions(+), 18 deletions(-)
 rename compiler/util/{isValidJavaScriptVarName.js => isValidJavaScriptIdentifier.js} (76%)

diff --git a/compiler/CodeGenerator.js b/compiler/CodeGenerator.js
index 56f6d59d7..a29040ef8 100644
--- a/compiler/CodeGenerator.js
+++ b/compiler/CodeGenerator.js
@@ -7,6 +7,7 @@ const Identifier = require('./ast/Identifier');
 const ok = require('assert').ok;
 const Container = require('./ast/Container');
 const util = require('util');
+const isValidJavaScriptIdentifier = require('./util/isValidJavaScriptIdentifier');
 
 class Slot {
     constructor(codegen, slotNode) {
@@ -495,8 +496,15 @@ class Generator {
             for (let i=0; i<keys.length; i++) {
                 let k = keys[i];
                 let v = value[k];
+
                 this.writeLineIndent();
-                this.write(JSON.stringify(k) + ': ');
+                
+                if (isValidJavaScriptIdentifier(k)) {
+                    this.write(k + ': ');
+                } else {
+                    this.write(JSON.stringify(k) + ': ');
+                }
+
                 if (v instanceof Node) {
                     this.generateCode(v);
                 } else {
diff --git a/compiler/ast/Property.js b/compiler/ast/Property.js
index 6deba4379..0481ada25 100644
--- a/compiler/ast/Property.js
+++ b/compiler/ast/Property.js
@@ -1,6 +1,6 @@
 'use strict';
-
-var Node = require('./Node');
+const isValidJavaScriptIdentifier = require('../util/isValidJavaScriptIdentifier');
+const Node = require('./Node');
 
 class Property extends Node {
     constructor(def) {
@@ -13,6 +13,13 @@ class Property extends Node {
         var key = this.key;
         var value = this.value;
 
+        if (key.type === 'Literal') {
+            var propName = key.value;
+            if (isValidJavaScriptIdentifier(propName)) {
+                key = codegen.builder.identifier(propName);
+            }
+        }
+
         codegen.generateCode(key);
         codegen.write(': ');
         codegen.generateCode(value);
diff --git a/compiler/util/isValidJavaScriptVarName.js b/compiler/util/isValidJavaScriptIdentifier.js
similarity index 76%
rename from compiler/util/isValidJavaScriptVarName.js
rename to compiler/util/isValidJavaScriptIdentifier.js
index ab2ab35f6..145ba29d9 100644
--- a/compiler/util/isValidJavaScriptVarName.js
+++ b/compiler/util/isValidJavaScriptIdentifier.js
@@ -1,7 +1,7 @@
 var reservedWords = require('./javaScriptReservedWords');
 var varNameRegExp = /^[$A-Z_][0-9A-Z_$]*$/i;
 
-module.exports = function isValidJavaScriptVarName(varName) {
+module.exports = function isValidJavaScriptIdentifier(varName) {
     if (reservedWords[varName]) {
         return false;
     }
diff --git a/test/fixtures/codegen/autotest/literal/expected.js b/test/fixtures/codegen/autotest/literal/expected.js
index e707018b5..e0161bb58 100644
--- a/test/fixtures/codegen/autotest/literal/expected.js
+++ b/test/fixtures/codegen/autotest/literal/expected.js
@@ -2,8 +2,8 @@ var aString = "abc",
     aNumber = 123,
     aBoolean = false,
     anObject = {
-      "foo": "bar",
-      "dynamic": data.name
+      foo: "bar",
+      dynamic: data.name
     },
     anArray = [
       "foo",
diff --git a/test/fixtures/compiler/autotest/custom-tag-body-function/expected.js b/test/fixtures/compiler/autotest/custom-tag-body-function/expected.js
index 87eff1c70..b98f5e585 100644
--- a/test/fixtures/compiler/autotest/custom-tag-body-function/expected.js
+++ b/test/fixtures/compiler/autotest/custom-tag-body-function/expected.js
@@ -8,8 +8,8 @@ function create(__helpers) {
 
   return function render(data, out) {
     test_body_function({
-      "name": "World",
-      "myBody": function myBody(foo, bar) {
+      name: "World",
+      myBody: function myBody(foo, bar) {
         out.w("This is the body content");
       }
     }, out);
diff --git a/test/fixtures/compiler/autotest/custom-tag-import-var/expected.js b/test/fixtures/compiler/autotest/custom-tag-import-var/expected.js
index c3d012fa6..68ea51df1 100644
--- a/test/fixtures/compiler/autotest/custom-tag-import-var/expected.js
+++ b/test/fixtures/compiler/autotest/custom-tag-import-var/expected.js
@@ -8,10 +8,10 @@ function create(__helpers) {
 
   return function render(data, out) {
     test_import_var({
-      "name": "World",
-      "foo": data.foo,
-      "bar": data.bar,
-      "renderBody": function renderBody(out) {
+      name: "World",
+      foo: data.foo,
+      bar: data.bar,
+      renderBody: function renderBody(out) {
         out.w("This is the body content");
       }
     }, out);
diff --git a/test/fixtures/compiler/autotest/custom-tag/expected.js b/test/fixtures/compiler/autotest/custom-tag/expected.js
index 57b1e6eb8..b7037466b 100644
--- a/test/fixtures/compiler/autotest/custom-tag/expected.js
+++ b/test/fixtures/compiler/autotest/custom-tag/expected.js
@@ -8,7 +8,7 @@ function create(__helpers) {
 
   return function render(data, out) {
     test_hello({
-      "name": "World"
+      name: "World"
     }, out);
   };
 }
diff --git a/test/fixtures/compiler/autotest/nested-tags/expected.js b/test/fixtures/compiler/autotest/nested-tags/expected.js
index 86e72cac6..0ec98bffa 100644
--- a/test/fixtures/compiler/autotest/nested-tags/expected.js
+++ b/test/fixtures/compiler/autotest/nested-tags/expected.js
@@ -10,18 +10,18 @@ function create(__helpers) {
 
   return function render(data, out) {
     test_nested_tags_overlay({
-      "header": "data.header"
+      header: "data.header"
     }, out, 0, function renderBody(out, test_nested_tags_overlay0) {
       test_nested_tags_overlay_body({
-        "className": "my-body",
-        "renderBody": function renderBody(out) {
+        className: "my-body",
+        renderBody: function renderBody(out) {
           out.w("Body content");
         }
       }, out, test_nested_tags_overlay0);
 
       test_nested_tags_overlay_footer({
-        "className": "my-footer",
-        "renderBody": function renderBody(out) {
+        className: "my-footer",
+        renderBody: function renderBody(out) {
           out.w("Footer content");
         }
       }, out, test_nested_tags_overlay0);