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

package/src/rules/prefer-arr-scan.mts

@@ -3,19 +3,18 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr } from 'ts-data-forge';
-import type { FixedLengthTuple } from 'ts-type-forge';
-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 { Arr } from 'ts-data-forge';
+import type { FixedLengthTuple } from 'ts-type-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -179,7 +178,10 @@ export const preferArrScan: TSESLint.RuleModule<MessageIds, Options> = {
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const services = sourceCode.parserServices;
 
@@ -343,10 +345,9 @@ export const preferArrScan: TSESLint.RuleModule<MessageIds, Options> = {
         mut_lastReads,
       );
 
-      const arrayText = toArgumentText(
-        // eslint-disable-next-line total-functions/no-unsafe-type-assertion
+      const arrayText = getArgumentText(
+        sourceCode, // eslint-disable-next-line total-functions/no-unsafe-type-assertion
         (call.callee as TSESTree.MemberExpression).object,
-        sourceCode,
       );
 
       // A node's text never includes the parentheses the source put around it:
@@ -358,7 +359,7 @@ export const preferArrScan: TSESLint.RuleModule<MessageIds, Options> = {
           ? `(${elementText})`
           : elementText;
 
-      return `Arr.scan(${arrayText}, (${parameterText}) => ${bodyText}, ${toArgumentText(seed, sourceCode)})`;
+      return `Arr.scan(${arrayText}, (${parameterText}) => ${bodyText}, ${getArgumentText(sourceCode, seed)})`;
     };
 
     /**
@@ -493,7 +494,8 @@ export const preferArrScan: TSESLint.RuleModule<MessageIds, Options> = {
       // been seen by the time its `map` is judged, whichever order the traversal
       // reached them in.
       'Program:exit': () => {
-        const hasArrImport = getNamedImports(tsDataForgeImport).includes('Arr');
+        const hasArrImport =
+          getNamedImports(tsDataForgeImports).includes('Arr');
 
         // The import is inserted once per pass: two fixes writing the same
         // insertion point would otherwise produce it twice.
@@ -514,9 +516,12 @@ export const preferArrScan: TSESLint.RuleModule<MessageIds, Options> = {
                 ? undefined
                 : (fixer) => [
                     ...(call === mut_importNeededBy
-                      ? buildImportFixes(fixer, program, tsDataForgeImport, [
-                          'Arr',
-                        ])
+                      ? buildNamedImportFix(
+                          fixer,
+                          program,
+                          TS_DATA_FORGE_MODULE,
+                          ['Arr'],
+                        )
                       : []),
                     fixer.replaceText(call, replacement),
                   ],

package/src/rules/prefer-arr-sum.mts

@@ -3,18 +3,17 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr, pipe } from 'ts-data-forge';
-import type { TypeReference } 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 { Arr, pipe } from 'ts-data-forge';
+import type { TypeReference } from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -41,7 +40,10 @@ export const preferArrSum: 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;
 
@@ -264,14 +266,14 @@ export const preferArrSum: TSESLint.RuleModule<MessageIds, Options> = {
         }
       },
       'Program:exit': () => {
-        const namedImports = getNamedImports(tsDataForgeImport);
+        const namedImports = getNamedImports(tsDataForgeImports);
 
         const hasArrImport = namedImports.includes('Arr');
 
         for (const [index, nodeInfo] of mut_nodesToFix.entries()) {
-          const arrayText = toArgumentText(
-            nodeInfo.arrayExpression,
+          const arrayText = getArgumentText(
             sourceCode,
+            nodeInfo.arrayExpression,
           );
 
           context.report({
@@ -289,7 +291,9 @@ export const preferArrSum: TSESLint.RuleModule<MessageIds, Options> = {
 
               const importFixes =
                 index === 0 && !hasArrImport
-                  ? buildImportFixes(fixer, program, tsDataForgeImport, ['Arr'])
+                  ? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
+                      'Arr',
+                    ])
                   : [];
 
               return [

package/src/rules/prefer-arr-uniq.mts

@@ -1,16 +1,20 @@
 import {
   AST_NODE_TYPES,
+  ASTUtils,
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr } from 'ts-data-forge';
-import * as ts from 'typescript';
-import { skipTypeWrappers, typeWrapperLayers } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
   getImportedLocalName,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  skipTypeWrappers,
+  typeWrapperLayers,
+} from 'eslint-rule-forge';
+import { Arr } from 'ts-data-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -47,7 +51,10 @@ export const preferArrUniq: TSESLint.RuleModule<MessageIds, Options> = {
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const services = sourceCode.parserServices;
 
@@ -150,7 +157,7 @@ export const preferArrUniq: TSESLint.RuleModule<MessageIds, Options> = {
         check(node, element.argument);
       },
       'Program:exit': () => {
-        const arrLocalName = getImportedLocalName(tsDataForgeImport, 'Arr');
+        const arrLocalName = getImportedLocalName(tsDataForgeImports, 'Arr');
 
         const arrName = arrLocalName ?? 'Arr';
 
@@ -162,16 +169,18 @@ export const preferArrUniq: TSESLint.RuleModule<MessageIds, Options> = {
         for (const match of mut_matches) {
           const arrayText = sourceCode.getText(match.arrayExpression);
 
-          const argumentText =
-            match.arrayExpression.type === AST_NODE_TYPES.SequenceExpression
-              ? `(${arrayText})`
-              : arrayText;
+          const argumentText = getArgumentText(
+            sourceCode,
+            match.arrayExpression,
+          );
 
           const buildFix =
             (withImport: boolean): TSESLint.ReportFixFunction =>
             (fixer) => [
               ...(withImport && arrLocalName === undefined
-                ? buildImportFixes(fixer, program, tsDataForgeImport, ['Arr'])
+                ? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
+                    'Arr',
+                  ])
                 : []),
               fixer.replaceText(match.node, `${arrName}.uniq(${argumentText})`),
             ];
@@ -254,23 +263,10 @@ const isGlobal = (
   node: TSESTree.Node,
   name: string,
 ): boolean => {
-  const variable = findVariable(sourceCode.getScope(node), name);
+  const variable = ASTUtils.findVariable(sourceCode.getScope(node), name);
 
   // Globals from the TypeScript lib are implicit variables with no definition.
-  return variable === undefined || variable.defs.length === 0;
-};
-
-const findVariable = (
-  // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-  scope: TSESLint.Scope.Scope,
-  name: string,
-): TSESLint.Scope.Variable | undefined => {
-  const variable = scope.set.get(name);
-
-  return (
-    variable ??
-    (scope.upper === null ? undefined : findVariable(scope.upper, name))
-  );
+  return variable === null || variable.defs.length === 0;
 };
 
 /**

package/src/rules/prefer-as-int.mts

@@ -3,14 +3,15 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import type { DeepReadonly } from 'ts-type-forge';
-import { toArgumentText } from './ast-utils.mjs';
-import { brandedNumberTypeNameToFunctionName } from './branded-number-types.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getArgumentText,
+  getImportDeclarations,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+} from 'eslint-rule-forge';
+import type { DeepReadonly } from 'ts-type-forge';
+import { brandedNumberTypeNameToFunctionName } from './branded-number-types.mjs';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -36,7 +37,10 @@ export const preferAsInt: 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.TSAsExpression | TSESTree.TSTypeAssertion;
@@ -66,7 +70,7 @@ export const preferAsInt: TSESLint.RuleModule<MessageIds, Options> = {
       TSAsExpression: collect,
       TSTypeAssertion: collect,
       'Program:exit': () => {
-        const namedImports = getNamedImports(tsDataForgeImport);
+        const namedImports = getNamedImports(tsDataForgeImports);
 
         // Group nodes by function name to handle imports efficiently
         const functionNameToNodes = Map.groupBy(
@@ -87,14 +91,17 @@ export const preferAsInt: TSESLint.RuleModule<MessageIds, Options> = {
                 functionName,
               },
               fix: (fixer) => {
-                const replacement = `${functionName}(${toArgumentText(node.expression, sourceCode)})`;
+                const replacement = `${functionName}(${getArgumentText(sourceCode, node.expression)})`;
 
                 // Add import only for the first node of this function and only if not already imported
                 const importFixes =
                   index === 0 && !hasImport
-                    ? buildImportFixes(fixer, program, tsDataForgeImport, [
-                        functionName,
-                      ])
+                    ? buildNamedImportFix(
+                        fixer,
+                        program,
+                        TS_DATA_FORGE_MODULE,
+                        [functionName],
+                      )
                     : [];
 
                 return [...importFixes, fixer.replaceText(node, replacement)];

package/src/rules/prefer-canonical-array-slicing.mts

@@ -4,14 +4,16 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import type { ReadonlyRecord } from 'ts-type-forge';
-import * as ts from 'typescript';
-import { skipTypeWrappers, typeWrapperLayers } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getImportDeclarations,
   getImportedLocalName,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  skipTypeWrappers,
+  typeWrapperLayers,
+} from 'eslint-rule-forge';
+import type { ReadonlyRecord } from 'ts-type-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
@@ -188,7 +190,10 @@ export const preferCanonicalArraySlicing: TSESLint.RuleModule<
 
     const program = sourceCode.ast;
 
-    const tsDataForgeImport = getTsDataForgeImport(program);
+    const tsDataForgeImports = getImportDeclarations(
+      program,
+      TS_DATA_FORGE_MODULE,
+    );
 
     const parserServices = ESLintUtils.getParserServices(context);
 
@@ -199,11 +204,14 @@ export const preferCanonicalArraySlicing: TSESLint.RuleModule<
      * (possibly aliased), a namespace import member, or the canonical `Arr`
      * (added by the import fix when nothing is imported yet).
      */
-    const arrLocalName = getImportedLocalName(tsDataForgeImport, 'Arr');
+    const arrLocalName = getImportedLocalName(tsDataForgeImports, 'Arr');
 
-    const namespaceLocalName = tsDataForgeImport?.specifiers.find(
-      (specifier) => specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier,
-    )?.local.name;
+    const namespaceLocalName = tsDataForgeImports
+      .flatMap((declaration) => declaration.specifiers)
+      .find(
+        (specifier) =>
+          specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier,
+      )?.local.name;
 
     const arrRef =
       arrLocalName ??
@@ -837,7 +845,9 @@ export const preferCanonicalArraySlicing: TSESLint.RuleModule<
             fix: (fixer) => {
               const importFixes =
                 index === 0 && needsArrImport
-                  ? buildImportFixes(fixer, program, tsDataForgeImport, ['Arr'])
+                  ? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
+                      'Arr',
+                    ])
                   : [];
 
               return [

package/src/rules/prefer-canonical-length-cast.mts

@@ -4,8 +4,12 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { skipTypeWrappers } from './ast-utils.mjs';
-import { getImportedLocalName, getTsDataForgeImport } from './import-utils.mjs';
+import {
+  getImportDeclarations,
+  getImportedLocalName,
+  skipTypeWrappers,
+} from 'eslint-rule-forge';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -143,7 +147,7 @@ export const preferCanonicalLengthCast: TSESLint.RuleModule<
     const sourceCode = context.sourceCode;
 
     const arrLocalName = getImportedLocalName(
-      getTsDataForgeImport(sourceCode.ast),
+      getImportDeclarations(sourceCode.ast, TS_DATA_FORGE_MODULE),
       'Arr',
     );
 

package/src/rules/prefer-canonical-length-guard.mts

@@ -3,9 +3,14 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
+import {
+  getArgumentText,
+  getImportDeclarations,
+  getImportedLocalName,
+  skipTypeWrappers,
+} from 'eslint-rule-forge';
 import type { MutableRecord, ReadonlyRecord } from 'ts-type-forge';
-import { skipTypeWrappers, toArgumentText } from './ast-utils.mjs';
-import { getImportedLocalName, getTsDataForgeImport } from './import-utils.mjs';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 import { preferArrIsBoundedLengthArray } from './prefer-arr-is-bounded-length-array.mjs';
 import { preferArrIsFixedLengthArray } from './prefer-arr-is-fixed-length-array.mjs';
 import { preferArrIsMaxLengthArray } from './prefer-arr-is-max-length-array.mjs';
@@ -117,7 +122,7 @@ export const preferCanonicalLengthGuard: TSESLint.RuleModule<
     const sourceCode = context.sourceCode;
 
     const arrLocalName = getImportedLocalName(
-      getTsDataForgeImport(sourceCode.ast),
+      getImportDeclarations(sourceCode.ast, TS_DATA_FORGE_MODULE),
       'Arr',
     );
 
@@ -154,7 +159,7 @@ export const preferCanonicalLengthGuard: TSESLint.RuleModule<
             return;
           }
 
