v1.11.1

CHANGELOG.md

@@ -5,6 +5,11 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 
 ## [Unreleased]
 
+## [1.11.1] - 2016-07-20
+### Fixed
+- [`newline-after-import`] exception for `switch` branches with `require`s iff parsed as `sourceType:'module'`.
+  (still [#441], thanks again [@ljharb])
+
 ## [1.11.0] - 2016-07-17
 ### Added
 - Added an `peerDependencies` option to [`no-extraneous-dependencies`] to allow/forbid peer dependencies ([#423], [#428], thanks [@jfmengels]!).
@@ -323,7 +328,8 @@ for info on changes for earlier releases.
 [#119]: https://github.com/benmosher/eslint-plugin-import/issues/119
 [#89]: https://github.com/benmosher/eslint-plugin-import/issues/89
 
-[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v1.11.0...HEAD
+[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v1.11.1...HEAD
+[1.11.1]: https://github.com/benmosher/eslint-plugin-import/compare/v1.11.0...v1.11.1
 [1.11.0]: https://github.com/benmosher/eslint-plugin-import/compare/v1.10.3...v1.11.0
 [1.10.3]: https://github.com/benmosher/eslint-plugin-import/compare/v1.10.2...v1.10.3
 [1.10.2]: https://github.com/benmosher/eslint-plugin-import/compare/v1.10.1...v1.10.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-import",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Import with sanity.",
   "main": "lib/index.js",
   "directories": {
@@ -70,6 +70,7 @@
   "dependencies": {
     "builtin-modules": "^1.1.1",
     "contains-path": "^0.1.0",
+    "debug": "^2.2.0",
     "doctrine": "1.2.x",
     "es6-map": "^0.1.3",
     "es6-set": "^0.1.4",

src/rules/newline-after-import.js

@@ -6,6 +6,10 @@
 import isStaticRequire from '../core/staticRequire'
 import findIndex from 'lodash.findindex'
 
+import debug from 'debug'
+
+const log = debug('eslint-plugin-import:rules:newline-after-import')
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -16,7 +20,8 @@ function containsNodeOrEqual(outerNode, innerNode) {
 
 function getScopeBody(scope) {
     if (scope.block.type === 'SwitchStatement') {
-      return []
+      log('SwitchStatement scopes not supported')
+      return null
     }
 
     const { body } = scope.block
@@ -85,14 +90,22 @@ module.exports = function (context) {
       }
     },
     'Program:exit': function () {
+      log('exit processing for', context.getFilename())
       scopes.forEach(function ({ scope, requireCalls }) {
         const scopeBody = getScopeBody(scope)
 
         // skip non-array scopes (i.e. arrow function expressions)
-        if (!(scopeBody instanceof Array)) return
+        if (!scopeBody || !(scopeBody instanceof Array)) {
+          log('invalid scope:', scopeBody)
+          return
+        }
+
+        log('got scope:', scopeBody)
 
         requireCalls.forEach(function (node, index) {
           const nodePosition = findNodeIndexInScopeBody(scopeBody, node)
+          log('node position in scope:', nodePosition)
+
           const statementWithRequireCall = scopeBody[nodePosition]
           const nextStatement = scopeBody[nodePosition + 1]
           const nextRequireCall = requireCalls[index + 1]

tests/src/rules/newline-after-import.js

@@ -32,6 +32,39 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           return renderData.mainModalContent.clone()
       }
     }`,
+    { code: `//issue 441
+    function bar() {
+      switch (foo) {
+        case '1':
+          return require('../path/to/file1.jst.hbs')(renderData, options);
+        case '2':
+          return require('../path/to/file2.jst.hbs')(renderData, options);
+        case '3':
+          return require('../path/to/file3.jst.hbs')(renderData, options);
+        case '4':
+          return require('../path/to/file4.jst.hbs')(renderData, options);
+        case '5':
+          return require('../path/to/file5.jst.hbs')(renderData, options);
+        case '6':
+          return require('../path/to/file6.jst.hbs')(renderData, options);
+        case '7':
+          return require('../path/to/file7.jst.hbs')(renderData, options);
+        case '8':
+          return require('../path/to/file8.jst.hbs')(renderData, options);
+        case '9':
+          return require('../path/to/file9.jst.hbs')(renderData, options);
+        case '10':
+          return require('../path/to/file10.jst.hbs')(renderData, options);
+        case '11':
+          return require('../path/to/file11.jst.hbs')(renderData, options);
+        case '12':
+          return something();
+        default:
+          return somethingElse();
+      }
+    }`,
+      parserOptions: { sourceType: 'module' },
+    },
     {
       code: "import path from 'path';\nimport foo from 'foo';\n",
       parserOptions: { sourceType: 'module' },
@@ -196,5 +229,5 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
       } ],
       parserOptions: { sourceType: 'module' },
     },
-  ]
+  ],
 })