Remove slicknode-client dependency, refactoring

Author: ivome

package.json

@@ -31,10 +31,9 @@
     "@types/chai": "^4.1.4",
     "@types/mocha": "^5.2.5",
     "@types/sinon": "^5.0.2",
-    "apollo-cache-inmemory": "^1.2.10",
-    "apollo-client": "^2.4.2",
     "chai": "^4.1.2",
     "coveralls": "^3.0.2",
+    "graphql-tag": "^2.10.0",
     "mocha": "^5.2.0",
     "nyc": "^13.0.1",
     "rimraf": "^2.6.2",
@@ -61,7 +60,6 @@
   },
   "dependencies": {
     "apollo-link": "^1.2.2",
-    "graphql": "^14.0.2",
-    "slicknode-client": "^0.2.2"
+    "graphql": "^14.0.2"
   }
 }

src/__tests__/index-test.ts

@@ -1,77 +1,69 @@
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
+import {ApolloLink, execute, FetchResult, GraphQLRequest, Observable} from 'apollo-link';
 import {expect} from 'chai';
 import { parse } from 'graphql';
+import gql from 'graphql-tag';
 import sinon from 'sinon';
-import Client from 'slicknode-client';
 import SlicknodeLink from '../index';
 
 describe('SlicknodeLink', () => {
-  it('fails for missing configuration options', () => {
-    expect(() => {
-      const link = new SlicknodeLink({
-        client: null,
-      });
-    }).to.throw('No instance of a client provided in configuration options for SlicknodeLink');
-  });
-
-  it('creates link successfully', () => {
-    const client = new Client({
-      endpoint: 'https://localhost',
-    });
-    const link = new SlicknodeLink({
-      client,
-    });
-    expect(link).to.not.equal(null);
-  });
-
-  it('sends and receives requests with apollo client', async () => {
-    const client = new Client({
-      endpoint: 'https://localhost',
-    });
-    const link = new SlicknodeLink({
-      client,
-    });
-
-    const payload = {
-      data: {
-        value: 'test',
-      },
+  it('forwards request to next link', (done) => {
+    const data = {
+      test: true,
     };
-    sinon.stub(client, 'fetch').resolves(payload);
-    const apolloClient = new ApolloClient({
-      link,
-      cache: new InMemoryCache(),
-    });
-
-    const result = await apolloClient.query({
-      query: parse('{value}'),
+    const slicknodeLink = ApolloLink.from([
+      new SlicknodeLink(),
+      new ApolloLink((e) => {
+        return new Observable<FetchResult>((observer) => {
+          observer.next({data});
+        });
+      }),
+    ]);
+    const query = gql`{test}`;
+    const request: GraphQLRequest = {
+      query,
+      variables: {},
+    };
+    const observable = execute(slicknodeLink, request);
+    observable.subscribe({
+      next(result: FetchResult) {
+        expect(result.data).to.equal(data);
+        done();
+      },
+      error: done,
     });
-
-    expect(result.data).to.deep.equal(payload.data);
   });
 
-  it('handles error with apollo client', async () => {
-    const client = new Client({
-      endpoint: 'https://localhost',
-    });
-    const link = new SlicknodeLink({
-      client,
+  it('forwards accessToken from options', (done) => {
+    const data = {
+      test: true,
+    };
+    const accessToken = 'abc123';
+    const slicknodeLink = new SlicknodeLink({
+      accessToken,
     });
-
-    const errorMessage = 'Error fetching data';
-    sinon.stub(client, 'fetch').throws(errorMessage);
-    const apolloClient = new ApolloClient({
-      link,
-      cache: new InMemoryCache(),
+    const link = ApolloLink.from([
+      slicknodeLink,
+      new ApolloLink((operation) => {
+        expect(operation.getContext()).to.deep.equal({
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+          },
+        });
+        done();
+        return null;
+      }),
+    ]);
+    const query = gql`{test}`;
+    const request: GraphQLRequest = {
+      query,
+      variables: {},
+    };
+    const observable = execute(link, request);
+    observable.subscribe({
+      next(result: FetchResult) {
+        expect(result.data).to.equal(data);
+      },
+      error: done,
     });
-
-    try {
-      const result = await apolloClient.query({
-        query: parse('{value}'),
-      });
-    } catch (e) {
-      expect(e.networkError.name).to.deep.equal(errorMessage);
-    }
   });
 });