eslint-plugin-no-jquery 2.6.0 → 3.0.0

package/src/rules/no-error.js

@@ -7,8 +7,6 @@ module.exports = utils.createUtilMethodRule(
 	'Prefer `throw` to `$.error`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
-			return fixer.replaceText( node.callee, 'throw new Error' );
-		}
+		fix: ( node, context, fixer ) => fixer.replaceText( node.callee, 'throw new Error' )
 	}
 );

package/src/rules/no-escape-selector.js

@@ -7,8 +7,6 @@ module.exports = utils.createUtilMethodRule(
 	'Prefer `CSS.escape` to `$.escapeSelector`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
-			return fixer.replaceText( node.callee, 'CSS.escape' );
-		}
+		fix: ( node, context, fixer ) => fixer.replaceText( node.callee, 'CSS.escape' )
 	}
 );

package/src/rules/no-event-shorthand.js

@@ -3,12 +3,12 @@
 const utils = require( '../utils.js' );
 
 const ajaxEvents = [
-	'ajaxStart',
-	'ajaxStop',
 	'ajaxComplete',
 	'ajaxError',
-	'ajaxSuccess',
-	'ajaxSend'
+	'ajaxSend',
+	'ajaxStart',
+	'ajaxStop',
+	'ajaxSuccess'
 ];
 
 const rule = utils.createCollectionMethodRule(
@@ -48,7 +48,7 @@ const rule = utils.createCollectionMethodRule(
 	].concat( ajaxEvents ),
 	( node ) => node === true ?
 		'Use the `allowAjaxEvents` option to allow `ajax*` methods. Prefer `.on` or `.trigger`' :
-		`Prefer .on or .trigger to .${node.callee.property.name}`,
+		`Prefer .on or .trigger to .${ node.callee.property.name }`,
 	{
 		fixable: 'code',
 		fix: utils.eventShorthandFixer
@@ -69,10 +69,10 @@ rule.meta.schema = [
 
 const parentCreate = rule.create;
 
-rule.create = function ( context ) {
+rule.create = ( context ) => {
 	const rules = parentCreate( context );
 	return {
-		'CallExpression:exit': function ( node ) {
+		'CallExpression:exit': ( node ) => {
 			if (
 				node.callee.type === 'MemberExpression' &&
 				context.options[ 0 ] && context.options[ 0 ].allowAjaxEvents

package/src/rules/no-extend.js

@@ -8,6 +8,7 @@ module.exports = {
 		docs: {
 			description: 'Disallows the ' + utils.jQueryGlobalLink( 'extend' ) + ' utility. Prefer `Object.assign` or the spread operator.'
 		},
+		fixable: 'code',
 		schema: [
 			{
 				type: 'object',
@@ -21,32 +22,33 @@ module.exports = {
 		]
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if ( node.callee.type !== 'MemberExpression' ) {
-					return;
-				}
-				const name = node.callee.property.name;
-				if (
-					name !== 'extend' ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if ( node.callee.type !== 'MemberExpression' ) {
+				return;
+			}
+			const name = node.callee.property.name;
+			if (
+				name !== 'extend' ||
 					!utils.isjQueryConstructor( context, node.callee.object.name )
-				) {
-					return;
-				}
-				const allowDeep = context.options[ 0 ] && context.options[ 0 ].allowDeep;
-				if (
-					allowDeep &&
-					node.arguments[ 0 ] && node.arguments[ 0 ].value === true
-				) {
-					return;
-				}
-
-				context.report( {
-					node: node,
-					message: 'Prefer Object.assign or the spread operator to $.extend'
-				} );
+			) {
+				return;
 			}
-		};
-	}
+			const allowDeep = context.options[ 0 ] && context.options[ 0 ].allowDeep;
+			const isDeep = node.arguments[ 0 ] && node.arguments[ 0 ].value === true;
+			if ( allowDeep && isDeep ) {
+				return;
+			}
+
+			context.report( {
+				node,
+				message: 'Prefer Object.assign or the spread operator to $.extend',
+				fix: function ( fixer ) {
+					if ( !isDeep ) {
+						return fixer.replaceText( node.callee, 'Object.assign' );
+					}
+				}
+			} );
+		}
+	} )
 };

package/src/rules/no-fade.js

@@ -6,5 +6,5 @@ module.exports = utils.createCollectionMethodRule(
 	[ 'fadeIn', 'fadeOut', 'fadeTo', 'fadeToggle' ],
 	( node ) => node === true ?
 		'Prefer CSS transitions' :
-		`Prefer CSS transitions to .${node.callee.property.name}`
+		`Prefer CSS transitions to .${ node.callee.property.name }`
 );

package/src/rules/no-fx-interval.js

@@ -11,23 +11,21 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			MemberExpression: function ( node ) {
-				if (
-					!utils.isjQueryConstructor( context, node.object.name ) ||
+	create: ( context ) => ( {
+		MemberExpression: ( node ) => {
+			if (
+				!utils.isjQueryConstructor( context, node.object.name ) ||
 					node.property.name !== 'fx' ||
 					!node.parent.property ||
 					node.parent.property.name !== 'interval'
-				) {
-					return;
-				}
-
-				context.report( {
-					node: node,
-					message: '$.fx.interval is not allowed'
-				} );
+			) {
+				return;
 			}
-		};
-	}
+
+			context.report( {
+				node,
+				message: '$.fx.interval is not allowed'
+			} );
+		}
+	} )
 };

package/src/rules/no-global-selector.js

@@ -28,61 +28,59 @@ module.exports = {
 		]
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if (
-					node.callee.type !== 'Identifier' ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if (
+				node.callee.type !== 'Identifier' ||
 					!utils.isjQueryConstructor( context, node.callee.name ) ||
 					!node.arguments[ 0 ] ||
 					node.arguments[ 0 ].type !== 'Literal'
-				) {
-					return;
-				}
-				const value = node.arguments[ 0 ].value;
-				const allowIds = context.options[ 0 ] && context.options[ 0 ].allowIds;
-				if (
-					typeof value !== 'string' ||
+			) {
+				return;
+			}
+			const value = node.arguments[ 0 ].value;
+			const allowIds = context.options[ 0 ] && context.options[ 0 ].allowIds;
+			if (
+				typeof value !== 'string' ||
 					!value ||
 					value === '#' ||
 					( allowIds && idPattern.test( value.trim() ) )
-				) {
-					return;
-				}
+			) {
+				return;
+			}
 
-				// Simple HTML check (copied from jQuery)
-				if (
-					value[ 0 ] === '<' &&
+			// Simple HTML check (copied from jQuery)
+			if (
+				value[ 0 ] === '<' &&
 					value[ value.length - 1 ] === '>' &&
 					value.length >= 3
-				) {
-					return;
-				}
-				if ( rquickExpr.exec( value ) ) {
-					return;
-				}
+			) {
+				return;
+			}
+			if ( rquickExpr.exec( value ) ) {
+				return;
+			}
 
-				const selectorContext = node.arguments[ 1 ];
-				if ( selectorContext ) {
-					if (
-						selectorContext.type !== 'Literal' &&
+			const selectorContext = node.arguments[ 1 ];
+			if ( selectorContext ) {
+				if (
+					selectorContext.type !== 'Literal' &&
 						!(
 							selectorContext.type === 'Identifier' &&
 							selectorContext.name === 'undefined'
 						)
-					) {
-						return;
-					}
-					if ( selectorContext.value === '#' ) {
-						return;
-					}
+				) {
+					return;
+				}
+				if ( selectorContext.value === '#' ) {
+					return;
 				}
-
-				context.report( {
-					node: node,
-					message: 'Avoid queries which search the entire DOM. Keep DOM nodes in memory where possible.'
-				} );
 			}
-		};
-	}
+
+			context.report( {
+				node,
+				message: 'Avoid queries which search the entire DOM. Keep DOM nodes in memory where possible.'
+			} );
+		}
+	} )
 };

