chore: allow babel in tc

jsx-eslint · Aug 15, 2023 · c984b4f · c984b4f
1 parent f7447b7
commit c984b4f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/lib/rules/sort-prop-types.js b/lib/rules/sort-prop-types.js
@@ -72,6 +72,9 @@ module.exports = {
     const typeAnnotations = new Map();
 
     function getKey(node) {
+      if (node.type === 'ObjectTypeProperty') {
+        return context.getSourceCode().getFirstToken(node).value;
+      }
       if (node.key && node.key.value) {
         return node.key.value;
       }
@@ -236,6 +239,16 @@ module.exports = {
         if (firstArg.members) {
           checkSorted(firstArg.members);
         }
+      } else if (firstArg && firstArg.type === 'GenericTypeAnnotation') {
+        const propType = typeAnnotations.get(firstArg.id.name)
+          && typeAnnotations.get(firstArg.id.name)[0];
+        if (propType && propType.properties) {
+          checkSorted(propType.properties);
+        }
+      } else if (firstArg && firstArg.type === 'ObjectTypeAnnotation') {
+        if (firstArg.properties) {
+          checkSorted(firstArg.properties);
+        }
       }
     }
 
@@ -296,6 +309,16 @@ module.exports = {
         }
       },
 
+      TypeAlias(node) {
+        if (node.right.type === 'ObjectTypeAnnotation') {
+          const currentNode = [].concat(
+            typeAnnotations.get(node.id.name) || [],
+            node.right
+          );
+          typeAnnotations.set(node.id.name, currentNode);
+        }
+      },
+
       TSTypeAliasDeclaration(node) {
         if (node.typeAnnotation.type === 'TSTypeLiteral' || node.typeAnnotation.type === 'ObjectTypeAnnotation') {
           const currentNode = [].concat(

diff --git a/tests/lib/rules/sort-prop-types.js b/tests/lib/rules/sort-prop-types.js
@@ -2283,14 +2283,13 @@ ruleTester.run('sort-prop-types', rule, {
           return null;
         }
       `,
-      features: ['ts', 'no-babel'],
+      features: ['types'],
       options: [{ checkTypes: true }],
       errors: [
         {
           messageId: 'propsNotSorted',
           line: 4,
           column: 11,
-          type: 'TSPropertySignature',
         },
       ],
     },
@@ -2313,14 +2312,13 @@ ruleTester.run('sort-prop-types', rule, {
           return null;
         }
       `,
-      features: ['ts', 'no-babel'],
+      features: ['types'],
       options: [{ checkTypes: true }],
       errors: [
         {
           messageId: 'propsNotSorted',
           line: 4,
           column: 11,
-          type: 'TSPropertySignature',
         },
       ],
     },
@@ -2341,14 +2339,13 @@ ruleTester.run('sort-prop-types', rule, {
           return null;
         }
       `,
-      features: ['ts', 'no-babel'],
+      features: ['types'],
       options: [{ checkTypes: true }],
       errors: [
         {
           messageId: 'propsNotSorted',
           line: 4,
           column: 11,
-          type: 'TSPropertySignature',
         },
       ],
     }