Readd proper inheritance pattern for Client constructor

urql-graphql · May 12, 2021 · ab0a0ac · ab0a0ac
1 parent 6b6bfad
commit ab0a0ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/core/src/__snapshots__/client.test.ts.snap b/packages/core/src/__snapshots__/client.test.ts.snap
@@ -1,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`createClient passes snapshot 1`] = `
+exports[`createClient / Client passes snapshot 1`] = `
 Client {
-  "constructor": [Function],
   "createOperationContext": [Function],
   "createRequestOperation": [Function],
   "executeMutation": [Function],

diff --git a/packages/core/src/client.test.ts b/packages/core/src/client.test.ts
@@ -21,18 +21,20 @@ import {
 import { gql } from './gql';
 import { Exchange, Operation, OperationResult } from './types';
 import { makeOperation } from './utils';
-import { createClient } from './client';
+import { Client, createClient } from './client';
 import { queryOperation, subscriptionOperation } from './test-utils';
 
 const url = 'https://hostname.com';
 
-describe('createClient', () => {
-  it('passes snapshot', () => {
-    const c = createClient({
-      url,
-    });
+describe('createClient / Client', () => {
+  it('creates an instance of Client', () => {
+    expect(createClient({ url }) instanceof Client).toBeTruthy();
+    expect(new Client({ url }) instanceof Client).toBeTruthy();
+  });
 
-    expect(c).toMatchSnapshot();
+  it('passes snapshot', () => {
+    const client = createClient({ url });
+    expect(client).toMatchSnapshot();
   });
 });
 

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
@@ -143,6 +143,7 @@ export interface Client {
 }
 
 export const Client: new (opts: ClientOptions) => Client = function Client(
+  this: Client | {},
   opts: ClientOptions
 ) {
   if (process.env.NODE_ENV !== 'production' && !opts.url) {
@@ -251,7 +252,9 @@ export const Client: new (opts: ClientOptions) => Client = function Client(
     return source;
   };
 
-  const client = {
+  const instance: Client =
+    this instanceof Client ? this : Object.create(Client.prototype);
+  const client: Client = Object.assign(instance, {
     url: opts.url,
     fetchOptions: opts.fetchOptions,
     fetch: opts.fetch,
@@ -385,7 +388,7 @@ export const Client: new (opts: ClientOptions) => Client = function Client(
         client.executeMutation(createRequest(query, variables), context)
       );
     },
-  } as Client;
+  } as Client);
 
   let dispatchDebug: ExchangeInput['dispatchDebug'] = noop;
   if (process.env.NODE_ENV !== 'production') {
@@ -417,7 +420,6 @@ export const Client: new (opts: ClientOptions) => Client = function Client(
   // cancellations cascading up from components
   pipe(results$, publish);
 
-  client.constructor = Client;
   return client;
 } as any;