always ignore invalid extensions if import/extensions is set (fixes #…

…478)

CHANGELOG.md

@@ -11,6 +11,10 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 ### Changed
 - Modified [`no-nodejs-modules`] error message to include the module's name ([#453], [#461])
 
+### Fixed
+- [`import/extensions` setting] is respected in spite of the appearance of imports
+  in an imported file. (fixes [#478], thaks [@rhys-vdw])
+
 ## [1.12.0] - 2016-07-26
 ### Added
 - [`import/external-module-folders` setting]: a possibility to configure folders for "external" modules ([#444], thanks [@zloirock])
@@ -311,6 +315,7 @@ for info on changes for earlier releases.
 [#157]: https://github.com/benmosher/eslint-plugin-import/pull/157
 [#314]: https://github.com/benmosher/eslint-plugin-import/pull/314
 
+[#478]: https://github.com/benmosher/eslint-plugin-import/issues/478
 [#456]: https://github.com/benmosher/eslint-plugin-import/issues/456
 [#453]: https://github.com/benmosher/eslint-plugin-import/issues/453
 [#441]: https://github.com/benmosher/eslint-plugin-import/issues/441
@@ -399,3 +404,4 @@ for info on changes for earlier releases.
 [@ljharb]: https://github.com/ljharb
 [@rhettlivingston]: https://github.com/rhettlivingston
 [@zloirock]: https://github.com/zloirock
+[@rhys-vdw]: https://github.com/rhys-vdw

src/core/getExports.js

@@ -7,7 +7,7 @@ import * as doctrine from 'doctrine'
 
 import parse from './parse'
 import resolve, { relative as resolveRelative } from './resolve'
-import isIgnored from './ignore'
+import isIgnored, { hasValidExtension } from './ignore'
 
 import { hashObject } from './hash'
 
@@ -71,6 +71,12 @@ export default class ExportMap {
       // future: check content equality?
     }
 
+    // check valid extensions first
+    if (!hasValidExtension(path, context)) {
+      exportCache.set(cacheKey, null)
+      return null
+    }
+
     const content = fs.readFileSync(path, { encoding: 'utf8' })
 
     // check for and cache ignore

src/core/ignore.js

@@ -26,7 +26,7 @@ export default function ignore(path, context) {
     : ['node_modules']
 
   // check extension list first (cheap)
-  if (!validExtensions(context).has(extname(path))) return true
+  if (!hasValidExtension(path, context)) return true
 
   if (ignoreStrings.length === 0) return false
 
@@ -37,3 +37,7 @@ export default function ignore(path, context) {
 
   return false
 }
+
+export function hasValidExtension(path, context) {
+  return validExtensions(context).has(extname(path))
+}

tests/files/typescript.ts

@@ -0,0 +1,5 @@
+type X = { y: string | null }
+
+export function getX() : X {
+  return null
+}

tests/src/core/getExports.js

@@ -292,4 +292,19 @@ describe('getExports', function () {
     })
   })
 
+  context('issue #478: never parse non-whitelist extensions', function () {
+    const context = Object.assign({}, fakeContext,
+      { settings: { 'import/extensions': ['.js'] } })
+
+    let imports
+    before('load imports', function () {
+      imports = ExportMap.get('./typescript.ts', context)
+    })
+
+    it('returns nothing for a TypeScript file', function () {
+      expect(imports).not.to.exist
+    })
+
+  })
+
 })