Skip to content

Commit

Permalink
extract require utils in rules
Browse files Browse the repository at this point in the history
  • Loading branch information
tilmanschweitzer committed Dec 6, 2015
1 parent dcfff4a commit 2aa5400
Show file tree
Hide file tree
Showing 27 changed files with 53 additions and 28 deletions.
3 changes: 2 additions & 1 deletion rules/controller-as-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {
CallExpression: function(node) {
Expand Down
3 changes: 2 additions & 1 deletion rules/controller-as-vm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down
3 changes: 2 additions & 1 deletion rules/controller-as.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');
var badStatements = [];
var controllerFunctions = [];

Expand Down
3 changes: 2 additions & 1 deletion rules/controller-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/di.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];

Expand Down
3 changes: 2 additions & 1 deletion rules/directive-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
}
Expand Down
3 changes: 2 additions & 1 deletion rules/directive-restrict.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 2 additions & 1 deletion rules/empty-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down
3 changes: 2 additions & 1 deletion rules/file-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
3 changes: 2 additions & 1 deletion rules/filter-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/function-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
3 changes: 2 additions & 1 deletion rules/module-dependency-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion rules/module-getter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/module-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
2 changes: 1 addition & 1 deletion rules/module-setter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/no-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/no-service-method.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/no-services.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion rules/rest-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
3 changes: 2 additions & 1 deletion rules/service-name.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
*/
'use strict';

var utils = require('./utils/utils');

module.exports = function(context) {
var utils = require('./utils/utils');

return {

Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-array.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]') {
Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-date.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]') {
Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-function.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]')) {
Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-number.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]')) {
Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-object.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]')) {
Expand Down
3 changes: 2 additions & 1 deletion rules/typecheck-regexp.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]') {
Expand Down
4 changes: 2 additions & 2 deletions rules/typecheck-string.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', {});
Expand Down

0 comments on commit 2aa5400

Please sign in to comment.