Export whole angular modules instead of its name.

- Remove JSHint and use ESLint instead.

Author: marc92w

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}

.eslintrc

@@ -3,15 +3,27 @@
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
+    "jasmine": true,
+    "jest": true
   },
   "rules": {
+    "camelcase": 1,
+    "complexity": 1,
+    "curly": 1,
+    "eqeqeq": 2,
+    "indent": [0, 2],
+    "no-bitwise": 1,
     "no-console": 0,
     "new-cap": 0,
     "strict": 0,
     "no-underscore-dangle": 0,
     "no-use-before-define": 0,
     "eol-last": 0,
-    "quotes": [2, "single", "avoid-escape"]
+    "quotes": [2, "single", "avoid-escape"],
+    "max-len": [1, 120],
+    "max-params": [1, 10],
+    "max-statements": [1, 40],
+    "no-var": 0
   }
 }

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 coverage/
 dist/
 .idea/
+.vscode/

.jshintrc

@@ -50,9 +50,7 @@ function routing($httpProvider, $routeProvider, $logProvider) {
       redirectTo: '/'
     });
 
-  // jshint ignore:start
   $logProvider.debugEnabled(__LOGGING__); // eslint-disable-line no-undef
-  //jshint ignore:end
 
 } // end of routing()
 

app/app.config.js

@@ -11,7 +11,10 @@ import routing from './app.config';
 import runBlock from './app.run';
 
 // create main app module
-export default angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap', 'ngCookies', components, filters,
-  services, utilities])
+export default angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap', 'ngCookies', 
+                                            components.name, 
+                                            filters.name,
+                                            services.name, 
+                                            utilities.name])
   .config(routing)
   .run(runBlock);

app/app.js

@@ -1,4 +1,4 @@
-import angular from 'angular';
+import * as angular from 'angular';
 
 import AboutCtrl from './about.ctrl';
 
@@ -10,5 +10,4 @@ import AboutCtrl from './about.ctrl';
  * Module for the about page of the application.
  */
 export default angular.module('components.about', [])
-  .controller('AboutCtrl', AboutCtrl)
-  .name;
+  .controller('AboutCtrl', AboutCtrl);

app/components/about/about.module.js

@@ -7,5 +7,9 @@ import sidebar from './sidebar/sidebar.module';
 import start from './start/start.module';
 import about from './about/about.module';
 
-export default angular.module('components', [graph, header, settings, sidebar, start, about])
-                      .name;
+export default angular.module('components', [graph.name, 
+                                              header.name, 
+                                              settings.name,
+                                              sidebar.name,
+                                              start.name,
+                                              about.name]);

app/components/components.module.js

@@ -5,7 +5,7 @@
  * @param {$location} $location
  * @param {$log} $log
  * @param {TBoxExtractor} TBoxExtractor
- * @param DetailExtractor
+ * @param {DetailExtractor} DetailExtractor
  * @param {RequestConfig} RequestConfig
  * @param {Data} Data
  * @param View
