refactor: use helper for wrapping text in quotes

src/rules/no-alias-methods.ts

@@ -1,5 +1,9 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/utils';
-import { createRule, isExpectCall, parseExpectCall } from './utils';
+import {
+ createRule,
+ isExpectCall,
+ parseExpectCall,
+ replaceAccessorFixer,
+} from './utils';
 
 export default createRule({
  name: __filename,
@@ -58,12 +62,7 @@ export default createRule({
  },
  node: matcher.node.property,
  fix: fixer => [
- fixer.replaceText(
- matcher.node.property,
- matcher.node.property.type === AST_NODE_TYPES.Identifier
- ? canonical
- : `'${canonical}'`,
- ),
+ replaceAccessorFixer(fixer, matcher.node.property, canonical),
  ],
  });
  }

src/rules/prefer-strict-equal.ts

@@ -1,10 +1,10 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 import {
  EqualityMatcher,
  createRule,
  isExpectCall,
  isParsedEqualityMatcherCall,
  parseExpectCall,
+ replaceAccessorFixer,
 } from './utils';
 
 export default createRule({
@@ -45,11 +45,10 @@ export default createRule({
  {
  messageId: 'suggestReplaceWithStrictEqual',
  fix: fixer => [
- fixer.replaceText(
+ replaceAccessorFixer(
+ fixer,
  matcher.node.property,
- matcher.node.property.type === AST_NODE_TYPES.Identifier
- ? EqualityMatcher.toStrictEqual
- : `'${EqualityMatcher.toStrictEqual}'`,
+ EqualityMatcher.toStrictEqual,
  ),
  ],
  },

src/rules/prefer-to-be.ts

@@ -12,6 +12,7 @@ import {
  isIdentifier,
  isParsedEqualityMatcherCall,
  parseExpectCall,
+ replaceAccessorFixer,
 } from './utils';
 
 const isNullLiteral = (node: TSESTree.Node): node is TSESTree.NullLiteral =>
@@ -69,11 +70,9 @@ const reportPreferToBe = (
  context.report({
  messageId: `useToBe${whatToBe}`,
  fix(fixer) {
- const r = `toBe${whatToBe}`;
- const text =
- matcher.node.property.type === AST_NODE_TYPES.Identifier ? r : `'${r}'`;
-
- const fixes = [fixer.replaceText(matcher.node.property, text)];
+ const fixes = [
+ replaceAccessorFixer(fixer, matcher.node.property, `toBe${whatToBe}`),
+ ];
 
  if (matcher.arguments?.length && whatToBe !== '') {
  fixes.push(fixer.remove(matcher.arguments[0]));

src/rules/prefer-todo.ts

@@ -7,6 +7,7 @@ import {
  isFunction,
  isStringNode,
  parseJestFnCall,
+ replaceAccessorFixer,
 } from './utils';
 
 function isEmptyFunction(node: TSESTree.CallExpressionArgument) {
@@ -24,12 +25,7 @@ function createTodoFixer(
  fixer: TSESLint.RuleFixer,
 ) {
  if (jestFnCall.members.length) {
- const text =
- jestFnCall.members[0].type === AST_NODE_TYPES.Identifier
- ? 'todo'
- : "'todo'";
-
- return [fixer.replaceText(jestFnCall.members[0], text)];
+ return [replaceAccessorFixer(fixer, jestFnCall.members[0], 'todo')];
  }
 
  return [

src/rules/utils/misc.ts

@@ -137,3 +137,20 @@ export const getTestCallExpressionsFromDeclaredVariables = (
  [],
  );
 };
+
+/**
+ * Replaces an accessor node with the given `text`, surrounding it in quotes if required.
+ *
+ * This ensures that fixes produce valid code when replacing both dot-based and
+ * bracket-based property accessors.
+ */
+export const replaceAccessorFixer = (
+ fixer: TSESLint.RuleFixer,
+ node: AccessorNode,
+ text: string,
+) => {
+ return fixer.replaceText(
+ node,
+ node.type === AST_NODE_TYPES.Identifier ? text : `'${text}'`,
+ );
+};