package/src/rules/no-html.js

@@ -4,5 +4,6 @@ const utils = require( '../utils.js' );
 
 module.exports = utils.createCollectionMethodRule(
 	'html',
-	'Prefer `Element#innerHTML` to `.html`'
+	'Prefer `Element#innerHTML` to `.html`',
+	{ getAndSetOptions: true }
 );

package/src/rules/no-is-array.js

@@ -7,8 +7,6 @@ module.exports = utils.createUtilMethodRule(
 	'Prefer `Array.isArray` to `$.isArray`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
-			return fixer.replaceText( node.callee, 'Array.isArray' );
-		}
+		fix: ( node, context, fixer ) => fixer.replaceText( node.callee, 'Array.isArray' )
 	}
 );

package/src/rules/no-is-function.js

@@ -7,7 +7,7 @@ module.exports = utils.createUtilMethodRule(
 	'Prefer `typeof` to `$.isFunction`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
+		fix: ( node, context, fixer ) => {
 			const calleeRange = node.callee.range;
 			return [
 				fixer.replaceTextRange( [ calleeRange[ 0 ], calleeRange[ 1 ] + 1 ], 'typeof ' ),

package/src/rules/no-jquery-constructor.js

@@ -11,21 +11,19 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if (
-					node.callee.type !== 'Identifier' ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if (
+				node.callee.type !== 'Identifier' ||
 					!utils.isjQueryConstructor( context, node.callee.name )
-				) {
-					return;
-				}
-
-				context.report( {
-					node: node,
-					message: 'The jQuery constructor is not allowed'
-				} );
+			) {
+				return;
 			}
-		};
-	}
+
+			context.report( {
+				node,
+				message: 'The jQuery constructor is not allowed'
+			} );
+		}
+	} )
 };

