[Fix] TSNonNullExpression: Handle function calls

jsx-eslint · Jun 16, 2023 · 26cc3c4 · 26cc3c4
1 parent a0f4f38
commit 26cc3c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/__tests__/src/getPropValue-babelparser-test.js b/__tests__/src/getPropValue-babelparser-test.js
@@ -1148,6 +1148,13 @@ describe('getPropValue', () => {
       assert.equal(actual, expected);
     });
 
+    it('should return string representation of a TSNonNullExpression of form `function()!.property`', () => {
+      const prop = extractProp('<div foo={bar()!.bar} />');
+      const expected = 'bar()!.bar';
+      const actual = getPropValue(prop);
+      assert.equal(actual, expected);
+    });
+
     it('should return string representation of a TSNonNullExpression of form `object!.property!`', () => {
       const prop = extractProp('<div foo={bar!.bar!} />');
       const actual = getPropValue(prop);

diff --git a/src/values/expressions/TSNonNullExpression.js b/src/values/expressions/TSNonNullExpression.js
@@ -1,4 +1,5 @@
 const extractValueFromThisExpression = require('./ThisExpression').default;
+const extractValueFromCallExpression = require('./CallExpression').default;
 
 function navigate(obj, prop, value) {
   if (value.computed) {
@@ -35,6 +36,10 @@ export default function extractValueFromTSNonNullExpression(value) {
     return extractValueFromTSNonNullExpression(value.expression);
   }
 
+  if (value.type === 'CallExpression') {
+    return extractValueFromCallExpression(value);
+  }
+
   if (value.type === 'ThisExpression') {
     return extractValueFromThisExpression();
   }