catch expression statements correctly (#94)

0no-co · Jul 15, 2023 · 2aabbfa · 2aabbfa
1 parent e3cfed7
commit 2aabbfa
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 14 deletions.
diff --git a/.changeset/small-pots-boil.md b/.changeset/small-pots-boil.md
@@ -0,0 +1,5 @@
+---
+'@0no-co/graphqlsp': patch
+---
+
+Catch expression statements
diff --git a/packages/example/src/index.generated.ts b/packages/example/src/index.generated.ts
diff --git a/packages/example/src/index.ts b/packages/example/src/index.ts
@@ -1,12 +1,13 @@
 import { gql, createClient } from '@urql/core';
 import { Pokemon, PokemonFields, WeakFields } from './Pokemon';
 
-const PokemonsQuery = gql`
-  query Pok {
-    pokemons {
+const x = gql`
+  query Pok($limit: Int!) {
+    pokemons(limit: $limit) {
       id
       name
       fleeRate
+      classification
       ...pokemonFields
       ...weaknessFields
       __typename
@@ -21,15 +22,6 @@ const client = createClient({
   url: '',
 });
 
-client
-  .query(PokemonsQuery, {})
-  .toPromise()
-  .then(result => {
-    const fastAttacks = result.data?.pokemons?.map(
-      pokemon => pokemon?.attacks?.fast
-    );
-  });
-
 const PokemonQuery = gql`
   query Po($id: ID!) {
     pokemon(id: $id) {

diff --git a/packages/graphqlsp/src/diagnostics.ts b/packages/graphqlsp/src/diagnostics.ts
@@ -1,6 +1,8 @@
 import ts from 'typescript/lib/tsserverlibrary';
 import {
   ImportTypeNode,
+  isAsExpression,
+  isExpressionStatement,
   isImportTypeNode,
   isNamedImportBindings,
   isNamespaceImport,
@@ -83,7 +85,20 @@ export function getGraphQLDiagnostics(
       );
       const lines = text.split('\n');
 
-      let startingPosition = node.pos + (tagTemplate.length + 1);
+      let isExpression = false;
+      if (isAsExpression(node.parent)) {
+        if (isExpressionStatement(node.parent.parent)) {
+          isExpression = true;
+        }
+      } else {
+        if (isExpressionStatement(node.parent)) {
+          isExpression = true;
+        }
+      }
+      // When we are dealing with a plain gql statement we have to add two these can be recognised
+      // by the fact that the parent is an expressionStatement
+      let startingPosition =
+        node.pos + (tagTemplate.length + (isExpression ? 2 : 1));
       const endPosition = startingPosition + node.getText().length;
       const graphQLDiagnostics = getDiagnostics(text, schema.current)
         .map(x => {