eslint-rule-forge 0.3.2 → 0.5.0

package/dist/rules/prefer-safe-parse.mjs

@@ -1,6 +1,7 @@
 import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
 import * as ts from 'typescript';
-import { buildNamedImportFix, getImportDeclarations, getNamedImports, } from '../imports.mjs';
+import { hasForeignBinding } from '../bindings.mjs';
+import { bindValueImports } from '../imports.mjs';
 import { getArgumentText } from '../parentheses.mjs';
 import { isIdentifierNamed, skipTypeWrappers, typeHoldsAtEveryLayer, } from '../type-wrappers.mjs';
 
@@ -11,6 +12,7 @@ import { isIdentifierNamed, skipTypeWrappers, typeHoldsAtEveryLayer, } from '../
 
 
 
+
 export const createPreferSafeParseInt = (config) => createSafeParseRule(config, 'useSafeParseInt', {
     messages: { useSafeParseInt: messageText(config) },
     description: `Replace \`parseInt(x)\` or \`Number.parseInt(x, 10)\` with \`Result.unwrapOkOr(${config.namespace}.${config.method}(x), Number.NaN)\` from ${config.moduleName}.`,
@@ -33,6 +35,8 @@ export const createPreferSafeParseInt = (config) => createSafeParseRule(config,
 
 
 
+
+
 export const createPreferSafeParseFloat = (config) => createSafeParseRule(config, 'useSafeParseFloat', {
     messages: { useSafeParseFloat: messageText(config) },
     description: `Replace \`parseFloat(x)\`, \`Number.parseFloat(x)\`, or \`Number(x)\` (when x is a string) with \`Result.unwrapOkOr(${config.namespace}.${config.method}(x), Number.NaN)\` from ${config.moduleName}.`,
@@ -43,24 +47,34 @@ export const createPreferSafeParseFloat = (config) => createSafeParseRule(config
         isGlobalCall(callee, 'Number'),
 });
 
+
+
+
+
+
+const isStringType = (type) => {
+    const parts = type.isUnion() ? type.types : [type];
+    return (parts.length > 0 &&
+        parts.every((t) => (t.flags & ts.TypeFlags.StringLike) !== 0));
+};
 const createSafeParseRule = ({ moduleName, namespace, method }, messageId, { messages, description, isTarget, }) => {
-    const parseFunction = `${namespace}.${method}`;
 
     const requiredImports = [namespace, 'Result'].toSorted();
     return {
         meta: {
             type: 'suggestion',
             docs: { description },
-            fixable: 'code',
+            hasSuggestions: true,
             schema: [],
-            messages,
+            messages: {
+                ...messages,
+                replaceWithSafeParse: `Replace with \`Result.unwrapOkOr(${namespace}.${method}({{argName}}), Number.NaN)\`.`,
+            },
             defaultOptions: [],
         },
         create: (context) => {
             const sourceCode = context.sourceCode;
-            const program = sourceCode.ast;
-            const moduleImports = getImportDeclarations(program, moduleName);
-            const mut_nodesToFix = [];
+            const mut_reports = [];
             return {
                 CallExpression: (node) => {
                     if (!isTarget(skipTypeWrappers(node.callee), node.arguments)) {
@@ -68,7 +82,6 @@ const createSafeParseRule = ({ moduleName, namespace, method }, messageId, { mes
                     }
                     const firstArg = node.arguments[0];
 
-
                     if (firstArg === undefined ||
                         firstArg.type === AST_NODE_TYPES.SpreadElement) {
                         return;
@@ -83,30 +96,43 @@ const createSafeParseRule = ({ moduleName, namespace, method }, messageId, { mes
                     if (!typeHoldsAtEveryLayer(sourceCode, firstArg, isStringType)) {
                         return;
                     }
-                    mut_nodesToFix.push({ node, argExpression: firstArg });
+                    mut_reports.push({ node, argExpression: firstArg });
                 },
                 'Program:exit': () => {
-                    const namedImports = getNamedImports(moduleImports);
-                    const missingImports = requiredImports.filter((name) => !namedImports.includes(name));
+                    const binding = bindValueImports(sourceCode, moduleName, requiredImports);
+                    const localNameOf = (name) => binding?.localNames[requiredImports.indexOf(name)];
+                    const namespaceName = localNameOf(namespace);
+                    const resultName = localNameOf('Result');
+
 
 
 
-                    for (const [index, { node, argExpression },] of mut_nodesToFix.entries()) {
+
+                    for (const { node, argExpression } of mut_reports) {
                         const argText = getArgumentText(sourceCode, argExpression);
+                        const data = {
+                            original: sourceCode.getText(node),
+                            argName: argText,
+                        };
                         context.report({
                             node,
                             messageId,
-                            data: {
-                                original: sourceCode.getText(node),
-                                argName: argText,
-                            },
-                            fix: (fixer) => {
-                                const core = `Result.unwrapOkOr(${parseFunction}(${argText}), Number.NaN)`;
-                                const importFixes = index === 0 && missingImports.length > 0
-                                    ? buildNamedImportFix(fixer, program, moduleName, missingImports)
-                                    : [];
-                                return [...importFixes, fixer.replaceText(node, core)];
-                            },
+                            data,
+                            suggest: binding === undefined ||
+                                namespaceName === undefined ||
+                                resultName === undefined ||
+                                [namespaceName, resultName].some((name) => hasForeignBinding(sourceCode, node, name, moduleName))
+                                ? []
+                                : [
+                                    {
+                                        messageId: 'replaceWithSafeParse',
+                                        data,
+                                        fix: (fixer) => [
+                                            ...binding.edits(fixer),
+                                            fixer.replaceText(node, `${resultName}.unwrapOkOr(${namespaceName}.${method}(${argText}), Number.NaN)`),
+                                        ],
+                                    },
+                                ],
                         });
                     }
                 },
@@ -114,7 +140,7 @@ const createSafeParseRule = ({ moduleName, namespace, method }, messageId, { mes
         },
     };
 };
-const messageText = ({ moduleName, namespace, method, }) => `Replace \`{{original}}\` with \`Result.unwrapOkOr(${namespace}.${method}({{argName}}), Number.NaN)\` from ${moduleName}.`;
+const messageText = ({ moduleName, namespace, method, }) => `Replace \`{{original}}\` with \`Result.unwrapOkOr(${namespace}.${method}({{argName}}), Number.NaN)\` from ${moduleName}. It parses some strings differently from the call it replaces, so check the input before applying it.`;
 
 const isGlobalCall = (callee, name) => callee.type === AST_NODE_TYPES.Identifier && callee.name === name;
 
@@ -126,14 +152,4 @@ const isNumberMethod = (callee, name) => callee.type === AST_NODE_TYPES.MemberEx
     isIdentifierNamed(callee.object, 'Number') &&
     callee.property.type === AST_NODE_TYPES.Identifier &&
     callee.property.name === name;
-
-
-
-
-
-const isStringType = (type) => {
-    const parts = type.isUnion() ? type.types : [type];
-    return (parts.length > 0 &&
-        parts.every((t) => (t.flags & ts.TypeFlags.StringLike) !== 0));
-};
 //# sourceMappingURL=prefer-safe-parse.mjs.map

package/dist/rules/prefer-safe-parse.mjs.map

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

package/dist/statements.d.mts

@@ -0,0 +1,12 @@
+import { type TSESTree } from '@typescript-eslint/utils';
+import type { DeepReadonly } from 'ts-type-forge';
+/**
+ * The statement next to `node` (`offset` 1) or before it (-1) in the statement
+ * list `node` is one of: the program's, a block's, a class static block's, a
+ * namespace's or a `case`'s. What an `export` declares (or, for
+ * `export default`, the expression it exports) is read as the `export`
+ * statement. `undefined` when there is none, or when `node` is not in a
+ * statement list (an arrow function's expression body, a `for` initializer).
+ */
+export declare const siblingOf: (node: DeepReadonly<TSESTree.Node>, offset: 1 | -1) => DeepReadonly<TSESTree.Node> | undefined;
+//# sourceMappingURL=statements.d.mts.map

package/dist/statements.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statements.d.mts","sourceRoot":"","sources":["../src/statements.mts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,SACd,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,UACzB,CAAC,GAAG,CAAC,CAAC,KACb,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAmBhC,CAAC"}

package/dist/statements.mjs

@@ -0,0 +1,39 @@
+import { AST_NODE_TYPES } from '@typescript-eslint/utils';
+
+
+
+
+
+
+
+
+export const siblingOf = (node, offset) => {
+    const { parent } = node;
+    const statement = (parent?.type === AST_NODE_TYPES.ExportNamedDeclaration ||
+        parent?.type === AST_NODE_TYPES.ExportDefaultDeclaration) &&
+        parent.declaration === node
+        ? parent
+        : node;
+    const list = statementListOf(statement);
+    if (list === undefined) {
+        return undefined;
+    }
+    const index = list.indexOf(statement);
+    return index === -1 ? undefined : list[index + offset];
+};
+const statementListOf = (node) => {
+    const { parent } = node;
+    if (parent === undefined) {
+        return undefined;
+    }
+    if (parent.type === AST_NODE_TYPES.Program ||
+        parent.type === AST_NODE_TYPES.BlockStatement ||
+        parent.type === AST_NODE_TYPES.StaticBlock ||
+        parent.type === AST_NODE_TYPES.TSModuleBlock) {
+        return parent.body;
+    }
+    return parent.type === AST_NODE_TYPES.SwitchCase
+        ? parent.consequent
+        : undefined;
+};
+//# sourceMappingURL=statements.mjs.map

package/dist/statements.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"statements.mjs","sourceRoot":"","sources":["../src/statements.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,0BAA0B,CAAC;AAGzE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAiC,EACjC,MAAc,EAC2B,EAAE;IAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExB,MAAM,SAAS,GACb,CAAC,MAAM,EAAE,IAAI,KAAK,cAAc,CAAC,sBAAsB;QACrD,MAAM,EAAE,IAAI,KAAK,cAAc,CAAC,wBAAwB,CAAC;QAC3D,MAAM,CAAC,WAAW,KAAK,IAAI;QACzB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,IAAI,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAExC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,IAAiC,EACmB,EAAE;IACtD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IACE,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,OAAO;QACtC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,cAAc;QAC7C,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,WAAW;QAC1C,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,EAC5C,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU;QAC9C,CAAC,CAAC,MAAM,CAAC,UAAU;QACnB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}

package/dist/type-wrappers.d.mts

@@ -51,9 +51,9 @@ export declare const isIdentifierNamed: (node: DeepReadonly<TSESTree.Node>, name
  * Whether `holds` is true of the type of every layer of type wrappers around
  * `node` (see {@link typeWrapperLayers}), outermost to innermost; `false`
  * without type information. A widening cast (`s as string | number`) is the
- * author saying the value may be more than it is, and is respected; a
- * narrowing one (`s!`, `v as unknown as string`) cannot vouch for what the
- * value's own type does not, and the fix, which keeps the wrapper, has to
+ * author saying the value may be more than it is, and is respected; a narrowing
+ * one (`s!`, `v as unknown as string`) cannot vouch for what the value's own
+ * type does not, and the fix, which keeps the wrapper, has to
  * type-check at every layer too.
  */
 export declare const typeHoldsAtEveryLayer: (sourceCode: TSESLint.SourceCode, node: TSESTree.Node, holds: (type: ts.Type, typeChecker: ts.TypeChecker) => boolean) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-rule-forge",
-  "version": "0.3.2",
+  "version": "0.5.0",
   "private": false,
   "description": "Helpers for writing typescript-eslint rules that see through type wrappers and parentheses, and resolve what a file imports.",
   "keywords": [
@@ -41,13 +41,13 @@
     "@typescript-eslint/rule-tester": "8.72.0",
     "dedent": "1.7.2",
     "eslint": "10.13.0",
-    "eslint-config-typed": "5.20.1",
-    "eslint-plugin-ts-fortress": "1.3.9",
-    "eslint-plugin-ts-type-forge": "0.8.14",
+    "eslint-config-typed": "7.3.0",
+    "eslint-plugin-ts-fortress": "1.3.12",
+    "eslint-plugin-ts-type-forge": "0.8.17",
     "prettier": "3.9.10",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-packagejson": "3.0.2",
-    "ts-data-forge": "14.10.0",
+    "ts-data-forge": "14.10.1",
     "ts-repo-utils": "10.7.1"
   },
   "peerDependencies": {

package/src/bindings.mts

@@ -8,8 +8,8 @@ import {
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
 /**
- * Whether `name`, read at `node`, resolves to something this file writes down
- * — a declaration, a parameter, an import — rather than to a global or a
+ * Whether `name`, read at `node`, resolves to something this file writes down —
+ * a declaration, a parameter, an import — rather than to a global or a
  * standard-library type of the same name.
  *
  * The scope manager makes an implicit variable for every reference it cannot
@@ -29,9 +29,8 @@ export const isLocallyBound = (
 /**
  * Whether `name`, read at `node`, resolves to a binding that is not an import
  * from `moduleName` — a declaration, a parameter, or an import from another
- * module. A fix that makes code at `node` refer to `moduleName`'s export
- * `name` has to give up then, because the name would refer to that binding
- * instead.
+ * module. A fix that makes code at `node` refer to `moduleName`'s export `name`
+ * has to give up then, because the name would refer to that binding instead.
  *
  * The innermost binding decides: an import from `moduleName` at the top of the
  * file does not help a name a function shadows around `node`.

package/src/comments.mts

@@ -0,0 +1,23 @@
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+import type { DeepReadonly } from 'ts-type-forge';
+
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+
+/**
+ * Whether a comment inside `node` lies within one of `ranges`, which a fix
+ * would delete along with it. Such a fix is dropped instead of the comment.
+ * Only comments inside `node` are looked at, so each range has to lie within
+ * it.
+ */
+export const hasCommentWithin = (
+  sourceCode: TSESLint.SourceCode,
+  node: TSESTree.Node,
+  ranges: DeepReadonly<TSESTree.Range[]>,
+): boolean =>
+  sourceCode
+    .getCommentsInside(node)
+    .some((comment) =>
+      ranges.some(
+        ([start, end]) => start <= comment.range[0] && comment.range[1] <= end,
+      ),
+    );