build(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 #1362
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
dependabot
bot
added
dependencies
Diff between eslint-plugin-import 2.30.0 and 2.31.0diff --git a/lib/exportMap/builder.js b/lib/exportMap/builder.js
index v2.30.0..v2.31.0 100644
--- a/lib/exportMap/builder.js
+++ b/lib/exportMap/builder.js
@@ -93,5 +93,9 @@
exportMap.mtime = stats.mtime;
- exportCache.set(cacheKey, exportMap);
+ // If the visitor keys were not populated, then we shouldn't save anything to the cache,
+ // since the parse results may not be reliable.
+ if (exportMap.visitorKeys) {
+ exportCache.set(cacheKey, exportMap);
+ }
return exportMap;
}return _for;}() }, { key: 'parse', value: function () {function parse(
@@ -204,3 +208,3 @@
return exportMap;
}return parse;}() }]);return ExportMapBuilder;}();exports['default'] = ExportMapBuilder;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/exportMap/builder.js"],"names":["unambiguous","log","exportCache","Map","thunkFor","p","context","ExportMapBuilder","source","path","cacheKey","digest","exportMap","get","stats","fs","statSync","mtime","set","content","readFileSync","encoding","test","parse","ExportMap","isEsModuleInteropTrue","ast","visitorKeys","result","err","errors","push","hasDynamicImports","remotePathResolver","RemotePath","processDynamicImport","type","resolve","value","importedSpecifiers","Set","add","getter","imports","declarations","loc","dynamic","ImportExpression","node","CallExpression","callee","arguments","unambiguouslyESM","isModule","comments","some","c","doc","doctrine","unwrap","tags","t","title","visitorBuilder","ImportExportVisitorBuilder","body","forEach","astNode","visitor","build","call","namespace","size","has","parseGoal"],"mappings":"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","file":"builder.js","sourcesContent":["import fs from 'fs';\n\nimport doctrine from 'doctrine';\n\nimport debug from 'debug';\n\nimport parse from 'eslint-module-utils/parse';\nimport visit from 'eslint-module-utils/visit';\nimport resolve from 'eslint-module-utils/resolve';\nimport isIgnored, { hasValidExtension } from 'eslint-module-utils/ignore';\n\nimport { hashObject } from 'eslint-module-utils/hash';\nimport * as unambiguous from 'eslint-module-utils/unambiguous';\n\nimport ExportMap from '.';\nimport childContext from './childContext';\nimport { isEsModuleInterop } from './typescript';\nimport { RemotePath } from './remotePath';\nimport ImportExportVisitorBuilder from './visitor';\n\nconst log = debug('eslint-plugin-import:ExportMap');\n\nconst exportCache = new Map();\n\n/**\n * The creation of this closure is isolated from other scopes\n * to avoid over-retention of unrelated variables, which has\n * caused memory leaks. See #1266.\n */\nfunction thunkFor(p, context) {\n  // eslint-disable-next-line no-use-before-define\n  return () => ExportMapBuilder.for(childContext(p, context));\n}\n\nexport default class ExportMapBuilder {\n  static get(source, context) {\n    const path = resolve(source, context);\n    if (path == null) { return null; }\n\n    return ExportMapBuilder.for(childContext(path, context));\n  }\n\n  static for(context) {\n    const { path } = context;\n\n    const cacheKey = context.cacheKey || hashObject(context).digest('hex');\n    let exportMap = exportCache.get(cacheKey);\n\n    // return cached ignore\n    if (exportMap === null) { return null; }\n\n    const stats = fs.statSync(path);\n    if (exportMap != null) {\n      // date equality check\n      if (exportMap.mtime - stats.mtime === 0) {\n        return exportMap;\n      }\n      // future: check content equality?\n    }\n\n    // check valid extensions first\n    if (!hasValidExtension(path, context)) {\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    // check for and cache ignore\n    if (isIgnored(path, context)) {\n      log('ignored path due to ignore settings:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    const content = fs.readFileSync(path, { encoding: 'utf8' });\n\n    // check for and cache unambiguous modules\n    if (!unambiguous.test(content)) {\n      log('ignored path due to unambiguous regex:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    log('cache miss', cacheKey, 'for path', path);\n    exportMap = ExportMapBuilder.parse(path, content, context);\n\n    // ambiguous modules return null\n    if (exportMap == null) {\n      log('ignored path due to ambiguous parse:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    exportMap.mtime = stats.mtime;\n\n    exportCache.set(cacheKey, exportMap);\n    return exportMap;\n  }\n\n  static parse(path, content, context) {\n    const exportMap = new ExportMap(path);\n    const isEsModuleInteropTrue = isEsModuleInterop(context);\n\n    let ast;\n    let visitorKeys;\n    try {\n      const result = parse(path, content, context);\n      ast = result.ast;\n      visitorKeys = result.visitorKeys;\n    } catch (err) {\n      exportMap.errors.push(err);\n      return exportMap; // can't continue\n    }\n\n    exportMap.visitorKeys = visitorKeys;\n\n    let hasDynamicImports = false;\n\n    const remotePathResolver = new RemotePath(path, context);\n\n    function processDynamicImport(source) {\n      hasDynamicImports = true;\n      if (source.type !== 'Literal') {\n        return null;\n      }\n      const p = remotePathResolver.resolve(source.value);\n      if (p == null) {\n        return null;\n      }\n      const importedSpecifiers = new Set();\n      importedSpecifiers.add('ImportNamespaceSpecifier');\n      const getter = thunkFor(p, context);\n      exportMap.imports.set(p, {\n        getter,\n        declarations: new Set([{\n          source: {\n          // capturing actual node reference holds full AST in memory!\n            value: source.value,\n            loc: source.loc,\n          },\n          importedSpecifiers,\n          dynamic: true,\n        }]),\n      });\n    }\n\n    visit(ast, visitorKeys, {\n      ImportExpression(node) {\n        processDynamicImport(node.source);\n      },\n      CallExpression(node) {\n        if (node.callee.type === 'Import') {\n          processDynamicImport(node.arguments[0]);\n        }\n      },\n    });\n\n    const unambiguouslyESM = unambiguous.isModule(ast);\n    if (!unambiguouslyESM && !hasDynamicImports) { return null; }\n\n    // attempt to collect module doc\n    if (ast.comments) {\n      ast.comments.some((c) => {\n        if (c.type !== 'Block') { return false; }\n        try {\n          const doc = doctrine.parse(c.value, { unwrap: true });\n          if (doc.tags.some((t) => t.title === 'module')) {\n            exportMap.doc = doc;\n            return true;\n          }\n        } catch (err) { /* ignore */ }\n        return false;\n      });\n    }\n\n    const visitorBuilder = new ImportExportVisitorBuilder(\n      path,\n      context,\n      exportMap,\n      ExportMapBuilder,\n      content,\n      ast,\n      isEsModuleInteropTrue,\n      thunkFor,\n    );\n    ast.body.forEach(function (astNode) {\n      const visitor = visitorBuilder.build(astNode);\n\n      if (visitor[astNode.type]) {\n        visitor[astNode.type].call(visitorBuilder);\n      }\n    });\n\n    if (\n      isEsModuleInteropTrue // esModuleInterop is on in tsconfig\n      && exportMap.namespace.size > 0 // anything is exported\n      && !exportMap.namespace.has('default') // and default isn't added already\n    ) {\n      exportMap.namespace.set('default', {}); // add default export\n    }\n\n    if (unambiguouslyESM) {\n      exportMap.parseGoal = 'Module';\n    }\n    return exportMap;\n  }\n}\n"]}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/exportMap/builder.js"],"names":["unambiguous","log","exportCache","Map","thunkFor","p","context","ExportMapBuilder","source","path","cacheKey","digest","exportMap","get","stats","fs","statSync","mtime","set","content","readFileSync","encoding","test","parse","visitorKeys","ExportMap","isEsModuleInteropTrue","ast","result","err","errors","push","hasDynamicImports","remotePathResolver","RemotePath","processDynamicImport","type","resolve","value","importedSpecifiers","Set","add","getter","imports","declarations","loc","dynamic","ImportExpression","node","CallExpression","callee","arguments","unambiguouslyESM","isModule","comments","some","c","doc","doctrine","unwrap","tags","t","title","visitorBuilder","ImportExportVisitorBuilder","body","forEach","astNode","visitor","build","call","namespace","size","has","parseGoal"],"mappings":"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","file":"builder.js","sourcesContent":["import fs from 'fs';\n\nimport doctrine from 'doctrine';\n\nimport debug from 'debug';\n\nimport parse from 'eslint-module-utils/parse';\nimport visit from 'eslint-module-utils/visit';\nimport resolve from 'eslint-module-utils/resolve';\nimport isIgnored, { hasValidExtension } from 'eslint-module-utils/ignore';\n\nimport { hashObject } from 'eslint-module-utils/hash';\nimport * as unambiguous from 'eslint-module-utils/unambiguous';\n\nimport ExportMap from '.';\nimport childContext from './childContext';\nimport { isEsModuleInterop } from './typescript';\nimport { RemotePath } from './remotePath';\nimport ImportExportVisitorBuilder from './visitor';\n\nconst log = debug('eslint-plugin-import:ExportMap');\n\nconst exportCache = new Map();\n\n/**\n * The creation of this closure is isolated from other scopes\n * to avoid over-retention of unrelated variables, which has\n * caused memory leaks. See #1266.\n */\nfunction thunkFor(p, context) {\n  // eslint-disable-next-line no-use-before-define\n  return () => ExportMapBuilder.for(childContext(p, context));\n}\n\nexport default class ExportMapBuilder {\n  static get(source, context) {\n    const path = resolve(source, context);\n    if (path == null) { return null; }\n\n    return ExportMapBuilder.for(childContext(path, context));\n  }\n\n  static for(context) {\n    const { path } = context;\n\n    const cacheKey = context.cacheKey || hashObject(context).digest('hex');\n    let exportMap = exportCache.get(cacheKey);\n\n    // return cached ignore\n    if (exportMap === null) { return null; }\n\n    const stats = fs.statSync(path);\n    if (exportMap != null) {\n      // date equality check\n      if (exportMap.mtime - stats.mtime === 0) {\n        return exportMap;\n      }\n      // future: check content equality?\n    }\n\n    // check valid extensions first\n    if (!hasValidExtension(path, context)) {\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    // check for and cache ignore\n    if (isIgnored(path, context)) {\n      log('ignored path due to ignore settings:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    const content = fs.readFileSync(path, { encoding: 'utf8' });\n\n    // check for and cache unambiguous modules\n    if (!unambiguous.test(content)) {\n      log('ignored path due to unambiguous regex:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    log('cache miss', cacheKey, 'for path', path);\n    exportMap = ExportMapBuilder.parse(path, content, context);\n\n    // ambiguous modules return null\n    if (exportMap == null) {\n      log('ignored path due to ambiguous parse:', path);\n      exportCache.set(cacheKey, null);\n      return null;\n    }\n\n    exportMap.mtime = stats.mtime;\n\n    // If the visitor keys were not populated, then we shouldn't save anything to the cache,\n    // since the parse results may not be reliable.\n    if (exportMap.visitorKeys) {\n      exportCache.set(cacheKey, exportMap);\n    }\n    return exportMap;\n  }\n\n  static parse(path, content, context) {\n    const exportMap = new ExportMap(path);\n    const isEsModuleInteropTrue = isEsModuleInterop(context);\n\n    let ast;\n    let visitorKeys;\n    try {\n      const result = parse(path, content, context);\n      ast = result.ast;\n      visitorKeys = result.visitorKeys;\n    } catch (err) {\n      exportMap.errors.push(err);\n      return exportMap; // can't continue\n    }\n\n    exportMap.visitorKeys = visitorKeys;\n\n    let hasDynamicImports = false;\n\n    const remotePathResolver = new RemotePath(path, context);\n\n    function processDynamicImport(source) {\n      hasDynamicImports = true;\n      if (source.type !== 'Literal') {\n        return null;\n      }\n      const p = remotePathResolver.resolve(source.value);\n      if (p == null) {\n        return null;\n      }\n      const importedSpecifiers = new Set();\n      importedSpecifiers.add('ImportNamespaceSpecifier');\n      const getter = thunkFor(p, context);\n      exportMap.imports.set(p, {\n        getter,\n        declarations: new Set([{\n          source: {\n          // capturing actual node reference holds full AST in memory!\n            value: source.value,\n            loc: source.loc,\n          },\n          importedSpecifiers,\n          dynamic: true,\n        }]),\n      });\n    }\n\n    visit(ast, visitorKeys, {\n      ImportExpression(node) {\n        processDynamicImport(node.source);\n      },\n      CallExpression(node) {\n        if (node.callee.type === 'Import') {\n          processDynamicImport(node.arguments[0]);\n        }\n      },\n    });\n\n    const unambiguouslyESM = unambiguous.isModule(ast);\n    if (!unambiguouslyESM && !hasDynamicImports) { return null; }\n\n    // attempt to collect module doc\n    if (ast.comments) {\n      ast.comments.some((c) => {\n        if (c.type !== 'Block') { return false; }\n        try {\n          const doc = doctrine.parse(c.value, { unwrap: true });\n          if (doc.tags.some((t) => t.title === 'module')) {\n            exportMap.doc = doc;\n            return true;\n          }\n        } catch (err) { /* ignore */ }\n        return false;\n      });\n    }\n\n    const visitorBuilder = new ImportExportVisitorBuilder(\n      path,\n      context,\n      exportMap,\n      ExportMapBuilder,\n      content,\n      ast,\n      isEsModuleInteropTrue,\n      thunkFor,\n    );\n    ast.body.forEach(function (astNode) {\n      const visitor = visitorBuilder.build(astNode);\n\n      if (visitor[astNode.type]) {\n        visitor[astNode.type].call(visitorBuilder);\n      }\n    });\n\n    if (\n      isEsModuleInteropTrue // esModuleInterop is on in tsconfig\n      && exportMap.namespace.size > 0 // anything is exported\n      && !exportMap.namespace.has('default') // and default isn't added already\n    ) {\n      exportMap.namespace.set('default', {}); // add default export\n    }\n\n    if (unambiguouslyESM) {\n      exportMap.parseGoal = 'Module';\n    }\n    return exportMap;\n  }\n}\n"]}
\ No newline at end of file
diff --git a/lib/exportMap/childContext.js b/lib/exportMap/childContext.js
index v2.30.0..v2.31.0 100644
--- a/lib/exportMap/childContext.js
+++ b/lib/exportMap/childContext.js
@@ -10,24 +10,48 @@
-childContext;var _hash = require('eslint-module-utils/hash');var parserOptionsHash = '';var prevParserOptions = '';var settingsHash = '';var prevSettings = ''; /**
- * don't hold full context object in memory, just grab what we need.
- * also calculate a cacheKey, where parts of the cacheKey hash are memoized
- */function childContext(path, context) {var settings = context.settings,parserOptions = context.parserOptions,parserPath = context.parserPath;if (JSON.stringify(settings) !== prevSettings) {
- settingsHash = (0, _hash.hashObject)({ settings: settings }).digest('hex');
+
+
+
+
+
+
+
+
+childContext;var _hash = require('eslint-module-utils/hash');var optionsHash = '';var prevOptions = '';var settingsHash = '';var prevSettings = ''; // Replacer function helps us with serializing the parser nested within `languageOptions`.
+function stringifyReplacerFn(_, value) {if (typeof value === 'function') {return String(value);}return value;} /**
+ * don't hold full context object in memory, just grab what we need.
+ * also calculate a cacheKey, where parts of the cacheKey hash are memoized
+ */function childContext(path, context) {var settings = context.settings,parserOptions = context.parserOptions,parserPath = context.parserPath,languageOptions = context.languageOptions;if (JSON.stringify(settings) !== prevSettings) {settingsHash = (0, _hash.hashObject)({ settings: settings }).digest('hex');
prevSettings = JSON.stringify(settings);
}
- if (JSON.stringify(parserOptions) !== prevParserOptions) {
\ No newline at end of file
- parserOptionsHash = (0, _hash.hashObject)({ parserOptions: parserOptions }).digest('hex');
- prevParserOptions = JSON.stringify(parserOptions);
+ // We'll use either a combination of `parserOptions` and `parserPath` or `languageOptions`
+ // to construct the cache key, depending on whether this is using a flat config or not.
+ var optionsToken = void 0;
+ if (!parserPath && languageOptions) {
+ if (JSON.stringify(languageOptions, stringifyReplacerFn) !== prevOptions) {
+ optionsHash = (0, _hash.hashObject)({ languageOptions: languageOptions }).digest('hex');
+ prevOptions = JSON.stringify(languageOptions, stringifyReplacerFn);
+ }
+ // For languageOptions, we're just using the hashed options as the options token
+ optionsToken = optionsHash;
+ } else {
+ if (JSON.stringify(parserOptions) !== prevOptions) {
+ optionsHash = (0, _hash.hashObject)({ parserOptions: parserOptions }).digest('hex');
+ prevOptions = JSON.stringify(parserOptions);
+ }
+ // When not using flat config, we use a combination of the hashed parserOptions
+ // and parserPath as the token
+ optionsToken = String(parserPath) + optionsHash;
}
return {
- cacheKey: String(parserPath) + parserOptionsHash + settingsHash + String(path),
+ cacheKey: optionsToken + settingsHash + String(path),
settings: settings,
parserOptions: parserOptions,
parserPath: parserPath,
- path: path };
+ path: path,
+ languageOptions: languageOptions };
}
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9leHBvcnRNYXAvY2hpbGRDb250ZXh0LmpzIl0sIm5hbWVzIjpbImNoaWxkQ29udGV4dCIsInBhcnNlck9wdGlvbnNIYXNoIiwicHJldlBhcnNlck9wdGlvbnMiLCJzZXR0aW5nc0hhc2giLCJwcmV2U2V0dGluZ3MiLCJwYXRoIiwiY29udGV4dCIsInNldHRpbmdzIiwicGFyc2VyT3B0aW9ucyIsInBhcnNlclBhdGgiLCJKU09OIiwic3RyaW5naWZ5IiwiZGlnZXN0IiwiY2FjaGVLZXkiLCJTdHJpbmciXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBV3dCQSxZLENBWHhCLGdEQUVBLElBQUlDLG9CQUFvQixFQUF4QixDQUNBLElBQUlDLG9CQUFvQixFQUF4QixDQUNBLElBQUlDLGVBQWUsRUFBbkIsQ0FDQSxJQUFJQyxlQUFlLEVBQW5CLEMsQ0FFQTs7O21LQUllLFNBQVNKLFlBQVQsQ0FBc0JLLElBQXRCLEVBQTRCQyxPQUE1QixFQUFxQyxLQUMxQ0MsUUFEMEMsR0FDRkQsT0FERSxDQUMxQ0MsUUFEMEMsQ0FDaENDLGFBRGdDLEdBQ0ZGLE9BREUsQ0FDaENFLGFBRGdDLENBQ2pCQyxVQURpQixHQUNGSCxPQURFLENBQ2pCRyxVQURpQixDQUdsRCxJQUFJQyxLQUFLQyxTQUFMLENBQWVKLFFBQWYsTUFBNkJILFlBQWpDLEVBQStDO0FBQzdDRCxtQkFBZSxzQkFBVyxFQUFFSSxrQkFBRixFQUFYLEVBQXlCSyxNQUF6QixDQUFnQyxLQUFoQyxDQUFmO0FBQ0FSLG1CQUFlTSxLQUFLQyxTQUFMLENBQWVKLFFBQWYsQ0FBZjtBQUNEOztBQUVELE1BQUlHLEtBQUtDLFNBQUwsQ0FBZUgsYUFBZixNQUFrQ04saUJBQXRDLEVBQXlEO0FBQ3ZERCx3QkFBb0Isc0JBQVcsRUFBRU8sNEJBQUYsRUFBWCxFQUE4QkksTUFBOUIsQ0FBcUMsS0FBckMsQ0FBcEI7QUFDQVYsd0JBQW9CUSxLQUFLQyxTQUFMLENBQWVILGFBQWYsQ0FBcEI7QUFDRDs7QUFFRCxTQUFPO0FBQ0xLLGNBQVVDLE9BQU9MLFVBQVAsSUFBcUJSLGlCQUFyQixHQUF5Q0UsWUFBekMsR0FBd0RXLE9BQU9ULElBQVAsQ0FEN0Q7QUFFTEUsc0JBRks7QUFHTEMsZ0NBSEs7QUFJTEMsMEJBSks7QUFLTEosY0FMSyxFQUFQOztBQU9EIiwiZmlsZSI6ImNoaWxkQ29udGV4dC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGhhc2hPYmplY3QgfSBmcm9tICdlc2xpbnQtbW9kdWxlLXV0aWxzL2hhc2gnO1xuXG5sZXQgcGFyc2VyT3B0aW9uc0hhc2ggPSAnJztcbmxldCBwcmV2UGFyc2VyT3B0aW9ucyA9ICcnO1xubGV0IHNldHRpbmdzSGFzaCA9ICcnO1xubGV0IHByZXZTZXR0aW5ncyA9ICcnO1xuXG4vKipcbiAqIGRvbid0IGhvbGQgZnVsbCBjb250ZXh0IG9iamVjdCBpbiBtZW1vcnksIGp1c3QgZ3JhYiB3aGF0IHdlIG5lZWQuXG4gKiBhbHNvIGNhbGN1bGF0ZSBhIGNhY2hlS2V5LCB3aGVyZSBwYXJ0cyBvZiB0aGUgY2FjaGVLZXkgaGFzaCBhcmUgbWVtb2l6ZWRcbiAqL1xuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gY2hpbGRDb250ZXh0KHBhdGgsIGNvbnRleHQpIHtcbiAgY29uc3QgeyBzZXR0aW5ncywgcGFyc2VyT3B0aW9ucywgcGFyc2VyUGF0aCB9ID0gY29udGV4dDtcblxuICBpZiAoSlNPTi5zdHJpbmdpZnkoc2V0dGluZ3MpICE9PSBwcmV2U2V0dGluZ3MpIHtcbiAgICBzZXR0aW5nc0hhc2ggPSBoYXNoT2JqZWN0KHsgc2V0dGluZ3MgfSkuZGlnZXN0KCdoZXgnKTtcbiAgICBwcmV2U2V0dGluZ3MgPSBKU09OLnN0cmluZ2lmeShzZXR0aW5ncyk7XG4gIH1cblxuICBpZiAoSlNPTi5zdHJpbmdpZnkocGFyc2VyT3B0aW9ucykgIT09IHByZXZQYXJzZXJPcHRpb25zKSB7XG4gICAgcGFyc2VyT3B0aW9uc0hhc2ggPSBoYXNoT2JqZWN0KHsgcGFyc2VyT3B0aW9ucyB9KS5kaWdlc3QoJ2hleCcpO1xuICAgIHByZXZQYXJzZXJPcHRpb25zID0gSlNPTi5zdHJpbmdpZnkocGFyc2VyT3B0aW9ucyk7XG4gIH1cblxuICByZXR1cm4ge1xuICAgIGNhY2hlS2V5OiBTdHJpbmcocGFyc2VyUGF0aCkgKyBwYXJzZXJPcHRpb25zSGFzaCArIHNldHRpbmdzSGFzaCArIFN0cmluZyhwYXRoKSxcbiAgICBzZXR0aW5ncyxcbiAgICBwYXJzZXJPcHRpb25zLFxuICAgIHBhcnNlclBhdGgsXG4gICAgcGF0aCxcbiAgfTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9leHBvcnRNYXAvY2hpbGRDb250ZXh0LmpzIl0sIm5hbWVzIjpbImNoaWxkQ29udGV4dCIsIm9wdGlvbnNIYXNoIiwicHJldk9wdGlvbnMiLCJzZXR0aW5nc0hhc2giLCJwcmV2U2V0dGluZ3MiLCJzdHJpbmdpZnlSZXBsYWNlckZuIiwiXyIsInZhbHVlIiwiU3RyaW5nIiwicGF0aCIsImNvbnRleHQiLCJzZXR0aW5ncyIsInBhcnNlck9wdGlvbnMiLCJwYXJzZXJQYXRoIiwibGFuZ3VhZ2VPcHRpb25zIiwiSlNPTiIsInN0cmluZ2lmeSIsImRpZ2VzdCIsIm9wdGlvbnNUb2tlbiIsImNhY2hlS2V5Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBbUJ3QkEsWSxDQW5CeEIsZ0RBRUEsSUFBSUMsY0FBYyxFQUFsQixDQUNBLElBQUlDLGNBQWMsRUFBbEIsQ0FDQSxJQUFJQyxlQUFlLEVBQW5CLENBQ0EsSUFBSUMsZUFBZSxFQUFuQixDLENBRUE7QUFDQSxTQUFTQyxtQkFBVCxDQUE2QkMsQ0FBN0IsRUFBZ0NDLEtBQWhDLEVBQXVDLENBQ3JDLElBQUksT0FBT0EsS0FBUCxLQUFpQixVQUFyQixFQUFpQyxDQUMvQixPQUFPQyxPQUFPRCxLQUFQLENBQVAsQ0FDRCxDQUNELE9BQU9BLEtBQVAsQ0FDRCxDLENBRUQ7OztrSEFJZSxTQUFTUCxZQUFULENBQXNCUyxJQUF0QixFQUE0QkMsT0FBNUIsRUFBcUMsS0FDMUNDLFFBRDBDLEdBQ2VELE9BRGYsQ0FDMUNDLFFBRDBDLENBQ2hDQyxhQURnQyxHQUNlRixPQURmLENBQ2hDRSxhQURnQyxDQUNqQkMsVUFEaUIsR0FDZUgsT0FEZixDQUNqQkcsVUFEaUIsQ0FDTEMsZUFESyxHQUNlSixPQURmLENBQ0xJLGVBREssQ0FHbEQsSUFBSUMsS0FBS0MsU0FBTCxDQUFlTCxRQUFmLE1BQTZCUCxZQUFqQyxFQUErQyxDQUM3Q0QsZUFBZSxzQkFBVyxFQUFFUSxrQkFBRixFQUFYLEVBQXlCTSxNQUF6QixDQUFnQyxLQUFoQyxDQUFmO0FBQ0FiLG1CQUFlVyxLQUFLQyxTQUFMLENBQWVMLFFBQWYsQ0FBZjtBQUNEOztBQUVEO0FBQ0E7QUFDQSxNQUFJTyxxQkFBSjtBQUNBLE1BQUksQ0FBQ0wsVUFBRCxJQUFlQyxlQUFuQixFQUFvQztBQUNsQyxRQUFJQyxLQUFLQyxTQUFMLENBQWVGLGVBQWYsRUFBZ0NULG1CQUFoQyxNQUF5REgsV0FBN0QsRUFBMEU7QUFDeEVELG9CQUFjLHNCQUFXLEVBQUVhLGdDQUFGLEVBQVgsRUFBZ0NHLE1BQWhDLENBQXVDLEtBQXZDLENBQWQ7QUFDQWYsb0JBQWNhLEtBQUtDLFNBQUwsQ0FBZUYsZUFBZixFQUFnQ1QsbUJBQWhDLENBQWQ7QUFDRDtBQUNEO0FBQ0FhLG1CQUFlakIsV0FBZjtBQUNELEdBUEQsTUFPTztBQUNMLFFBQUljLEtBQUtDLFNBQUwsQ0FBZUosYUFBZixNQUFrQ1YsV0FBdEMsRUFBbUQ7QUFDakRELG9CQUFjLHNCQUFXLEVBQUVXLDRCQUFGLEVBQVgsRUFBOEJLLE1BQTlCLENBQXFDLEtBQXJDLENBQWQ7QUFDQWYsb0JBQWNhLEtBQUtDLFNBQUwsQ0FBZUosYUFBZixDQUFkO0FBQ0Q7QUFDRDtBQUNBO0FBQ0FNLG1CQUFlVixPQUFPSyxVQUFQLElBQXFCWixXQUFwQztBQUNEOztBQUVELFNBQU87QUFDTGtCLGNBQVVELGVBQWVmLFlBQWYsR0FBOEJLLE9BQU9DLElBQVAsQ0FEbkM7QUFFTEUsc0JBRks7QUFHTEMsZ0NBSEs7QUFJTEMsMEJBSks7QUFLTEosY0FMSztBQU1MSyxvQ0FOSyxFQUFQOztBQVFEIiwiZmlsZSI6ImNoaWxkQ29udGV4dC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGhhc2hPYmplY3QgfSBmcm9tICdlc2xpbnQtbW9kdWxlLXV0aWxzL2hhc2gnO1xuXG5sZXQgb3B0aW9uc0hhc2ggPSAnJztcbmxldCBwcmV2T3B0aW9ucyA9ICcnO1xubGV0IHNldHRpbmdzSGFzaCA9ICcnO1xubGV0IHByZXZTZXR0aW5ncyA9ICcnO1xuXG4vLyBSZXBsYWNlciBmdW5jdGlvbiBoZWxwcyB1cyB3aXRoIHNlcmlhbGl6aW5nIHRoZSBwYXJzZXIgbmVzdGVkIHdpdGhpbiBgbGFuZ3VhZ2VPcHRpb25zYC5cbmZ1bmN0aW9uIHN0cmluZ2lmeVJlcGxhY2VyRm4oXywgdmFsdWUpIHtcbiAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIHJldHVybiBTdHJpbmcodmFsdWUpO1xuICB9XG4gIHJldHVybiB2YWx1ZTtcbn1cblxuLyoqXG4gKiBkb24ndCBob2xkIGZ1bGwgY29udGV4dCBvYmplY3QgaW4gbWVtb3J5LCBqdXN0IGdyYWIgd2hhdCB3ZSBuZWVkLlxuICogYWxzbyBjYWxjdWxhdGUgYSBjYWNoZUtleSwgd2hlcmUgcGFydHMgb2YgdGhlIGNhY2hlS2V5IGhhc2ggYXJlIG1lbW9pemVkXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGNoaWxkQ29udGV4dChwYXRoLCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgc2V0dGluZ3MsIHBhcnNlck9wdGlvbnMsIHBhcnNlclBhdGgsIGxhbmd1YWdlT3B0aW9ucyB9ID0gY29udGV4dDtcblxuICBpZiAoSlNPTi5zdHJpbmdpZnkoc2V0dGluZ3MpICE9PSBwcmV2U2V0dGluZ3MpIHtcbiAgICBzZXR0aW5nc0hhc2ggPSBoYXNoT2JqZWN0KHsgc2V0dGluZ3MgfSkuZGlnZXN0KCdoZXgnKTtcbiAgICBwcmV2U2V0dGluZ3MgPSBKU09OLnN0cmluZ2lmeShzZXR0aW5ncyk7XG4gIH1cblxuICAvLyBXZSdsbCB1c2UgZWl0aGVyIGEgY29tYmluYXRpb24gb2YgYHBhcnNlck9wdGlvbnNgIGFuZCBgcGFyc2VyUGF0aGAgb3IgYGxhbmd1YWdlT3B0aW9uc2BcbiAgLy8gdG8gY29uc3RydWN0IHRoZSBjYWNoZSBrZXksIGRlcGVuZGluZyBvbiB3aGV0aGVyIHRoaXMgaXMgdXNpbmcgYSBmbGF0IGNvbmZpZyBvciBub3QuXG4gIGxldCBvcHRpb25zVG9rZW47XG4gIGlmICghcGFyc2VyUGF0aCAmJiBsYW5ndWFnZU9wdGlvbnMpIHtcbiAgICBpZiAoSlNPTi5zdHJpbmdpZnkobGFuZ3VhZ2VPcHRpb25zLCBzdHJpbmdpZnlSZXBsYWNlckZuKSAhPT0gcHJldk9wdGlvbnMpIHtcbiAgICAgIG9wdGlvbnNIYXNoID0gaGFzaE9iamVjdCh7IGxhbmd1YWdlT3B0aW9ucyB9KS5kaWdlc3QoJ2hleCcpO1xuICAgICAgcHJldk9wdGlvbnMgPSBKU09OLnN0cmluZ2lmeShsYW5ndWFnZU9wdGlvbnMsIHN0cmluZ2lmeVJlcGxhY2VyRm4pO1xuICAgIH1cbiAgICAvLyBGb3IgbGFuZ3VhZ2VPcHRpb25zLCB3ZSdyZSBqdXN0IHVzaW5nIHRoZSBoYXNoZWQgb3B0aW9ucyBhcyB0aGUgb3B0aW9ucyB0b2tlblxuICAgIG9wdGlvbnNUb2tlbiA9IG9wdGlvbnNIYXNoO1xuICB9IGVsc2Uge1xuICAgIGlmIChKU09OLnN0cmluZ2lmeShwYXJzZXJPcHRpb25zKSAhPT0gcHJldk9wdGlvbnMpIHtcbiAgICAgIG9wdGlvbnNIYXNoID0gaGFzaE9iamVjdCh7IHBhcnNlck9wdGlvbnMgfSkuZGlnZXN0KCdoZXgnKTtcbiAgICAgIHByZXZPcHRpb25zID0gSlNPTi5zdHJpbmdpZnkocGFyc2VyT3B0aW9ucyk7XG4gICAgfVxuICAgIC8vIFdoZW4gbm90IHVzaW5nIGZsYXQgY29uZmlnLCB3ZSB1c2UgYSBjb21iaW5hdGlvbiBvZiB0aGUgaGFzaGVkIHBhcnNlck9wdGlvbnNcbiAgICAvLyBhbmQgcGFyc2VyUGF0aCBhcyB0aGUgdG9rZW5cbiAgICBvcHRpb25zVG9rZW4gPSBTdHJpbmcocGFyc2VyUGF0aCkgKyBvcHRpb25zSGFzaDtcbiAgfVxuXG4gIHJldHVybiB7XG4gICAgY2FjaGVLZXk6IG9wdGlvbnNUb2tlbiArIHNldHRpbmdzSGFzaCArIFN0cmluZyhwYXRoKSxcbiAgICBzZXR0aW5ncyxcbiAgICBwYXJzZXJPcHRpb25zLFxuICAgIHBhcnNlclBhdGgsXG4gICAgcGF0aCxcbiAgICBsYW5ndWFnZU9wdGlvbnMsXG4gIH07XG59XG4iXX0=
\ No newline at end of file
diff --git a/lib/rules/consistent-type-specifier-style.js b/lib/rules/consistent-type-specifier-style.js
index v2.30.0..v2.31.0 100644
--- a/lib/rules/consistent-type-specifier-style.js
+++ b/lib/rules/consistent-type-specifier-style.js
@@ -1,8 +1,16 @@
-'use strict';var _docsUrl = require('../docsUrl');var _docsUrl2 = _interopRequireDefault(_docsUrl);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { 'default': obj };}
+'use strict';var _contextCompat = require('eslint-module-utils/contextCompat');
+var _docsUrl = require('../docsUrl');var _docsUrl2 = _interopRequireDefault(_docsUrl);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { 'default': obj };}
+
function isComma(token) {
return token.type === 'Punctuator' && token.value === ',';
}
+/**
+ * @param {import('eslint').Rule.Fix[]} fixes
+ * @param {import('eslint').Rule.RuleFixer} fixer
+ * @param {import('eslint').SourceCode.SourceCode} sourceCode
+ * @param {(ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier)[]} specifiers
+ * */
function removeSpecifiers(fixes, fixer, sourceCode, specifiers) {var _iteratorNormalCompletion = true;var _didIteratorError = false;var _iteratorError = undefined;try {
for (var _iterator = specifiers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {var specifier = _step.value;
@@ -16,4 +24,5 @@
}
+/** @type {(node: import('estree').Node, sourceCode: import('eslint').SourceCode.SourceCode, specifiers: (ImportSpecifier | ImportNamespaceSpecifier)[], kind: 'type' | 'typeof') => string} */
function getImportText(
node,
@@ -37,4 +46,5 @@
}
+/** @type {import('eslint').Rule.RuleModule} */
module.exports = {
meta: {
@@ -56,5 +66,5 @@
create: function () {function create(context) {
- var sourceCode = context.getSourceCode();
+ var sourceCode = (0, _contextCompat.getSourceCode)(context);
if (context.options[0] === 'prefer-inline') {
@@ -101,4 +111,5 @@
// prefer-top-level
return {
+ /** @param {import('estree').ImportDeclaration} node */
ImportDeclaration: function () {function ImportDeclaration(node) {
if (
@@ -119,7 +130,11 @@
}
+ /** @type {typeof node.specifiers} */
var typeSpecifiers = [];
+ /** @type {typeof node.specifiers} */
var typeofSpecifiers = [];
+ /** @type {typeof node.specifiers} */
var valueSpecifiers = [];
+ /** @type {typeof node.specifiers[number]} */
var defaultSpecifier = null;var _iteratorNormalCompletion2 = true;var _didIteratorError2 = false;var _iteratorError2 = undefined;try {
for (var _iterator2 = node.specifiers[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {var specifier = _step2.value;
@@ -143,4 +158,5 @@
if (typeSpecifiers.length + typeofSpecifiers.length === node.specifiers.length) {
+ /** @type {('type' | 'typeof')[]} */
// all specifiers have inline specifiers - so we replace the entire import
var kind = [].concat(
@@ -161,61 +177,62 @@
} else {
// remove specific specifiers and insert new imports for them
- var _iteratorNormalCompletion3 = true;var _didIteratorError3 = false;var _iteratorError3 = undefined;try {for (var _iterator3 = typeSpecifiers.concat(typeofSpecifiers)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {var _specifier = _step3.value;
- context.report({
- node: _specifier,
- message: 'Prefer using a top-level {{kind}}-only import instead of inline {{kind}} specifiers.',
- data: {
- kind: _specifier.importKind },
+ typeSpecifiers.concat(typeofSpecifiers).forEach(function (specifier) {
+ context.report({
+ node: specifier,
+ message: 'Prefer using a top-level {{kind}}-only import instead of inline {{kind}} specifiers.',
+ data: {
+ kind: specifier.importKind },
- fix: function () {function fix(fixer) {
- var fixes = [];
+ fix: function () {function fix(fixer) {
+ /** @type {import('eslint').Rule.Fix[]} */
+ var fixes = [];
- // if there are no value specifiers, then the other report fixer will be called, not this one
+ // if there are no value specifiers, then the other report fixer will be called, not this one
- if (valueSpecifiers.length > 0) {
- // import { Value, type Type } from 'mod';
+ if (valueSpecifiers.length > 0) {
+ // import { Value, type Type } from 'mod';
- // we can just remove the type specifiers
- removeSpecifiers(fixes, fixer, sourceCode, typeSpecifiers);
- removeSpecifiers(fixes, fixer, sourceCode, typeofSpecifiers);
+ // we can just remove the type specifiers
+ removeSpecifiers(fixes, fixer, sourceCode, typeSpecifiers);
+ removeSpecifiers(fixes, fixer, sourceCode, typeofSpecifiers);
- // make the import nicely formatted by also removing the trailing comma after the last value import
- // eg
- // import { Value, type Type } from 'mod';
- // to
- // import { Value } from 'mod';
- // not
- // import { Value, } from 'mod';
- var maybeComma = sourceCode.getTokenAfter(valueSpecifiers[valueSpecifiers.length - 1]);
- if (isComma(maybeComma)) {
- fixes.push(fixer.remove(maybeComma));
- }
- } else if (defaultSpecifier) {
- // import Default, { type Type } from 'mod';
+ // make the import nicely formatted by also removing the trailing comma after the last value import
+ // eg
+ // import { Value, type Type } from 'mod';
+ // to
+ // import { Value } from 'mod';
+ // not
+ // import { Value, } from 'mod';
+ var maybeComma = sourceCode.getTokenAfter(valueSpecifiers[valueSpecifiers.length - 1]);
+ if (isComma(maybeComma)) {
+ fixes.push(fixer.remove(maybeComma));
+ }
+ } else if (defaultSpecifier) {
\ No newline at end of file
+ // import Default, { type Type } from 'mod';
- // remove the entire curly block so we don't leave an empty one behind
- // NOTE - the default specifier *must* be the first specifier always!
- // so a comma exists that we also have to clean up or else it's bad syntax
- var comma = sourceCode.getTokenAfter(defaultSpecifier, isComma);
- var closingBrace = sourceCode.getTokenAfter(
- node.specifiers[node.specifiers.length - 1],
- function (token) {return token.type === 'Punctuator' && token.value === '}';});
+ // remove the entire curly block so we don't leave an empty one behind
+ // NOTE - the default specifier *must* be the first specifier always!
+ // so a comma exists that we also have to clean up or else it's bad syntax
+ var comma = sourceCode.getTokenAfter(defaultSpecifier, isComma);
+ var closingBrace = sourceCode.getTokenAfter(
+ node.specifiers[node.specifiers.length - 1],
+ function (token) {return token.type === 'Punctuator' && token.value === '}';});
- fixes.push(fixer.removeRange([
- comma.range[0],
- closingBrace.range[1]]));
+ fixes.push(fixer.removeRange([
+ comma.range[0],
+ closingBrace.range[1]]));
- }
+ }
- return fixes.concat(
- // insert the new imports after the old declaration
- fixer.insertTextAfter(node, '\n' + String(newImports)));
+ return fixes.concat(
+ // insert the new imports after the old declaration
+ fixer.insertTextAfter(node, '\n' + String(newImports)));
- }return fix;}() });
+ }return fix;}() });
- }} catch (err) {_didIteratorError3 = true;_iteratorError3 = err;} finally {try {if (!_iteratorNormalCompletion3 && _iterator3['return']) {_iterator3['return']();}} finally {if (_didIteratorError3) {throw _iteratorError3;}}}
+ });
}
}return ImportDeclaration;}() };
}return create;}() };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ydWxlcy9jb25zaXN0ZW50LXR5cGUtc3BlY2lmaWVyLXN0eWxlLmpzIl0sIm5hbWVzIjpbImlzQ29tbWEiLCJ0b2tlbiIsInR5cGUiLCJ2YWx1ZSIsInJlbW92ZVNwZWNpZmllcnMiLCJmaXhlcyIsImZpeGVyIiwic291cmNlQ29kZSIsInNwZWNpZmllcnMiLCJzcGVjaWZpZXIiLCJnZXRUb2tlbkFmdGVyIiwicHVzaCIsInJlbW92ZSIsImdldEltcG9ydFRleHQiLCJub2RlIiwia2luZCIsInNvdXJjZVN0cmluZyIsImdldFRleHQiLCJzb3VyY2UiLCJsZW5ndGgiLCJuYW1lcyIsIm1hcCIsInMiLCJpbXBvcnRlZCIsIm5hbWUiLCJsb2NhbCIsImpvaW4iLCJtb2R1bGUiLCJleHBvcnRzIiwibWV0YSIsImRvY3MiLCJjYXRlZ29yeSIsImRlc2NyaXB0aW9uIiwidXJsIiwiZml4YWJsZSIsInNjaGVtYSIsImNyZWF0ZSIsImNvbnRleHQiLCJnZXRTb3VyY2VDb2RlIiwib3B0aW9ucyIsIkltcG9ydERlY2xhcmF0aW9uIiwiaW1wb3J0S2luZCIsInJlcG9ydCIsIm1lc3NhZ2UiLCJkYXRhIiwiZml4Iiwia2luZFRva2VuIiwiZ2V0Rmlyc3RUb2tlbiIsInNraXAiLCJjb25jYXQiLCJpbnNlcnRUZXh0QmVmb3JlIiwidHlwZVNwZWNpZmllcnMiLCJ0eXBlb2ZTcGVjaWZpZXJzIiwidmFsdWVTcGVjaWZpZXJzIiwiZGVmYXVsdFNwZWNpZmllciIsInR5cGVJbXBvcnQiLCJ0eXBlb2ZJbXBvcnQiLCJuZXdJbXBvcnRzIiwidHJpbSIsInJlcGxhY2VUZXh0IiwibWF5YmVDb21tYSIsImNvbW1hIiwiY2xvc2luZ0JyYWNlIiwicmVtb3ZlUmFuZ2UiLCJyYW5nZSIsImluc2VydFRleHRBZnRlciJdLCJtYXBwaW5ncyI6ImFBQUEscUM7O0FBRUEsU0FBU0EsT0FBVCxDQUFpQkMsS0FBakIsRUFBd0I7QUFDdEIsU0FBT0EsTUFBTUMsSUFBTixLQUFl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LENBQXpDLENBRG1CO0FBRW5CLG9DQUFDbEIsS0FBRCxVQUFXQSxNQUFNQyxJQUFOLEtBQWUsWUFBZixJQUErQkQsTUFBTUUsS0FBTixLQUFnQixHQUExRCxFQUZtQixDQUFyQjs7QUFJQUUsZ0NBQU1NLElBQU4sQ0FBV0wsTUFBTXlELFdBQU4sQ0FBa0I7QUFDM0JGLGdDQUFNRyxLQUFOLENBQVksQ0FBWixDQUQyQjtBQUUzQkYsdUNBQWFFLEtBQWIsQ0FBbUIsQ0FBbkIsQ0FGMkIsQ0FBbEIsQ0FBWDs7QUFJRDs7QUFFRCwrQkFBTzNELE1BQU00QyxNQUFOO0FBQ0w7QUFDQTNDLDhCQUFNMkQsZUFBTixDQUFzQm5ELElBQXRCLGdCQUFpQzJDLFVBQWpDLEVBRkssQ0FBUDs7QUFJRCx1QkFsRFksZ0JBQWY7O0FBb0RELGlCQXZESTtBQXdETjtBQUNGLFdBcEhJLDhCQUFQOztBQXNIRCxLQXJMYyxtQkFBakIiLCJmaWxlIjoiY29uc2lzdGVudC10eXBlLXNwZWNpZmllci1zdHlsZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBkb2NzVXJsIGZyb20gJy4uL2RvY3NVcmwnO1xuXG5mdW5jdGlvbiBpc0NvbW1hKHRva2VuKSB7XG4gIHJldHVybiB0b2tlbi50eXBlID09PSAnUHVuY3R1YXRvcicgJiYgdG9rZW4udmFsdWUgPT09ICcsJztcbn1cblxuZnVuY3Rpb24gcmVtb3ZlU3BlY2lmaWVycyhmaXhlcywgZml4ZXIsIHNvdXJjZUNvZGUsIHNwZWNpZmllcnMpIHtcbiAgZm9yIChjb25zdCBzcGVjaWZpZXIgb2Ygc3BlY2lmaWVycykge1xuICAgIC8vIHJlbW92ZSB0aGUgdHJhaWxpbmcgY29tbWFcbiAgICBjb25zdCB0b2tlbiA9IHNvdXJjZUNvZGUuZ2V0VG9rZW5BZnRlcihzcGVjaWZpZXIpO1xuICAgIGlmICh0b2tlbiAmJiBpc0NvbW1hKHRva2VuKSkge1xuICAgICAgZml4ZXMucHVzaChmaXhlci5yZW1vdmUodG9rZW4pKTtcbiAgICB9XG4gICAgZml4ZXMucHVzaChmaXhlci5yZW1vdmUoc3BlY2lmaWVyKSk7XG4gIH1cbn1cblxuZnVuY3Rpb24gZ2V0SW1wb3J0VGV4dChcbiAgbm9kZSxcbiAgc291cmNlQ29kZSxcbiAgc3BlY2lmaWVycyxcbiAga2luZCxcbikge1xuICBjb25zdCBzb3VyY2VTdHJpbmcgPSBzb3VyY2VDb2RlLmdldFRleHQobm9kZS5zb3VyY2UpO1xuICBpZiAoc3BlY2lmaWVycy5sZW5ndGggPT09IDApIHtcbiAgICByZXR1cm4gJyc7XG4gIH1cblxuICBjb25zdCBuYW1lcyA9IHNwZWNpZmllcnMubWFwKChzKSA9PiB7XG4gICAgaWYgKHMuaW1wb3J0ZWQubmFtZSA9PT0gcy5sb2NhbC5uYW1lKSB7XG4gICAgICByZXR1cm4gcy5pbXBvcnRlZC5uYW1lO1xuICAgIH1cbiAgICByZXR1cm4gYCR7cy5pbXBvcnRlZC5uYW1lfSBhcyAke3MubG9jYWwubmFtZX1gO1xuICB9KTtcbiAgLy8gaW5zZXJ0IGEgZnJlc2ggdG9wLWxldmVsIGltcG9ydFxuICByZXR1cm4gYGltcG9ydCAke2tpbmR9IHske25hbWVzLmpvaW4oJywgJyl9fSBmcm9tICR7c291cmNlU3RyaW5nfTtgO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IHtcbiAgbWV0YToge1xuICAgIHR5cGU6ICdzdWdnZXN0aW9uJyxcbiAgICBkb2NzOiB7XG4gICAgICBjYXRlZ29yeTogJ1N0eWxlIGd1aWRlJyxcbiAgICAgIGRlc2NyaXB0aW9uOiAnRW5mb3JjZSBvciBiYW4gdGhlIHVzZSBvZiBpbmxpbmUgdHlwZS1vbmx5IG1hcmtlcnMgZm9yIG5hbWVkIGltcG9ydHMuJyxcbiAgICAgIHVybDogZG9jc1VybCgnY29uc2lzdGVudC10eXBlLXNwZWNpZmllci1zdHlsZScpLFxuICAgIH0sXG4gICAgZml4YWJsZTogJ2NvZGUnLFxuICAgIHNjaGVtYTogW1xuICAgICAge1xuICAgICAgICB0eXBlOiAnc3RyaW5nJyxcbiAgICAgICAgZW51bTogWydwcmVmZXItaW5saW5lJywgJ3ByZWZlci10b3AtbGV2ZWwnXSxcbiAgICAgICAgZGVmYXVsdDogJ3ByZWZlci1pbmxpbmUnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuXG4gIGNyZWF0ZShjb250ZXh0KSB7XG4gICAgY29uc3Qgc291cmNlQ29kZSA9IGNvbnRleHQuZ2V0U291cmNlQ29kZSgpO1xuXG4gICAgaWYgKGNvbnRleHQub3B0aW9uc1swXSA9PT0gJ3ByZWZlci1pbmxpbmUnKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBJbXBvcnREZWNsYXJhdGlvbihub2RlKSB7XG4gICAgICAgICAgaWYgKG5vZGUuaW1wb3J0S2luZCA9PT0gJ3ZhbHVlJyB8fCBub2RlLmltcG9ydEtpbmQgPT0gbnVsbCkge1xuICAgICAgICAgICAgLy8gdG9wLWxldmVsIHZhbHVlIC8gdW5rbm93biBpcyB2YWxpZFxuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgIH1cblxuICAgICAgICAgIGlmIChcbiAgICAgICAgICAgIC8vIG5vIHNwZWNpZmllcnMgKGltcG9ydCB0eXBlIHt9IGZyb20gJycpIGhhdmUgbm8gc3BlY2lmaWVycyB0byBtYXJrIGFzIGlubGluZVxuICAgICAgICAgICAgbm9kZS5zcGVjaWZpZXJzLmxlbmd0aCA9PT0gMFxuICAgICAgICAgICAgfHwgbm9kZS5zcGVjaWZpZXJzLmxlbmd0aCA9PT0gMVxuICAgICAgICAgICAgLy8gZGVmYXVsdCBpbXBvcnRzIGFyZSBib3RoIFwiaW5saW5lXCIgYW5kIFwidG9wLWxldmVsXCJcbiAgICAgICAgICAgICYmIChcbiAgICAgICAgICAgICAgbm9kZS5zcGVjaWZpZXJzWzBdLnR5cGUgPT09ICdJbXBvcnREZWZhdWx0U3BlY2lmaWVyJ1xuICAgICAgICAgICAgICAvLyBuYW1lc3BhY2UgaW1wb3J0cyBhcmUgYm90aCBcImlubGluZVwiIGFuZCBcInRvcC1sZXZlbFwiXG4gICAgICAgICAgICAgIHx8IG5vZGUuc3BlY2lmaWVyc1swXS50eXBlID09PSAnSW1wb3J0TmFtZXNwYWNlU3BlY2lmaWVyJ1xuICAgICAgICAgICAgKVxuICAgICAgICAgICkge1xuICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgIH1cblxuICAgICAgICAgIGNvbnRleHQucmVwb3J0KHtcbiAgICAgICAgICAgIG5vZGUsXG4gICAgICAgICAgICBtZXNzYWdlOiAnUHJlZmVyIHVzaW5nIGlubGluZSB7e2tpbmR9fSBzcGVjaWZpZXJzIGluc3RlYWQgb2YgYSB0b3AtbGV2ZWwge3traW5kfX0tb25seSBpbXBvcnQuJyxcbiAgICAgICAgICAgIGRhdGE6IHtcbiAgICAgICAgICAgICAga2luZDogbm9kZS5pbXBvcnRLaW5kLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIGZpeChmaXhlcikge1xuICAgICAgICAgICAgICBjb25zdCBraW5kVG9rZW4gPSBzb3VyY2VDb2RlLmdldEZpcnN0VG9rZW4obm9kZSwgeyBza2lwOiAxIH0pO1xuXG4gICAgICAgICAgICAgIHJldHVybiBbXS5jb25jYXQoXG4gICAgICAgICAgICAgICAga2luZFRva2VuID8gZml4ZXIucmVtb3ZlKGtpbmRUb2tlbikgOiBbXSxcbiAgICAgICAgICAgICAgICBub2RlLnNwZWNpZmllcnMubWFwKChzcGVjaWZpZXIpID0+IGZpeGVyLmluc2VydFRleHRCZWZvcmUoc3BlY2lmaWVyLCBgJHtub2RlLmltcG9ydEtpbmR9IGApKSxcbiAgICAgICAgICAgICAgKTtcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgfSk7XG4gICAgICAgIH0sXG4gICAgICB9O1xuICAgIH1cblxuICAgIC8vIHByZWZlci10b3AtbGV2ZWxcbiAgICByZXR1cm4(too long so truncated)
Command detailsnpm diff --diff=eslint-plugin-import@2.30.0 --diff=eslint-plugin-import@2.31.0 --diff-unified=2See also the Reported by ybiquitous/npm-diff-action@v1.6.0 (Node.js 22.11.0 and npm 10.9.0) |
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/eslint-plugin-import-2.31.0
branch
from
8cb3346 to
14813c6
Compare
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/eslint-plugin-import-2.31.0
branch
from
14813c6 to
c3c2891
Compare
github-actions
bot
deleted the
dependabot/npm_and_yarn/eslint-plugin-import-2.31.0
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps eslint-plugin-import from 2.30.0 to 2.31.0.
Release notes
Sourced from eslint-plugin-import's releases.
... (truncated)
Changelog
Sourced from eslint-plugin-import's changelog.
Commits
91f809bv2.31.03f1ac24[utils] [refactor]parse: avoid using a regex hered225176[New]extensions: add thecheckTypeImportsoption5a51b9a[Tests]rule-tester: try this babel class workaroundd66cde0[New] support eslint v9d27a639[Fix] adjust "is source type module" checks for flat config1fa8a07[Refactor] createsourceTypehelper0bc1355[Tests]no-default-export,no-named-export: add test cases with non-modu...55fa203[Tests]no-default-export,no-named-export: add test case6be20df[Docs]no-restricted-paths: fix grammarDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)