eslint-plugin-ts-type-forge 0.8.16 → 0.8.17

package/README.md

@@ -251,8 +251,9 @@ options.
   the type and never touches imports.
 - `'named'` — the fix additionally imports the name when the file does not
   import it yet: added to an existing `import type { … }` from `ts-type-forge`,
-  else to an `import { … }` from it (as `type X`), else after a lone default
-  import, and otherwise as a new `import { type … } from 'ts-type-forge';`.
+  else to an `import { … }` from it (as `type X`, empty braces included), else
+  after a lone default import, and otherwise as a new
+  `import { type … } from 'ts-type-forge';`.
 
 Either way, if the file already imports the target type from `ts-type-forge`
 (possibly under an alias), the fix reuses that binding.

package/dist/plugin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.mts","sourceRoot":"","sources":["../src/plugin.mts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAmClE,eAAO,MAAM,uBAAuB;;iBAEhC,IAAI,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;QAInC,oDAAoD;iBACpD,WAAW;2BAtBP,2BAA2B;;yBAQ3B,eAAe,EAAI,YAAY;;;gEAlBE,OAAO;oFACa,OAAO;0EACjB,OAAO;4EACL,OAAO;gFACH,OAAO;;;;CA8B/B,CAAC"}
+{"version":3,"file":"plugin.d.mts","sourceRoot":"","sources":["../src/plugin.mts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAoClE,eAAO,MAAM,uBAAuB;;iBAEhC,IAAI,EAAE,6BAA6B;;;;;;;;;;;;;;;;;;;QAInC,oDAAoD;iBACpD,WAAW;2BAtBP,2BAA2B;;yBAQ3B,eAAe,EAAI,YAAY;;;gEAlBE,OAAO;oFACa,OAAO;0EACjB,OAAO;4EACL,OAAO;gFACH,OAAO;;;;CA8B/B,CAAC"}

package/dist/plugin.mjs

@@ -6,6 +6,7 @@ import { tsTypeForgeRules } from './rules/index.mjs';
 
 
 
+
 const recommendedRules = {
     'ts-type-forge/no-side-effect-import': 'error',
     'ts-type-forge/prefer-canonical-length-constrained-tuple': 'error',

package/dist/plugin.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.mjs","sourceRoot":"","sources":["../src/plugin.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG;IACvB,qCAAqC,EAAE,OAAO;IAC9C,yDAAyD,EAAE,OAAO;IAClE,+CAA+C,EAAE,OAAO;IACxD,iDAAiD,EAAE,OAAO;IAC1D,qDAAqD,EAAE,OAAO;CAG/D,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE;QACP,uEAAuE;QACvE,yEAAyE;QACzE,wEAAwE;QACxE,mDAAmD;QACnD,0EAA0E;QAC1E,wDAAwD;QACxD,IAAI,eAAe;YACjB,OAAO,uBAAuB,CAAC;QACjC,CAAC;KACF;IACD,KAAK,EAAE,gBAAgB;CACY,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,6BAA6B;KACpC;IACD,KAAK,EAAE,gBAAgB;IACvB,OAAO,EAAE;QACP,oDAAoD;QACpD,WAAW,EAAE,iBAAiB;KAC/B;CAC8B,CAAC"}
+{"version":3,"file":"plugin.mjs","sourceRoot":"","sources":["../src/plugin.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAGrD;;;;;;;GAOG;AACH,MAAM,gBAAgB,GAAG;IACvB,qCAAqC,EAAE,OAAO;IAC9C,yDAAyD,EAAE,OAAO;IAClE,+CAA+C,EAAE,OAAO;IACxD,iDAAiD,EAAE,OAAO;IAC1D,qDAAqD,EAAE,OAAO;CAG/D,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE;QACP,uEAAuE;QACvE,yEAAyE;QACzE,wEAAwE;QACxE,mDAAmD;QACnD,0EAA0E;QAC1E,wDAAwD;QACxD,IAAI,eAAe;YACjB,OAAO,uBAAuB,CAAC;QACjC,CAAC;KACF;IACD,KAAK,EAAE,gBAAgB;CACY,CAAC;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,6BAA6B;KACpC;IACD,KAAK,EAAE,gBAAgB;IACvB,OAAO,EAAE;QACP,oDAAoD;QACpD,WAAW,EAAE,iBAAiB;KAC/B;CAC8B,CAAC"}

package/dist/rule-types.d.mts

@@ -3,9 +3,9 @@ import type { Linter } from 'eslint';
 import type { tsTypeForgeRules } from './rules/index.mjs';
 type SpreadOptionsIfIsArray<T extends readonly [Linter.StringSeverity, unknown]> = T[1] extends readonly unknown[] ? readonly [Linter.StringSeverity, ...T[1]] : T;
 /**
- * Extracts the options tuple type of a rule from its TypeScript
- * implementation, so that option types stay in sync with the rule source
- * without converting `meta.schema` (JSON Schema) back into TypeScript types.
+ * Extracts the options tuple type of a rule from its TypeScript implementation,
+ * so that option types stay in sync with the rule source without converting
+ * `meta.schema` (JSON Schema) back into TypeScript types.
  */
 type RuleOptionsOf<Name extends keyof typeof tsTypeForgeRules> = (typeof tsTypeForgeRules)[Name] extends TSESLint.RuleModule<infer _MessageIds extends string, infer Options extends readonly unknown[]> ? Options : never;
 /**

package/dist/rules/import-style.d.mts

@@ -10,8 +10,8 @@ export declare const IMPORT_STYLE_SCHEMA_PROPERTY: JsonSchema;
  *
  * Returns `undefined` when the name is already bound to something else (a local
  * alias, an import from another module, or another ts-type-forge export
- * imported under the name) — rewriting to it would then silently
- * resolve to the wrong declaration, which is exactly what happens inside
+ * imported under the name) — rewriting to it would then silently resolve to the
+ * wrong declaration, which is exactly what happens inside
  * ts-type-forge's own sources.
  */
 export declare const resolveTypeName: (program: TSESTree.Program, canonicalName: string, importStyle: ImportStyle) => Readonly<{

package/dist/rules/import-utils.d.mts

@@ -1,12 +1,7 @@
 import { type TSESLint, type TSESTree } from '@typescript-eslint/utils';
 /**
  * The edits that import the ts-type-forge types `names` the file does not
- * import yet, as types: added to an existing `import type { … }` from the
- * module (`, X`), else to a named import from it (`, type X`), else after a
- * lone default import (`, { type X }`), and only failing all of those as a
- * new `import { type X } from 'ts-type-forge'` after the directive prologue.
- * Empty braces count as a host. Adding to an existing declaration keeps
- * `import-x/no-duplicates` satisfied.
+ * import yet, as `addTypeImports` places them.
  *
  * Fixes that add an import overlap, so `--fix` applies one per pass, and the
  * rest in later passes, by when the file imports their names (see

package/dist/rules/import-utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"import-utils.d.mts","sourceRoot":"","sources":["../../src/rules/import-utils.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAOlC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,UACtB,QAAQ,CAAC,SAAS,cACb,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,SAClC,SAAS,MAAM,EAAE,KACvB,SAAS,QAAQ,CAAC,OAAO,EAqD3B,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,YAC3B,QAAQ,CAAC,OAAO,QACnB,MAAM,KACX,OAuBC,CAAC"}
+{"version":3,"file":"import-utils.d.mts","sourceRoot":"","sources":["../../src/rules/import-utils.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAMlC;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,UACtB,QAAQ,CAAC,SAAS,cACb,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,SAClC,SAAS,MAAM,EAAE,KACvB,SAAS,QAAQ,CAAC,OAAO,EACoC,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,YAC3B,QAAQ,CAAC,OAAO,QACnB,MAAM,KACX,OAqBC,CAAC"}

package/dist/rules/import-utils.mjs

@@ -1,6 +1,5 @@
 import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
-import { buildNamedImportFix, getImportDeclarations } from 'eslint-rule-forge';
-import { Arr } from 'ts-data-forge';
+import { addTypeImports, importedNameOf } from 'eslint-rule-forge';
 import { TS_TYPE_FORGE_MODULE } from './constants.mjs';
 
 
@@ -11,40 +10,7 @@ import { TS_TYPE_FORGE_MODULE } from './constants.mjs';
 
 
 
-
-
-
-
-
-export const buildTypeImportFix = (fixer, sourceCode, names) => {
-    if (!Arr.isNonEmpty(names)) {
-        return [];
-    }
-    const declarations = getImportDeclarations(sourceCode.ast, TS_TYPE_FORGE_MODULE);
-    const typeOnlyFix = declarations
-        .filter((declaration) => declaration.importKind === 'type')
-        .map((declaration) => addToBraces(fixer, sourceCode, declaration, names))
-        .find((fix) => fix !== undefined);
-    if (typeOnlyFix !== undefined) {
-        return [typeOnlyFix];
-    }
-    const typeSpecifiers = names.map((name) => `type ${name}`);
-    const valueDeclarations = declarations.filter((declaration) => declaration.importKind !== 'type');
-    const valueFix = valueDeclarations
-        .map((declaration) => addToBraces(fixer, sourceCode, declaration, typeSpecifiers))
-        .find((fix) => fix !== undefined);
-    if (valueFix !== undefined) {
-        return [valueFix];
-    }
-    const defaultHost = valueDeclarations.find((declaration) => Arr.isFixedLengthArray(1, declaration.specifiers) &&
-        declaration.specifiers[0].type === AST_NODE_TYPES.ImportDefaultSpecifier)?.specifiers[0];
-    if (defaultHost !== undefined) {
-        return [
-            fixer.insertTextAfter(defaultHost, `, { ${typeSpecifiers.join(', ')} }`),
-        ];
-    }
-    return buildNamedImportFix(fixer, sourceCode.ast, TS_TYPE_FORGE_MODULE, typeSpecifiers);
-};
+export const buildTypeImportFix = (fixer, sourceCode, names) => addTypeImports(fixer, sourceCode, TS_TYPE_FORGE_MODULE, names);
 
 
 
@@ -62,35 +28,13 @@ export const hasConflictingDeclaration = (program, name) => program.body.some((n
         return node.specifiers.some((specifier) => specifier.local.name === name &&
             !(node.source.value === TS_TYPE_FORGE_MODULE &&
                 specifier.type === AST_NODE_TYPES.ImportSpecifier &&
-                (specifier.imported.type === AST_NODE_TYPES.Identifier
-                    ? specifier.imported.name
-                    : specifier.imported.value) === name));
+                importedNameOf(specifier) === name));
     }
     return declaresName(node.type === AST_NODE_TYPES.ExportNamedDeclaration ||
         node.type === AST_NODE_TYPES.ExportDefaultDeclaration
         ? node.declaration
         : node, name);
 });
-
-
-
-
-
-const addToBraces = (fixer, sourceCode, declaration, specifiers) => {
-    const lastNamed = declaration.specifiers
-        .filter((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier)
-        .at(-1);
-    if (lastNamed !== undefined) {
-        return fixer.insertTextAfter(lastNamed, `, ${specifiers.join(', ')}`);
-    }
-
-    const openingBrace = sourceCode.getFirstToken(declaration, {
-        filter: (token) => token.value === '{' && token.range[1] <= declaration.source.range[0],
-    });
-    return openingBrace === null
-        ? undefined
-        : fixer.insertTextAfter(openingBrace, ` ${specifiers.join(', ')} `);
-};
 const declaresName = (node, name) => {
     if (node === null || node === undefined) {
         return false;

package/dist/rules/import-utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"import-utils.mjs","sourceRoot":"","sources":["../../src/rules/import-utils.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-utils.mjs","sourceRoot":"","sources":["../../src/rules/import-utils.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,uEAAuE;AAEvE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAyB,EACzB,UAAyC,EACzC,KAAwB,EACK,EAAE,CAC/B,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;AAEjE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,IAAY,EACH,EAAE,CACX,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;IACzB,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CACzB,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI;YAC7B,CAAC,CACC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,oBAAoB;gBAC1C,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe;gBACjD,cAAc,CAAC,SAAS,CAAC,KAAK,IAAI,CACnC,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CACjB,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB;QACjD,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,wBAAwB;QACrD,CAAC,CAAC,IAAI,CAAC,WAAW;QAClB,CAAC,CAAC,IAAI,EACR,IAAI,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,MAAM,YAAY,GAAG,CACnB,IAAsC,EACtC,IAAY,EACH,EAAE;IACX,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IACE,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB;QACnD,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB;QACnD,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB,EAC9C,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;IAC/B,CAAC;IAED,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,KAAK,IAAI,CACxE,CAAC;AACJ,CAAC,CAAC"}

package/dist/rules/rewrite-rule-utils.d.mts

@@ -11,11 +11,11 @@ export type TypeRewrite = Readonly<{
  * Emits one report per rewrite, resolving each target name. Every fix imports
  * the name it writes when the file does not import it yet
  * ({@link buildTypeImportFix}), so that one applied alone is complete, and the
- * first of those imports every name the reports need: the import edits
- * overlap, so `--fix` applies one fix per pass, and when that is the batching
- * fix the second pass applies the rest. (With nested rewrites an inner fix,
- * whose range ends first, can win the pass instead; that costs a pass, not a
- * fix.) A report that needs no import has no import edit.
+ * first of those imports every name the reports need: the import edits overlap,
+ * so `--fix` applies one fix per pass, and when that is the batching fix the
+ * second pass applies the rest. (With nested rewrites an inner fix, whose range
+ * ends first, can win the pass instead; that costs a pass, not a fix.) A report
+ * that needs no import has no import edit.
  */
 export declare const reportTypeRewrites: <MessageIds extends string>(context: TSESLint.RuleContext<MessageIds, readonly unknown[]>, rewrites: readonly TypeRewrite[], messageId: MessageIds, importStyle: ImportStyle) => void;
 //# sourceMappingURL=rewrite-rule-utils.d.mts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ts-type-forge",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "private": false,
   "description": "ESLint rules that steer type declarations toward ts-type-forge idioms.",
   "keywords": [
@@ -36,17 +36,17 @@
   ],
   "dependencies": {
     "@typescript-eslint/utils": "~8.72.0",
-    "eslint-rule-forge": "^0.4.0",
-    "ts-data-forge": "~14.10.0",
+    "eslint-rule-forge": "^0.5.0",
+    "ts-data-forge": "~14.10.1",
     "ts-type-forge": "9.2.2"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "8.72.0",
     "@typescript-eslint/rule-tester": "8.72.0",
     "dedent": "1.7.2",
-    "eslint-config-typed": "7.2.1",
-    "eslint-plugin-ts-data-forge": "0.10.6",
-    "eslint-plugin-ts-fortress": "1.3.11",
+    "eslint-config-typed": "7.3.0",
+    "eslint-plugin-ts-data-forge": "0.10.7",
+    "eslint-plugin-ts-fortress": "1.3.12",
     "prettier": "3.9.10",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-packagejson": "3.0.2",

package/src/plugin.mts

@@ -4,9 +4,10 @@ import type { ESLintFlatConfig, ESLintPlugin } from './types.mjs';
 /**
  * Every rule this plugin ships, at `error`.
  *
- * The `satisfies` clause below is keyed off {@link tsTypeForgeRules}, so leaving a
- * rule out, naming one that does not exist, or setting one to anything
- * but `error` fails to type-check. That is the whole check; no test repeats it.
+ * The `satisfies` clause below is keyed off {@link tsTypeForgeRules}, so
+ * leaving a rule out, naming one that does not exist, or setting one to
+ * anything but `error` fails to type-check. That is the whole check; no test
+ * repeats it.
  */
 const recommendedRules = {
   'ts-type-forge/no-side-effect-import': 'error',

package/src/rule-types.mts

@@ -15,9 +15,9 @@ type SpreadOptionsIfIsArray<
   : T;
 
 /**
- * Extracts the options tuple type of a rule from its TypeScript
- * implementation, so that option types stay in sync with the rule source
- * without converting `meta.schema` (JSON Schema) back into TypeScript types.
+ * Extracts the options tuple type of a rule from its TypeScript implementation,
+ * so that option types stay in sync with the rule source without converting
+ * `meta.schema` (JSON Schema) back into TypeScript types.
  */
 type RuleOptionsOf<Name extends keyof typeof tsTypeForgeRules> =
   (typeof tsTypeForgeRules)[Name] extends TSESLint.RuleModule<

package/src/rules/ast-utils.mts

@@ -163,8 +163,8 @@ const isNode = (value: unknown): value is TSESTree.Node =>
  * Children are found through the parser's visitor keys, so only the properties
  * that actually hold one are read. Reading every own property instead works
  * too, and is the fallback for a parser that declares no keys for a node type,
- * but it allocates an entry pair per property and walks `loc` / `range` as
- * well — on the generated rule-type files that alone was most of the cost.
+ * but it allocates an entry pair per property and walks `loc` / `range` as well
+ * — on the generated rule-type files that alone was most of the cost.
  */
 const walk = (
   node: TSESTree.Node,

package/src/rules/import-style.mts

@@ -34,8 +34,8 @@ export const IMPORT_STYLE_SCHEMA_PROPERTY: JsonSchema = {
  *
  * Returns `undefined` when the name is already bound to something else (a local
  * alias, an import from another module, or another ts-type-forge export
- * imported under the name) — rewriting to it would then silently
- * resolve to the wrong declaration, which is exactly what happens inside
+ * imported under the name) — rewriting to it would then silently resolve to the
+ * wrong declaration, which is exactly what happens inside
  * ts-type-forge's own sources.
  */
 export const resolveTypeName = (

package/src/rules/import-utils.mts

@@ -3,20 +3,14 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { buildNamedImportFix, getImportDeclarations } from 'eslint-rule-forge';
-import { Arr } from 'ts-data-forge';
+import { addTypeImports, importedNameOf } from 'eslint-rule-forge';
 import { TS_TYPE_FORGE_MODULE } from './constants.mjs';
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
 /**
  * The edits that import the ts-type-forge types `names` the file does not
- * import yet, as types: added to an existing `import type { … }` from the
- * module (`, X`), else to a named import from it (`, type X`), else after a
- * lone default import (`, { type X }`), and only failing all of those as a
- * new `import { type X } from 'ts-type-forge'` after the directive prologue.
- * Empty braces count as a host. Adding to an existing declaration keeps
- * `import-x/no-duplicates` satisfied.
+ * import yet, as `addTypeImports` places them.
  *
  * Fixes that add an import overlap, so `--fix` applies one per pass, and the
  * rest in later passes, by when the file imports their names (see
@@ -26,60 +20,8 @@ export const buildTypeImportFix = (
   fixer: TSESLint.RuleFixer,
   sourceCode: Readonly<TSESLint.SourceCode>,
   names: readonly string[],
-): readonly TSESLint.RuleFix[] => {
-  if (!Arr.isNonEmpty(names)) {
-    return [];
-  }
-
-  const declarations = getImportDeclarations(
-    sourceCode.ast,
-    TS_TYPE_FORGE_MODULE,
-  );
-
-  const typeOnlyFix = declarations
-    .filter((declaration) => declaration.importKind === 'type')
-    .map((declaration) => addToBraces(fixer, sourceCode, declaration, names))
-    .find((fix) => fix !== undefined);
-
-  if (typeOnlyFix !== undefined) {
-    return [typeOnlyFix];
-  }
-
-  const typeSpecifiers = names.map((name) => `type ${name}`);
-
-  const valueDeclarations = declarations.filter(
-    (declaration) => declaration.importKind !== 'type',
-  );
-
-  const valueFix = valueDeclarations
-    .map((declaration) =>
-      addToBraces(fixer, sourceCode, declaration, typeSpecifiers),
-    )
-    .find((fix) => fix !== undefined);
-
-  if (valueFix !== undefined) {
-    return [valueFix];
-  }
-
-  const defaultHost = valueDeclarations.find(
-    (declaration) =>
-      Arr.isFixedLengthArray(1, declaration.specifiers) &&
-      declaration.specifiers[0].type === AST_NODE_TYPES.ImportDefaultSpecifier,
-  )?.specifiers[0];
-
-  if (defaultHost !== undefined) {
-    return [
-      fixer.insertTextAfter(defaultHost, `, { ${typeSpecifiers.join(', ')} }`),
-    ];
-  }
-
-  return buildNamedImportFix(
-    fixer,
-    sourceCode.ast,
-    TS_TYPE_FORGE_MODULE,
-    typeSpecifiers,
-  );
-};
+): readonly TSESLint.RuleFix[] =>
+  addTypeImports(fixer, sourceCode, TS_TYPE_FORGE_MODULE, names);
 
 /**
  * Whether the file already binds `name` to something that is not the
@@ -105,9 +47,7 @@ export const hasConflictingDeclaration = (
           !(
             node.source.value === TS_TYPE_FORGE_MODULE &&
             specifier.type === AST_NODE_TYPES.ImportSpecifier &&
-            (specifier.imported.type === AST_NODE_TYPES.Identifier
-              ? specifier.imported.name
-              : specifier.imported.value) === name
+            importedNameOf(specifier) === name
           ),
       );
     }
@@ -121,39 +61,6 @@ export const hasConflictingDeclaration = (
     );
   });
 
-/**
- * Adds `specifiers` to the `{ … }` of `declaration`: after its last named
- * specifier, or inside empty braces (`import d, {} from …`). `undefined` when
- * the declaration has no braces (a default or namespace import alone).
- */
-const addToBraces = (
-  fixer: TSESLint.RuleFixer,
-  sourceCode: Readonly<TSESLint.SourceCode>,
-  declaration: TSESTree.ImportDeclaration,
-  specifiers: readonly string[],
-): TSESLint.RuleFix | undefined => {
-  const lastNamed = declaration.specifiers
-    .filter(
-      (specifier): specifier is TSESTree.ImportSpecifier =>
-        specifier.type === AST_NODE_TYPES.ImportSpecifier,
-    )
-    .at(-1);
-
-  if (lastNamed !== undefined) {
-    return fixer.insertTextAfter(lastNamed, `, ${specifiers.join(', ')}`);
-  }
-
-  // Before the source, or the brace found is that of `with { … }`.
-  const openingBrace = sourceCode.getFirstToken(declaration, {
-    filter: (token) =>
-      token.value === '{' && token.range[1] <= declaration.source.range[0],
-  });
-
-  return openingBrace === null
-    ? undefined
-    : fixer.insertTextAfter(openingBrace, ` ${specifiers.join(', ')} `);
-};
-
 const declaresName = (
   node: TSESTree.Node | null | undefined,
   name: string,

package/src/rules/rewrite-rule-utils.mts

@@ -17,11 +17,11 @@ export type TypeRewrite = Readonly<{
  * Emits one report per rewrite, resolving each target name. Every fix imports
  * the name it writes when the file does not import it yet
  * ({@link buildTypeImportFix}), so that one applied alone is complete, and the
- * first of those imports every name the reports need: the import edits
- * overlap, so `--fix` applies one fix per pass, and when that is the batching
- * fix the second pass applies the rest. (With nested rewrites an inner fix,
- * whose range ends first, can win the pass instead; that costs a pass, not a
- * fix.) A report that needs no import has no import edit.
+ * first of those imports every name the reports need: the import edits overlap,
+ * so `--fix` applies one fix per pass, and when that is the batching fix the
+ * second pass applies the rest. (With nested rewrites an inner fix, whose range
+ * ends first, can win the pass instead; that costs a pass, not a fix.) A report
+ * that needs no import has no import edit.
  */
 export const reportTypeRewrites = <MessageIds extends string>(
   context: TSESLint.RuleContext<MessageIds, readonly unknown[]>,