fix invalid type of __typename and __isAbstractType

Author: mizdra

src/schema-scanner.test.ts

@@ -417,7 +417,6 @@ describe('getTypeInfos', () => {
           }
         `);
       });
-      // FIXME
       it('does not effect to __typename and __is<AbstractType>', () => {
         const schema = buildSchema(`
           type Type {
@@ -434,11 +433,11 @@ describe('getTypeInfos', () => {
           [
             {
               "name": "__typename",
-              "typeString": "'type'",
+              "typeString": "'Type'",
             },
             {
               "name": "__isUnion",
-              "typeString": "'type'",
+              "typeString": "'Type'",
             },
             {
               "comment": undefined,
@@ -480,7 +479,6 @@ describe('getTypeInfos', () => {
           }
         `);
       });
-      // FIXME
       it('does not effect to __typename and __is<AbstractType>', () => {
         const schema = buildSchema(`
           type Type {
@@ -497,11 +495,11 @@ describe('getTypeInfos', () => {
           [
             {
               "name": "__typename",
-              "typeString": "'IType'",
+              "typeString": "'Type'",
             },
             {
               "name": "__isUnion",
-              "typeString": "'IType'",
+              "typeString": "'Type'",
             },
             {
               "comment": undefined,
@@ -543,7 +541,6 @@ describe('getTypeInfos', () => {
           }
         `);
       });
-      // FIXME
       it('does not effect to __typename and __is<AbstractType>', () => {
         const schema = buildSchema(`
           type Type {
@@ -560,11 +557,11 @@ describe('getTypeInfos', () => {
           [
             {
               "name": "__typename",
-              "typeString": "'TypeI'",
+              "typeString": "'Type'",
             },
             {
               "name": "__isUnion",
-              "typeString": "'TypeI'",
+              "typeString": "'Type'",
             },
             {
               "comment": undefined,

src/schema-scanner.ts

@@ -51,15 +51,15 @@ function parseTypeNode(node: TypeNode, config: Config): string {
 
 function parseFieldOrInputValueDefinition(
   node: FieldDefinitionNode | InputValueDefinitionNode,
-  objectTypeName: string,
+  convertedTypeName: string,
   config: Config,
   userDefinedTypeNames: string[],
 ): { typeString: string; comment: string | undefined } {
   const comment = node.description ? transformComment(node.description) : undefined;
   if (isTypeBasedOnUserDefinedType(node.type, userDefinedTypeNames)) {
     return { typeString: `${parseTypeNode(node.type, config)} | undefined`, comment };
   } else {
-    return { typeString: `${objectTypeName}['${node.name.value}'] | undefined`, comment };
+    return { typeString: `${convertedTypeName}['${node.name.value}'] | undefined`, comment };
   }
 }
 
@@ -69,19 +69,20 @@ function parseObjectTypeOrInputObjectTypeDefinition(
   userDefinedTypeNames: string[],
   getAbstractTypeNames: (type: ObjectTypeDefinitionNode) => string[],
 ): TypeInfo {
-  const objectTypeName = convertName(node.name.value, config);
+  const originalTypeName = node.name.value;
+  const convertedTypeName = convertName(originalTypeName, config);
   const comment = node.description ? transformComment(node.description) : undefined;
   const abstractTypeNames = node.kind === Kind.OBJECT_TYPE_DEFINITION ? getAbstractTypeNames(node) : [];
   return {
-    name: objectTypeName,
+    name: convertedTypeName,
     fields: [
-      ...(!config.skipTypename ? [{ name: '__typename', typeString: `'${objectTypeName}'` }] : []),
+      ...(!config.skipTypename ? [{ name: '__typename', typeString: `'${originalTypeName}'` }] : []),
       ...(!config.skipIsAbstractType
-        ? abstractTypeNames.map((name) => ({ name: `__is${name}`, typeString: `'${objectTypeName}'` }))
+        ? abstractTypeNames.map((name) => ({ name: `__is${name}`, typeString: `'${originalTypeName}'` }))
         : []),
       ...(node.fields ?? []).map((field) => ({
         name: field.name.value,
-        ...parseFieldOrInputValueDefinition(field, objectTypeName, config, userDefinedTypeNames),
+        ...parseFieldOrInputValueDefinition(field, convertedTypeName, config, userDefinedTypeNames),
       })),
     ],
     comment,