@avantstay/graphql-ts-client 12.0.2 → 12.1.0

package/dist/endpoint.d.ts

@@ -1,7 +1,8 @@
-import { C as ClientConfig, I as IResponseListener, E as Endpoint } from './types-23d2d6aa.js';
+import { C as ClientConfig, I as IRequestListener, c as IResponseListener, E as Endpoint } from './types-c6f94d0b.js';
 
 declare const getApiEndpointCreator: (apiConfig: {
     getClient: () => ClientConfig;
+    requestListeners: IRequestListener[];
     responseListeners: IResponseListener[];
     typesTree: any;
     maxAge: number;

package/dist/endpoint.js

@@ -724,13 +724,11 @@ var getApiEndpointCreator = function(apiConfig) {
     return function(kind, queryName) {
         var rawEndpoint = function() {
             var _ref = _asyncToGenerator(function(failureMode, jsonQuery) {
-                var clientConfig, _jsonQuery___alias, alias, _jsonQuery___url, url, _jsonQuery___retry, shouldRetry, _jsonQuery___headers, requestHeaders, _jsonToGraphQLQuery, query, variables, start, logOptions, responseListenerData, _ref, data, errors, warnings, headers, status, response, error;
+                var _jsonQuery___alias, alias, _jsonQuery___retry, shouldRetry, _jsonQuery___headers, requestHeaders, _jsonToGraphQLQuery, query, variables, start, logOptions, listenerData, clientConfig, _jsonQuery___url, url, _ref, data, errors, warnings, headers, status, response, error;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            clientConfig = apiConfig.getClient();
                             alias = (_jsonQuery___alias = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__alias) !== null && _jsonQuery___alias !== void 0 ? _jsonQuery___alias : queryName;
-                            url = (_jsonQuery___url = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__url) !== null && _jsonQuery___url !== void 0 ? _jsonQuery___url : clientConfig.url;
                             shouldRetry = (_jsonQuery___retry = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__retry) !== null && _jsonQuery___retry !== void 0 ? _jsonQuery___retry : true;
                             requestHeaders = (_jsonQuery___headers = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__headers) !== null && _jsonQuery___headers !== void 0 ? _jsonQuery___headers : {};
                             _jsonToGraphQLQuery = jsonToGraphQLQuery({
@@ -748,18 +746,29 @@ var getApiEndpointCreator = function(apiConfig) {
                                 query: query,
                                 variables: variables
                             };
-                            responseListenerData = {
+                            listenerData = {
                                 queryName: alias,
                                 query: apiConfig.formatGraphQL(query),
-                                variables: variables
+                                variables: variables,
+                                headers: _objectSpread({}, requestHeaders)
                             };
-                            _state.label = 1;
+                            return [
+                                4,
+                                Promise.all(apiConfig.requestListeners.map(function(listener) {
+                                    return listener(listenerData);
+                                }))
+                            ];
                         case 1:
+                            _state.sent();
+                            clientConfig = apiConfig.getClient();
+                            url = (_jsonQuery___url = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__url) !== null && _jsonQuery___url !== void 0 ? _jsonQuery___url : clientConfig.url;
+                            _state.label = 2;
+                        case 2:
                             _state.trys.push([
-                                1,
-                                3,
+                                2,
+                                4,
                                 ,
-                                4
+                                5
                             ]);
                             return [
                                 4,
@@ -770,13 +779,13 @@ var getApiEndpointCreator = function(apiConfig) {
                                     client: _objectSpreadProps(_objectSpread({}, clientConfig), {
                                         url: url
                                     }),
-                                    requestHeaders: requestHeaders,
+                                    requestHeaders: listenerData.headers,
                                     query: query,
                                     variables: variables,
                                     errorsParser: apiConfig.errorsParser
                                 })
                             ];
-                        case 2:
+                        case 3:
                             _ref = _state.sent(), data = _ref.data, errors = _ref.errors, warnings = _ref.warnings, headers = _ref.headers, status = _ref.status;
                             response = {
                                 data: data,
@@ -791,7 +800,7 @@ var getApiEndpointCreator = function(apiConfig) {
                                     duration: +new Date() - start
                                 }));
                             }
-                            executeListeners(apiConfig.responseListeners, _objectSpreadProps(_objectSpread({}, responseListenerData), {
+                            executeListeners(apiConfig.responseListeners, _objectSpreadProps(_objectSpread({}, listenerData), {
                                 response: response
                             }));
                             return [
@@ -804,7 +813,7 @@ var getApiEndpointCreator = function(apiConfig) {
                                     status: status
                                 }
                             ];
-                        case 3:
+                        case 4:
                             error = _state.sent();
                             if (apiConfig.verbose && globalThis.document) {
                                 logRequest(_objectSpreadProps(_objectSpread({}, logOptions), {
@@ -812,11 +821,11 @@ var getApiEndpointCreator = function(apiConfig) {
                                     duration: +new Date() - start
                                 }));
                             }
-                            executeListeners(apiConfig.responseListeners, _objectSpreadProps(_objectSpread({}, responseListenerData), {
+                            executeListeners(apiConfig.responseListeners, _objectSpreadProps(_objectSpread({}, listenerData), {
                                 response: error.response
                             }));
                             throw error;
-                        case 4:
+                        case 5:
                             return [
                                 2
                             ];

package/dist/endpoint.mjs

@@ -197,9 +197,7 @@ function logRequest(logInfo) {
 var executeListeners = (listeners, data) => setTimeout(() => listeners.forEach((runResponseListener) => runResponseListener(data)));
 var getApiEndpointCreator = (apiConfig) => (kind, queryName) => {
   const rawEndpoint = async (failureMode, jsonQuery) => {
-    const clientConfig = apiConfig.getClient();
     const alias = jsonQuery?.__alias ?? queryName;
-    const url = jsonQuery?.__url ?? clientConfig.url;
     const shouldRetry = jsonQuery?.__retry ?? true;
     const requestHeaders = jsonQuery?.__headers ?? {};
     const { query, variables } = jsonToGraphQLQuery({ kind, queryName, jsonQuery, typesTree: apiConfig.typesTree });
@@ -212,18 +210,22 @@ var getApiEndpointCreator = (apiConfig) => (kind, queryName) => {
       query,
       variables
     };
-    const responseListenerData = {
+    const listenerData = {
       queryName: alias,
       query: apiConfig.formatGraphQL(query),
-      variables
+      variables,
+      headers: { ...requestHeaders }
     };
+    await Promise.all(apiConfig.requestListeners.map((listener) => listener(listenerData)));
+    const clientConfig = apiConfig.getClient();
+    const url = jsonQuery?.__url ?? clientConfig.url;
     try {
       const { data, errors, warnings, headers, status } = await graphqlRequest({
         shouldRetry,
         failureMode,
         queryName: alias,
         client: { ...clientConfig, url },
-        requestHeaders,
+        requestHeaders: listenerData.headers,
         query,
         variables,
         errorsParser: apiConfig.errorsParser
@@ -237,7 +239,7 @@ var getApiEndpointCreator = (apiConfig) => (kind, queryName) => {
         });
       }
       executeListeners(apiConfig.responseListeners, {
-        ...responseListenerData,
+        ...listenerData,
         response
       });
       return { data: data?.[alias], errors, warnings, headers, status };
@@ -250,7 +252,7 @@ var getApiEndpointCreator = (apiConfig) => (kind, queryName) => {
         });
       }
       executeListeners(apiConfig.responseListeners, {
-        ...responseListenerData,
+        ...listenerData,
         response: error.response
       });
       throw error;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PathLike } from 'fs';
-import { T as TypescriptClientOutput } from './types-23d2d6aa.js';
-export { C as ClientConfig, c as DeepReplace, D as Defined, E as Endpoint, G as GraphQLClientError, I as IResponseListener, J as JsonOutput, L as LogInfo, M as Maybe, P as Projection, d as RawEndpoint, b as Replacement, R as ResponseData, a as ResponseListenerInfo, T as TypescriptClientOutput, U as Unpacked } from './types-23d2d6aa.js';
+import { T as TypescriptClientOutput } from './types-c6f94d0b.js';
+export { C as ClientConfig, e as DeepReplace, D as Defined, E as Endpoint, G as GraphQLClientError, I as IRequestListener, c as IResponseListener, J as JsonOutput, L as LogInfo, M as Maybe, P as Projection, f as RawEndpoint, d as Replacement, a as RequestListenerInfo, R as ResponseData, b as ResponseListenerInfo, T as TypescriptClientOutput, U as Unpacked } from './types-c6f94d0b.js';
 
 type IClientOptions = {
     output?: PathLike;

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.0.2",
+    version: "12.1.0",
     description: "GraphQL Typescript Client Generator",
     homepage: "https://github.com/avantstay/graphql-ts-client",
     bugs: {
@@ -810,12 +810,12 @@ 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 responseListeners = []\n    let errorsParser = ").concat(options.errorsParser, "\n    // noinspection JSUnusedLocalSymbols\n    let apiEndpoint = getApiEndpointCreator({\n      getClient: () => ({ url, headers, retryConfig }),\n      responseListeners,\n      maxAge: 30000,\n      verbose,\n      typesTree,\n      formatGraphQL,\n      errorsParser\n    })\n\n    export const ").concat(clientName, " = {\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) => 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) {
         return gqlEndpointToCode("query", query, "js");
     }).join(",\n"), "\n      },\n      mutations: {\n        ").concat(mutations.map(function(mutation) {
         return gqlEndpointToCode("mutation", mutation, "js");
     }).join(",\n"), "\n      }\n    }\n\n    export default ").concat(clientName);
-    var typingsCode = "\n    // noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport\n    import { DeepRequired } from 'ts-essentials'\n    import { Maybe, IResponseListener, Endpoint } from '".concat(graphqlTsClientPath, "'\n\n    // Scalars\n    export type IDate = string | Date\n    ").concat(scalars.map(function(it) {
+    var typingsCode = "\n    // noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport\n    import { DeepRequired } from 'ts-essentials'\n    import { Maybe, IRequestListener, IResponseListener, Endpoint } from '".concat(graphqlTsClientPath, "'\n\n    // Scalars\n    export type IDate = string | Date\n    ").concat(scalars.map(function(it) {
         return gqlSchemaToCode(it, {
             selection: false,
             outputType: "ts"
@@ -842,7 +842,7 @@ function generateClientCode(types, options) {
             selection: true,
             outputType: "ts"
         });
-    }).join("\n"), "\n    \n    export declare const ").concat(clientName, ": {\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      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) {
         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.0.2",
+  version: "12.1.0",
   description: "GraphQL Typescript Client Generator",
   homepage: "https://github.com/avantstay/graphql-ts-client",
   bugs: {
@@ -355,11 +355,13 @@ function generateClientCode(types, options) {
       before: undefined,
       waitBeforeRetry: 0
     }
+    let requestListeners = []
     let responseListeners = []
     let errorsParser = ${options.errorsParser}
     // noinspection JSUnusedLocalSymbols
     let apiEndpoint = getApiEndpointCreator({
       getClient: () => ({ url, headers, retryConfig }),
+      requestListeners,
       responseListeners,
       maxAge: 30000,
       verbose,
@@ -369,6 +371,7 @@ function generateClientCode(types, options) {
     })
 
     export const ${clientName} = {
+      addRequestListener: (listener) => requestListeners.push(listener),
       addResponseListener: (listener) => responseListeners.push(
         listener),
       setHeader: (key, value) => {
@@ -401,7 +404,7 @@ function generateClientCode(types, options) {
   const typingsCode = `
     // noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
     import { DeepRequired } from 'ts-essentials'
-    import { Maybe, IResponseListener, Endpoint } from '${graphqlTsClientPath}'
+    import { Maybe, IRequestListener, IResponseListener, Endpoint } from '${graphqlTsClientPath}'
 
     // Scalars
     export type IDate = string | Date
@@ -431,6 +434,7 @@ 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
       setHeader: (key: string, value: string) => void
       setHeaders: (newHeaders: { [k: string]: string }) => void,

package/dist/{types-4ecbabdf.d.ts → types-9b559f16.d.ts}

@@ -9,6 +9,12 @@ type ResponseData = {
         message: string;
     }[];
 };
+type RequestListenerInfo = {
+    queryName: string;
+    query: string;
+    variables: any;
+};
+type IRequestListener = (info: RequestListenerInfo) => void | Promise<void>;
 type ResponseListenerInfo = {
     queryName: string;
     query: string;
@@ -17,7 +23,8 @@ type ResponseListenerInfo = {
 };
 type IResponseListener = (info: ResponseListenerInfo) => void | Promise<void>;
 type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
-type Projection<Selection, Base, E = never> = Base extends Array<any> ? ArrayElement<Base> extends Date | string | number | boolean | null | undefined | E ? ArrayElement<Base>[] : Projection<Defined<Selection>, ArrayElement<Base>, E>[] : Base extends Date | string | number | boolean | null | E ? Selection extends undefined ? Base | undefined : Base : {
+type Primitive = Date | string | number | boolean | null | undefined;
+type Projection<Selection, Base, E = never> = Base extends Array<any> ? ArrayElement<Base> extends Primitive | E ? ArrayElement<Base>[] : Projection<Defined<Selection>, ArrayElement<Base>, E>[] : Base extends Primitive | E ? Selection extends undefined ? Base | undefined : Base : {
     [k in keyof Selection & keyof Base]: Selection[k] extends boolean ? Base[k] : Base[k] extends Array<infer A> ? Projection<Defined<Selection[k]>, A, E>[] : Projection<Defined<Selection[k]>, Base[k], E>;
 };
 type Unpacked<T> = T extends (infer U)[] ? U : T extends (...args: any[]) => infer U ? U : T extends Promise<infer U> ? U : T;
@@ -59,6 +66,11 @@ type LogInfo = {
     error?: Error;
     duration: number;
 };
+type TypescriptClientOutput = {
+    js: string;
+    mjs: string;
+    typings: string;
+};
 declare class GraphQLClientError extends Error {
     responseData: ResponseData;
     constructor(responseData: ResponseData);
@@ -66,4 +78,4 @@ declare class GraphQLClientError extends Error {
     get response(): ResponseData;
 }
 
-export { ClientConfig as C, Defined as D, Endpoint as E, GraphQLClientError as G, IResponseListener as I, JsonOutput as J, LogInfo as L, Maybe as M, Projection as P, ResponseData as R, Unpacked as U, ResponseListenerInfo as a, Replacement as b, DeepReplace as c, RawEndpoint as d };
+export { ClientConfig as C, Defined as D, Endpoint as E, GraphQLClientError as G, IRequestListener as I, JsonOutput as J, LogInfo as L, Maybe as M, Projection as P, ResponseData as R, TypescriptClientOutput as T, Unpacked as U, RequestListenerInfo as a, ResponseListenerInfo as b, IResponseListener as c, Replacement as d, DeepReplace as e, RawEndpoint as f };

package/dist/types-c109c17f.d.ts

@@ -0,0 +1,85 @@
+type Maybe<T> = null | undefined | T;
+type Defined<T> = Exclude<T, undefined>;
+type ResponseData = {
+    data: any;
+    warnings: any;
+    headers: any;
+    status?: number;
+    errors: {
+        message: string;
+    }[];
+};
+type RequestListenerInfo = {
+    url: string;
+    queryName: string;
+    query: string;
+    variables: any;
+    headers: {
+        [key: string]: string;
+    };
+};
+type IRequestListener = (info: RequestListenerInfo) => void | Promise<void>;
+type ResponseListenerInfo = {
+    queryName: string;
+    query: string;
+    variables: any;
+    response: ResponseData;
+};
+type IResponseListener = (info: ResponseListenerInfo) => void | Promise<void>;
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
+type Primitive = Date | string | number | boolean | null | undefined;
+type Projection<Selection, Base, E = never> = Base extends Array<any> ? ArrayElement<Base> extends Primitive | E ? ArrayElement<Base>[] : Projection<Defined<Selection>, ArrayElement<Base>, E>[] : Base extends Primitive | E ? Selection extends undefined ? Base | undefined : Base : {
+    [k in keyof Selection & keyof Base]: Selection[k] extends boolean ? Base[k] : Base[k] extends Array<infer A> ? Projection<Defined<Selection[k]>, A, E>[] : Projection<Defined<Selection[k]>, Base[k], E>;
+};
+type Unpacked<T> = T extends (infer U)[] ? U : T extends (...args: any[]) => infer U ? U : T extends Promise<infer U> ? U : T;
+type Replacement<M extends [any, any], T> = M extends any ? ([T] extends [M[0]] ? M[1] : never) : never;
+type DeepReplace<T, Ignore, M extends [any, any]> = {
+    [P in keyof T]: T[P] extends M[0] ? T[P] extends Ignore ? T[P] extends object ? DeepReplace<T[P], Ignore, M> : T[P] : Replacement<M, T[P]> : T[P] extends object ? DeepReplace<T[P], Ignore, M> : T[P];
+};
+type RawEndpoint<I, O, E> = <S extends I>(jsonQuery?: S) => Promise<{
+    data: Projection<S, O, E>;
+    errors: any[];
+    warnings: any[];
+    headers: any;
+    status: any;
+}>;
+type JsonOutput<O, ToBeIgnored> = DeepReplace<O, ToBeIgnored, [string | Date, string]>;
+type Endpoint<I, O, E> = (<S extends I>(jsonQuery?: S) => Promise<Projection<S, JsonOutput<O, E>, E>>) & {
+    memo: <S extends I>(jsonQuery?: S) => Promise<Projection<S, JsonOutput<O, E>, E>>;
+    memoRaw: RawEndpoint<I, JsonOutput<O, E>, E>;
+    raw: RawEndpoint<I, JsonOutput<O, E>, E>;
+};
+type ClientConfig = {
+    url: string;
+    headers: {
+        [key: string]: string;
+    };
+    retryConfig: {
+        max: number;
+        waitBeforeRetry?: number;
+        before: IResponseListener;
+    };
+};
+type LogInfo = {
+    query: string;
+    variables: any;
+    formatGraphQL: any;
+    kind: string;
+    queryName: string;
+    response?: any;
+    error?: Error;
+    duration: number;
+};
+type TypescriptClientOutput = {
+    js: string;
+    mjs: string;
+    typings: string;
+};
+declare class GraphQLClientError extends Error {
+    responseData: ResponseData;
+    constructor(responseData: ResponseData);
+    get message(): string;
+    get response(): ResponseData;
+}
+
+export { ClientConfig as C, Defined as D, Endpoint as E, GraphQLClientError as G, IRequestListener as I, JsonOutput as J, LogInfo as L, Maybe as M, Projection as P, ResponseData as R, TypescriptClientOutput as T, Unpacked as U, RequestListenerInfo as a, ResponseListenerInfo as b, IResponseListener as c, Replacement as d, DeepReplace as e, RawEndpoint as f };

package/dist/types-c6f94d0b.d.ts

@@ -0,0 +1,84 @@
+type Maybe<T> = null | undefined | T;
+type Defined<T> = Exclude<T, undefined>;
+type ResponseData = {
+    data: any;
+    warnings: any;
+    headers: any;
+    status?: number;
+    errors: {
+        message: string;
+    }[];
+};
+type RequestListenerInfo = {
+    queryName: string;
+    query: string;
+    variables: any;
+    headers: {
+        [key: string]: string;
+    };
+};
+type IRequestListener = (info: RequestListenerInfo) => void | Promise<void>;
+type ResponseListenerInfo = {
+    queryName: string;
+    query: string;
+    variables: any;
+    response: ResponseData;
+};
+type IResponseListener = (info: ResponseListenerInfo) => void | Promise<void>;
+type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
+type Primitive = Date | string | number | boolean | null | undefined;
+type Projection<Selection, Base, E = never> = Base extends Array<any> ? ArrayElement<Base> extends Primitive | E ? ArrayElement<Base>[] : Projection<Defined<Selection>, ArrayElement<Base>, E>[] : Base extends Primitive | E ? Selection extends undefined ? Base | undefined : Base : {
+    [k in keyof Selection & keyof Base]: Selection[k] extends boolean ? Base[k] : Base[k] extends Array<infer A> ? Projection<Defined<Selection[k]>, A, E>[] : Projection<Defined<Selection[k]>, Base[k], E>;
+};
+type Unpacked<T> = T extends (infer U)[] ? U : T extends (...args: any[]) => infer U ? U : T extends Promise<infer U> ? U : T;
+type Replacement<M extends [any, any], T> = M extends any ? ([T] extends [M[0]] ? M[1] : never) : never;
+type DeepReplace<T, Ignore, M extends [any, any]> = {
+    [P in keyof T]: T[P] extends M[0] ? T[P] extends Ignore ? T[P] extends object ? DeepReplace<T[P], Ignore, M> : T[P] : Replacement<M, T[P]> : T[P] extends object ? DeepReplace<T[P], Ignore, M> : T[P];
+};
+type RawEndpoint<I, O, E> = <S extends I>(jsonQuery?: S) => Promise<{
+    data: Projection<S, O, E>;
+    errors: any[];
+    warnings: any[];
+    headers: any;
+    status: any;
+}>;
+type JsonOutput<O, ToBeIgnored> = DeepReplace<O, ToBeIgnored, [string | Date, string]>;
+type Endpoint<I, O, E> = (<S extends I>(jsonQuery?: S) => Promise<Projection<S, JsonOutput<O, E>, E>>) & {
+    memo: <S extends I>(jsonQuery?: S) => Promise<Projection<S, JsonOutput<O, E>, E>>;
+    memoRaw: RawEndpoint<I, JsonOutput<O, E>, E>;
+    raw: RawEndpoint<I, JsonOutput<O, E>, E>;
+};
+type ClientConfig = {
+    url: string;
+    headers: {
+        [key: string]: string;
+    };
+    retryConfig: {
+        max: number;
+        waitBeforeRetry?: number;
+        before: IResponseListener;
+    };
+};
+type LogInfo = {
+    query: string;
+    variables: any;
+    formatGraphQL: any;
+    kind: string;
+    queryName: string;
+    response?: any;
+    error?: Error;
+    duration: number;
+};
+type TypescriptClientOutput = {
+    js: string;
+    mjs: string;
+    typings: string;
+};
+declare class GraphQLClientError extends Error {
+    responseData: ResponseData;
+    constructor(responseData: ResponseData);
+    get message(): string;
+    get response(): ResponseData;
+}
+
+export { ClientConfig as C, Defined as D, Endpoint as E, GraphQLClientError as G, IRequestListener as I, JsonOutput as J, LogInfo as L, Maybe as M, Projection as P, ResponseData as R, TypescriptClientOutput as T, Unpacked as U, RequestListenerInfo as a, ResponseListenerInfo as b, IResponseListener as c, Replacement as d, DeepReplace as e, RawEndpoint as f };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avantstay/graphql-ts-client",
-  "version": "12.0.2",
+  "version": "12.1.0",
   "description": "GraphQL Typescript Client Generator",
   "homepage": "https://github.com/avantstay/graphql-ts-client",
   "bugs": {
@@ -91,4 +91,4 @@
       "limit": "10 KB"
     }
   ]
-}
+}

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

@@ -29,7 +29,7 @@ __export(exports, {
   client: () => client,
   default: () => stdin_default
 });
-var import_endpoint = __toModule(require("./endpoint"));
+var import_endpoint = __toModule(require("@avantstay/graphql-ts-client/dist/endpoint"));
 const formatGraphQL = (query) => query;
 const typesTree = {};
 let verbose = false;
@@ -40,10 +40,12 @@ let retryConfig = {
   before: void 0,
   waitBeforeRetry: 0
 };
+let requestListeners = [];
 let responseListeners = [];
 let errorsParser = void 0;
 let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   getClient: () => ({ url, headers, retryConfig }),
+  requestListeners,
   responseListeners,
   maxAge: 3e4,
   verbose,
@@ -52,6 +54,7 @@ let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   errorsParser
 });
 const client = {
+  addRequestListener: (listener) => requestListeners.push(listener),
   addResponseListener: (listener) => responseListeners.push(listener),
   setHeader: (key, value) => {
     headers[key] = value;
@@ -77,7 +80,7 @@ const client = {
 };
 var stdin_default = client;
 ",
-  "mjs": "import { getApiEndpointCreator } from "./endpoint";
+  "mjs": "import { getApiEndpointCreator } from "@avantstay/graphql-ts-client/dist/endpoint";
 const formatGraphQL = (query) => query;
 const typesTree = {};
 let verbose = false;
@@ -88,10 +91,12 @@ let retryConfig = {
   before: void 0,
   waitBeforeRetry: 0
 };
+let requestListeners = [];
 let responseListeners = [];
 let errorsParser = void 0;
 let apiEndpoint = getApiEndpointCreator({
   getClient: () => ({ url, headers, retryConfig }),
+  requestListeners,
   responseListeners,
   maxAge: 3e4,
   verbose,
@@ -100,6 +105,7 @@ let apiEndpoint = getApiEndpointCreator({
   errorsParser
 });
 const client = {
+  addRequestListener: (listener) => requestListeners.push(listener),
   addResponseListener: (listener) => responseListeners.push(listener),
   setHeader: (key, value) => {
     headers[key] = value;
@@ -131,7 +137,12 @@ export {
 ",
   "typings": "// noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
 import { DeepRequired } from "ts-essentials"
-import { Maybe, IResponseListener, Endpoint } from "."
+import {
+  Maybe,
+  IRequestListener,
+  IResponseListener,
+  Endpoint,
+} from "@avantstay/graphql-ts-client/dist"
 
 // Scalars
 export type IDate = string | Date
@@ -156,6 +167,7 @@ export interface Query {
 // Selection Types
 
 export declare const client: {
+  addRequestListener: (listener: IRequestListener) => void
   addResponseListener: (listener: IResponseListener) => void
   setHeader: (key: string, value: string) => void
   setHeaders: (newHeaders: { [k: string]: string }) => void

package/src/__testClient.d.ts

@@ -1,6 +1,11 @@
 // noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
 import { DeepRequired } from "ts-essentials"
-import { Maybe, IResponseListener, Endpoint } from "."
+import {
+  Maybe,
+  IRequestListener,
+  IResponseListener,
+  Endpoint,
+} from "@avantstay/graphql-ts-client/dist"
 
 // Scalars
 export type IDate = string | Date
@@ -92,6 +97,7 @@ export interface BookSearchParamsSomeRequiredSelection {
 }
 
 export declare const myApiClient: {
+  addRequestListener: (listener: IRequestListener) => void
   addResponseListener: (listener: IResponseListener) => void
   setHeader: (key: string, value: string) => void
   setHeaders: (newHeaders: { [k: string]: string }) => void

package/src/__testClient.js

@@ -26,7 +26,7 @@ __export(exports, {
   default: () => stdin_default,
   myApiClient: () => myApiClient
 });
-var import_endpoint = __toModule(require("./endpoint"));
+var import_endpoint = __toModule(require("@avantstay/graphql-ts-client/dist/endpoint"));
 var import_standalone = __toModule(require("prettier/standalone"));
 var import_parser_graphql = __toModule(require("prettier/parser-graphql"));
 const formatGraphQL = (query) => (0, import_standalone.format)(query, { parser: "graphql", plugins: [import_parser_graphql.default] });
@@ -69,10 +69,12 @@ let retryConfig = {
   before: void 0,
   waitBeforeRetry: 0
 };
+let requestListeners = [];
 let responseListeners = [];
 let errorsParser = void 0;
 let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   getClient: () => ({ url, headers, retryConfig }),
+  requestListeners,
   responseListeners,
   maxAge: 3e4,
   verbose,
@@ -81,6 +83,7 @@ let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
   errorsParser
 });
 const myApiClient = {
+  addRequestListener: (listener) => requestListeners.push(listener),
   addResponseListener: (listener) => responseListeners.push(listener),
   setHeader: (key, value) => {
     headers[key] = value;

package/src/__testClient.mjs

@@ -1,4 +1,4 @@
-import { getApiEndpointCreator } from "./endpoint";
+import { getApiEndpointCreator } from "@avantstay/graphql-ts-client/dist/endpoint";
 import { format as formatCode } from "prettier/standalone";
 import parserGraphql from "prettier/parser-graphql";
 const formatGraphQL = (query) => formatCode(query, { parser: "graphql", plugins: [parserGraphql] });
@@ -41,10 +41,12 @@ let retryConfig = {
   before: void 0,
   waitBeforeRetry: 0
 };
+let requestListeners = [];
 let responseListeners = [];
 let errorsParser = void 0;
 let apiEndpoint = getApiEndpointCreator({
   getClient: () => ({ url, headers, retryConfig }),
+  requestListeners,
   responseListeners,
   maxAge: 3e4,
   verbose,
@@ -53,6 +55,7 @@ let apiEndpoint = getApiEndpointCreator({
   errorsParser
 });
 const myApiClient = {
+  addRequestListener: (listener) => requestListeners.push(listener),
   addResponseListener: (listener) => responseListeners.push(listener),
   setHeader: (key, value) => {
     headers[key] = value;

package/src/endpoint.ts

@@ -2,7 +2,15 @@ import memoize from 'moize'
 import { graphqlRequest } from './graphqlRequest'
 import { jsonToGraphQLQuery } from './jsonToGraphQLQuery'
 import { logRequest } from './logging'
-import { ClientConfig, Endpoint, GraphQLClientError, IResponseListener, Projection, ResponseListenerInfo } from './types'
+import {
+  ClientConfig,
+  Endpoint,
+  GraphQLClientError,
+  IRequestListener,
+  IResponseListener,
+  Projection,
+  ResponseListenerInfo,
+} from './types'
 
 const executeListeners = (listeners: IResponseListener[], data: ResponseListenerInfo) =>
   setTimeout(() => listeners.forEach(runResponseListener => runResponseListener(data)))
@@ -10,6 +18,7 @@ const executeListeners = (listeners: IResponseListener[], data: ResponseListener
 export const getApiEndpointCreator =
   (apiConfig: {
     getClient: () => ClientConfig
+    requestListeners: IRequestListener[]
     responseListeners: IResponseListener[]
     typesTree: any
     maxAge: number
@@ -28,10 +37,7 @@ export const getApiEndpointCreator =
       headers: any
       status: any
     }> => {
-      const clientConfig = apiConfig.getClient()
-
       const alias = (jsonQuery as any)?.__alias ?? queryName
-      const url = (jsonQuery as any)?.__url ?? clientConfig.url
       const shouldRetry = (jsonQuery as any)?.__retry ?? true
       const requestHeaders = (jsonQuery as any)?.__headers ?? {}
       const { query, variables } = jsonToGraphQLQuery({ kind, queryName, jsonQuery, typesTree: apiConfig.typesTree })
@@ -46,19 +52,25 @@ export const getApiEndpointCreator =
         variables,
       }
 
-      const responseListenerData = {
+      const listenerData = {
         queryName: alias,
         query: apiConfig.formatGraphQL(query),
         variables,
+        headers: { ...requestHeaders },
       }
 
+      await Promise.all(apiConfig.requestListeners.map(listener => listener(listenerData)))
+
+      const clientConfig = apiConfig.getClient()
+      const url = (jsonQuery as any)?.__url ?? clientConfig.url
+
       try {
         const { data, errors, warnings, headers, status } = await graphqlRequest({
           shouldRetry,
           failureMode,
           queryName: alias,
           client: { ...clientConfig, url },
-          requestHeaders,
+          requestHeaders: listenerData.headers,
           query,
           variables,
           errorsParser: apiConfig.errorsParser,
@@ -75,7 +87,7 @@ export const getApiEndpointCreator =
         }
 
         executeListeners(apiConfig.responseListeners, {
-          ...responseListenerData,
+          ...listenerData,
           response,
         })
 
@@ -90,7 +102,7 @@ export const getApiEndpointCreator =
         }
 
         executeListeners(apiConfig.responseListeners, {
-          ...responseListenerData,
+          ...listenerData,
           response: (error as GraphQLClientError).response,
         })
 

package/src/generateTypescriptClient.test.ts

@@ -2,7 +2,7 @@ import { ApolloServer } from 'apollo-server'
 import * as path from 'path'
 import { generateTypescriptClient, generateTypescriptClientFromSDL } from './generateTypescriptClient'
 import { startServer } from './testServer'
-import { GraphQLClientError, ResponseListenerInfo } from './types'
+import { RequestListenerInfo, ResponseListenerInfo } from './types'
 
 let testServer: { server: ApolloServer; url: string }
 let client: any
@@ -77,7 +77,7 @@ describe('Generated Client', () => {
         (err: any) => err
       )
 
-    expect(result).toBeInstanceOf(GraphQLClientError)
+    expect(result.constructor.name).toContain('GraphQLClientError')
     expect(result.message).toBe('Failed lorem ipsum dolor')
   })
 
@@ -109,6 +109,53 @@ describe('Generated Client', () => {
     expect(failed).toBe(true)
   })
 
+  it('request listener is called before the request', async () => {
+    let requestData: RequestListenerInfo | undefined
+    client.addRequestListener((data: any) => (requestData = data))
+
+    await client.queries.booksWithoutParams({ title: true })
+
+    expect(requestData?.queryName).toBe('booksWithoutParams')
+    expect(requestData?.query).toBeDefined()
+    expect(requestData?.variables).toBeDefined()
+  })
+
+  it('header set in request listener is sent with the request', async () => {
+    const axios = require('axios')
+    const axiosSpy = jest.spyOn(axios, 'post')
+
+    client.addRequestListener(async () => {
+      const token = await Promise.resolve('my-fresh-token')
+      client.setHeader('Authorization', `Bearer ${token}`)
+    })
+
+    await client.queries.booksWithoutParams({ title: true })
+
+    expect(axiosSpy).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.any(Object),
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer my-fresh-token',
+        }),
+      })
+    )
+
+    axiosSpy.mockRestore()
+    client.setHeader('Authorization', undefined)
+  })
+
+  it('request listener is called even for failing operations', async () => {
+    let requestData: RequestListenerInfo | undefined
+    client.addRequestListener((data: any) => (requestData = data))
+
+    try {
+      await client.queries.failingQuery({ __args: { id: 'hello' } })
+    } catch {}
+
+    expect(requestData?.queryName).toBe('failingQuery')
+  })
+
   it('failing operations throw errors', async () => {
     let responseData: ResponseListenerInfo | undefined
     client.addResponseListener((data: any) => (responseData = data))

package/src/generateTypescriptClient.ts

@@ -376,11 +376,13 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
       before: undefined,
       waitBeforeRetry: 0
     }
+    let requestListeners = []
     let responseListeners = []
     let errorsParser = ${options.errorsParser}
     // noinspection JSUnusedLocalSymbols
     let apiEndpoint = getApiEndpointCreator({
       getClient: () => ({ url, headers, retryConfig }),
+      requestListeners,
       responseListeners,
       maxAge: 30000,
       verbose,
@@ -390,6 +392,7 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
     })
 
     export const ${clientName} = {
+      addRequestListener: (listener) => requestListeners.push(listener),
       addResponseListener: (listener) => responseListeners.push(
         listener),
       setHeader: (key, value) => {
@@ -424,7 +427,7 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
   const typingsCode = `
     // noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
     import { DeepRequired } from 'ts-essentials'
-    import { Maybe, IResponseListener, Endpoint } from '${graphqlTsClientPath}'
+    import { Maybe, IRequestListener, IResponseListener, Endpoint } from '${graphqlTsClientPath}'
 
     // Scalars
     export type IDate = string | Date
@@ -461,6 +464,7 @@ function generateClientCode(types: ReadonlyArray<IntrospectionType>, options: Om
       .join('\n')}
     
     export declare const ${clientName}: {
+      addRequestListener: (listener: IRequestListener) => void
       addResponseListener: (listener: IResponseListener) => void
       setHeader: (key: string, value: string) => void
       setHeaders: (newHeaders: { [k: string]: string }) => void,

package/src/types.ts

@@ -11,6 +11,14 @@ export type ResponseData = {
   }[]
 }
 
+export type RequestListenerInfo = {
+  queryName: string
+  query: string
+  variables: any
+  headers: { [key: string]: string }
+}
+export type IRequestListener = (info: RequestListenerInfo) => void | Promise<void>
+
 export type ResponseListenerInfo = {
   queryName: string
   query: string

package/dist/chunk-I4QOADOI.mjs

@@ -1,27 +0,0 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// src/types.ts
-var GraphQLClientError = class extends Error {
-  constructor(responseData) {
-    super();
-    this.responseData = responseData;
-    Object.setPrototypeOf(this, GraphQLClientError.prototype);
-  }
-  get message() {
-    return this.response.errors.map((it) => it.message).join(";\n");
-  }
-  get response() {
-    return this.responseData;
-  }
-};
-
-export {
-  __require,
-  GraphQLClientError
-};