From 2aa54003f418f5ce5b81484d7053518bbf0dc51e Mon Sep 17 00:00:00 2001 From: Tilman Potthof Date: Sun, 6 Dec 2015 19:39:02 +0100 Subject: [PATCH] extract require utils in rules --- rules/controller-as-route.js | 3 ++- rules/controller-as-vm.js | 3 ++- rules/controller-as.js | 3 ++- rules/controller-name.js | 3 ++- rules/di.js | 3 ++- rules/directive-name.js | 3 ++- rules/directive-restrict.js | 3 ++- rules/empty-controller.js | 3 ++- rules/file-name.js | 3 ++- rules/filter-name.js | 3 ++- rules/function-type.js | 3 ++- rules/module-dependency-order.js | 3 ++- rules/module-getter.js | 3 ++- rules/module-name.js | 3 ++- rules/module-setter.js | 2 +- rules/no-controller.js | 3 ++- rules/no-service-method.js | 3 ++- rules/no-services.js | 3 ++- rules/rest-service.js | 3 ++- rules/service-name.js | 3 ++- rules/typecheck-array.js | 3 ++- rules/typecheck-date.js | 3 ++- rules/typecheck-function.js | 3 ++- rules/typecheck-number.js | 3 ++- rules/typecheck-object.js | 3 ++- rules/typecheck-regexp.js | 3 ++- rules/typecheck-string.js | 4 ++-- 27 files changed, 53 insertions(+), 28 deletions(-) diff --git a/rules/controller-as-route.js b/rules/controller-as-route.js index fa13104e..48181c92 100644 --- a/rules/controller-as-route.js +++ b/rules/controller-as-route.js @@ -9,8 +9,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { CallExpression: function(node) { diff --git a/rules/controller-as-vm.js b/rules/controller-as-vm.js index 970aa82b..eec549a0 100644 --- a/rules/controller-as-vm.js +++ b/rules/controller-as-vm.js @@ -11,8 +11,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var badStatements = []; var badCaptureStatements = []; var controllerFunctions = []; diff --git a/rules/controller-as.js b/rules/controller-as.js index 1cfbff9c..a67147d9 100644 --- a/rules/controller-as.js +++ b/rules/controller-as.js @@ -11,8 +11,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var badStatements = []; var controllerFunctions = []; diff --git a/rules/controller-name.js b/rules/controller-name.js index 89705187..b9bd4d75 100644 --- a/rules/controller-name.js +++ b/rules/controller-name.js @@ -12,8 +12,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/di.js b/rules/di.js index 3c92416b..1ca21e2f 100644 --- a/rules/di.js +++ b/rules/di.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var angularNamedObjectList = ['value', 'factory', 'service', 'provider', 'controller', 'filter', 'directive']; diff --git a/rules/directive-name.js b/rules/directive-name.js index bdead682..f10039b0 100644 --- a/rules/directive-name.js +++ b/rules/directive-name.js @@ -12,8 +12,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); if (context.settings.angular === 2) { return {}; } diff --git a/rules/directive-restrict.js b/rules/directive-restrict.js index 46747098..192a6e24 100644 --- a/rules/directive-restrict.js +++ b/rules/directive-restrict.js @@ -12,8 +12,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var options = context.options[0] || {}; var restrictOpt = options.restrict || 'AE'; diff --git a/rules/empty-controller.js b/rules/empty-controller.js index b3174699..44449035 100644 --- a/rules/empty-controller.js +++ b/rules/empty-controller.js @@ -9,8 +9,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function report(node, name) { context.report(node, 'The {{ctrl}} controller is useless because empty. You can remove it from your Router configuration or in one of your view', { diff --git a/rules/file-name.js b/rules/file-name.js index d5ef4ac0..5192ac90 100644 --- a/rules/file-name.js +++ b/rules/file-name.js @@ -13,8 +13,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = (function() { - var utils = require('./utils/utils'); var path = require('path'); var fileEnding = '.js'; diff --git a/rules/filter-name.js b/rules/filter-name.js index 7fb7983e..fdcca71d 100644 --- a/rules/filter-name.js +++ b/rules/filter-name.js @@ -10,8 +10,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/function-type.js b/rules/function-type.js index 7566c9b9..8a84381c 100644 --- a/rules/function-type.js +++ b/rules/function-type.js @@ -12,8 +12,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var angularObjectList = ['animation', 'config', 'constant', 'controller', 'directive', 'factory', 'filter', 'provider', 'service', 'value', 'decorator']; var configType = context.options[0] || 'anonymous'; var messageByConfigType = { diff --git a/rules/module-dependency-order.js b/rules/module-dependency-order.js index ed459eaa..13b894d0 100644 --- a/rules/module-dependency-order.js +++ b/rules/module-dependency-order.js @@ -14,8 +14,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var options = context.options[0] || {}; var groupedMode = options.grouped !== false; diff --git a/rules/module-getter.js b/rules/module-getter.js index 72e3a389..e7a26945 100644 --- a/rules/module-getter.js +++ b/rules/module-getter.js @@ -10,8 +10,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/module-name.js b/rules/module-name.js index be61a1b9..cd9132ea 100644 --- a/rules/module-name.js +++ b/rules/module-name.js @@ -11,8 +11,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/module-setter.js b/rules/module-setter.js index 06b90d8b..d989fbd3 100644 --- a/rules/module-setter.js +++ b/rules/module-setter.js @@ -10,9 +10,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/no-controller.js b/rules/no-controller.js index b1d5b531..0e1afbbb 100644 --- a/rules/no-controller.js +++ b/rules/no-controller.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/no-service-method.js b/rules/no-service-method.js index 6767045c..7eddb315 100644 --- a/rules/no-service-method.js +++ b/rules/no-service-method.js @@ -9,8 +9,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/no-services.js b/rules/no-services.js index 66925848..9b4cecca 100644 --- a/rules/no-services.js +++ b/rules/no-services.js @@ -12,8 +12,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var angularObjectList = ['controller', 'filter', 'directive']; var badServices; diff --git a/rules/rest-service.js b/rules/rest-service.js index 9656f17c..506b3fb7 100644 --- a/rules/rest-service.js +++ b/rules/rest-service.js @@ -9,8 +9,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider']; var services = ['$http', '$resource', 'Restangular']; diff --git a/rules/service-name.js b/rules/service-name.js index 774b934f..17886cdb 100644 --- a/rules/service-name.js +++ b/rules/service-name.js @@ -11,8 +11,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); return { diff --git a/rules/typecheck-array.js b/rules/typecheck-array.js index 32af27a6..84af52be 100644 --- a/rules/typecheck-array.js +++ b/rules/typecheck-array.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && node.value === '[object Array]') { diff --git a/rules/typecheck-date.js b/rules/typecheck-date.js index 95b0b26d..c43f552e 100644 --- a/rules/typecheck-date.js +++ b/rules/typecheck-date.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && node.value === '[object Date]') { diff --git a/rules/typecheck-function.js b/rules/typecheck-function.js index 2587ad20..98baf684 100644 --- a/rules/typecheck-function.js +++ b/rules/typecheck-function.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && (node.value === 'function' || node.value === '[object Function]')) { diff --git a/rules/typecheck-number.js b/rules/typecheck-number.js index cf12b890..141214fd 100644 --- a/rules/typecheck-number.js +++ b/rules/typecheck-number.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && (node.value === 'number' || node.value === '[object Number]')) { diff --git a/rules/typecheck-object.js b/rules/typecheck-object.js index 760f85a1..390d2946 100644 --- a/rules/typecheck-object.js +++ b/rules/typecheck-object.js @@ -8,8 +8,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && (node.value === 'object' || node.value === '[object Object]')) { diff --git a/rules/typecheck-regexp.js b/rules/typecheck-regexp.js index c5677bdc..13429048 100644 --- a/rules/typecheck-regexp.js +++ b/rules/typecheck-regexp.js @@ -9,8 +9,9 @@ */ 'use strict'; +var utils = require('./utils/utils'); + module.exports = function(context) { - var utils = require('./utils/utils'); function recordError(node, origin) { if (node.type === 'Literal' && node.value === '[object RegExp]') { diff --git a/rules/typecheck-string.js b/rules/typecheck-string.js index 9bdcd0f1..e3a2e147 100644 --- a/rules/typecheck-string.js +++ b/rules/typecheck-string.js @@ -8,9 +8,9 @@ */ 'use strict'; -module.exports = function(context) { - var utils = require('./utils/utils'); +var utils = require('./utils/utils'); +module.exports = function(context) { function recordError(node, origin) { if (node.type === 'Literal' && (node.value === 'string' || node.value === '[object String]')) { context.report(origin, 'You should use the angular.isString method', {});