fix some styles and lint problem

Author: wwwy3y3

examples/simple-todo/src/index.tsx

@@ -45,7 +45,7 @@ class Example extends Component<{}, State> {
         Apollo-link-firebase Simple Todo Example
       </Header>
       <Content style={{padding: '0 50px'}}>
-        <div style={{background: '#fff', padding: 24, minHeight: '100%'}}>
+        <div style={{background: '#fff', padding: 24, minHeight: 280}}>
         {
           (this.state.user) ?
             <Row>

src/rtdb/link.ts

@@ -1,11 +1,10 @@
 import { OperationTypeNode } from 'graphql';
-import { graphql, ExecInfo } from 'graphql-anywhere/lib/async';
+import { graphql } from 'graphql-anywhere/lib/async';
 import { ApolloLink, Observable, FetchResult, Operation, NextLink } from 'apollo-link';
-import { hasDirectives, addTypenameToDocument, getMainDefinition, getFragmentDefinitions } from 'apollo-utilities';
+import { hasDirectives, addTypenameToDocument, getMainDefinition } from 'apollo-utilities';
 import { database as firebaseDatabase } from 'firebase';
 import { Resolver } from 'graphql-anywhere';
 import { ResolverContext } from './types';
-import { createQuery } from './utils';
 
 // resolvers
 import queryResolver from './queryResolver';

src/rtdb/mutationResolver.ts

@@ -13,6 +13,7 @@ const resolver: Resolver = async (
 ) => {
   const { resultKey, directives, isLeaf } = info;
   const { database } = context;
+  const hasTypeDirective = has(directives, 'type');
 
   // used when rtdbPush need to know the generated pushKey
   // also fields return in @rtdbPush payload
@@ -29,7 +30,7 @@ const resolver: Resolver = async (
 
   // __typename
   if (isLeaf && resultKey === '__typename') {
-    return has(directives, 'type')
+    return hasTypeDirective
       ? directives.type.name
       : root.__typename || null;
   }
@@ -43,9 +44,9 @@ const resolver: Resolver = async (
   // https://dev-blog.apollodata.com/designing-graphql-mutations-e09de826ed97
   const payload: any = args && args.input;
   // deal with @rtdbUpdate, @rtdbSet, @rtdbRemove
-  const typeTagName: string = has(directives, 'type') 
+  const typeTagName: string = hasTypeDirective
     ? directives.type.name
-    : null  
+    : null;
   if (has(directives, 'rtdbUpdate')) {
     const {ref, type} = directives.rtdbUpdate;
     context.mutationRef = ref;
@@ -71,7 +72,8 @@ const resolver: Resolver = async (
       __pushKey: newRef.key,
       __typename: typeTagName || type
     };
-  } else if (!isLeaf && root && has(root, 'payload') && has(directives, 'type')) {
+  } else if (!isLeaf && root && has(root, 'payload') && hasTypeDirective) {
+    // if it's a selectionSet with payload and @type
     return {
       payload: (root.payload && root.payload[resultKey]) || null,
       __typename: directives.type.name

src/rtdb/queryResolver.ts

@@ -27,6 +27,7 @@ const queryResolver: Resolver = async (
   const { directives, isLeaf, resultKey } = info;
   const { database, exportVal } = context;
   const {rootSnapshot} = root;
+  const hasTypeDirective = has(directives, 'type');
   let currentSnapshot = root.__snapshot;
 
   if (isLeaf) {
@@ -35,9 +36,9 @@ const queryResolver: Resolver = async (
 
     // typename
     if (resultKey === '__typename') {
-      return has(directives, 'type')
-      ? directives.type.name
-      : root.__typename || null;
+      return hasTypeDirective
+        ? directives.type.name
+        : root.__typename || null;
     }
 
     // dealing with different directives
@@ -81,28 +82,26 @@ const queryResolver: Resolver = async (
 
   // if it's nested selectionSet, we return the child
   if (!isLeaf && !has(directives, 'rtdbQuery') && !rootSnapshot) {
+    // tslint:disable-next-line:no-shadowed-variable
+    const typename = hasTypeDirective ? directives.type.name : null;
     return (has(directives, 'array'))
-      ? snapshotToArray(currentSnapshot.child(resultKey), has(directives, 'type') ? directives.type.name : null)
-      : has(directives, 'type')
-        ? {
-            __snapshot: currentSnapshot.child(resultKey),
-            __typename: directives.type.name
-          }
-        : {
-            __snapshot: currentSnapshot.child(resultKey)
-          };
+      ? snapshotToArray(currentSnapshot.child(resultKey), typename)
+      : {
+        __snapshot: currentSnapshot.child(resultKey),
+        __typename: typename
+      };
   }
 
   // type could be defined in different directives, @rtdbQuery, @rtdbSub...
-  const type = has(directives, 'type') ? directives.type.name : context.findType(directives);
+  const typename = hasTypeDirective ? directives.type.name : context.findType(directives);
 
   // firebase treat all data as object, even array
   // so we need a hint using @array to know when to parse object to array
   return (has(directives, 'array'))
-    ? snapshotToArray(currentSnapshot, type)
+    ? snapshotToArray(currentSnapshot, typename)
     : {
       __snapshot: currentSnapshot,
-      __typename: type
+      __typename: typename
     };
 };
 

src/rtdb/subscriptionLink.ts

@@ -1,4 +1,4 @@
-import { OperationTypeNode, FieldNode } from 'graphql';
+import { FieldNode } from 'graphql';
 import { ApolloLink, Observable, FetchResult, Operation, NextLink } from 'apollo-link';
 import {
   hasDirectives, addTypenameToDocument, getMainDefinition, getFragmentDefinitions, getDirectiveInfoFromField
@@ -36,7 +36,7 @@ export default class RtdbSubLink extends ApolloLink {
     };
 
     // Subscription operations must have exactly one root field.
-    const onlyRootField: FieldNode = mainDefinition.selectionSet.selections[0];
+    const onlyRootField: FieldNode = mainDefinition.selectionSet.selections[0] as FieldNode;
 
     // get directives
     const directives = getDirectiveInfoFromField(onlyRootField, operation.variables);

src/rtdb/types.ts

@@ -1,4 +1,3 @@
-import { OperationTypeNode, OperationDefinitionNode, FragmentDefinitionNode } from 'graphql';
 import { database } from 'firebase';
 
 export interface ResolverContext {

test/rtdbLink.spec.ts

@@ -517,10 +517,10 @@ describe('rtdbLink', () => {
           }
         }),
       );
-      expect(data.articles[0]['__typename']).to.be.eql('Article');
-      expect(data.articles[0]['nested']['__typename']).to.be.eql('NestedType');
-      expect(data.articles[0].authors[0]['__typename']).to.be.eql('Author');
-      expect(data.articles[0].authors[0]['info']['__typename']).to.be.eql('AuthorInfo');      
+      expect(data.articles[0].__typename).to.be.eql('Article');
+      expect(data.articles[0].nested.__typename).to.be.eql('NestedType');
+      expect(data.articles[0].authors[0].__typename).to.be.eql('Author');
+      expect(data.articles[0].authors[0].info.__typename).to.be.eql('AuthorInfo');
     });
   });