Add eslint

Author: Anthropic

.eslintrc.json

@@ -0,0 +1,49 @@
+{
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "extends": "google",
+  "rules": {
+    "array-bracket-spacing": [
+      2,
+      "always",
+      {
+        "objectsInArrays": false,
+        "arraysInArrays": false
+      }
+    ],
+    "object-curly-spacing": [
+      2,
+      "always",
+      {
+        "objectsInObjects": false,
+        "arraysInObjects": false
+      }
+    ],
+    "brace-style": [
+      2,
+      "stroustrup",
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "max-len": [
+      2,
+      120,
+      { "ignoreStrings": true }
+    ],
+    "semi": [
+      2,
+      "always"
+    ],
+    "linebreak-style": "off",
+    "space-before-function-paren": "off",
+    "valid-jsdoc": "off",
+    "no-invalid-this": "off"
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-schema-form-core",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "JSON-Schema and JSON-UI-Schema utilities for form generation.",
   "main": "dist/json-schema-form-core.js",
   "scripts": {
@@ -53,6 +53,8 @@
     "babel-preset-stage-0": "^6.22.0",
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",
+    "eslint": "^3.19.0",
+    "eslint-config-google": "^0.7.1",
     "json-refs": "^2.1.6",
     "karma": "^1.3.0",
     "karma-babel-preprocessor": "^6.0.1",

src/lib/merge.spec.js

@@ -161,17 +161,55 @@ describe('merge.js', () => {
 
       var merged = merge(subschema, [{key: 'sub', readonly: true}]);
 
-      //sub
+      // sub
       merged[0].should.have.property('readonly');
       merged[0].readonly.should.eq(true);
 
-      //array
+      // array
       merged[0].items[0].should.have.property('readonly');
       merged[0].items[0].readonly.should.eq(true);
 
-      //array items
+      // array items
       merged[0].items[0].items[0].should.have.property('readonly');
       merged[0].items[0].items[0].readonly.should.eq(true);
     });
+
+    it('should add x-schema-form properties', () => {
+      let subschema = {
+        "type": "object",
+        "properties": {
+          "comment": {
+            "type": "string",
+            "title": "Comment",
+            "x-schema-form": {
+              "type": "textarea",
+              "placeholder": "Don't hold back"
+            }
+          }
+        }
+      };
+
+      var merged = merge(subschema, [ '*' ]);
+
+      merged.should.deep.eq(
+        [
+          {
+            "title": "Comment",
+            "schema": {
+              "type": "string",
+              "title":"Comment",
+              "x-schema-form": {
+                "type": "textarea",
+                "placeholder": "Don't hold back"
+              }
+            },
+            "ngModelOptions": {},
+            "key": [ "comment" ],
+            "type": "textarea",
+            "placeholder": "Don't hold back"
+          }
+        ]
+      )
+    });
   });
 });