package/src/rules/no-load-shorthand.js

@@ -12,28 +12,26 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if ( !(
-					node.callee.type === 'MemberExpression' &&
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if ( !(
+				node.callee.type === 'MemberExpression' &&
 					!utils.isjQueryConstructor( context, node.callee.object.name ) &&
 					node.callee.property.name === 'load' && (
-						node.arguments.length === 0 ||
+					node.arguments.length === 0 ||
 						utils.isFunction( node.arguments[ 0 ] )
-					)
-				) ) {
-					return;
-				}
+				)
+			) ) {
+				return;
+			}
 
-				if ( utils.isjQuery( context, node.callee ) ) {
-					context.report( {
-						node: node,
-						message: 'Prefer .on or .trigger to .load',
-						fix: utils.eventShorthandFixer.bind( this, node, context )
-					} );
-				}
+			if ( utils.isjQuery( context, node.callee ) ) {
+				context.report( {
+					node,
+					message: 'Prefer .on or .trigger to .load',
+					fix: utils.eventShorthandFixer.bind( this, node, context )
+				} );
 			}
-		};
-	}
+		}
+	} )
 };

package/src/rules/no-noop.js

@@ -7,8 +7,6 @@ module.exports = utils.createUtilPropertyRule(
 	'Prefer `function(){}` to `$.noop`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
-			return fixer.replaceText( node, '(function(){})' );
-		}
+		fix: ( node, context, fixer ) => fixer.replaceText( node, '(function(){})' )
 	}
 );

package/src/rules/no-now.js

@@ -7,8 +7,6 @@ module.exports = utils.createUtilMethodRule(
 	'Prefer `Date.now` to `$.now`',
 	{
 		fixable: 'code',
-		fix: function ( node, context, fixer ) {
-			return fixer.replaceText( node.callee, 'Date.now' );
-		}
+		fix: ( node, context, fixer ) => fixer.replaceText( node.callee, 'Date.now' )
 	}
 );

