eslint 4.11.0 → 4.13.1

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+v4.13.1 - December 11, 2017
+
+* b72dc83 Fix: eol-last allow empty-string to always pass (refs #9534) (#9696) (Kevin Partington)
+* d80aa7c Fix: camelcase destructure leading/trailing underscore (fixes #9700) (#9701) (Kevin Partington)
+* d49d9d0 Docs: Add missing period to the README (#9702) (Kevin Partington)
+* 4564fe0 Chore: no-invalid-meta crash if no export assignment (refs #9534) (#9698) (Kevin Partington)
+
+v4.13.0 - December 8, 2017
+
+* 256481b Update: update handling of destructuring in camelcase (fixes #8511) (#9468) (Erin)
+* d067ae1 Docs: Don’t use undocumented array-style configuration for max-len (#9690) (Jed Fox)
+* 1ad3091 Chore: fix test-suite to work with node master (#9688) (Myles Borins)
+* cdb1488 Docs: Adds an example with try/catch. (#9672) (Jaap Taal)
+
+v4.12.1 - November 30, 2017
+
+* 1e362a0 Revert "Fix: Use XML 1.1 on XML formatters (fixes #9607) (#9608)" (#9667) (Kevin Partington)
+
+v4.12.0 - November 25, 2017
+
+* 76dab18 Upgrade: doctrine@^2.0.2 (#9656) (Kevin Partington)
+* 28c9c8e New: add a Linter#defineParser function (#9321) (Ives van Hoorne)
+* 5619910 Update: Add autofix for `sort-vars` (#9496) (Trevin Hofmann)
+* 71eedbf Update: add `beforeStatementContinuationChars` to semi (fixes #9521) (#9594) (Toru Nagashima)
+* 4118f14 New: Adds implicit-arrow-linebreak rule (refs #9510) (#9629) (Sharmila Jesupaul)
+* 208fb0f Fix: Use XML 1.1 on XML formatters (fixes #9607) (#9608) (Daniel Reigada)
+* 6e04f14 Upgrade: `globals` to 11.0.1 (fixes #9614) (#9632) (Toru Nagashima)
+* e13d439 Fix: space-in-parens crash (#9655) (Toru Nagashima)
+* 92171cc Docs: Updating migration guide for single-line disable (#9385) (Justin Helmer)
+* f39ffe7 Docs: remove extra punctuation from readme (#9640) (Teddy Katz)
+* a015234 Fix: prefer-destructuring false positive on "super" (fixes #9625) (#9626) (Kei Ito)
+* 0cf081e Update: add importNames option to no-restricted-imports (#9506) (Benjamin R Gibson)
+* 332c214 Docs: Add @platinumazure to TSC (#9618) (Ilya Volodin)
+
 v4.11.0 - November 10, 2017
 
 * d4557a6 Docs: disallow use of the comma operator using no-restricted-syntax (#9585) (薛定谔的猫)

package/README.md

@@ -116,6 +116,7 @@ These folks keep the project moving and are resources for help.
 * Alberto Rodríguez ([@alberto](https://github.com/alberto))
 * Kai Cataldo ([@kaicataldo](https://github.com/kaicataldo))
 * Teddy Katz ([@not-an-aardvark](https://github.com/not-an-aardvark))
+* Kevin Partington ([@platinumazure](https://github.com/platinumazure))
 
 ### Development Team
 
@@ -130,7 +131,6 @@ These folks keep the project moving and are resources for help.
 * Henry Zhu ([@hzoo](https://github.com/hzoo))
 * Marat Dulin ([@mdevils](https://github.com/mdevils))
 * Alexej Yaroshevich ([@zxqfox](https://github.com/zxqfox))
-* Kevin Partington ([@platinumazure](https://github.com/platinumazure))
 * Vitor Balocco ([@vitorbal](https://github.com/vitorbal))
 * James Henry ([@JamesHenry](https://github.com/JamesHenry))
 * Reyad Attiyat ([@soda0289](https://github.com/soda0289))
@@ -225,7 +225,7 @@ In all cases, make sure your plugins' peerDependencies have been installed as we
 
 ### Does ESLint support JSX?
 
-Yes, ESLint natively supports parsing JSX syntax (this must be enabled in [configuration](https://eslint.org/docs/user-guide/configuring).). Please note that supporting JSX syntax *is not* the same as supporting React. React applies specific semantics to JSX syntax that ESLint doesn't recognize. We recommend using [eslint-plugin-react](https://www.npmjs.com/package/eslint-plugin-react) if you are using React and want React semantics.
+Yes, ESLint natively supports parsing JSX syntax (this must be enabled in [configuration](https://eslint.org/docs/user-guide/configuring)). Please note that supporting JSX syntax *is not* the same as supporting React. React applies specific semantics to JSX syntax that ESLint doesn't recognize. We recommend using [eslint-plugin-react](https://www.npmjs.com/package/eslint-plugin-react) if you are using React and want React semantics.
 
 ### What about ECMAScript 6 support?
 
@@ -239,7 +239,7 @@ Once a language feature has been adopted into the ECMAScript standard (stage 4 a
 
 ### Where to ask for help?
 
-Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://gitter.im/eslint/eslint)
+Join our [Mailing List](https://groups.google.com/group/eslint) or [Chatroom](https://gitter.im/eslint/eslint).
 
 
 [npm-image]: https://img.shields.io/npm/v/eslint.svg?style=flat-square

package/conf/environments.js

@@ -17,10 +17,126 @@ const globals = require("globals");
 module.exports = {
     builtin: globals.es5,
     browser: {
-        globals: globals.browser
+
+        /*
+         * For backward compatibility.
+         * Remove those on the next major release.
+         */
+        globals: Object.assign(
+            {
+                AutocompleteErrorEvent: false,
+                CDATASection: false,
+                ClientRect: false,
+                ClientRectList: false,
+                CSSAnimation: false,
+                CSSTransition: false,
+                CSSUnknownRule: false,
+                CSSViewportRule: false,
+                Debug: false,
+                DocumentTimeline: false,
+                DOMSettableTokenList: false,
+                ElementTimeControl: false,
+                FederatedCredential: false,
+                FileError: false,
+                HTMLAppletElement: false,
+                HTMLBlockquoteElement: false,
+                HTMLIsIndexElement: false,
+                HTMLKeygenElement: false,
+                HTMLLayerElement: false,
+                IDBEnvironment: false,
+                InputMethodContext: false,
+                MediaKeyError: false,
+                MediaKeyEvent: false,
+                MediaKeys: false,
+                opera: false,
+                PasswordCredential: false,
+                ReadableByteStream: false,
+                SharedKeyframeList: false,
+                showModalDialog: false,
+                SiteBoundCredential: false,
+                SVGAltGlyphDefElement: false,
+                SVGAltGlyphElement: false,
+                SVGAltGlyphItemElement: false,
+                SVGAnimateColorElement: false,
+                SVGAnimatedPathData: false,
+                SVGAnimatedPoints: false,
+                SVGColor: false,
+                SVGColorProfileElement: false,
+                SVGColorProfileRule: false,
+                SVGCSSRule: false,
+                SVGCursorElement: false,
+                SVGDocument: false,
+                SVGElementInstance: false,
+                SVGElementInstanceList: false,
+                SVGEvent: false,
+                SVGExternalResourcesRequired: false,
+                SVGFilterPrimitiveStandardAttributes: false,
+                SVGFitToViewBox: false,
+                SVGFontElement: false,
+                SVGFontFaceElement: false,
+                SVGFontFaceFormatElement: false,
+                SVGFontFaceNameElement: false,
+                SVGFontFaceSrcElement: false,
+                SVGFontFaceUriElement: false,
+                SVGGlyphElement: false,
+                SVGGlyphRefElement: false,
+                SVGHKernElement: false,
+                SVGICCColor: false,
+                SVGLangSpace: false,
+                SVGLocatable: false,
+                SVGMissingGlyphElement: false,
+                SVGPaint: false,
+                SVGPathSeg: false,
+                SVGPathSegArcAbs: false,
+                SVGPathSegArcRel: false,
+                SVGPathSegClosePath: false,
+                SVGPathSegCurvetoCubicAbs: false,
+                SVGPathSegCurvetoCubicRel: false,
+                SVGPathSegCurvetoCubicSmoothAbs: false,
+                SVGPathSegCurvetoCubicSmoothRel: false,
+                SVGPathSegCurvetoQuadraticAbs: false,
+                SVGPathSegCurvetoQuadraticRel: false,
+                SVGPathSegCurvetoQuadraticSmoothAbs: false,
+                SVGPathSegCurvetoQuadraticSmoothRel: false,
+                SVGPathSegLinetoAbs: false,
+                SVGPathSegLinetoHorizontalAbs: false,
+                SVGPathSegLinetoHorizontalRel: false,
+                SVGPathSegLinetoRel: false,
+                SVGPathSegLinetoVerticalAbs: false,
+                SVGPathSegLinetoVerticalRel: false,
+                SVGPathSegList: false,
+                SVGPathSegMovetoAbs: false,
+                SVGPathSegMovetoRel: false,
+                SVGRenderingIntent: false,
+                SVGStylable: false,
+                SVGTests: false,
+                SVGTransformable: false,
+                SVGTRefElement: false,
+                SVGURIReference: false,
+                SVGViewSpec: false,
+                SVGVKernElement: false,
+                SVGZoomAndPan: false,
+                SVGZoomEvent: false,
+                TimeEvent: false,
+                XDomainRequest: false,
+                XMLHttpRequestProgressEvent: false,
+                XPathException: false,
+                XPathNamespace: false,
+                XPathNSResolver: false
+            },
+            globals.browser
+        )
     },
     node: {
-        globals: globals.node,
+
+        /*
+         * For backward compatibility.
+         * Remove those on the next major release.
+         */
+        globals: Object.assign(
+            { arguments: false, GLOBAL: false, root: false },
+            globals.node
+        ),
         parserOptions: {
             ecmaFeatures: {
                 globalReturn: true
@@ -51,7 +167,15 @@ module.exports = {
         globals: globals.jasmine
     },
     jest: {
-        globals: globals.jest
+
+        /*
+         * For backward compatibility.
+         * Remove those on the next major release.
+         */
+        globals: Object.assign(
+            { check: false, gen: false },
+            globals.jest
+        )
     },
     phantomjs: {
         globals: globals.phantomjs
@@ -96,7 +220,7 @@ module.exports = {
         globals: globals.webextensions
     },
     es6: {
-        globals: globals.es6,
+        globals: globals.es2015,
         parserOptions: {
             ecmaVersion: 6
         }

package/conf/eslint-recommended.js

@@ -53,6 +53,7 @@ module.exports = {
         "id-blacklist": "off",
         "id-length": "off",
         "id-match": "off",
+        "implicit-arrow-linebreak": "off",
         indent: "off",
         "indent-legacy": "off",
         "init-declarations": "off",

package/lib/linter.js

@@ -507,13 +507,13 @@ function getRuleOptions(ruleConfig) {
  * as possible
  * @param {string} text The text to parse.
  * @param {Object} providedParserOptions Options to pass to the parser
- * @param {string} parserName The name of the parser
+ * @param {Object} parser The parser module
  * @param {string} filePath The path to the file being parsed.
  * @returns {{success: false, error: Problem}|{success: true,ast: ASTNode, services: Object}}
  * An object containing the AST and parser services if parsing was successful, or the error if parsing failed
  * @private
  */
-function parse(text, providedParserOptions, parserName, filePath) {
+function parse(text, providedParserOptions, parser, filePath) {
 
     const parserOptions = Object.assign({}, providedParserOptions, {
         loc: true,
@@ -524,25 +524,6 @@ function parse(text, providedParserOptions, parserName, filePath) {
         filePath
     });
 
-    let parser;
-
-    try {
-        parser = require(parserName);
-    } catch (ex) {
-        return {
-            success: false,
-            error: {
-                ruleId: null,
-                fatal: true,
-                severity: 2,
-                source: null,
-                message: ex.message,
-                line: 0,
-                column: 0
-            }
-        };
-    }
-
     /*
      * Check for parsing errors first. If there's a parsing error, nothing
      * else can happen. However, a parsing error does not throw an error
@@ -706,6 +687,7 @@ module.exports = class Linter {
         this.version = pkg.version;
 
         this.rules = new Rules();
+        this._parsers = new Map();
         this.environments = new Environments();
     }
 
@@ -785,10 +767,25 @@ module.exports = class Linter {
                 return [];
             }
 
+            let parser;
+
+            try {
+                parser = this._parsers.get(config.parser) || require(config.parser);
+            } catch (ex) {
+                return [{
+                    ruleId: null,
+                    fatal: true,
+                    severity: 2,
+                    source: null,
+                    message: ex.message,
+                    line: 0,
+                    column: 0
+                }];
+            }
             const parseResult = parse(
                 stripUnicodeBOM(text).replace(astUtils.SHEBANG_MATCHER, (match, captured) => `//${captured}`),
                 config.parserOptions,
-                config.parser,
+                parser,
                 filename
             );
 
@@ -1036,6 +1033,16 @@ module.exports = class Linter {
         return this.rules.getAllLoadedRules();
     }
 
+    /**
+     * Define a new parser module
+     * @param {any} parserId Name of the parser
+     * @param {any} parserModule The parser object
+     * @returns {void}
+     */
+    defineParser(parserId, parserModule) {
+        this._parsers.set(parserId, parserModule);
+    }
+
     /**
      * Performs multiple autofix passes over the text until as many fixes as possible
      * have been applied.

package/lib/rules/camelcase.js

@@ -92,34 +92,45 @@ module.exports = {
                     }
 
                     // Always report underscored object names
-                    if (node.parent.object.type === "Identifier" &&
-                            node.parent.object.name === node.name &&
-                            isUnderscored(name)) {
+                    if (node.parent.object.type === "Identifier" && node.parent.object.name === node.name && isUnderscored(name)) {
                         report(node);
 
                     // Report AssignmentExpressions only if they are the left side of the assignment
-                    } else if (effectiveParent.type === "AssignmentExpression" &&
-                            isUnderscored(name) &&
-                            (effectiveParent.right.type !== "MemberExpression" ||
-                            effectiveParent.left.type === "MemberExpression" &&
-                            effectiveParent.left.property.name === node.name)) {
+                    } else if (effectiveParent.type === "AssignmentExpression" && isUnderscored(name) && (effectiveParent.right.type !== "MemberExpression" || effectiveParent.left.type === "MemberExpression" && effectiveParent.left.property.name === node.name)) {
                         report(node);
                     }
 
-                // Properties have their own rules
-                } else if (node.parent.type === "Property") {
+                /*
+                 * Properties have their own rules, and
+                 * AssignmentPattern nodes can be treated like Properties:
+                 * e.g.: const { no_camelcased = false } = bar;
+                 */
+                } else if (node.parent.type === "Property" || node.parent.type === "AssignmentPattern") {
 
-                    // "never" check properties
-                    if (properties === "never") {
-                        return;
+                    if (node.parent.parent && node.parent.parent.type === "ObjectPattern") {
+
+                        if (node.parent.shorthand && node.parent.value.left && isUnderscored(name)) {
+
+                            report(node);
+                        }
+
+                        // prevent checking righthand side of destructured object
+                        if (node.parent.key === node && node.parent.value !== node) {
+                            return;
+                        }
+
+                        if (node.parent.value.name && isUnderscored(name)) {
+                            report(node);
+                        }
                     }
 
-                    if (node.parent.parent && node.parent.parent.type === "ObjectPattern" &&
-                            node.parent.key === node && node.parent.value !== node) {
+                    // "never" check properties
+                    if (properties === "never") {
                         return;
                     }
 
-                    if (isUnderscored(name) && !ALLOWED_PARENT_TYPES.has(effectiveParent.type)) {
+                    // don't check right hand side of AssignmentExpression to prevent duplicate warnings
+                    if (isUnderscored(name) && !ALLOWED_PARENT_TYPES.has(effectiveParent.type) && !(node.parent.right === node)) {
                         report(node);
                     }
 

package/lib/rules/eol-last.js

@@ -46,6 +46,14 @@ module.exports = {
                     CRLF = `\r${LF}`,
                     endsWithNewline = lodash.endsWith(src, LF);
 
+                /*
+                 * Empty source is always valid: No content in file so we don't
+                 * need to lint for a newline on the last line of content.
+                 */
+                if (!src.length) {
+                    return;
+                }
+
                 let mode = context.options[0] || "always",
                     appendCRLF = false;
 

package/lib/rules/implicit-arrow-linebreak.js

@@ -0,0 +1,86 @@
+/**
+ * @fileoverview enforce the location of arrow function bodies
+ * @author Sharmila Jesupaul
+ */
+"use strict";
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+module.exports = {
+    meta: {
+        docs: {
+            description: "enforce the location of arrow function bodies",
+            category: "Stylistic Issues",
+            recommended: false
+        },
+        fixable: "whitespace",
+        schema: [
+            {
+                enum: ["beside", "below"]
+            }
+        ]
+    },
+
+    create(context) {
+        const sourceCode = context.getSourceCode();
+
+        //----------------------------------------------------------------------
+        // Helpers
+        //----------------------------------------------------------------------
+        /**
+         * Gets the applicable preference for a particular keyword
+         * @returns {string} The applicable option for the keyword, e.g. 'beside'
+         */
+        function getOption() {
+            return context.options[0] || "beside";
+        }
+
+        /**
+         * Validates the location of an arrow function body
+         * @param {ASTNode} node The arrow function body
+         * @param {string} keywordName The applicable keyword name for the arrow function body
+         * @returns {void}
+         */
+        function validateExpression(node) {
+            const option = getOption();
+
+            let tokenBefore = sourceCode.getTokenBefore(node.body);
+            const hasParens = tokenBefore.value === "(";
+
+            if (node.type === "BlockStatement") {
+                return;
+            }
+
+            let fixerTarget = node.body;
+
+            if (hasParens) {
+
+                // Gets the first token before the function body that is not an open paren
+                tokenBefore = sourceCode.getTokenBefore(node.body, token => token.value !== "(");
+                fixerTarget = sourceCode.getTokenAfter(tokenBefore);
+            }
+
+            if (tokenBefore.loc.end.line === fixerTarget.loc.start.line && option === "below") {
+                context.report({
+                    node: fixerTarget,
+                    message: "Expected a linebreak before this expression.",
+                    fix: fixer => fixer.insertTextBefore(fixerTarget, "\n")
+                });
+            } else if (tokenBefore.loc.end.line !== fixerTarget.loc.start.line && option === "beside") {
+                context.report({
+                    node: fixerTarget,
+                    message: "Expected no linebreak before this expression.",
+                    fix: fixer => fixer.replaceTextRange([tokenBefore.range[1], fixerTarget.range[0]], " ")
+                });
+            }
+        }
+
+        //----------------------------------------------------------------------
+        // Public
+        //----------------------------------------------------------------------
+        return {
+            ArrowFunctionExpression: node => validateExpression(node)
+        };
+    }
+};

package/lib/rules/no-restricted-imports.js

@@ -8,8 +8,8 @@
 // Helpers
 //------------------------------------------------------------------------------
 
-const DEFAULT_MESSAGE_TEMPLATE = "'{{importName}}' import is restricted from being used.";
-const CUSTOM_MESSAGE_TEMPLATE = "'{{importName}}' import is restricted from being used. {{customMessage}}";
+const DEFAULT_MESSAGE_TEMPLATE = "'{{importSource}}' import is restricted from being used.";
+const CUSTOM_MESSAGE_TEMPLATE = "'{{importSource}}' import is restricted from being used. {{customMessage}}";
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -35,6 +35,12 @@ const arrayOfStringsOrObjects = {
                     message: {
                         type: "string",
                         minLength: 1
+                    },
+                    importNames: {
+                        type: "array",
+                        items: {
+                            type: "string"
+                        }
                     }
                 },
                 additionalProperties: false,
@@ -81,11 +87,14 @@ module.exports = {
         const restrictedPaths = (isPathAndPatternsObject ? options[0].paths : context.options) || [];
         const restrictedPatterns = (isPathAndPatternsObject ? options[0].patterns : []) || [];
 
-        const restrictedPathMessages = restrictedPaths.reduce((memo, importName) => {
-            if (typeof importName === "string") {
-                memo[importName] = null;
+        const restrictedPathMessages = restrictedPaths.reduce((memo, importSource) => {
+            if (typeof importSource === "string") {
+                memo[importSource] = { message: null };
             } else {
-                memo[importName.name] = importName.message;
+                memo[importSource.name] = {
+                    message: importSource.message,
+                    importNames: importSource.importNames
+                };
             }
             return memo;
         }, {});
@@ -95,7 +104,16 @@ module.exports = {
             return {};
         }
 
-        const ig = ignore().add(restrictedPatterns);
+        const restrictedPatternsMatcher = ignore().add(restrictedPatterns);
+
+        /**
+         * Checks to see if "*" is being used to import everything.
+         * @param {Set.<string>} importNames - Set of import names that are being imported
+         * @returns {boolean} whether everything is imported or not
+         */
+        function isEverythingImported(importNames) {
+            return importNames.has("*");
+        }
 
         /**
          * Report a restricted path.
@@ -104,8 +122,8 @@ module.exports = {
          * @private
          */
         function reportPath(node) {
-            const importName = node.source.value.trim();
-            const customMessage = restrictedPathMessages[importName];
+            const importSource = node.source.value.trim();
+            const customMessage = restrictedPathMessages[importSource] && restrictedPathMessages[importSource].message;
             const message = customMessage
                 ? CUSTOM_MESSAGE_TEMPLATE
                 : DEFAULT_MESSAGE_TEMPLATE;
@@ -114,39 +132,130 @@ module.exports = {
                 node,
                 message,
                 data: {
-                    importName,
+                    importSource,
                     customMessage
                 }
             });
         }
 
         /**
-         * Check if the given name is a restricted path name.
-         * @param {string} name name of a variable
+         * Report a restricted path specifically for patterns.
+         * @param {node} node - representing the restricted path reference
+         * @returns {void}
+         * @private
+         */
+        function reportPathForPatterns(node) {
+            const importSource = node.source.value.trim();
+
+            context.report({
+                node,
+                message: "'{{importSource}}' import is restricted from being used by a pattern.",
+                data: {
+                    importSource
+                }
+            });
+        }
+
+        /**
+         * Report a restricted path specifically when using the '*' import.
+         * @param {string} importSource - path of the import
+         * @param {node} node - representing the restricted path reference
+         * @returns {void}
+         * @private
+         */
+        function reportPathForEverythingImported(importSource, node) {
+            const importNames = restrictedPathMessages[importSource].importNames;
+
+            context.report({
+                node,
+                message: "* import is invalid because '{{importNames}}' from '{{importSource}}' is restricted.",
+                data: {
+                    importSource,
+                    importNames
+                }
+            });
+        }
+
+        /**
+         * Check if the given importSource is restricted because '*' is being imported.
+         * @param {string} importSource - path of the import
+         * @param {Set.<string>} importNames - Set of import names that are being imported
+         * @returns {boolean} whether the path is restricted
+         * @private
+         */
+        function isRestrictedForEverythingImported(importSource, importNames) {
+            return Object.prototype.hasOwnProperty.call(restrictedPathMessages, importSource) &&
+                restrictedPathMessages[importSource].importNames &&
+                isEverythingImported(importNames);
+        }
+
+        /**
+         * Check if the given importNames are restricted given a list of restrictedImportNames.
+         * @param {Set.<string>} importNames - Set of import names that are being imported
+         * @param {[string]} restrictedImportNames - array of import names that are restricted for this import
+         * @returns {boolean} whether the objectName is restricted
+         * @private
+         */
+        function isRestrictedObject(importNames, restrictedImportNames) {
+            return restrictedImportNames.some(restrictedObjectName => (
+                importNames.has(restrictedObjectName)
+            ));
+        }
+
+        /**
+         * Check if the given importSource is a restricted path.
+         * @param {string} importSource - path of the import
+         * @param {Set.<string>} importNames - Set of import names that are being imported
          * @returns {boolean} whether the variable is a restricted path or not
          * @private
          */
-        function isRestrictedPath(name) {
-            return Object.prototype.hasOwnProperty.call(restrictedPathMessages, name);
+        function isRestrictedPath(importSource, importNames) {
+            let isRestricted = false;
+
+            if (Object.prototype.hasOwnProperty.call(restrictedPathMessages, importSource)) {
+                if (restrictedPathMessages[importSource].importNames) {
+                    isRestricted = isRestrictedObject(importNames, restrictedPathMessages[importSource].importNames);
+                } else {
+                    isRestricted = true;
+                }
+            }
+
+            return isRestricted;
+        }
+
+        /**
+         * Check if the given importSource is restricted by a pattern.
+         * @param {string} importSource - path of the import
+         * @returns {boolean} whether the variable is a restricted pattern or not
+         * @private
+         */
+        function isRestrictedPattern(importSource) {
+            return restrictedPatterns.length > 0 && restrictedPatternsMatcher.ignores(importSource);
         }
 
         return {
             ImportDeclaration(node) {
-                if (node && node.source && node.source.value) {
-                    const importName = node.source.value.trim();
-
-                    if (isRestrictedPath(importName)) {
-                        reportPath(node);
-                    }
-                    if (restrictedPatterns.length > 0 && ig.ignores(importName)) {
-                        context.report({
-                            node,
-                            message: "'{{importName}}' import is restricted from being used by a pattern.",
-                            data: {
-                                importName
-                            }
-                        });
+                const importSource = node.source.value.trim();
+                const importNames = node.specifiers.reduce((set, specifier) => {
+                    if (specifier.type === "ImportDefaultSpecifier") {
+                        set.add("default");
+                    } else if (specifier.type === "ImportNamespaceSpecifier") {
+                        set.add("*");
+                    } else {
+                        set.add(specifier.imported.name);
                     }
+                    return set;
+                }, new Set());
+
+                if (isRestrictedForEverythingImported(importSource, importNames)) {
+                    reportPathForEverythingImported(importSource, node);
+                }
+
+                if (isRestrictedPath(importSource, importNames)) {
+                    reportPath(node);
+                }
+                if (isRestrictedPattern(importSource)) {
+                    reportPathForPatterns(node);
                 }
             }
         };

package/lib/rules/prefer-destructuring.js

@@ -145,7 +145,7 @@ module.exports = {
          * @returns {void}
          */
         function performCheck(leftNode, rightNode, reportNode) {
-            if (rightNode.type !== "MemberExpression") {
+            if (rightNode.type !== "MemberExpression" || rightNode.object.type === "Super") {
                 return;
             }
 

package/lib/rules/semi.js

@@ -32,10 +32,19 @@ module.exports = {
                     items: [
                         {
                             enum: ["never"]
+                        },
+                        {
+                            type: "object",
+                            properties: {
+                                beforeStatementContinuationChars: {
+                                    enum: ["always", "any", "never"]
+                                }
+                            },
+                            additionalProperties: false
                         }
                     ],
                     minItems: 0,
-                    maxItems: 1
+                    maxItems: 2
                 },
                 {
                     type: "array",
@@ -62,9 +71,10 @@ module.exports = {
 
         const OPT_OUT_PATTERN = /^[-[(/+`]/; // One of [(/+-`
         const options = context.options[1];
-        const never = context.options[0] === "never",
-            exceptOneLine = options && options.omitLastInOneLineBlock === true,
-            sourceCode = context.getSourceCode();
+        const never = context.options[0] === "never";
+        const exceptOneLine = Boolean(options && options.omitLastInOneLineBlock);
+        const beforeStatementContinuationChars = (options && options.beforeStatementContinuationChars) || "any";
+        const sourceCode = context.getSourceCode();
 
         //--------------------------------------------------------------------------
         // Helpers
@@ -114,29 +124,115 @@ module.exports = {
         }
 
         /**
-         * Check if a semicolon is unnecessary, only true if:
-         *   - next token is on a new line and is not one of the opt-out tokens
-         *   - next token is a valid statement divider
-         * @param {Token} lastToken last token of current node.
-         * @returns {boolean} whether the semicolon is unnecessary.
+         * Check whether a given semicolon token is redandant.
+         * @param {Token} semiToken A semicolon token to check.
+         * @returns {boolean} `true` if the next token is `;` or `}`.
+         */
+        function isRedundantSemi(semiToken) {
+            const nextToken = sourceCode.getTokenAfter(semiToken);
+
+            return (
+                !nextToken ||
+                astUtils.isClosingBraceToken(nextToken) ||
+                astUtils.isSemicolonToken(nextToken)
+            );
+        }
+
+        /**
+         * Check whether a given token is the closing brace of an arrow function.
+         * @param {Token} lastToken A token to check.
+         * @returns {boolean} `true` if the token is the closing brace of an arrow function.
          */
-        function isUnnecessarySemicolon(lastToken) {
-            if (!astUtils.isSemicolonToken(lastToken)) {
+        function isEndOfArrowBlock(lastToken) {
+            if (!astUtils.isClosingBraceToken(lastToken)) {
                 return false;
             }
+            const node = sourceCode.getNodeByRangeIndex(lastToken.range[0]);
 
-            const nextToken = sourceCode.getTokenAfter(lastToken);
+            return (
+                node.type === "BlockStatement" &&
+                node.parent.type === "ArrowFunctionExpression"
+            );
+        }
+
+        /**
+         * Check whether a given node is on the same line with the next token.
+         * @param {Node} node A statement node to check.
+         * @returns {boolean} `true` if the node is on the same line with the next token.
+         */
+        function isOnSameLineWithNextToken(node) {
+            const prevToken = sourceCode.getLastToken(node, 1);
+            const nextToken = sourceCode.getTokenAfter(node);
+
+            return !!nextToken && astUtils.isTokenOnSameLine(prevToken, nextToken);
+        }
+
+        /**
+         * Check whether a given node can connect the next line if the next line is unreliable.
+         * @param {Node} node A statement node to check.
+         * @returns {boolean} `true` if the node can connect the next line.
+         */
+        function maybeAsiHazardAfter(node) {
+            const t = node.type;
 
-            if (!nextToken) {
-                return true;
+            if (t === "DoWhileStatement" ||
+                t === "BreakStatement" ||
+                t === "ContinueStatement" ||
+                t === "DebuggerStatement" ||
+                t === "ImportDeclaration" ||
+                t === "ExportAllDeclaration"
+            ) {
+                return false;
+            }
+            if (t === "ReturnStatement") {
+                return Boolean(node.argument);
+            }
+            if (t === "ExportNamedDeclaration") {
+                return Boolean(node.declaration);
+            }
+            if (isEndOfArrowBlock(sourceCode.getLastToken(node, 1))) {
+                return false;
             }
 
-            const lastTokenLine = lastToken.loc.end.line;
-            const nextTokenLine = nextToken.loc.start.line;
-            const isOptOutToken = OPT_OUT_PATTERN.test(nextToken.value) && nextToken.value !== "++" && nextToken.value !== "--";
-            const isDivider = (astUtils.isClosingBraceToken(nextToken) || astUtils.isSemicolonToken(nextToken));
+            return true;
+        }
 
-            return (lastTokenLine !== nextTokenLine && !isOptOutToken) || isDivider;
+        /**
+         * Check whether a given token can connect the previous statement.
+         * @param {Token} token A token to check.
+         * @returns {boolean} `true` if the token is one of `[`, `(`, `/`, `+`, `-`, ```, `++`, and `--`.
+         */
+        function maybeAsiHazardBefore(token) {
+            return (
+                Boolean(token) &&
+                OPT_OUT_PATTERN.test(token.value) &&
+                token.value !== "++" &&
+                token.value !== "--"
+            );
+        }
+
+        /**
+         * Check if the semicolon of a given node is unnecessary, only true if:
+         *   - next token is a valid statement divider (`;` or `}`).
+         *   - next token is on a new line and the node is not connectable to the new line.
+         * @param {Node} node A statement node to check.
+         * @returns {boolean} whether the semicolon is unnecessary.
+         */
+        function canRemoveSemicolon(node) {
+            if (isRedundantSemi(sourceCode.getLastToken(node))) {
+                return true; // `;;` or `;}`
+            }
+            if (isOnSameLineWithNextToken(node)) {
+                return false; // One liner.
+            }
+            if (beforeStatementContinuationChars === "never" && !maybeAsiHazardAfter(node)) {
+                return true; // ASI works. This statement doesn't connect to the next.
+            }
+            if (!maybeAsiHazardBefore(sourceCode.getTokenAfter(node))) {
+                return true; // ASI works. The next token doesn't connect to this statement.
+            }
+
+            return false;
         }
 
         /**
@@ -145,16 +241,17 @@ module.exports = {
          * @returns {boolean} whether the node is in a one-liner block statement.
          */
         function isOneLinerBlock(node) {
+            const parent = node.parent;
             const nextToken = sourceCode.getTokenAfter(node);
 
             if (!nextToken || nextToken.value !== "}") {
                 return false;
             }
-
-            const parent = node.parent;
-
-            return parent && parent.type === "BlockStatement" &&
-              parent.loc.start.line === parent.loc.end.line;
+            return (
+                !!parent &&
+                parent.type === "BlockStatement" &&
+                parent.loc.start.line === parent.loc.end.line
+            );
         }
 
         /**
@@ -163,21 +260,21 @@ module.exports = {
          * @returns {void}
          */
         function checkForSemicolon(node) {
-            const lastToken = sourceCode.getLastToken(node);
+            const isSemi = astUtils.isSemicolonToken(sourceCode.getLastToken(node));
 
             if (never) {
-                if (isUnnecessarySemicolon(lastToken)) {
+                if (isSemi && canRemoveSemicolon(node)) {
                     report(node, true);
+                } else if (!isSemi && beforeStatementContinuationChars === "always" && maybeAsiHazardBefore(sourceCode.getTokenAfter(node))) {
+                    report(node);
                 }
             } else {
-                if (!astUtils.isSemicolonToken(lastToken)) {
-                    if (!exceptOneLine || !isOneLinerBlock(node)) {
-                        report(node);
-                    }
-                } else {
-                    if (exceptOneLine && isOneLinerBlock(node)) {
-                        report(node, true);
-                    }
+                const oneLinerBlock = (exceptOneLine && isOneLinerBlock(node));
+
+                if (isSemi && oneLinerBlock) {
+                    report(node, true);
+                } else if (!isSemi && !oneLinerBlock) {
+                    report(node);
                 }
             }
         }
@@ -188,9 +285,7 @@ module.exports = {
          * @returns {void}
          */
         function checkForSemicolonForVariableDeclaration(node) {
-            const ancestors = context.getAncestors(),
-                parentIndex = ancestors.length - 1,
-                parent = ancestors[parentIndex];
+            const parent = node.parent;
 
             if ((parent.type !== "ForStatement" || parent.init !== node) &&
                 (!/^For(?:In|Of)Statement/.test(parent.type) || parent.left !== node)

package/lib/rules/sort-vars.js

@@ -27,29 +27,64 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        fixable: "code"
     },
 
     create(context) {
 
         const configuration = context.options[0] || {},
-            ignoreCase = configuration.ignoreCase || false;
+            ignoreCase = configuration.ignoreCase || false,
+            sourceCode = context.getSourceCode();
 
         return {
             VariableDeclaration(node) {
                 const idDeclarations = node.declarations.filter(decl => decl.id.type === "Identifier");
+                const getSortableName = ignoreCase ? decl => decl.id.name.toLowerCase() : decl => decl.id.name;
+                const unfixable = idDeclarations.some(decl => decl.init !== null && decl.init.type !== "Literal");
+                let fixed = false;
 
                 idDeclarations.slice(1).reduce((memo, decl) => {
-                    let lastVariableName = memo.id.name,
-                        currenVariableName = decl.id.name;
+                    const lastVariableName = getSortableName(memo),
+                        currentVariableName = getSortableName(decl);
 
-                    if (ignoreCase) {
-                        lastVariableName = lastVariableName.toLowerCase();
-                        currenVariableName = currenVariableName.toLowerCase();
-                    }
+                    if (currentVariableName < lastVariableName) {
+                        context.report({
+                            node: decl,
+                            message: "Variables within the same declaration block should be sorted alphabetically.",
+                            fix(fixer) {
+                                if (unfixable || fixed) {
+                                    return null;
+                                }
+                                return fixer.replaceTextRange(
+                                    [idDeclarations[0].range[0], idDeclarations[idDeclarations.length - 1].range[1]],
+                                    idDeclarations
+
+                                        // Clone the idDeclarations array to avoid mutating it
+                                        .slice()
+
+                                        // Sort the array into the desired order
+                                        .sort((declA, declB) => {
+                                            const aName = getSortableName(declA);
+                                            const bName = getSortableName(declB);
+
+                                            return aName > bName ? 1 : -1;
+                                        })
+
+                                        // Build a string out of the sorted list of identifier declarations and the text between the originals
+                                        .reduce((sourceText, identifier, index) => {
+                                            const textAfterIdentifier = index === idDeclarations.length - 1
+                                                ? ""
+                                                : sourceCode.getText().slice(idDeclarations[index].range[1], idDeclarations[index + 1].range[0]);
+
+                                            return sourceText + sourceCode.getText(identifier) + textAfterIdentifier;
+                                        }, "")
 
-                    if (currenVariableName < lastVariableName) {
-                        context.report({ node: decl, message: "Variables within the same declaration block should be sorted alphabetically." });
+                                );
+                            }
+                        });
+                        fixed = true;
                         return memo;
                     }
                     return decl;

package/lib/rules/space-in-parens.js

@@ -45,8 +45,7 @@ module.exports = {
         const MISSING_SPACE_MESSAGE = "There must be a space inside this paren.",
             REJECTED_SPACE_MESSAGE = "There should be no spaces inside this paren.",
             ALWAYS = context.options[0] === "always",
-
-            exceptionsArrayOptions = (context.options.length === 2) ? context.options[1].exceptions : [],
+            exceptionsArrayOptions = (context.options[1] && context.options[1].exceptions) || [],
             options = {};
         let exceptions;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "4.11.0",
+  "version": "4.13.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -40,7 +40,7 @@
     "concat-stream": "^1.6.0",
     "cross-spawn": "^5.1.0",
     "debug": "^3.0.1",
-    "doctrine": "^2.0.0",
+    "doctrine": "^2.0.2",
     "eslint-scope": "^3.7.1",
     "espree": "^3.5.2",
     "esquery": "^1.0.0",
@@ -49,7 +49,7 @@
     "file-entry-cache": "^2.0.0",
     "functional-red-black-tree": "^1.0.1",
     "glob": "^7.1.2",
-    "globals": "^9.17.0",
+    "globals": "^11.0.1",
     "ignore": "^3.3.3",
     "imurmurhash": "^0.1.4",
     "inquirer": "^3.0.6",