chore: simplify setup (#954)

Author: n1ru4l

packages/todo-example/client-apollo/src/apollo-link/create-http-apollo-link.ts

@@ -9,7 +9,8 @@ import { HttpLink } from "@apollo/client/link/http";
 import { isLiveQueryOperationDefinitionNode } from "@n1ru4l/graphql-live-query";
 import { Repeater } from "@repeaterjs/repeater";
 import { print, getOperationAST } from "graphql";
-import { applySourceToSink } from "./shared";
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import { applyAsyncIterableIteratorToSink } from "@n1ru4l/push-pull-async-iterable-iterator";
 
 type SSELinkOptions = EventSourceInit & { uri: string };
 
@@ -52,8 +53,10 @@ class SSELink extends ApolloLink {
     }
 
     return new Observable((sink) =>
-      applySourceToSink(
-        makeEventStreamSource(url.toString(), this.options),
+      applyAsyncIterableIteratorToSink(
+        applyLiveQueryJSONDiffPatch(
+          makeEventStreamSource(url.toString(), this.options)
+        ),
         sink
       )
     );

packages/todo-example/client-apollo/src/apollo-link/create-socket-io-apollo-link.ts

@@ -5,7 +5,8 @@ import {
 import { ApolloLink, Operation, Observable, FetchResult } from "@apollo/client";
 import { print } from "graphql";
 import { io } from "socket.io-client";
-import { applySourceToSink } from "./shared";
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import { applyAsyncIterableIteratorToSink } from "@n1ru4l/push-pull-async-iterable-iterator";
 
 class SocketIOGraphQLApolloLink extends ApolloLink {
   private networkLayer: SocketIOGraphQLClient<FetchResult>;
@@ -16,12 +17,14 @@ class SocketIOGraphQLApolloLink extends ApolloLink {
 
   public request(operation: Operation): Observable<FetchResult> | null {
     return new Observable<FetchResult>((sink) =>
-      applySourceToSink(
-        this.networkLayer.execute({
-          operationName: operation.operationName,
-          operation: print(operation.query),
-          variables: operation.variables,
-        }),
+      applyAsyncIterableIteratorToSink(
+        applyLiveQueryJSONDiffPatch(
+          this.networkLayer.execute({
+            operationName: operation.operationName,
+            operation: print(operation.query),
+            variables: operation.variables,
+          })
+        ),
         sink
       )
     );

packages/todo-example/client-apollo/src/apollo-link/create-ws-apollo-link.ts

@@ -8,7 +8,8 @@ import {
 import { print } from "graphql";
 import { createClient, Client } from "graphql-ws";
 import { makeAsyncIterableIteratorFromSink } from "@n1ru4l/push-pull-async-iterable-iterator";
-import { applySourceToSink } from "./shared";
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import { applyAsyncIterableIteratorToSink } from "@n1ru4l/push-pull-async-iterable-iterator";
 
 class GraphQLWsLink extends ApolloLink {
   private client: Client;
@@ -21,7 +22,7 @@ class GraphQLWsLink extends ApolloLink {
 
   public request(operation: Operation): Observable<FetchResult> {
     return new Observable((sink) => {
-      const source = makeAsyncIterableIteratorFromSink((sink) => {
+      const source = makeAsyncIterableIteratorFromSink<FetchResult>((sink) => {
         return this.client.subscribe<FetchResult>(
           { ...operation, query: print(operation.query) },
           {
@@ -32,7 +33,10 @@ class GraphQLWsLink extends ApolloLink {
         );
       });
 
-      return applySourceToSink(source, sink);
+      return applyAsyncIterableIteratorToSink(
+        applyLiveQueryJSONDiffPatch(source),
+        sink
+      );
     });
   }
 }

packages/todo-example/client-apollo/src/apollo-link/shared.ts

@@ -5,7 +5,8 @@ import {
   Variables,
 } from "relay-runtime";
 import { Repeater } from "@repeaterjs/repeater";
-import { applySourceToSink } from "./shared";
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import { applyAsyncIterableIteratorToSink } from "@n1ru4l/push-pull-async-iterable-iterator";
 
 function makeEventStreamSource(url: string) {
   return new Repeater<GraphQLResponse>(async (push, end) => {
@@ -49,8 +50,10 @@ export function createHTTPFetcher(url: string) {
         if (variables) {
           targetUrl.searchParams.append("variables", JSON.stringify(variables));
         }
-        return applySourceToSink(
-          makeEventStreamSource(targetUrl.toString()),
+        return applyAsyncIterableIteratorToSink(
+          applyLiveQueryJSONDiffPatch(
+            makeEventStreamSource(targetUrl.toString())
+          ),
           sink
         );
       }

packages/todo-example/client-apollo/src/setupProxy.js

@@ -6,7 +6,8 @@ import {
   Variables,
 } from "relay-runtime";
 import { io } from "socket.io-client";
-import { applySourceToSink } from "./shared";
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import { applyAsyncIterableIteratorToSink } from "@n1ru4l/push-pull-async-iterable-iterator";
 
 export function createSocketIOFetcher() {
   let host =
@@ -21,12 +22,14 @@ export function createSocketIOFetcher() {
     if (!request.text) throw new Error("Missing document.");
     const { text: operation, name } = request;
     return Observable.create<GraphQLResponse>((sink) =>
-      applySourceToSink(
-        networkInterface.execute({
-          operation,
-          variables,
-          operationName: name,
-        }),
+      applyAsyncIterableIteratorToSink(
+        applyLiveQueryJSONDiffPatch(
+          networkInterface.execute({
+            operation,
+            variables,
+            operationName: name,
+          })
+        ),
         sink
       )
     );

packages/todo-example/client-apollo/src/setupTests.js

@@ -5,29 +5,11 @@ import {
   Variables,
 } from "relay-runtime";
 import { createClient } from "graphql-ws";
-import { Repeater } from "@repeaterjs/repeater";
-import { applySourceToSink } from "./shared";
-import { makeAsyncIterableIteratorFromSink } from "@n1ru4l/push-pull-async-iterable-iterator";
-
-function makeEventStreamSource(url: string) {
-  return new Repeater<GraphQLResponse>(async (push, end) => {
-    const eventsource = new EventSource(url);
-    eventsource.onmessage = function (event) {
-      const data = JSON.parse(event.data);
-      push(data);
-      if (eventsource.readyState === 2) {
-        end();
-      }
-    };
-    eventsource.onerror = function (event) {
-      console.log("Error", event);
-      end(new Error("Check the console bruv."));
-    };
-    await end;
-
-    eventsource.close();
-  });
-}
+import { applyLiveQueryJSONDiffPatch } from "@n1ru4l/graphql-live-query-patch-jsondiffpatch";
+import {
+  makeAsyncIterableIteratorFromSink,
+  applyAsyncIterableIteratorToSink,
+} from "@n1ru4l/push-pull-async-iterable-iterator";
 
 export function createWSFetcher(url: string) {
   const client = createClient({ url });
@@ -39,18 +21,22 @@ export function createWSFetcher(url: string) {
     const { text: operation, name } = request;
 
     return Observable.create<GraphQLResponse>((sink) => {
-      const source = makeAsyncIterableIteratorFromSink((sink) => {
-        return client.subscribe<GraphQLResponse>(
-          { variables, query: operation },
-          {
-            next: sink.next.bind(sink),
-            complete: sink.complete.bind(sink),
-            error: sink.error.bind(sink),
-          }
-        );
-      });
-
-      return applySourceToSink(source, sink);
+      const source = makeAsyncIterableIteratorFromSink<GraphQLResponse>(
+        (sink) => {
+          return client.subscribe<GraphQLResponse>(
+            { variables, query: operation },
+            {
+              next: sink.next.bind(sink) as any,
+              complete: sink.complete.bind(sink),
+              error: sink.error.bind(sink),
+            }
+          );
+        }
+      );
+      return applyAsyncIterableIteratorToSink(
+        applyLiveQueryJSONDiffPatch(source),
+        sink
+      );
     });
   };
 }