Eslint some stuff

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"
+ }
+}

karma.conf.js

@@ -1,31 +1,31 @@
 // Karma configuration
-
+/* eslint-disable no-var */
 var fs = require('fs');
 var path = require('path');
 var origin = fs.existsSync(path.resolve(__dirname, '../angular-schema-form-bootstrap/dist/angular-schema-form-bootstrap.js'));
 var include = (origin)
  ? '../angular-schema-form-bootstrap/dist/angular-schema-form-bootstrap.js'
  : 'dist/angular-schema-form-bootstrap.js';
-console.log("Karma bootstrap:" + origin);
+console.log('Karma bootstrap:' + origin);
 
 module.exports = function(config) {
  config.set({
  // base path, that will be used to resolve files and exclude
  basePath: '.',
 
  // frameworks to use
- frameworks: ['mocha', 'chai-sinon'],
+ frameworks: [ 'mocha', 'chai-sinon' ],
 
  // list of files / patterns to load in the browser
  files: [
  'node_modules/babel-polyfill/dist/polyfill.js',
  'bower_components/jquery/dist/jquery.min.js',
  'test/lib/angular.js',
  'test/lib/angular-mocks.js',
- 'bower_components/tv4/tv4.js',
+ //'bower_components/tv4/tv4.js',
  'dist/angular-schema-form.js',
  include,
- 'src/**/*.spec.js'
+ 'src/**/*.spec.js',
 // 'src/**/sf-schema.directive.spec.js'
  ],
 
@@ -34,28 +34,32 @@ module.exports = function(config) {
 
  // test results reporter to use
  // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
- reporters: ['dots','progress','coverage','growler'],
+ reporters: [ 'mocha', 'coverage', 'growler' ],
+
+ mochaReporter: {
+ showDiff: true,
+ },
 
  preprocessors: {
- 'src/**/*.js': ['coverage']
+ 'src/**/*.js': [ 'coverage' ],
  },
  babelPreprocessor: {
  options: {
- presets: ['es2015'],
- sourceMap: 'inline'
+ presets: [ 'es2015' ],
+ sourceMap: 'inline',
  },
  filename: function (file) {
  return file.originalPath.replace(/\.js$/, '.es5.js');
  },
  sourceFileName: function (file) {
  return file.originalPath;
- }
+ },
  },
 
  // optionally, configure the reporter
  coverageReporter: {
  type: 'lcov',
- dir: 'coverage/'
+ dir: 'coverage/',
  },
 
  // web server port
@@ -70,7 +74,7 @@ module.exports = function(config) {
  // config.LOG_INFO || config.LOG_DEBUG
  logLevel: config.LOG_DEBUG,
 
- loggers: [{type: 'console'}],
+ loggers: [{ type: 'console' }],
 
  // enable / disable watching file and executing tests whenever any file changes
  autoWatch: true,
@@ -83,16 +87,16 @@ module.exports = function(config) {
  // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
  // - PhantomJS
  // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
- browsers: ['PhantomJS'],
+ browsers: [ 'PhantomJS' ],
 
  // If browser does not capture in given timeout [ms], kill it
  captureTimeout: 60000,
 
  client: {
- captureConsole: true
+ captureConsole: true,
  },
  // Continuous Integration mode
  // if true, it capture browsers, run tests and exit
- singleRun: false
+ singleRun: false,
  });
 };

package.json

@@ -14,7 +14,8 @@
  "dist": "webpack --config webpack.config.dist.js",
  "watch": "webpack --watch",
  "testlinux": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js",
- "test": "karma start karma.conf.js --log-level debug --single-run",
+ "lint": "eslint src/**/*.js",
+ "test": "webpack && karma start karma.conf.js --log-level debug --single-run",
  "tests": "karma start karma.conf.js --log-level debug --auto-watch"
  },
  "author": "json-schema-form",
@@ -29,11 +30,6 @@
  "bugs": {
  "url": "https://github.com/json-schema-form/angular-schema-form/issues"
  },
- "dependencies": {
- "angular": ">= 1.2",
- "tv4": "~1.0.15",
- "angular-sanitize": ">= 1.2"
- },
  "keywords": [
  "angular",
  "angularjs",
@@ -44,20 +40,29 @@
  "ui-schema",
  "schema"
  ],
+ "dependencies": {
+ "angular": ">= 1.2",
+ "tv4": "~1.0.15",
+ "angular-sanitize": ">= 1.2"
+ },
  "devDependencies": {
  "babel-core": "^6.18.2",
  "babel-loader": "^6.2.8",
  "babel-plugin-add-module-exports": "^0.2.1",
  "babel-polyfill": "^6.16.0",
  "babel-preset-es2015": "^6.18.0",
  "chai": "^3.5.0",
+ "diff": "^3.2.0",
+ "eslint": "^3.19.0",
+ "eslint-config-google": "^0.7.1",
  "html-webpack-externals-plugin": "^2.1.2",
  "karma": "^1.3.0",
  "karma-babel-preprocessor": "^6.0.1",
  "karma-chai-sinon": "^0.1.5",
  "karma-coverage": "^1.1.1",
  "karma-growler-reporter": "0.0.1",
  "karma-mocha": "^1.3.0",
+ "karma-mocha-reporter": "^2.2.3",
  "karma-phantomjs-launcher": "^1.0.2",
  "karma-webpack": "^1.8.0",
  "mocha": "^3.2.0",

src/directives/schema-validate.directive.js

@@ -1,5 +1,15 @@
 import angular from 'angular';
 
+/**
+ * I am the schema-validate directive
+ *
+ * @param {function} sfValidator
+ * @param {function} $parse
+ * @param {function} sfSelect
+ * @param {function} $interpolate
+ *
+ * @return {object} I am the directive properties made available to Angular
+ */
 export default function(sfValidator, $parse, sfSelect, $interpolate) {
  return {
  restrict: 'A',
@@ -14,33 +24,33 @@ export default function(sfValidator, $parse, sfSelect, $interpolate) {
  // So we emit it up to the decorator directive so it can put it on scope.
  scope.$emit('schemaFormPropagateNgModelController', ngModel);
 
- var error = null;
- var form = scope.$eval(attrs.schemaValidate);
+ let error = null;
+ let form = scope.$eval(attrs.schemaValidate);
 
- //TODO move this out of validate
- var copyTo = (typeof form.copyValueTo === 'string')? [ form.copyValueTo ]: form.copyValueTo;
+ // TODO move this out of validate
+ let copyTo = (typeof form.copyValueTo === 'string')? [ form.copyValueTo ]: form.copyValueTo;
  if (copyTo && copyTo.length) {
  ngModel.$viewChangeListeners.push(function() {
- var context = {
- "model": scope.model,
- "form": form,
- "arrayIndex": scope.$index,
- "arrayIndices": scope.arrayIndices,
- "path": scope.path,
- "$i": scope.$i,
- "$index": scope.$index
+ let context = {
+ 'model': scope.model,
+ 'form': form,
+ 'arrayIndex': scope.$index,
+ 'arrayIndices': scope.arrayIndices,
+ 'path': scope.path,
+ '$i': scope.$i,
+ '$index': scope.$index,
  };
  angular.forEach(copyTo, function(copyToPath) {
- var path = copyToPath.replace(/\[/g,"[{{ ").replace(/\]/g," }}]").replace(/^model\./,"");
+ let path = copyToPath.replace(/\[/g, '[{{ ').replace(/\]/g, ' }}]').replace(/^model\./, '');
  path = $interpolate(path)(context);
  sfSelect(path, scope.model, ngModel.$modelValue);
  });
  });
  };
  // Validate against the schema.
 
- var validate = function(viewValue, triggered) {
- //Still might be undefined
+ let validate = function(viewValue, triggered) {
+ // Still might be undefined
  if (!form) {
  return viewValue;
  }
@@ -50,8 +60,8 @@ export default function(sfValidator, $parse, sfSelect, $interpolate) {
  return viewValue;
  }
 
- var result =  sfValidator(form, viewValue);
- //console.log('result is', result)
+ let result = sfValidator(form, viewValue);
+ // console.log('result is', result)
  // Since we might have different tv4 errors we must clear all
  // errors that start with tv4-
  Object.keys(ngModel.$error)
@@ -110,16 +120,16 @@ export default function(sfValidator, $parse, sfSelect, $interpolate) {
  // updating if we've found an error.
  if (ngModel.$validators) {
  ngModel.$validators.schemaForm = function() {
- //console.log('validators called.')
+ // console.log('validators called.')
  // Any error and we're out of here!
  return !Object.keys(ngModel.$error).some(function(e) { return e !== 'schemaForm';});
  };
  }
 
- var schema = form.schema;
+ let schema = form.schema;
 
  // A bit ugly but useful.
- scope.validateField =  function(formName, triggered) {
+ scope.validateField = function(formName, triggered) {
  let noField = (formName === undefined);
  // If we have specified a form name, and this model is not within
  // that form, then leave things be.
@@ -166,12 +176,12 @@ export default function(sfValidator, $parse, sfSelect, $interpolate) {
  }
  };
 
- var first = true;
+ let first = true;
  ngModel.$formatters.push(function(val) {
  // When a form first loads this will be called for each field.
  // we usually don't want that.
- if (ngModel.$pristine  && first &&
- (!scope.options || scope.options.validateOnRender !== true))  {
+ if (ngModel.$pristine && first &&
+ (!scope.options || scope.options.validateOnRender !== true)) {
  first = false;
  return val;
  }
@@ -187,6 +197,6 @@ export default function(sfValidator, $parse, sfSelect, $interpolate) {
  scope.schemaError = function() {
  return error;
  };
- }
+ },
  };
 }