Merge remote-tracking branch 'upstream2/master' into support-multiple-tsconfigs-2

Author: teoxoy

index.js

@@ -9,10 +9,8 @@ const isGlob = require('is-glob');
 
 const log = debug('eslint-import-resolver-typescript');
 
-const extensions = Object.keys(require.extensions).concat(
-  '.ts',
-  '.tsx',
-  '.d.ts',
+const extensions = ['.ts', '.tsx', '.d.ts'].concat(
+  Object.keys(require.extensions),
 );
 
 /**
@@ -50,6 +48,25 @@ function resolveFile(source, file, options = {}) {
     foundNodePath = null;
   }
 
+  // naive attempt at @types/* resolution,
+  // if path is neither absolute nor relative
+  if (
+    (/\.jsx?$/.test(foundNodePath) ||
+      (options.alwaysTryTypes && !foundNodePath)) &&
+    !/^@types[/\\]/.test(source) &&
+    !path.isAbsolute(source) &&
+    source[0] !== '.'
+  ) {
+    const definitelyTyped = resolveFile(
+      '@types' + path.sep + mangleScopedPackage(source),
+      file,
+      options,
+    );
+    if (definitelyTyped.found) {
+      return definitelyTyped;
+    }
+  }
+
   if (foundNodePath) {
     log('matched node path:', foundNodePath);
 
@@ -59,17 +76,16 @@ function resolveFile(source, file, options = {}) {
     };
   }
 
-  log('didnt find', source);
+  log("didn't find", source);
 
   return {
     found: false,
   };
 }
 
 function packageFilter(pkg) {
-  if (pkg['jsnext:main']) {
-    pkg['main'] = pkg['jsnext:main'];
-  }
+  pkg.main =
+    pkg.types || pkg.typings || pkg.module || pkg['jsnext:main'] || pkg.main;
   return pkg;
 }
 
@@ -141,6 +157,22 @@ function initMappers(options) {
     });
 }
 
+/*
+ * For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`.
+ *
+ * @param {string} moduleName
+ * @returns {string}
+ */
+function mangleScopedPackage(moduleName) {
+  if (moduleName[0] === '@') {
+    const replaceSlash = moduleName.replace(path.sep, '__');
+    if (replaceSlash !== moduleName) {
+      return replaceSlash.slice(1); // Take off the "@"
+    }
+  }
+  return moduleName;
+}
+
 module.exports = {
   interfaceVersion: 2,
   resolve: resolveFile,

package-lock.json

@@ -1,14 +1,14 @@
 {
-  "name": "eslint-import-resolver-typescript",
-  "version": "1.1.1",
+  "name": "eslint-import-resolver-ts",
+  "version": "0.1.0",
   "description": "TypeScript .ts .tsx module resolver for `eslint-plugin-import`.",
   "main": "index.js",
   "files": [
     "index.js"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/alexgorbatchev/eslint-import-resolver-typescript"
+    "url": "https://github.com/rx-ts/eslint-import-resolver-ts"
   },
   "keywords": [
     "typescript",
@@ -31,6 +31,7 @@
     "eslint-plugin-import": "*"
   },
   "devDependencies": {
+    "@types/unist": "^2.0.3",
     "dummy.js": "file:dummy.js",
     "eslint": "^5.6.1",
     "eslint-plugin-import": "^2.14.0",

package.json

@@ -26,6 +26,7 @@ module.exports = dirname => ({
     'import/resolver': {
       [path.resolve(`${__dirname}/../index.js`)]: {
         directory: dirname,
+        alwaysTryTypes: true
       },
     },
   },

tests/baseEslintConfig.js

@@ -0,0 +1,3 @@
+declare const content : 'yes';
+
+export default content;

tests/withoutPaths/dtsImportee.d.ts

@@ -1,9 +1,17 @@
 // import relative
 import './tsImportee'
 import './tsxImportee'
+import './dtsImportee'
+import './subfolder/dtsImportee'
 import './subfolder/tsImportee'
 import './subfolder/tsxImportee'
 
 // import from node_module
 import 'typescript'
 import 'dummy.js'
+
+// import from `@types/`
+import 'json5'
+
+// enable alwaysTryTypes 
+import 'unist'

tests/withoutPaths/index.ts

@@ -0,0 +1,3 @@
+declare const content : 'yes';
+
+export default content;