eslint-plugin-import - npm Package Compare versions

Comparing version 1.9.0 to 1.9.1

CHANGELOG.md

@@ -8,2 +8,5 @@ # Change Log
 
+## [1.9.1] - 2016-06-16
+### Fixed
+- Reordered precedence for loading resolvers. ([#373])
 
@@ -252,2 +255,3 @@ ## [1.9.0] - 2016-06-10
 
+[#373]: https://github.com/benmosher/eslint-plugin-import/issues/373
 [#342]: https://github.com/benmosher/eslint-plugin-import/issues/342
@@ -273,3 +277,4 @@ [#328]: https://github.com/benmosher/eslint-plugin-import/issues/328
 
-[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v1.9.0...HEAD
+[Unreleased]: https://github.com/benmosher/eslint-plugin-import/compare/v1.9.1...HEAD
+[1.9.1]: https://github.com/benmosher/eslint-plugin-import/compare/v1.9.0...v1.9.1
 [1.9.0]: https://github.com/benmosher/eslint-plugin-import/compare/v1.8.1...v1.9.0
@@ -276,0 +281,0 @@ [1.8.1]: https://github.com/benmosher/eslint-plugin-import/compare/v1.8.0...v1.8.1

lib/core/resolve.js

@@ -29,6 +29,2 @@ 'use strict';
 
-var _isAbsolute = require('is-absolute');
-
-var _isAbsolute2 = _interopRequireDefault(_isAbsolute);
-
 var _fs = require('fs');
@@ -40,10 +36,12 @@
 
+var path = _interopRequireWildcard(_path);
+
 var _crypto = require('crypto');
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var isAbsolute = _path.isAbsolute || _isAbsolute2.default;
+var CASE_SENSITIVE_FS = exports.CASE_SENSITIVE_FS = !_fs2.default.existsSync(path.join(__dirname, 'reSOLVE.js'));
 
-var CASE_SENSITIVE_FS = exports.CASE_SENSITIVE_FS = !_fs2.default.existsSync((0, _path.join)(__dirname, 'reSOLVE.js'));
-
 var fileExistsCache = new _es6Map2.default();
@@ -79,3 +77,3 @@
 
-  var dir = (0, _path.dirname)(filepath);
+  var dir = path.dirname(filepath);
 
@@ -90,3 +88,3 @@ var result = checkCache(filepath, cacheSettings);
     var filenames = _fs2.default.readdirSync(dir);
-    if (filenames.indexOf((0, _path.basename)(filepath)) === -1) {
+    if (filenames.indexOf(path.basename(filepath)) === -1) {
       result = false;
@@ -103,3 +101,3 @@ } else {
 
-  var sourceDir = (0, _path.dirname)(sourceFile),
+  var sourceDir = path.dirname(sourceFile),
       cacheKey = sourceDir + hashObject(settings) + modulePath;
@@ -119,5 +117,5 @@
 
-  function cache(path) {
-    cachePath(cacheKey, path);
-    return path;
+  function cache(resolvedPath) {
+    cachePath(cacheKey, resolvedPath);
+    return resolvedPath;
   }
@@ -129,5 +127,5 @@
       try {
-        var path = resolver.resolveImport(modulePath, sourceFile, config);
-        if (path === undefined) return { found: false };
-        return { found: true, path: path };
+        var resolved = resolver.resolveImport(modulePath, sourceFile, config);
+        if (resolved === undefined) return { found: false };
+        return { found: true, path: resolved };
       } catch (err) {
@@ -216,13 +214,5 @@ return { found: false };
 function requireResolver(name, sourceFile) {
-  // Try to resolve package with absolute path (/Volumes/....)
-  if (isAbsolute(name)) {
-    try {
-      return require(name);
-    } catch (err) {/* continue */}
-  }
-
-  // Try to resolve package with path, relative to closest package.json
+  // Try to resolve package with conventional name
   try {
-    var packageDir = _pkgDir2.default.sync(sourceFile);
-    return require((0, _path.join)(packageDir, name));
+    return require('eslint-import-resolver-' + name);
   } catch (err) {} /* continue */
@@ -235,5 +225,8 @@
 
-  // Try to resolve package with conventional name
+  // Try to resolve package with path, relative to closest package.json
+  // or current working directory
   try {
-    return require('eslint-import-resolver-' + name);
+    var baseDir = _pkgDir2.default.sync(sourceFile) || process.cwd();
+    // absolute paths ignore base, so this covers both
+    return require(path.resolve(baseDir, name));
   } catch (err) {} /* continue */
@@ -275,2 +268,2 @@
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["core/resolve.js"],"names":[],"mappings":"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","file":"core/resolve.js","sourcesContent":["import 'es6-symbol/implement'\nimport Map from 'es6-map'\nimport Set from 'es6-set'\nimport assign from 'object-assign'\nimport pkgDir from 'pkg-dir'\nimport isAbsoluteFallback from 'is-absolute'\n\nimport fs from 'fs'\nimport { dirname, basename, join, isAbsolute as isAbsoluteNode } from 'path'\n\nconst isAbsolute = isAbsoluteNode || isAbsoluteFallback\n\nexport const CASE_SENSITIVE_FS = !fs.existsSync(join(__dirname, 'reSOLVE.js'))\n\nconst fileExistsCache = new Map()\n\nfunction cachePath(cacheKey, result) {\n  fileExistsCache.set(cacheKey, { result, lastSeen: Date.now() })\n}\n\nfunction checkCache(cacheKey, { lifetime }) {\n  if (fileExistsCache.has(cacheKey)) {\n    const { result, lastSeen } = fileExistsCache.get(cacheKey)\n    // check fresness\n    if (Date.now() - lastSeen < (lifetime * 1000)) return result\n  }\n  // cache miss\n  return undefined\n}\n\n// http://stackoverflow.com/a/27382838\nfunction fileExistsWithCaseSync(filepath, cacheSettings) {\n  // don't care if the FS is case-sensitive\n  if (CASE_SENSITIVE_FS) return true\n\n  // null means it resolved to a builtin\n  if (filepath === null) return true\n\n  const dir = dirname(filepath)\n\n  let result = checkCache(filepath, cacheSettings)\n  if (result != null) return result\n\n  // base case\n  if (dir === '/' || dir === '.' || /^[A-Z]:\\\\$/i.test(dir)) {\n    result = true\n  } else {\n    const filenames = fs.readdirSync(dir)\n    if (filenames.indexOf(basename(filepath)) === -1) {\n      result = false\n    } else {\n      result = fileExistsWithCaseSync(dir, cacheSettings)\n    }\n  }\n  cachePath(filepath, result)\n  return result\n}\n\nexport function relative(modulePath, sourceFile, settings) {\n\n  const sourceDir = dirname(sourceFile)\n      , cacheKey = sourceDir + hashObject(settings) + modulePath\n\n  const cacheSettings = assign({\n    lifetime: 30,  // seconds\n  }, settings['import/cache'])\n\n  // parse infinity\n  if (cacheSettings.lifetime === '∞' || cacheSettings.lifetime === 'Infinity') {\n    cacheSettings.lifetime = Infinity\n  }\n\n  const cachedPath = checkCache(cacheKey, cacheSettings)\n  if (cachedPath !== undefined) return cachedPath\n\n  function cache(path) {\n    cachePath(cacheKey, path)\n    return path\n  }\n\n  function withResolver(resolver, config) {\n\n    function v1() {\n      try {\n        const path = resolver.resolveImport(modulePath, sourceFile, config)\n        if (path === undefined) return { found: false }\n        return { found: true, path }\n      } catch (err) {\n        return { found: false }\n      }\n    }\n\n    function v2() {\n      return resolver.resolve(modulePath, sourceFile, config)\n    }\n\n    switch (resolver.interfaceVersion) {\n      case 2:\n        return v2()\n\n      default:\n      case 1:\n        return v1()\n    }\n  }\n\n  const configResolvers = (settings['import/resolver']\n    || { 'node': settings['import/resolve'] }) // backward compatibility\n\n  const resolvers = resolverReducer(configResolvers, new Map())\n\n  for (let [name, config] of resolvers) {\n    const resolver = requireResolver(name, sourceFile)\n\n    let { path: fullPath, found } = withResolver(resolver, config)\n\n    // resolvers imply file existence, this double-check just ensures the case matches\n    if (found && !fileExistsWithCaseSync(fullPath, cacheSettings)) {\n      // reject resolved path\n      fullPath = undefined\n    }\n\n    if (found) return cache(fullPath)\n  }\n\n  return cache(undefined)\n}\n\nfunction resolverReducer(resolvers, map) {\n  if (resolvers instanceof Array) {\n    resolvers.forEach(r => resolverReducer(r, map))\n    return map\n  }\n\n  if (typeof resolvers === 'string') {\n    map.set(resolvers, null)\n    return map\n  }\n\n  if (typeof resolvers === 'object') {\n    for (let key in resolvers) {\n      map.set(key, resolvers[key])\n    }\n    return map\n  }\n\n  throw new Error('invalid resolver config')\n}\n\nfunction requireResolver(name, sourceFile) {\n  // Try to resolve package with absolute path (/Volumes/....)\n  if (isAbsolute(name)) {\n    try {\n      return require(name)\n    } catch (err) { /* continue */ }\n  }\n\n  // Try to resolve package with path, relative to closest package.json\n  try {\n    const packageDir = pkgDir.sync(sourceFile)\n    return require(join(packageDir, name))\n  } catch (err) { /* continue */ }\n\n  // Try to resolve package with custom name (@myorg/resolver-name)\n  try {\n    return require(name)\n  } catch (err) { /* continue */ }\n\n  // Try to resolve package with conventional name\n  try {\n    return require(`eslint-import-resolver-${name}`)\n  } catch (err) { /* continue */ }\n\n  // all else failed\n  throw new Error(`unable to load resolver \"${name}\".`)\n}\n\nconst erroredContexts = new Set()\n\n/**\n * Given\n * @param  {string} p - module path\n * @param  {object} context - ESLint context\n * @return {string} - the full module filesystem path;\n *                    null if package is core;\n *                    undefined if not found\n */\nexport default function resolve(p, context) {\n  try {\n    return relative( p\n                   , context.getFilename()\n                   , context.settings\n                   )\n  } catch (err) {\n    if (!erroredContexts.has(context)) {\n      context.report({\n        message: `Resolve error: ${err.message}`,\n        loc: { line: 1, col: 0 },\n      })\n      erroredContexts.add(context)\n    }\n  }\n}\nresolve.relative = relative\n\n\nimport { createHash } from 'crypto'\nfunction hashObject(object) {\n  const settingsShasum = createHash('sha1')\n  settingsShasum.update(JSON.stringify(object))\n  return settingsShasum.digest('hex')\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["core/resolve.js"],"names":[],"mappings":"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","file":"core/resolve.js","sourcesContent":["import 'es6-symbol/implement'\nimport Map from 'es6-map'\nimport Set from 'es6-set'\nimport assign from 'object-assign'\nimport pkgDir from 'pkg-dir'\n\nimport fs from 'fs'\nimport * as path from 'path'\n\nexport const CASE_SENSITIVE_FS = !fs.existsSync(path.join(__dirname, 'reSOLVE.js'))\n\nconst fileExistsCache = new Map()\n\nfunction cachePath(cacheKey, result) {\n  fileExistsCache.set(cacheKey, { result, lastSeen: Date.now() })\n}\n\nfunction checkCache(cacheKey, { lifetime }) {\n  if (fileExistsCache.has(cacheKey)) {\n    const { result, lastSeen } = fileExistsCache.get(cacheKey)\n    // check fresness\n    if (Date.now() - lastSeen < (lifetime * 1000)) return result\n  }\n  // cache miss\n  return undefined\n}\n\n// http://stackoverflow.com/a/27382838\nfunction fileExistsWithCaseSync(filepath, cacheSettings) {\n  // don't care if the FS is case-sensitive\n  if (CASE_SENSITIVE_FS) return true\n\n  // null means it resolved to a builtin\n  if (filepath === null) return true\n\n  const dir = path.dirname(filepath)\n\n  let result = checkCache(filepath, cacheSettings)\n  if (result != null) return result\n\n  // base case\n  if (dir === '/' || dir === '.' || /^[A-Z]:\\\\$/i.test(dir)) {\n    result = true\n  } else {\n    const filenames = fs.readdirSync(dir)\n    if (filenames.indexOf(path.basename(filepath)) === -1) {\n      result = false\n    } else {\n      result = fileExistsWithCaseSync(dir, cacheSettings)\n    }\n  }\n  cachePath(filepath, result)\n  return result\n}\n\nexport function relative(modulePath, sourceFile, settings) {\n\n  const sourceDir = path.dirname(sourceFile)\n      , cacheKey = sourceDir + hashObject(settings) + modulePath\n\n  const cacheSettings = assign({\n    lifetime: 30,  // seconds\n  }, settings['import/cache'])\n\n  // parse infinity\n  if (cacheSettings.lifetime === '∞' || cacheSettings.lifetime === 'Infinity') {\n    cacheSettings.lifetime = Infinity\n  }\n\n  const cachedPath = checkCache(cacheKey, cacheSettings)\n  if (cachedPath !== undefined) return cachedPath\n\n  function cache(resolvedPath) {\n    cachePath(cacheKey, resolvedPath)\n    return resolvedPath\n  }\n\n  function withResolver(resolver, config) {\n\n    function v1() {\n      try {\n        const resolved = resolver.resolveImport(modulePath, sourceFile, config)\n        if (resolved === undefined) return { found: false }\n        return { found: true, path: resolved }\n      } catch (err) {\n        return { found: false }\n      }\n    }\n\n    function v2() {\n      return resolver.resolve(modulePath, sourceFile, config)\n    }\n\n    switch (resolver.interfaceVersion) {\n      case 2:\n        return v2()\n\n      default:\n      case 1:\n        return v1()\n    }\n  }\n\n  const configResolvers = (settings['import/resolver']\n    || { 'node': settings['import/resolve'] }) // backward compatibility\n\n  const resolvers = resolverReducer(configResolvers, new Map())\n\n  for (let [name, config] of resolvers) {\n    const resolver = requireResolver(name, sourceFile)\n\n    let { path: fullPath, found } = withResolver(resolver, config)\n\n    // resolvers imply file existence, this double-check just ensures the case matches\n    if (found && !fileExistsWithCaseSync(fullPath, cacheSettings)) {\n      // reject resolved path\n      fullPath = undefined\n    }\n\n    if (found) return cache(fullPath)\n  }\n\n  return cache(undefined)\n}\n\nfunction resolverReducer(resolvers, map) {\n  if (resolvers instanceof Array) {\n    resolvers.forEach(r => resolverReducer(r, map))\n    return map\n  }\n\n  if (typeof resolvers === 'string') {\n    map.set(resolvers, null)\n    return map\n  }\n\n  if (typeof resolvers === 'object') {\n    for (let key in resolvers) {\n      map.set(key, resolvers[key])\n    }\n    return map\n  }\n\n  throw new Error('invalid resolver config')\n}\n\nfunction requireResolver(name, sourceFile) {\n  // Try to resolve package with conventional name\n  try {\n    return require(`eslint-import-resolver-${name}`)\n  } catch (err) { /* continue */ }\n\n  // Try to resolve package with custom name (@myorg/resolver-name)\n  try {\n    return require(name)\n  } catch (err) { /* continue */ }\n\n  // Try to resolve package with path, relative to closest package.json\n  // or current working directory\n  try {\n    const baseDir = pkgDir.sync(sourceFile) || process.cwd()\n    // absolute paths ignore base, so this covers both\n    return require(path.resolve(baseDir, name))\n  } catch (err) { /* continue */ }\n\n  // all else failed\n  throw new Error(`unable to load resolver \"${name}\".`)\n}\n\nconst erroredContexts = new Set()\n\n/**\n * Given\n * @param  {string} p - module path\n * @param  {object} context - ESLint context\n * @return {string} - the full module filesystem path;\n *                    null if package is core;\n *                    undefined if not found\n */\nexport default function resolve(p, context) {\n  try {\n    return relative( p\n                   , context.getFilename()\n                   , context.settings\n                   )\n  } catch (err) {\n    if (!erroredContexts.has(context)) {\n      context.report({\n        message: `Resolve error: ${err.message}`,\n        loc: { line: 1, col: 0 },\n      })\n      erroredContexts.add(context)\n    }\n  }\n}\nresolve.relative = relative\n\n\nimport { createHash } from 'crypto'\nfunction hashObject(object) {\n  const settingsShasum = createHash('sha1')\n  settingsShasum.update(JSON.stringify(object))\n  return settingsShasum.digest('hex')\n}\n"]}

package.json

 {
   "name": "eslint-plugin-import",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Import with sanity.",
@@ -74,3 +74,2 @@ "main": "lib/index.js",
     "eslint-import-resolver-node": "^0.2.0",
-    "is-absolute": "^0.2.5",
     "lodash.cond": "^4.3.0",
@@ -77,0 +76,0 @@ "lodash.endswith": "^4.0.1",

README.md

@@ -128,17 +128,10 @@ # eslint-plugin-import
 
-- with an absolute path to resolver, used as a `computed property` name, which is supported since Node v4:
+- as a conventional `eslint-import-resolver` name, like `eslint-import-resolver-foo`:
 
-```js
-// .eslintrc.js
-module.exports = {
-  settings: {
-    'import/resolver': {
-      [path.resolve('../../../my-resolver')]: { someConfig: value }
-    }
-  }
-}
+```yaml
+# .eslintrc.yml
+settings:
+  # uses 'eslint-import-resolver-foo':
+  import/resolver: foo
 ```
-
-- with a path relative to the closest `package.json` file:
-
 ```js
@@ -149,3 +142,3 @@ // .eslintrc.js
     'import/resolver': {
-      './my-resolver': { someConfig: value }
+      foo: { someConfig: value }
     }
@@ -156,2 +149,3 @@ }
 
+- with a full npm module name, like `my-awesome-npm-module`:
 
@@ -161,7 +155,4 @@ ```yaml
 settings:
-  import/resolver: './my-resolver'
+  import/resolver: 'my-awesome-npm-module'
 ```
-
-- with an npm module name, like `my-awesome-npm-module`:
-
 ```js
@@ -178,12 +169,4 @@ // .eslintrc.js
 
+- with a filesystem path to resolver, defined in this example as a `computed property` name:
 
-```yaml
-# .eslintrc.yml
-settings:
-  import/resolver: 'my-awesome-npm-module'
-```
-
-- as a conventional `eslint-import-resolver` name, like `eslint-import-resolver-foo`:
-
-
 ```js
@@ -194,3 +177,3 @@ // .eslintrc.js
     'import/resolver': {
-      foo: { someConfig: value }
+      [path.resolve('../../../my-resolver')]: { someConfig: value }
     }
@@ -201,8 +184,7 @@ }
 
-`.eslintrc.yml`:
-```yaml
-settings:
-  import/resolver: foo
-```
+Relative paths will be resolved relative to the source's nearest `package.json` or
+the process's current working directory if no `package.json` is found.
 
+
+
 If you are interesting in writing a resolver, see the [spec](./resolvers/README.md) for more details.
@@ -209,0 +191,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Dependency count

14

decreased by-6.67%

Number of low supply chain risk alerts

9

decreased by-10%

Worsened metrics

Total package byte prevSize

292472

decreased by-0.03%

Lines of code

2374

decreased by-0.21%

Number of lines in readme file

341

decreased by-5.01%

Dependency changes

• - Removedis-absolute@^0.2.5

• - Removedis-absolute@0.2.6(transitive)

• - Removedis-relative@0.2.1(transitive)

• - Removedis-unc-path@0.1.2(transitive)

• - Removedis-windows@0.2.0(transitive)

• - Removedunc-path-regex@0.1.2(transitive)