fix base caes

0no-co · Apr 25, 2024 · cafbe5c · cafbe5c
1 parent 0377fc3
commit cafbe5c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/packages/example-tada/introspection.d.ts b/packages/example-tada/introspection.d.ts
@@ -10,7 +10,6 @@
  * instead save to a .ts instead of a .d.ts file.
  */
 export type introspection = {
-  name: 'pokemons';
   query: 'Query';
   mutation: never;
   subscription: never;

diff --git a/packages/example-tada/tsconfig.json b/packages/example-tada/tsconfig.json
@@ -3,13 +3,8 @@
     "plugins": [
       {
         "name": "@0no-co/graphqlsp",
-        "schemas": [
-          {
-            "name": "pokemons",
-            "schema": "./schema.graphql",
-            "tadaOutputLocation": "./introspection.d.ts"
-          }
-        ]
+        "schema": "./schema.graphql",
+        "tadaOutputLocation": "./introspection.d.ts"
       }
     ],
     "jsx": "react-jsx",

diff --git a/packages/graphqlsp/src/ast/index.ts b/packages/graphqlsp/src/ast/index.ts
@@ -127,8 +127,8 @@ export function unrollTadaFragments(
 export const getSchemaName = (
   node: ts.CallExpression,
   typeChecker?: ts.TypeChecker
-): string => {
-  if (!typeChecker) return 'default';
+): string | null => {
+  if (!typeChecker) return null;
 
   const expression = ts.isPropertyAccessExpression(node.expression)
     ? node.expression.expression
@@ -140,28 +140,31 @@ export const getSchemaName = (
       const brand = typeChecker.getTypeOfSymbol(brandTypeSymbol);
       if (brand.isUnionOrIntersection()) {
         const found = brand.types.find(x => x.isStringLiteral());
-        return found && found.isStringLiteral() ? found.value : 'default';
+        return found && found.isStringLiteral() ? found.value : null;
       } else if (brand.isStringLiteral()) {
         return brand.value;
       }
     }
   }
 
-  return 'default';
+  return null;
 };
 
 export function findAllCallExpressions(
   sourceFile: ts.SourceFile,
   info: ts.server.PluginCreateInfo,
   shouldSearchFragments: boolean = true
 ): {
-  nodes: Array<{ node: ts.NoSubstitutionTemplateLiteral; schema: string }>;
+  nodes: Array<{
+    node: ts.NoSubstitutionTemplateLiteral;
+    schema: string | null;
+  }>;
   fragments: Array<FragmentDefinitionNode>;
 } {
   const typeChecker = info.languageService.getProgram()?.getTypeChecker();
   const result: Array<{
     node: ts.NoSubstitutionTemplateLiteral;
-    schema: string;
+    schema: string | null;
   }> = [];
   let fragments: Array<FragmentDefinitionNode> = [];
   let hasTriedToFindFragments = shouldSearchFragments ? false : true;
@@ -206,8 +209,8 @@ export function findAllCallExpressions(
 export function findAllPersistedCallExpressions(
   sourceFile: ts.SourceFile,
   info: ts.server.PluginCreateInfo
-): Array<{ node: ts.CallExpression; schema: string }> {
-  const result: Array<{ node: ts.CallExpression; schema: string }> = [];
+): Array<{ node: ts.CallExpression; schema: string | null }> {
+  const result: Array<{ node: ts.CallExpression; schema: string | null }> = [];
   const typeChecker = info.languageService.getProgram()?.getTypeChecker();
   function find(node: ts.Node) {
     if (ts.isCallExpression(node)) {

diff --git a/packages/graphqlsp/src/autoComplete.ts b/packages/graphqlsp/src/autoComplete.ts
@@ -48,7 +48,7 @@ export function getGraphQLCompletions(
     ? bubbleUpCallExpression(node)
     : bubbleUpTemplate(node);
 
-  let text, cursor, schemaToUse: GraphQLSchema;
+  let text, cursor, schemaToUse: GraphQLSchema | undefined;
   if (
     ts.isCallExpression(node) &&
     isCallExpression &&
@@ -59,18 +59,19 @@ export function getGraphQLCompletions(
     const typeChecker = info.languageService.getProgram()?.getTypeChecker();
     const schemaName = getSchemaName(node, typeChecker);
 
+    schemaToUse =
+      schemaName && schema.multi[schemaName]
+        ? schema.multi[schemaName]?.schema
+        : schema.current?.schema;
+
     const foundToken = getToken(node.arguments[0], cursorPosition);
-    if ((!schema.current && !schema.multi[schemaName]) || !foundToken)
-      return undefined;
+    if (!schemaToUse || !foundToken) return undefined;
 
     const queryText = node.arguments[0].getText().slice(1, -1);
     const fragments = getAllFragments(filename, node, info);
 
     text = `${queryText}\n${fragments.map(x => print(x)).join('\n')}`;
     cursor = new Cursor(foundToken.line, foundToken.start - 1);
-    schemaToUse = schema.multi[schemaName]
-      ? schema.multi[schemaName]!.schema
-      : schema.current!.schema;
   } else if (ts.isTaggedTemplateExpression(node)) {
     const { template, tag } = node;
 

diff --git a/packages/graphqlsp/src/diagnostics.ts b/packages/graphqlsp/src/diagnostics.ts
@@ -88,7 +88,7 @@ export function getGraphQLDiagnostics(
   let fragments: Array<FragmentDefinitionNode> = [],
     nodes: {
       node: ts.NoSubstitutionTemplateLiteral | ts.TaggedTemplateExpression;
-      schema: string;
+      schema: string | null;
     }[];
   if (isCallExpression) {
     const result = findAllCallExpressions(source, info);
@@ -339,7 +339,7 @@ const runDiagnostics = (
   }: {
     nodes: {
       node: ts.TaggedTemplateExpression | ts.NoSubstitutionTemplateLiteral;
-      schema: string;
+      schema: string | null;
     }[];
     fragments: FragmentDefinitionNode[];
   },
@@ -406,9 +406,15 @@ const runDiagnostics = (
         } catch (e) {}
       }
 
-      const schemaToUse = schema.multi[originalNode.schema]
-        ? schema.multi[originalNode.schema]!.schema
-        : schema.current!.schema;
+      const schemaToUse =
+        originalNode.schema && schema.multi[originalNode.schema]
+          ? schema.multi[originalNode.schema]?.schema
+          : schema.current?.schema;
+
+      if (!schemaToUse) {
+        return undefined;
+      }
+
       const graphQLDiagnostics = getDiagnostics(
         text,
         schemaToUse,

diff --git a/packages/graphqlsp/src/quickInfo.ts b/packages/graphqlsp/src/quickInfo.ts
@@ -33,7 +33,7 @@ export function getGraphQLQuickInfo(
     ? bubbleUpCallExpression(node)
     : bubbleUpTemplate(node);
 
-  let cursor, text, schemaToUse: GraphQLSchema;
+  let cursor, text, schemaToUse: GraphQLSchema | undefined;
   if (
     ts.isCallExpression(node) &&
     isCallExpression &&
@@ -44,15 +44,16 @@ export function getGraphQLQuickInfo(
     const typeChecker = info.languageService.getProgram()?.getTypeChecker();
     const schemaName = getSchemaName(node, typeChecker);
 
+    schemaToUse =
+      schemaName && schema.multi[schemaName]
+        ? schema.multi[schemaName]?.schema
+        : schema.current?.schema;
+
     const foundToken = getToken(node.arguments[0], cursorPosition);
-    if ((!schema.current && !schema.multi[schemaName]) || !foundToken)
-      return undefined;
+    if (!schemaToUse || !foundToken) return undefined;
 
     text = node.arguments[0].getText();
     cursor = new Cursor(foundToken.line, foundToken.start - 1);
-    schemaToUse = schema.multi[schemaName]
-      ? schema.multi[schemaName]!.schema
-      : schema.current!.schema;
   } else if (ts.isTaggedTemplateExpression(node)) {
     const { template, tag } = node;
     if (!ts.isIdentifier(tag) || !templates.has(tag.text)) return undefined;