package/src/rules/no-on-ready.js

@@ -12,41 +12,36 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if (
-					node.callee.type !== 'MemberExpression' ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if (
+				node.callee.type !== 'MemberExpression' ||
 					node.callee.property.name !== 'on'
-				) {
-					return;
-				}
-				const arg = node.arguments[ 0 ];
-				if ( !arg || arg.value !== 'ready' ) {
-					return;
-				}
+			) {
+				return;
+			}
+			const arg = node.arguments[ 0 ];
+			if ( !arg || arg.value !== 'ready' ) {
+				return;
+			}
 
-				if ( utils.isjQuery( context, node.callee ) ) {
-					context.report( {
-						node: node,
-						message: '.on("ready") is not allowed',
-						fix: function ( fixer ) {
-							if ( node.arguments.length > 1 ) {
-								return [
-									fixer.replaceText( node.callee.property, 'ready' ),
-									fixer.replaceTextRange(
-										[
-											node.arguments[ 0 ].range[ 0 ],
-											node.arguments[ 1 ].range[ 0 ]
-										],
-										''
-									)
-								];
-							}
-						}
-					} );
-				}
+			if ( utils.isjQuery( context, node.callee ) ) {
+				context.report( {
+					node,
+					message: '.on("ready") is not allowed',
+					fix: ( fixer ) => ( node.arguments.length > 1 ) ?
+						[
+							fixer.replaceText( node.callee.property, 'ready' ),
+							fixer.replaceTextRange(
+								[
+									node.arguments[ 0 ].range[ 0 ],
+									node.arguments[ 1 ].range[ 0 ]
+								],
+								''
+							)
+						] : null
+				} );
 			}
-		};
-	}
+		}
+	} )
 };

package/src/rules/no-other-methods.js

@@ -94,28 +94,26 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if ( node.callee.type !== 'MemberExpression' ) {
-					return;
-				}
-				const name = node.callee.property.name;
-				if (
-					!name ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if ( node.callee.type !== 'MemberExpression' ) {
+				return;
+			}
+			const name = node.callee.property.name;
+			if (
+				!name ||
 					methodsWithRules.includes( name ) ||
 					utils.isjQueryConstructor( context, node.callee.object.name )
-				) {
-					return;
-				}
-				if ( utils.isjQuery( context, node.callee ) ) {
-					context.report( {
-						node: node,
-						message: '.{{name}} is not allowed',
-						data: { name: name }
-					} );
-				}
+			) {
+				return;
+			}
+			if ( utils.isjQuery( context, node.callee ) ) {
+				context.report( {
+					node,
+					message: '.{{name}} is not allowed',
+					data: { name }
+				} );
 			}
-		};
-	}
+		}
+	} )
 };

package/src/rules/no-other-utils.js

@@ -62,27 +62,25 @@ module.exports = {
 		schema: []
 	},
 
-	create: function ( context ) {
-		return {
-			'CallExpression:exit': function ( node ) {
-				if ( node.callee.type !== 'MemberExpression' ) {
-					return;
-				}
-				const name = node.callee.property.name;
-				if (
-					!name ||
+	create: ( context ) => ( {
+		'CallExpression:exit': ( node ) => {
+			if ( node.callee.type !== 'MemberExpression' ) {
+				return;
+			}
+			const name = node.callee.property.name;
+			if (
+				!name ||
 					utilsWithRules.includes( name ) ||
 					!utils.isjQueryConstructor( context, node.callee.object.name )
-				) {
-					return;
-				}
-
-				context.report( {
-					node: node,
-					message: '$.{{name}} is not allowed',
-					data: { name: name }
-				} );
+			) {
+				return;
 			}
-		};
-	}
+
+			context.report( {
+				node,
+				message: '$.{{name}} is not allowed',
+				data: { name }
+			} );
+		}
+	} )
 };