From ecd0082229382b394ea609cf7f752cf573f61931 Mon Sep 17 00:00:00 2001 From: Scott Newcomer Date: Sun, 6 Nov 2022 14:08:21 -0600 Subject: [PATCH] inlineTypeImport to preferInline --- docs/rules/no-duplicates.md | 4 ++-- src/rules/no-duplicates.js | 6 +++--- tests/src/rules/no-duplicates.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/rules/no-duplicates.md b/docs/rules/no-duplicates.md index 248b7894fc..752e293097 100644 --- a/docs/rules/no-duplicates.md +++ b/docs/rules/no-duplicates.md @@ -69,12 +69,12 @@ import * from './mod.js?minify' ### Inline Type imports -TypeScript 4.5 introduced a new [feature](https://devblogs.microsoft.com/typescript/announcing-typescript-4-5/#type-on-import-names) that allows mixing of named value and type imports. In order to support fixing to an inline type import when duplicate imports are detected, `inlineTypeImport` can be set to true. +TypeScript 4.5 introduced a new [feature](https://devblogs.microsoft.com/typescript/announcing-typescript-4-5/#type-on-import-names) that allows mixing of named value and type imports. In order to support fixing to an inline type import when duplicate imports are detected, `preferInline` can be set to true. Config: ```json -"import/no-duplicates": ["error", {"inlineTypeImport": true}] +"import/no-duplicates": ["error", {"preferInline": true}] ``` ```js diff --git a/src/rules/no-duplicates.js b/src/rules/no-duplicates.js index c826da9334..c7effa9024 100644 --- a/src/rules/no-duplicates.js +++ b/src/rules/no-duplicates.js @@ -109,8 +109,8 @@ function getFix(first, rest, sourceCode, context) { const [specifiersText] = specifiers.reduce( ([result, needsComma], specifier) => { const isTypeSpecifier = specifier.importNode.importKind === 'type'; - const inlineTypeImport = context.options[0] && context.options[0].inlineTypeImport; - const insertText = `${inlineTypeImport && isTypeSpecifier ? 'type ' : ''}${specifier.text}`; + const preferInline = context.options[0] && context.options[0].preferInline; + const insertText = `${preferInline && isTypeSpecifier ? 'type ' : ''}${specifier.text}`; return [ needsComma && !specifier.isEmpty ? `${result},${insertText}` @@ -260,7 +260,7 @@ module.exports = { considerQueryString: { type: 'boolean', }, - inlineTypeImport: { + preferInline: { type: 'boolean', }, }, diff --git a/tests/src/rules/no-duplicates.js b/tests/src/rules/no-duplicates.js index 6203e3b914..848907540c 100644 --- a/tests/src/rules/no-duplicates.js +++ b/tests/src/rules/no-duplicates.js @@ -538,7 +538,7 @@ context('TypeScript', function () { test({ code: "import {type x} from './foo'; import type {y} from './foo'", ...parserConfig, - options: [{ 'inlineTypeImport': false }], + options: [{ 'preferInline': false }], output: `import {type x,y} from './foo'; `, errors: [ { @@ -556,7 +556,7 @@ context('TypeScript', function () { test({ code: "import {type x} from 'foo'; import type {y} from 'foo'", ...parserConfig, - options: [{ 'inlineTypeImport': true }], + options: [{ 'preferInline': true }], output: `import {type x,type y} from 'foo'; `, errors: [ {