@@ -14,7 +14,6 @@
  */
 function graphCtrl($location, $log, TBoxExtractor, DetailExtractor, RequestConfig, Data, View) {
 
-  /* jshint validthis: true */
   const vm = this;
 
   vm.selected = {

app/components/graph/graph.ctrl.js

@@ -1,5 +1,4 @@
-import angular from 'angular';
-
+import * as angular from 'angular';
 import GraphCtrl from './graph.ctrl';
 import nodeLinkGraph from './nodelink-graph.drv';
 
@@ -13,5 +12,4 @@ import nodeLinkGraph from './nodelink-graph.drv';
  */
 export default angular.module('components.graph', [])
   .controller('GraphCtrl', GraphCtrl)
-  .directive('nodeLinkGraph', nodeLinkGraph)
-  .name;
+  .directive('nodeLinkGraph', nodeLinkGraph);

app/components/graph/graph.module.js

@@ -1,5 +1,5 @@
-import angular from 'angular';
-import d3 from 'd3';
+import * as angular from 'angular';
+import * as d3 from 'd3';
 
 /**
  * @ngdoc directive
@@ -107,11 +107,11 @@ function NodeLinkGraph($window, $log, Properties, Nodes, Prefixes, Filters, Util
       });
 
       scope.$watch(function () {
-          return Filters.getIncludeLiterals();
-        },
-        function (newVal) {
-          scope.data.showTypes = newVal;
-          return scope.render(scope.data);
+        return Filters.getIncludeLiterals();
+      },
+      function (newVal) {
+        scope.data.showTypes = newVal;
+        return scope.render(scope.data);
       });
 
       scope.$watch(function () {

app/components/graph/nodelink-graph.drv.js

@@ -13,9 +13,7 @@ function HeaderCtrl($scope, $location) {
 
   header.loading = false;
 
-  // jshint ignore:start
   header.appVersion = (__VERSION__ !== undefined) ? __VERSION__ : '0.0'; // eslint-disable-line no-undef
-  // jshint ignore:end
 
   $scope.$on('pending-requests-changed', function(event, pending) {
     header.loading = pending > 0;

app/components/header/header.ctrl.js

@@ -1,4 +1,4 @@
-import angular from 'angular';
+import * as angular from 'angular';
 
 import HeaderCtrl from './header.ctrl';
 import HeaderDirective from './header.drv';
@@ -13,5 +13,4 @@ import HeaderDirective from './header.drv';
  */
 export default angular.module('components.header', [])
               .controller('HeaderCtrl', HeaderCtrl)
-              .directive('header', HeaderDirective)
-              .name;
+              .directive('header', HeaderDirective);

app/components/header/header.module.js

@@ -15,5 +15,4 @@ import BlacklistClasses from './blacklist_classes';
 export default angular.module('blacklist', [])
   .constant('PREFIX', BlacklistPrefixes)
   .constant('PROPERTY_BLACKLIST', BlacklistProperties)
-  .constant('CLASS_BLACKLIST', BlacklistClasses)
-  .name;
+  .constant('CLASS_BLACKLIST', BlacklistClasses);

app/components/settings/blacklist/blacklist.module.js

@@ -17,7 +17,6 @@
 function settingsCtrl($log, $cookies, PREFIX, PROPERTY_BLACKLIST, CLASS_BLACKLIST, RequestConfig, Data, ClassExtractor,
                       RelationExtractor) {
 
-  /* jshint validthis: true */
   const vm = this;
 
   const cookiePrefix = 'ldvowl_';
@@ -125,7 +124,6 @@ function settingsCtrl($log, $cookies, PREFIX, PROPERTY_BLACKLIST, CLASS_BLACKLIS
     vm.restoreListDefaults();
   };
 
-
   /**
    * Restore blacklists to predefined list.
    */

app/components/settings/settings.ctrl.js

@@ -1,4 +1,4 @@
-import angular from 'angular';
+import * as angular from 'angular';
 
 import SettingsCtrl from './settings.ctrl';
 import blacklist from './blacklist/blacklist.module.js';
@@ -14,6 +14,5 @@ import blacklist from './blacklist/blacklist.module.js';
  * This is the settings module of the application. This is where you can configure the extraction of the tbox
  * information and the blacklist being used.
  */
-export default angular.module('components.settings', [blacklist])
-  .controller('SettingsCtrl', SettingsCtrl)
-  .name;
+export default angular.module('components.settings', [blacklist.name])
+  .controller('SettingsCtrl', SettingsCtrl);

app/components/settings/settings.module.js

@@ -5,5 +5,4 @@ import EndpointGroupCtrl from './endpoint-group.ctrl';
 
 export default angular.module('components.sidebar.groups.endpoint', [])
                       .controller('EndpointGroupCtrl', EndpointGroupCtrl)
-                      .directive('endpointGroup', EndpointGroup)
-                      .name;
+                      .directive('endpointGroup', EndpointGroup);

app/components/sidebar/groups/endpoint-group/endpoint-group.module.js

@@ -15,9 +15,7 @@ function filterGroupCtrl(Filters, TBoxExtractor) {
   vm.filterDisjointNodes = !Filters.getIncludeDisjointNode();
   vm.filterSubclassRelations = !Filters.getIncludeSubclassRelations();
 
-  // jshint ignore:start
   vm.showEndpointUrl = __SHOW_ENDPOINT__; // eslint-disable-line no-undef
-  // jshint ignore:end
 
   /**
    * Toggle whether data types should be shown in the graph.

app/components/sidebar/groups/filter-group/filter-group.ctrl.js

@@ -14,7 +14,6 @@ import FilterGroup from './filter-group.drv';
  */
 const filterModule = angular.module('components.sidebar.groups.filter', [])
                       .controller('FilterGroupCtrl', FilterGroupCtrl)
-                      .directive('filterGroup', FilterGroup)
-                      .name;
+                      .directive('filterGroup', FilterGroup);
 
 export default filterModule;

app/components/sidebar/groups/filter-group/filter-group.module.js

@@ -11,7 +11,6 @@
  */
 function graphSettingsCtrl($rootScope, $log, Prefixes, Links) {
 
-  /* jshint validthis: true */
   const graphSettings = this;
 
   graphSettings.differentColors = Prefixes.getDifferentColors();

app/components/sidebar/groups/graph-settings-group/graph-settings-group.ctrl.js

@@ -13,7 +13,6 @@ import graphSettingsGroup from './graph-settings-group.drv';
  */
 const graphSettingsModule = angular.module('components.sidebar.groups.graphsettings', [])
                     .directive('graphSettingsGroup', graphSettingsGroup)
-                    .controller('GraphSettingsCtrl', GraphSettingsGroupCtrl)
-                    .name;
+                    .controller('GraphSettingsCtrl', GraphSettingsGroupCtrl);
 
 export default graphSettingsModule;

app/components/sidebar/groups/graph-settings-group/graph-settings-group.module.js

@@ -13,7 +13,6 @@ import NamespaceGroup from './namespace-group.drv';
  */
 const namespaceGroupModule = angular.module('components.sidebar.groups.namespace', [])
                                     .controller('NamespaceGroupCtrl', NamespaceGroupCtrl)
-                                    .directive('namespaceGroup', NamespaceGroup)
-                                    .name;
+                                    .directive('namespaceGroup', NamespaceGroup);
 
 export default namespaceGroupModule;

app/components/sidebar/groups/namespace-group/namespace-group.module.js

@@ -14,7 +14,6 @@ import SelectionGroupCtrl from './selection-group.ctrl';
  */
 const selectionGroupModule = angular.module('sidebar.groups.selection', [])
                                     .controller('SelectionGroupCtrl', SelectionGroupCtrl)
-                                    .directive('selectionGroup', SelectionGroup)
-                                    .name;
+                                    .directive('selectionGroup', SelectionGroup);
 
 export default selectionGroupModule;

app/components/sidebar/groups/selection-group/selection-group.module.js

@@ -14,6 +14,8 @@ import selectionGroup from './selection-group/selection-group.module';
  *
  * This module includes all groups for the sidebar accordion of the application.
  */
-export default angular.module('sidebar.groups', [endpointGroup, filterGroup, graphSettingsGroup, namespaceGroup,
-                              selectionGroup])
-                      .name;
+export default angular.module('sidebar.groups', [endpointGroup.name, 
+                                                  filterGroup.name,
+                                                  graphSettingsGroup.name,
+                                                  namespaceGroup.name,
+                                                  selectionGroup.name]);

app/components/sidebar/groups/sidebar-groups.module.js

@@ -21,7 +21,6 @@ const selectionModule = angular.module('components.sidebar.selection', [])
   .directive('typeSelection', TypeSelection)
   .directive('propSelection', PropertySelection)
   .directive('datatypePropSelection', DatatypePropertySelection)
-  .directive('subclassPropSelection', SubclassPropertySelection)
-  .name;
+  .directive('subclassPropSelection', SubclassPropertySelection);
 
 export default selectionModule;

app/components/sidebar/selection/selection.module.js

@@ -15,6 +15,5 @@ import selections from './selection/selection.module';
  * 
  * This is the module for the sidebar of the application, including the directive for the jQuery slider.
  */
-export default angular.module('components.sidebar', [groups, selections])
-  .directive('slider', Slider)
-  .name;
+export default angular.module('components.sidebar', [groups.name, selections.name])
+  .directive('slider', Slider);