@avantstay/graphql-ts-client 12.1.0 → 12.2.0

package/dist/index.js

@@ -487,7 +487,7 @@ var prettier = __toESM(require("prettier"));
 // package.json
 var package_default = {
     name: "@avantstay/graphql-ts-client",
-    version: "12.1.0",
+    version: "12.2.0",
     description: "GraphQL Typescript Client Generator",
     homepage: "https://github.com/avantstay/graphql-ts-client",
     bugs: {
@@ -810,7 +810,7 @@ function generateClientCode(types, options) {
             selection: false,
             outputType: "js"
         });
-    }).join("\n"), "\n\n    // Schema Resolution Tree\n    ").concat(getTypesTreeCode(forInputExtraction), "\n\n    let verbose = ").concat(Boolean(options.verbose), "\n    let headers = {}\n    let url = '").concat(options.endpoint, "'\n    let retryConfig = {\n      max: 0,\n      before: undefined,\n      waitBeforeRetry: 0\n    }\n    let requestListeners = []\n    let responseListeners = []\n    let errorsParser = ").concat(options.errorsParser, "\n    // noinspection JSUnusedLocalSymbols\n    let apiEndpoint = getApiEndpointCreator({\n      getClient: () => ({ url, headers, retryConfig }),\n      requestListeners,\n      responseListeners,\n      maxAge: 30000,\n      verbose,\n      typesTree,\n      formatGraphQL,\n      errorsParser\n    })\n\n    export const ").concat(clientName, " = {\n      addRequestListener: (listener) => requestListeners.push(listener),\n      addResponseListener: (listener) => responseListeners.push(\n        listener),\n      setHeader: (key, value) => {\n        headers[key] = value\n      },\n      setHeaders: (newHeaders) => {\n        headers = newHeaders\n      },\n      setRetryConfig: (options) => {\n        if (!Number.isInteger(options.max) || options.max < 0) {\n          throw new Error('retryOptions.max should be a non-negative integer')\n        }\n        \n        retryConfig = { \n          max: options.max,\n          waitBeforeRetry: options.waitBeforeRetry,\n          before: options.before \n        }\n      },\n      setUrl: (_url) => url = _url,\n      queries: {\n        ").concat(queries.map(function(query) {
+    }).join("\n"), "\n\n    // Schema Resolution Tree\n    ").concat(getTypesTreeCode(forInputExtraction), "\n\n    let verbose = ").concat(Boolean(options.verbose), "\n    let headers = {}\n    let url = '").concat(options.endpoint, "'\n    let retryConfig = {\n      max: 0,\n      before: undefined,\n      waitBeforeRetry: 0\n    }\n    let requestListeners = []\n    let responseListeners = []\n    let errorsParser = ").concat(options.errorsParser, "\n    // noinspection JSUnusedLocalSymbols\n    let apiEndpoint = getApiEndpointCreator({\n      getClient: () => ({ url, headers, retryConfig }),\n      requestListeners,\n      responseListeners,\n      maxAge: 30000,\n      verbose,\n      typesTree,\n      formatGraphQL,\n      errorsParser\n    })\n\n    export const ").concat(clientName, " = {\n      addRequestListener: (listener) => {\n        requestListeners.push(listener)\n        return () => {\n          const index = requestListeners.indexOf(listener)\n          if (index > -1) requestListeners.splice(index, 1)\n        }\n      },\n      removeRequestListener: (listener) => {\n        const index = requestListeners.indexOf(listener)\n        if (index > -1) requestListeners.splice(index, 1)\n      },\n      addResponseListener: (listener) => {\n        responseListeners.push(listener)\n        return () => {\n          const index = responseListeners.indexOf(listener)\n          if (index > -1) responseListeners.splice(index, 1)\n        }\n      },\n      removeResponseListener: (listener) => {\n        const index = responseListeners.indexOf(listener)\n        if (index > -1) responseListeners.splice(index, 1)\n      },\n      setHeader: (key, value) => {\n        headers[key] = value\n      },\n      setHeaders: (newHeaders) => {\n        headers = newHeaders\n      },\n      setRetryConfig: (options) => {\n        if (!Number.isInteger(options.max) || options.max < 0) {\n          throw new Error('retryOptions.max should be a non-negative integer')\n        }\n        \n        retryConfig = { \n          max: options.max,\n          waitBeforeRetry: options.waitBeforeRetry,\n          before: options.before \n        }\n      },\n      setUrl: (_url) => url = _url,\n      queries: {\n        ").concat(queries.map(function(query) {
         return gqlEndpointToCode("query", query, "js");
     }).join(",\n"), "\n      },\n      mutations: {\n        ").concat(mutations.map(function(mutation) {
         return gqlEndpointToCode("mutation", mutation, "js");
@@ -842,7 +842,7 @@ function generateClientCode(types, options) {
             selection: true,
             outputType: "ts"
         });
-    }).join("\n"), "\n    \n    export declare const ").concat(clientName, ": {\n      addRequestListener: (listener: IRequestListener) => void\n      addResponseListener: (listener: IResponseListener) => void\n      setHeader: (key: string, value: string) => void\n      setHeaders: (newHeaders: { [k: string]: string }) => void,\n      setUrl: (url: string) => void,\n      setRetryConfig: (options: { max: number, waitBeforeRetry?: number, before?: IResponseListener }) => void\n      queries: {\n        ").concat(queries.map(function(q) {
+    }).join("\n"), "\n    \n    export declare const ").concat(clientName, ": {\n      addRequestListener: (listener: IRequestListener) => () => void\n      removeRequestListener: (listener: IRequestListener) => void\n      addResponseListener: (listener: IResponseListener) => () => void\n      removeResponseListener: (listener: IResponseListener) => void\n      setHeader: (key: string, value: string) => void\n      setHeaders: (newHeaders: { [k: string]: string }) => void,\n      setUrl: (url: string) => void,\n      setRetryConfig: (options: { max: number, waitBeforeRetry?: number, before?: IResponseListener }) => void\n      queries: {\n        ").concat(queries.map(function(q) {
         return gqlEndpointToCode("query", q, "ts");
     }).join(",\n"), "\n      },\n      mutations: {\n        ").concat(mutations.map(function(q) {
         return gqlEndpointToCode("mutation", q, "ts");

package/dist/index.mjs

@@ -24,7 +24,7 @@ import * as prettier from "prettier";
 // package.json
 var package_default = {
   name: "@avantstay/graphql-ts-client",
-  version: "12.1.0",
+  version: "12.2.0",
   description: "GraphQL Typescript Client Generator",
   homepage: "https://github.com/avantstay/graphql-ts-client",
   bugs: {
@@ -371,9 +371,28 @@ function generateClientCode(types, options) {
     })
 
     export const ${clientName} = {
-      addRequestListener: (listener) => requestListeners.push(listener),
-      addResponseListener: (listener) => responseListeners.push(
-        listener),
+      addRequestListener: (listener) => {
+        requestListeners.push(listener)
+        return () => {
+          const index = requestListeners.indexOf(listener)
+          if (index > -1) requestListeners.splice(index, 1)
+        }
+      },
+      removeRequestListener: (listener) => {
+        const index = requestListeners.indexOf(listener)
+        if (index > -1) requestListeners.splice(index, 1)
+      },
+      addResponseListener: (listener) => {
+        responseListeners.push(listener)
+        return () => {
+          const index = responseListeners.indexOf(listener)
+          if (index > -1) responseListeners.splice(index, 1)
+        }
+      },
+      removeResponseListener: (listener) => {
+        const index = responseListeners.indexOf(listener)
+        if (index > -1) responseListeners.splice(index, 1)
+      },
       setHeader: (key, value) => {
         headers[key] = value
       },
@@ -434,8 +453,10 @@ function generateClientCode(types, options) {
     ${objectTypes.filter((it) => it.name !== "Query").map((it) => gqlSchemaToCode(it, { selection: true, outputType: "ts" })).join("\n")}
     
     export declare const ${clientName}: {
-      addRequestListener: (listener: IRequestListener) => void
-      addResponseListener: (listener: IResponseListener) => void
+      addRequestListener: (listener: IRequestListener) => () => void
+      removeRequestListener: (listener: IRequestListener) => void
+      addResponseListener: (listener: IResponseListener) => () => void
+      removeResponseListener: (listener: IResponseListener) => void
       setHeader: (key: string, value: string) => void
       setHeaders: (newHeaders: { [k: string]: string }) => void,
       setUrl: (url: string) => void,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avantstay/graphql-ts-client",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "description": "GraphQL Typescript Client Generator",
   "homepage": "https://github.com/avantstay/graphql-ts-client",
   "bugs": {

package/src/__snapshots__/generateTypescriptClient.test.ts.snap

@@ -54,8 +54,32 @@ let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   errorsParser
 });
 const client = {
-  addRequestListener: (listener) => requestListeners.push(listener),
-  addResponseListener: (listener) => responseListeners.push(listener),
+  addRequestListener: (listener) => {
+    requestListeners.push(listener);
+    return () => {
+      const index = requestListeners.indexOf(listener);
+      if (index > -1)
+        requestListeners.splice(index, 1);
+    };
+  },
+  removeRequestListener: (listener) => {
+    const index = requestListeners.indexOf(listener);
+    if (index > -1)
+      requestListeners.splice(index, 1);
+  },
+  addResponseListener: (listener) => {
+    responseListeners.push(listener);
+    return () => {
+      const index = responseListeners.indexOf(listener);
+      if (index > -1)
+        responseListeners.splice(index, 1);
+    };
+  },
+  removeResponseListener: (listener) => {
+    const index = responseListeners.indexOf(listener);
+    if (index > -1)
+      responseListeners.splice(index, 1);
+  },
   setHeader: (key, value) => {
     headers[key] = value;
   },
@@ -105,8 +129,32 @@ let apiEndpoint = getApiEndpointCreator({
   errorsParser
 });
 const client = {
-  addRequestListener: (listener) => requestListeners.push(listener),
-  addResponseListener: (listener) => responseListeners.push(listener),
+  addRequestListener: (listener) => {
+    requestListeners.push(listener);
+    return () => {
+      const index = requestListeners.indexOf(listener);
+      if (index > -1)
+        requestListeners.splice(index, 1);
+    };
+  },
+  removeRequestListener: (listener) => {
+    const index = requestListeners.indexOf(listener);
+    if (index > -1)
+      requestListeners.splice(index, 1);
+  },
+  addResponseListener: (listener) => {
+    responseListeners.push(listener);
+    return () => {
+      const index = responseListeners.indexOf(listener);
+      if (index > -1)
+        responseListeners.splice(index, 1);
+    };
+  },
+  removeResponseListener: (listener) => {
+    const index = responseListeners.indexOf(listener);
+    if (index > -1)
+      responseListeners.splice(index, 1);
+  },
   setHeader: (key, value) => {
     headers[key] = value;
   },
@@ -167,8 +215,10 @@ export interface Query {
 // Selection Types
 
 export declare const client: {
-  addRequestListener: (listener: IRequestListener) => void
-  addResponseListener: (listener: IResponseListener) => void
+  addRequestListener: (listener: IRequestListener) => () => void
+  removeRequestListener: (listener: IRequestListener) => void
+  addResponseListener: (listener: IResponseListener) => () => void
+  removeResponseListener: (listener: IResponseListener) => void
   setHeader: (key: string, value: string) => void
   setHeaders: (newHeaders: { [k: string]: string }) => void
   setUrl: (url: string) => void

package/src/__testClient.d.ts

@@ -97,8 +97,10 @@ export interface BookSearchParamsSomeRequiredSelection {
 }
 
 export declare const myApiClient: {
-  addRequestListener: (listener: IRequestListener) => void
-  addResponseListener: (listener: IResponseListener) => void
+  addRequestListener: (listener: IRequestListener) => () => void
+  removeRequestListener: (listener: IRequestListener) => void
+  addResponseListener: (listener: IResponseListener) => () => void
+  removeResponseListener: (listener: IResponseListener) => void
   setHeader: (key: string, value: string) => void
   setHeaders: (newHeaders: { [k: string]: string }) => void
   setUrl: (url: string) => void

package/src/__testClient.js

@@ -83,8 +83,32 @@ let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   errorsParser
 });
 const myApiClient = {
-  addRequestListener: (listener) => requestListeners.push(listener),
-  addResponseListener: (listener) => responseListeners.push(listener),
+  addRequestListener: (listener) => {
+    requestListeners.push(listener);
+    return () => {
+      const index = requestListeners.indexOf(listener);
+      if (index > -1)
+        requestListeners.splice(index, 1);
+    };
+  },
+  removeRequestListener: (listener) => {
+    const index = requestListeners.indexOf(listener);
+    if (index > -1)
+      requestListeners.splice(index, 1);
+  },
+  addResponseListener: (listener) => {
+    responseListeners.push(listener);
+    return () => {
+      const index = responseListeners.indexOf(listener);
+      if (index > -1)
+        responseListeners.splice(index, 1);
+    };
+  },
+  removeResponseListener: (listener) => {
+    const index = responseListeners.indexOf(listener);
+    if (index > -1)
+      responseListeners.splice(index, 1);
+  },
   setHeader: (key, value) => {
     headers[key] = value;
   },

package/src/__testClient.mjs

@@ -55,8 +55,32 @@ let apiEndpoint = getApiEndpointCreator({
   errorsParser
 });
 const myApiClient = {
-  addRequestListener: (listener) => requestListeners.push(listener),
-  addResponseListener: (listener) => responseListeners.push(listener),
+  addRequestListener: (listener) => {
+    requestListeners.push(listener);
+    return () => {
+      const index = requestListeners.indexOf(listener);
+      if (index > -1)
+        requestListeners.splice(index, 1);
+    };
+  },
+  removeRequestListener: (listener) => {
+    const index = requestListeners.indexOf(listener);
+    if (index > -1)
+      requestListeners.splice(index, 1);
+  },
+  addResponseListener: (listener) => {
+    responseListeners.push(listener);
+    return () => {
+      const index = responseListeners.indexOf(listener);
+      if (index > -1)
+        responseListeners.splice(index, 1);
+    };
+  },
+  removeResponseListener: (listener) => {
+    const index = responseListeners.indexOf(listener);
+    if (index > -1)
+      responseListeners.splice(index, 1);
+  },
   setHeader: (key, value) => {
     headers[key] = value;
   },

package/src/generateTypescriptClient.test.ts

@@ -172,6 +172,56 @@ describe('Generated Client', () => {
     expect(responseData?.response.errors.length).toBeGreaterThan(0)
   })
 
+  it('removeRequestListener removes a previously added request listener', async () => {
+    let callCount = 0
+    const listener = () => { callCount++ }
+
+    client.addRequestListener(listener)
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+
+    client.removeRequestListener(listener)
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+  })
+
+  it('removeResponseListener removes a previously added response listener', async () => {
+    let callCount = 0
+    const listener = () => { callCount++ }
+
+    client.addResponseListener(listener)
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+
+    client.removeResponseListener(listener)
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+  })
+
+  it('addRequestListener returns an unsubscribe function', async () => {
+    let callCount = 0
+    const unsubscribe = client.addRequestListener(() => { callCount++ })
+
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+
+    unsubscribe()
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+  })
+
+  it('addResponseListener returns an unsubscribe function', async () => {
+    let callCount = 0
+    const unsubscribe = client.addResponseListener(() => { callCount++ })
+
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+
+    unsubscribe()
+    await client.queries.booksWithoutParams({ title: true })
+    expect(callCount).toBe(1)
+  })
+
   it('should generate proper code from SDL', () => {
     const sdlString = `
   type Query {

package/src/generateTypescriptClient.ts

@@ -392,9 +392,28 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
     })
 
     export const ${clientName} = {
-      addRequestListener: (listener) => requestListeners.push(listener),
-      addResponseListener: (listener) => responseListeners.push(
-        listener),
+      addRequestListener: (listener) => {
+        requestListeners.push(listener)
+        return () => {
+          const index = requestListeners.indexOf(listener)
+          if (index > -1) requestListeners.splice(index, 1)
+        }
+      },
+      removeRequestListener: (listener) => {
+        const index = requestListeners.indexOf(listener)
+        if (index > -1) requestListeners.splice(index, 1)
+      },
+      addResponseListener: (listener) => {
+        responseListeners.push(listener)
+        return () => {
+          const index = responseListeners.indexOf(listener)
+          if (index > -1) responseListeners.splice(index, 1)
+        }
+      },
+      removeResponseListener: (listener) => {
+        const index = responseListeners.indexOf(listener)
+        if (index > -1) responseListeners.splice(index, 1)
+      },
       setHeader: (key, value) => {
         headers[key] = value
       },
@@ -464,8 +483,10 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
       .join('\n')}
     
     export declare const ${clientName}: {
-      addRequestListener: (listener: IRequestListener) => void
-      addResponseListener: (listener: IResponseListener) => void
+      addRequestListener: (listener: IRequestListener) => () => void
+      removeRequestListener: (listener: IRequestListener) => void
+      addResponseListener: (listener: IResponseListener) => () => void
+      removeResponseListener: (listener: IResponseListener) => void
       setHeader: (key: string, value: string) => void
       setHeaders: (newHeaders: { [k: string]: string }) => void,
       setUrl: (url: string) => void,