eslint-plugin-ts-data-forge 0.8.4 → 0.8.6

package/src/rules/prefer-num-safe-parse-float.mts

@@ -3,13 +3,15 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import * as ts from 'typescript';
-import { toArgumentText, typeWrapperLayers } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  typeWrapperLayers,
+} from 'eslint-rule-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -62,7 +64,10 @@ export const preferNumSafeParseFloat: TSESLint.RuleModule<MessageIds, Options> =
 
       const program = sourceCode.ast;
 
-      const tsDataForgeImport = getTsDataForgeImport(program);
+      const tsDataForgeImports = getImportDeclarations(
+        program,
+        TS_DATA_FORGE_MODULE,
+      );
 
       const services = context.sourceCode.parserServices;
 
@@ -145,7 +150,7 @@ export const preferNumSafeParseFloat: TSESLint.RuleModule<MessageIds, Options> =
           mut_nodesToFix.push({ node, argExpression: firstArg });
         },
         'Program:exit': () => {
-          const namedImports = getNamedImports(tsDataForgeImport);
+          const namedImports = getNamedImports(tsDataForgeImports);
 
           const missingImports = (['Num', 'Result'] as const).filter(
             (name) => !namedImports.includes(name),
@@ -155,7 +160,7 @@ export const preferNumSafeParseFloat: TSESLint.RuleModule<MessageIds, Options> =
             index,
             { node, argExpression },
           ] of mut_nodesToFix.entries()) {
-            const argText = toArgumentText(argExpression, sourceCode);
+            const argText = getArgumentText(sourceCode, argExpression);
 
             const originalText = sourceCode.getText(node);
 
@@ -171,10 +176,10 @@ export const preferNumSafeParseFloat: TSESLint.RuleModule<MessageIds, Options> =
 
                 const importFixes =
                   index === 0 && missingImports.length > 0
-                    ? buildImportFixes(
+                    ? buildNamedImportFix(
                         fixer,
                         program,
-                        tsDataForgeImport,
+                        TS_DATA_FORGE_MODULE,
                         missingImports,
                       )
                     : [];

package/src/rules/prefer-num-safe-parse-int.mts

@@ -3,17 +3,16 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import * as ts from 'typescript';
 import {
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
+  getNamedImports,
   skipTypeWrappers,
-  toArgumentText,
   typeWrapperLayers,
-} from './ast-utils.mjs';
-import {
-  buildImportFixes,
-  getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+} from 'eslint-rule-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -63,7 +62,10 @@ export const preferNumSafeParseInt: TSESLint.RuleModule<MessageIds, Options> = {
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const services = context.sourceCode.parserServices;
 
@@ -147,7 +149,7 @@ export const preferNumSafeParseInt: TSESLint.RuleModule<MessageIds, Options> = {
         mut_nodesToFix.push({ node, argExpression: firstArg });
       },
       'Program:exit': () => {
-        const namedImports = getNamedImports(tsDataForgeImport);
+        const namedImports = getNamedImports(tsDataForgeImports);
 
         const missingImports = (['Num', 'Result'] as const).filter(
           (name) => !namedImports.includes(name),
@@ -157,7 +159,7 @@ export const preferNumSafeParseInt: TSESLint.RuleModule<MessageIds, Options> = {
           index,
           { node, argExpression },
         ] of mut_nodesToFix.entries()) {
-          const argText = toArgumentText(argExpression, sourceCode);
+          const argText = getArgumentText(sourceCode, argExpression);
 
           const originalText = sourceCode.getText(node);
 
@@ -173,10 +175,10 @@ export const preferNumSafeParseInt: TSESLint.RuleModule<MessageIds, Options> = {
 
               const importFixes =
                 index === 0 && missingImports.length > 0
-                  ? buildImportFixes(
+                  ? buildNamedImportFix(
                       fixer,
                       program,
-                      tsDataForgeImport,
+                      TS_DATA_FORGE_MODULE,
                       missingImports,
                     )
                   : [];

package/src/rules/prefer-obj-over-entries-round-trip.mts

@@ -3,14 +3,16 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr } from 'ts-data-forge';
-import type { ReadonlyRecord } from 'ts-type-forge';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
   getImportedLocalName,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+} from 'eslint-rule-forge';
+import { Arr } from 'ts-data-forge';
+import type { ReadonlyRecord } from 'ts-type-forge';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
@@ -91,7 +93,10 @@ export const preferObjOverEntriesRoundTrip: TSESLint.RuleModule<
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const mut_roundTrips: {
       node: TSESTree.CallExpression;
@@ -146,7 +151,7 @@ export const preferObjOverEntriesRoundTrip: TSESLint.RuleModule<
         body.test,
       );
 
-      const someText = `${optionalName}.some(${argumentText(sourceCode.getText(body.kept), body.kept)})`;
+      const someText = `${optionalName}.some(${getArgumentText(sourceCode, body.kept)})`;
 
       const noneText = `${optionalName}.none`;
 
@@ -167,12 +172,13 @@ export const preferObjOverEntriesRoundTrip: TSESLint.RuleModule<
       },
 
       'Program:exit': () => {
-        const namedImports = getNamedImports(tsDataForgeImport);
+        const namedImports = getNamedImports(tsDataForgeImports);
 
-        const objName = getImportedLocalName(tsDataForgeImport, 'Obj') ?? 'Obj';
+        const objName =
+          getImportedLocalName(tsDataForgeImports, 'Obj') ?? 'Obj';
 
         const optionalName =
-          getImportedLocalName(tsDataForgeImport, 'Optional') ?? 'Optional';
+          getImportedLocalName(tsDataForgeImports, 'Optional') ?? 'Optional';
 
         const needsOptional = mut_roundTrips.some(
           ({ roundTrip }) => roundTrip.body.kind === 'optional',
@@ -191,19 +197,16 @@ export const preferObjOverEntriesRoundTrip: TSESLint.RuleModule<
             node,
             messageId: MESSAGE_ID_OF[roundTrip.method],
             fix: (fixer) => {
-              const recordText = argumentText(
-                sourceCode.getText(roundTrip.record),
-                roundTrip.record,
-              );
+              const recordText = getArgumentText(sourceCode, roundTrip.record);
 
               const replacement = `${objName}.${roundTrip.method}(${recordText}, ${buildParams(roundTrip)} => ${buildCallbackBody(roundTrip, optionalName)})`;
 
               const importFixes =
                 index === 0 && missingImports.length > 0
-                  ? buildImportFixes(
+                  ? buildNamedImportFix(
                       fixer,
                       program,
-                      tsDataForgeImport,
+                      TS_DATA_FORGE_MODULE,
                       missingImports,
                     )
                   : [];
@@ -551,12 +554,6 @@ const conditionalTestText = (
 ): string =>
   NEEDS_PARENS_AS_TEST.has(node.type) ? (`(${text})` as const) : text;
 
-/** A comma expression would read as another argument without parentheses. */
-const argumentText = (text: string, node: TSESTree.Expression): string =>
-  node.type === AST_NODE_TYPES.SequenceExpression
-    ? (`(${text})` as const)
-    : text;
-
 /**
  * A concise arrow body cannot start with `{`, nor hold a bare comma. The text
  * is what decides the first case rather than the node type, because an object

package/src/rules/prefer-range-for-loop.mts

@@ -3,13 +3,15 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr } from 'ts-data-forge';
-import { skipTypeWrappers, toArgumentText } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  skipTypeWrappers,
+} from 'eslint-rule-forge';
+import { Arr } from 'ts-data-forge';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -35,7 +37,10 @@ export const preferRangeForLoop: TSESLint.RuleModule<MessageIds, Options> = {
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const mut_nodesToFix: {
       node: TSESTree.ForStatement;
@@ -128,15 +133,15 @@ export const preferRangeForLoop: TSESLint.RuleModule<MessageIds, Options> = {
             }
           } else {
             // Variable step like i += step
-            mut_step = toArgumentText(node.update.right, sourceCode);
+            mut_step = getArgumentText(sourceCode, node.update.right);
           }
         } else {
           return;
         }
 
-        const beginText = toArgumentText(beginExpr, sourceCode);
+        const beginText = getArgumentText(sourceCode, beginExpr);
 
-        const endText = toArgumentText(endExpr, sourceCode);
+        const endText = getArgumentText(sourceCode, endExpr);
 
         mut_nodesToFix.push({
           node,
@@ -147,7 +152,7 @@ export const preferRangeForLoop: TSESLint.RuleModule<MessageIds, Options> = {
         });
       },
       'Program:exit': () => {
-        const namedImports = getNamedImports(tsDataForgeImport);
+        const namedImports = getNamedImports(tsDataForgeImports);
 
         const hasRangeImport = namedImports.includes('range');
 
@@ -175,7 +180,7 @@ export const preferRangeForLoop: TSESLint.RuleModule<MessageIds, Options> = {
 
               const importFixes =
                 index === 0 && !hasRangeImport
-                  ? buildImportFixes(fixer, program, tsDataForgeImport, [
+                  ? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
                       'range',
                     ])
                   : [];

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

@@ -1,30 +0,0 @@
-import { type TSESLint, type TSESTree } from '@typescript-eslint/utils';
-import type { DeepReadonly } from 'ts-type-forge';
-export declare const getTsDataForgeImport: (program: TSESTree.Program) => TSESTree.ImportDeclaration | undefined;
-export declare const getNamedImports: (node: DeepReadonly<TSESTree.ImportDeclaration> | undefined) => readonly string[];
-/**
- * Returns the in-scope local name a given canonical export is imported as
- * (handling aliases such as `import { isX as y }` → `'y'`), or `undefined` when
- * it is not imported. Used so autofixes reference the binding that actually
- * exists rather than the canonical name.
- */
-export declare const getImportedLocalName: (node: DeepReadonly<TSESTree.ImportDeclaration> | undefined, importedName: string) => string | undefined;
-type ResolvedCallee = Readonly<{
-    /** The canonical (imported) ts-data-forge name, regardless of local alias. */
-    canonicalName: string;
-    /** The identifier node to rewrite when replacing the callee name. */
-    propertyNode: TSESTree.Node;
-    /** Whether the call was made through a namespace import (`tf.isX(...)`). */
-    isNamespace: boolean;
-}>;
-/**
- * Builds a resolver that maps a call expression's callee to the canonical
- * ts-data-forge function it refers to. Handles named imports (including aliases
- * such as `import { isX as y }`) and namespace imports (`import * as tf` →
- * `tf.isX(...)`). Returns `undefined` for any callee that does not reference the
- * given ts-data-forge import.
- */
-export declare const buildCalleeResolver: (importDecl: TSESTree.ImportDeclaration | undefined) => ((callee: DeepReadonly<TSESTree.Expression>) => ResolvedCallee | undefined);
-export declare const buildImportFixes: (fixer: TSESLint.RuleFixer, program: TSESTree.Program, _tsDataForgeImport: TSESTree.ImportDeclaration | undefined, requiredNames: readonly string[]) => readonly TSESLint.RuleFix[];
-export {};
-//# sourceMappingURL=import-utils.d.mts.map

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

@@ -1 +0,0 @@
-{"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;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlD,eAAO,MAAM,oBAAoB,YACtB,QAAQ,CAAC,OAAO,KACxB,QAAQ,CAAC,iBAAiB,GAAG,SAK7B,CAAC;AAEJ,eAAO,MAAM,eAAe,SACpB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,SAAS,KACzD,SAAS,MAAM,EAiBjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,SACzB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,SAAS,gBAC5C,MAAM,KACnB,MAAM,GAAG,SAOG,CAAC;AAEhB,KAAK,cAAc,GAAG,QAAQ,CAAC;IAC7B,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC;IAC5B,4EAA4E;IAC5E,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,eAClB,QAAQ,CAAC,iBAAiB,GAAG,SAAS,KACjD,CAAC,CACF,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,KACtC,cAAc,GAAG,SAAS,CAsE9B,CAAC;AAOF,eAAO,MAAM,gBAAgB,UACpB,QAAQ,CAAC,SAAS,WAChB,QAAQ,CAAC,OAAO,sBACL,QAAQ,CAAC,iBAAiB,GAAG,SAAS,iBAC3C,SAAS,MAAM,EAAE,KAC/B,SAAS,QAAQ,CAAC,OAAO,EAa3B,CAAC"}

package/dist/rules/import-utils.mjs

@@ -1,98 +0,0 @@
-import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
-import { isTypeWrapper } from './ast-utils.mjs';
-import { TS_DATA_FORGE_MODULE } from './constants.mjs';
-
-export const getTsDataForgeImport = (program) => program.body.find((node) => node.type === AST_NODE_TYPES.ImportDeclaration &&
-    node.source.value === TS_DATA_FORGE_MODULE);
-export const getNamedImports = (node) => {
-    if (node === undefined) {
-        return [];
-    }
-    return node.specifiers.flatMap((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier
-        ? (() => {
-            const importedName = specifier.imported.type === AST_NODE_TYPES.Identifier
-                ? specifier.imported.name
-                : specifier.imported.value;
-            return typeof importedName === 'string' ? [importedName] : [];
-        })()
-        : []);
-};
-
-
-
-
-
-
-export const getImportedLocalName = (node, importedName) => node?.specifiers.find((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier &&
-    (specifier.imported.type === AST_NODE_TYPES.Identifier
-        ? specifier.imported.name
-        : specifier.imported.value) === importedName)?.local.name;
-
-
-
-
-
-
-
-export const buildCalleeResolver = (importDecl) => {
-    const specifiers = importDecl?.specifiers ?? [];
-    const namespaceName = specifiers.find((specifier) => specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier)?.local.name;
-    const localToCanonical = new Map(specifiers.flatMap((specifier) => {
-        if (specifier.type !== AST_NODE_TYPES.ImportSpecifier) {
-            return [];
-        }
-        const importedName = specifier.imported.type === AST_NODE_TYPES.Identifier
-            ? specifier.imported.name
-            : specifier.imported.value;
-        return typeof importedName === 'string'
-            ? [[specifier.local.name, importedName]]
-            : [];
-    }));
-
-
-
-    const resolve = (callee) => {
-        if (isTypeWrapper(callee)) {
-            return resolve(callee.expression);
-        }
-        if (callee.type === AST_NODE_TYPES.Identifier) {
-            const canonicalName = localToCanonical.get(callee.name);
-            return canonicalName === undefined
-                ? undefined
-                : {
-                    canonicalName,
-
-                    propertyNode: callee,
-                    isNamespace: false,
-                };
-        }
-        if (namespaceName === undefined ||
-            callee.type !== AST_NODE_TYPES.MemberExpression ||
-            callee.computed ||
-            callee.property.type !== AST_NODE_TYPES.Identifier) {
-            return undefined;
-        }
-        const object = skipReadonlyTypeWrappers(callee.object);
-        return object.type === AST_NODE_TYPES.Identifier &&
-            object.name === namespaceName
-            ? {
-                canonicalName: callee.property.name,
-
-                propertyNode: callee.property,
-                isNamespace: true,
-            }
-            : undefined;
-    };
-    return resolve;
-};
-const skipReadonlyTypeWrappers = (node) => isTypeWrapper(node) ? skipReadonlyTypeWrappers(node.expression) : node;
-export const buildImportFixes = (fixer, program, _tsDataForgeImport, requiredNames) => {
-    const specifierText = requiredNames.join(', ');
-    const importStatement = `import { ${specifierText} } from '${TS_DATA_FORGE_MODULE}';`;
-    const newLine = '\n';
-    const insertionText = `${importStatement}${newLine}`;
-
-
-    return [fixer.insertTextBefore(program, insertionText)];
-};
-//# sourceMappingURL=import-utils.mjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"import-utils.mjs","sourceRoot":"","sources":["../../src/rules/import-utils.mts"],"names":[],"mappings":"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"}

package/src/rules/import-utils.mts

@@ -1,175 +0,0 @@
-import {
-  AST_NODE_TYPES,
-  type TSESLint,
-  type TSESTree,
-} from '@typescript-eslint/utils';
-import type { DeepReadonly } from 'ts-type-forge';
-import { isTypeWrapper } from './ast-utils.mjs';
-import { TS_DATA_FORGE_MODULE } from './constants.mjs';
-
-/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-
-export const getTsDataForgeImport = (
-  program: TSESTree.Program,
-): TSESTree.ImportDeclaration | undefined =>
-  program.body.find(
-    (node): node is TSESTree.ImportDeclaration =>
-      node.type === AST_NODE_TYPES.ImportDeclaration &&
-      node.source.value === TS_DATA_FORGE_MODULE,
-  );
-
-export const getNamedImports = (
-  node: DeepReadonly<TSESTree.ImportDeclaration> | undefined,
-): readonly string[] => {
-  if (node === undefined) {
-    return [];
-  }
-
-  return node.specifiers.flatMap((specifier) =>
-    specifier.type === AST_NODE_TYPES.ImportSpecifier
-      ? (() => {
-          const importedName =
-            specifier.imported.type === AST_NODE_TYPES.Identifier
-              ? specifier.imported.name
-              : specifier.imported.value;
-
-          return typeof importedName === 'string' ? [importedName] : [];
-        })()
-      : [],
-  );
-};
-
-/**
- * Returns the in-scope local name a given canonical export is imported as
- * (handling aliases such as `import { isX as y }` → `'y'`), or `undefined` when
- * it is not imported. Used so autofixes reference the binding that actually
- * exists rather than the canonical name.
- */
-export const getImportedLocalName = (
-  node: DeepReadonly<TSESTree.ImportDeclaration> | undefined,
-  importedName: string,
-): string | undefined =>
-  node?.specifiers.find(
-    (specifier) =>
-      specifier.type === AST_NODE_TYPES.ImportSpecifier &&
-      (specifier.imported.type === AST_NODE_TYPES.Identifier
-        ? specifier.imported.name
-        : specifier.imported.value) === importedName,
-  )?.local.name;
-
-type ResolvedCallee = Readonly<{
-  /** The canonical (imported) ts-data-forge name, regardless of local alias. */
-  canonicalName: string;
-  /** The identifier node to rewrite when replacing the callee name. */
-  propertyNode: TSESTree.Node;
-  /** Whether the call was made through a namespace import (`tf.isX(...)`). */
-  isNamespace: boolean;
-}>;
-
-/**
- * Builds a resolver that maps a call expression's callee to the canonical
- * ts-data-forge function it refers to. Handles named imports (including aliases
- * such as `import { isX as y }`) and namespace imports (`import * as tf` →
- * `tf.isX(...)`). Returns `undefined` for any callee that does not reference the
- * given ts-data-forge import.
- */
-export const buildCalleeResolver = (
-  importDecl: TSESTree.ImportDeclaration | undefined,
-): ((
-  callee: DeepReadonly<TSESTree.Expression>,
-) => ResolvedCallee | undefined) => {
-  const specifiers = importDecl?.specifiers ?? [];
-
-  const namespaceName = specifiers.find(
-    (specifier) => specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier,
-  )?.local.name;
-
-  const localToCanonical = new Map<string, string>(
-    specifiers.flatMap((specifier) => {
-      if (specifier.type !== AST_NODE_TYPES.ImportSpecifier) {
-        return [];
-      }
-
-      const importedName =
-        specifier.imported.type === AST_NODE_TYPES.Identifier
-          ? specifier.imported.name
-          : specifier.imported.value;
-
-      return typeof importedName === 'string'
-        ? [[specifier.local.name, importedName] as const]
-        : [];
-    }),
-  );
-
-  // `(isNull as (u: unknown) => boolean)(x)` and `(tf as typeof tf).isNull(x)`
-  // still call `isNull`: both the callee and a namespace object are read
-  // through type wrappers.
-  const resolve = (
-    callee: DeepReadonly<TSESTree.Expression>,
-  ): ResolvedCallee | undefined => {
-    if (isTypeWrapper(callee)) {
-      return resolve(callee.expression);
-    }
-
-    if (callee.type === AST_NODE_TYPES.Identifier) {
-      const canonicalName = localToCanonical.get(callee.name);
-
-      return canonicalName === undefined
-        ? undefined
-        : {
-            canonicalName,
-            // eslint-disable-next-line total-functions/no-unsafe-type-assertion
-            propertyNode: callee as TSESTree.Node,
-            isNamespace: false,
-          };
-    }
-
-    if (
-      namespaceName === undefined ||
-      callee.type !== AST_NODE_TYPES.MemberExpression ||
-      callee.computed ||
-      callee.property.type !== AST_NODE_TYPES.Identifier
-    ) {
-      return undefined;
-    }
-
-    const object = skipReadonlyTypeWrappers(callee.object);
-
-    return object.type === AST_NODE_TYPES.Identifier &&
-      object.name === namespaceName
-      ? {
-          canonicalName: callee.property.name,
-          // eslint-disable-next-line total-functions/no-unsafe-type-assertion
-          propertyNode: callee.property as TSESTree.Node,
-          isNamespace: true,
-        }
-      : undefined;
-  };
-
-  return resolve;
-};
-
-const skipReadonlyTypeWrappers = (
-  node: DeepReadonly<TSESTree.Expression>,
-): DeepReadonly<TSESTree.Expression> =>
-  isTypeWrapper(node) ? skipReadonlyTypeWrappers(node.expression) : node;
-
-export const buildImportFixes = (
-  fixer: TSESLint.RuleFixer,
-  program: TSESTree.Program,
-  _tsDataForgeImport: TSESTree.ImportDeclaration | undefined,
-  requiredNames: readonly string[],
-): readonly TSESLint.RuleFix[] => {
-  const specifierText = requiredNames.join(', ');
-
-  const importStatement =
-    `import { ${specifierText} } from '${TS_DATA_FORGE_MODULE}';` as const;
-
-  const newLine = '\n';
-
-  const insertionText = `${importStatement}${newLine}` as const;
-
-  // Always insert at the beginning of the file
-  // (organize-imports will handle merging/deduplication)
-  return [fixer.insertTextBefore(program, insertionText)];
-};