-          const arrayText = toArgumentText(array, sourceCode);
+          const arrayText = getArgumentText(sourceCode, array);
 
           context.report({
             node,

package/src/rules/prefer-comparison-over-nullish-guard.mts

@@ -3,8 +3,9 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
+import { buildCalleeResolver, getImportDeclarations } from 'eslint-rule-forge';
 import type { DeepReadonly, ReadonlyRecord } from 'ts-type-forge';
-import { buildCalleeResolver, getTsDataForgeImport } from './import-utils.mjs';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -121,7 +122,7 @@ export const preferComparisonOverNullishGuard: TSESLint.RuleModule<
     const sourceCode = context.sourceCode;
 
     const resolveGuard = buildCalleeResolver(
-      getTsDataForgeImport(sourceCode.ast),
+      getImportDeclarations(sourceCode.ast, TS_DATA_FORGE_MODULE),
     );
 
     return {

package/src/rules/prefer-comparison-over-nullish-guard.test.mts

@@ -49,6 +49,22 @@ describe('prefer-comparison-over-nullish-guard', () => {
         },
       ],
       invalid: [
+        {
+          name: 'the guard imported by a second ts-data-forge declaration',
+          code: dedent`
+            import type { Optional } from 'ts-data-forge';
+            import { isUndefined } from 'ts-data-forge';
+            declare const x: string | undefined;
+            const y = isUndefined(x);
+          `,
+          output: dedent`
+            import type { Optional } from 'ts-data-forge';
+            import { isUndefined } from 'ts-data-forge';
+            declare const x: string | undefined;
+            const y = x === undefined;
+          `,
+          errors: [{ messageId: 'preferComparison' }],
+        },
         {
           name: 'isNotUndefined with explicit argument',
           code: dedent`

package/src/rules/prefer-is-non-null-object.mts

@@ -3,12 +3,13 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { skipTypeWrappers } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getImportDeclarations,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  skipTypeWrappers,
+} from 'eslint-rule-forge';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -34,7 +35,10 @@ export const preferIsNonNullObject: 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.LogicalExpression;
@@ -54,7 +58,7 @@ export const preferIsNonNullObject: TSESLint.RuleModule<MessageIds, Options> = {
       'Program:exit': () => {
         // Check if isNonNullObject is already imported
         const hasIsNonNullObjectImport =
-          getNamedImports(tsDataForgeImport).includes('isNonNullObject');
+          getNamedImports(tsDataForgeImports).includes('isNonNullObject');
 
         // Note: We add import only for the first node to avoid conflicts when
         // multiple fixes try to insert at the same position. This means if the
@@ -73,7 +77,7 @@ export const preferIsNonNullObject: TSESLint.RuleModule<MessageIds, Options> = {
               // Add import only for the first node and only if not already imported
               const importFixes =
                 index === 0 && !hasIsNonNullObjectImport
-                  ? buildImportFixes(fixer, program, tsDataForgeImport, [
+                  ? buildNamedImportFix(fixer, program, TS_DATA_FORGE_MODULE, [
                       'isNonNullObject',
                     ])
                   : [];

package/src/rules/prefer-is-record-and-has-key.mts

@@ -3,14 +3,15 @@ import {
   type TSESLint,
   type TSESTree,
 } from '@typescript-eslint/utils';
-import { Arr } from 'ts-data-forge';
-import * as ts from 'typescript';
-import { typeWrapperLayers } from './ast-utils.mjs';
 import {
-  buildImportFixes,
+  buildNamedImportFix,
+  getImportDeclarations,
   getNamedImports,
-  getTsDataForgeImport,
-} from './import-utils.mjs';
+  typeWrapperLayers,
+} from 'eslint-rule-forge';
+import { Arr } from 'ts-data-forge';
+import * as ts from 'typescript';
+import { TS_DATA_FORGE_MODULE } from './constants.mjs';
 
 type Options = readonly [];
 
@@ -39,7 +40,10 @@ export const preferIsRecordAndHasKey: TSESLint.RuleModule<MessageIds, Options> =
 
       const program = sourceCode.ast;
 
-      const tsDataForgeImport = getTsDataForgeImport(program);
+      const tsDataForgeImports = getImportDeclarations(
+        program,
+        TS_DATA_FORGE_MODULE,
+      );
 
       const services = sourceCode.parserServices;
 
@@ -141,7 +145,7 @@ export const preferIsRecordAndHasKey: TSESLint.RuleModule<MessageIds, Options> =
         },
 
         'Program:exit': () => {
-          const namedImports = getNamedImports(tsDataForgeImport);
+          const namedImports = getNamedImports(tsDataForgeImports);
 
           const rewrites = mut_nodesToFix.map((entry) => ({
             ...entry,
@@ -186,10 +190,10 @@ export const preferIsRecordAndHasKey: TSESLint.RuleModule<MessageIds, Options> =
                 // otherwise and only one of them would survive a pass.
                 const importFixes =
                   index === 0 && importsToAdd.length > 0
-                    ? buildImportFixes(
+                    ? buildNamedImportFix(
                         fixer,
                         program,
-                        tsDataForgeImport,
+                        TS_DATA_FORGE_MODULE,
                         importsToAdd,
                       )
                     : [];

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,
                       )
                     : [];