Vendor "graphql-client" and bump "is-my-json-valid" to 2.20.6

examples/graphql/test/e2e.test.js

@@ -2,7 +2,7 @@ import {
     Selector
 } from 'testcafe';
 import AsyncTestUtil from 'async-test-util';
-import GraphQLClient from 'graphql-client';
+import GraphQLClient from 'rxdb/graphql-client';
 import {
     GRAPHQL_PORT
 } from '../shared';

package.json

@@ -105,9 +105,9 @@
     "event-reduce-js": "1.4.1",
     "express": "4.17.1",
     "get-graphql-from-jsonschema": "8.0.16",
-    "graphql-client": "2.0.1",
     "is-electron": "2.2.0",
-    "is-my-json-valid": "2.20.5",
+    "is-my-json-valid": "^2.20.6",
+    "isomorphic-fetch": "^3.0.0",
     "jsonschema-key-compression": "1.6.0",
     "lokijs": "1.5.12",
     "modifyjs": "0.3.1",

src/graphql-client.ts

@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: ISC
+// Copyright (c) 2016-2018, Simon Nord and other contributors
+// https://github.com/nordsimon/graphql-client/blob/f8d1dcba8a65f290e35b71c883a18094594d6d5a/index.js
+
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (c) 2021-present, Contributors to the rxdb project
+
+export interface GraphQLError {
+    message: string;
+    locations: Array<{
+        line: number;
+        column: number;
+    }>;
+    path: string[];
+}
+
+export type GraphQLErrors = Array<GraphQLError>;
+
+function highlightQuery(query: string, errors: GraphQLErrors) {
+    const locations = errors
+        .map((e) => {
+            return e.locations;
+        })
+        .reduce((a, b) => {
+            return a.concat(b);
+        }, []);
+
+    let queryHighlight = '';
+
+    query.split('\n').forEach((row, index) => {
+        const line = index + 1;
+        const lineErrors = locations.filter((loc) => {
+            return loc && loc.line === line;
+        });
+
+        queryHighlight += row + '\n';
+
+        if (lineErrors.length) {
+            const errorHighlight: string[] = [];
+
+            lineErrors.forEach((lineError) => {
+                for (let i = 0; i < 8; i++) {
+                    errorHighlight[lineError.column + i] = '~';
+                }
+            });
+
+            for (let i = 0; i < errorHighlight.length; i++) {
+                queryHighlight += errorHighlight[i] || ' ';
+            }
+            queryHighlight += '\n';
+        }
+    });
+
+    return queryHighlight;
+}
+
+export interface GraphQLClientParams {
+    url: string;
+    headers?: HeadersInit;
+    credentials?: RequestCredentials;
+}
+
+function GraphQLClient(params: GraphQLClientParams) {
+    require('isomorphic-fetch');
+    if (!params.url) throw new Error('Missing url parameter');
+
+    const headers = new Headers(params.headers || {});
+    headers.append('Content-Type', 'application/json');
+
+    return {
+        query: (
+            query: string,
+            variables?: Record<string, unknown>,
+            onResponse?: (req: Request, res: Response) => void
+        ) => {
+            const req = new Request(params.url, {
+                method: 'POST',
+                body: JSON.stringify({
+                    query: query,
+                    variables: variables,
+                }),
+                headers: headers,
+                credentials: params.credentials,
+            });
+
+            return fetch(req)
+                .then((res) => {
+                    onResponse && onResponse(req, res);
+
+                    return res.json();
+                })
+                .then((body) => {
+                    if (body.errors && body.errors.length) {
+                        body.highlightQuery = highlightQuery(
+                            query,
+                            body.errors
+                        );
+                    }
+
+                    return body;
+                });
+        },
+    };
+}
+
+export default GraphQLClient;

src/plugins/replication-graphql/index.ts

@@ -13,7 +13,7 @@ import {
 import {
     filter
 } from 'rxjs/operators';
-import GraphQLClient from 'graphql-client';
+import GraphQLClient from '../../graphql-client';
 import objectPath from 'object-path';
 import {
     promiseWait,

test/helper/graphql-server.ts

@@ -4,7 +4,7 @@
  * @link https://graphql.org/graphql-js/running-an-express-graphql-server/
  */
 
-import graphQlClient from 'graphql-client';
+import graphQlClient from '../../graphql-client';
 import { PubSub } from 'graphql-subscriptions';
 import {
     buildSchema,

test/unit/replication-graphql.test.ts

@@ -2,7 +2,7 @@ import assert from 'assert';
 import AsyncTestUtil, {
     clone, wait
 } from 'async-test-util';
-import GraphQLClient from 'graphql-client';
+import GraphQLClient from '../../graphql-client';
 
 import {
     first