@graphql-codegen/typescript-graphql-request 4.6.0-alpha-20220922145742-1e7fe329a → 5.0.0-alpha-20230518131850-e3b2bc819

package/cjs/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLRequestVisitor = exports.validate = exports.plugin = void 0;
-const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
+const path_1 = require("path");
 const graphql_1 = require("graphql");
+const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const visitor_js_1 = require("./visitor.js");
 Object.defineProperty(exports, "GraphQLRequestVisitor", { enumerable: true, get: function () { return visitor_js_1.GraphQLRequestVisitor; } });
-const path_1 = require("path");
 const plugin = (schema, documents, config) => {
     const allAst = (0, graphql_1.concatAST)(documents.map(v => v.document));
     const allFragments = [

package/cjs/visitor.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLRequestVisitor = void 0;
 const tslib_1 = require("tslib");
-const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 const auto_bind_1 = tslib_1.__importDefault(require("auto-bind"));
 const graphql_1 = require("graphql");
+const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 const additionalExportedTypes = `
 export type SdkFunctionWrapper = <T>(action: (requestHeaders?:Record<string, string>) => Promise<T>, operationName: string, operationType?: string) => Promise<T>;
 `;
@@ -18,12 +18,15 @@ class GraphQLRequestVisitor extends visitor_plugin_common_1.ClientSideBaseVisito
         (0, auto_bind_1.default)(this);
         const typeImport = this.config.useTypeImports ? 'import type' : 'import';
         const fileExtension = this.config.emitLegacyCommonJSImports ? '' : '.js';
+        const buildPath = this.config.emitLegacyCommonJSImports ? 'cjs' : 'esm';
         this._additionalImports.push(`${typeImport} { GraphQLClient } from 'graphql-request';`);
-        this._additionalImports.push(`${typeImport} * as Dom from 'graphql-request/dist/types.dom${fileExtension}';`);
+        this._additionalImports.push(`${typeImport} { GraphQLClientRequestHeaders } from 'graphql-request/build/${buildPath}/types${fileExtension}';`);
         if (this.config.rawRequest && this.config.documentMode !== visitor_plugin_common_1.DocumentMode.string) {
             this._additionalImports.push(`import { print } from 'graphql'`);
         }
-        this._externalImportPrefix = this.config.importOperationTypesFrom ? `${this.config.importOperationTypesFrom}.` : '';
+        this._externalImportPrefix = this.config.importOperationTypesFrom
+            ? `${this.config.importOperationTypesFrom}.`
+            : '';
     }
     OperationDefinition(node) {
         var _a;
@@ -68,11 +71,11 @@ class GraphQLRequestVisitor extends visitor_plugin_common_1.ClientSideBaseVisito
                     docArg = `${docVarName}String`;
                     extraVariables.push(`const ${docArg} = print(${docVarName});`);
                 }
-                return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: Dom.RequestInit["headers"]): Promise<{ data: ${o.operationResultType}; extensions?: ${this.config.extensionsType}; headers: Dom.Headers; status: number; }> {
+                return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: GraphQLClientRequestHeaders): Promise<{ data: ${o.operationResultType}; extensions?: ${this.config.extensionsType}; headers: Dom.Headers; status: number; }> {
     return withWrapper((wrappedRequestHeaders) => client.rawRequest<${o.operationResultType}>(${docArg}, variables, {...requestHeaders, ...wrappedRequestHeaders}), '${operationName}', '${operationType}');
 }`;
             }
-            return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: Dom.RequestInit["headers"]): Promise<${o.operationResultType}> {
+            return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: GraphQLClientRequestHeaders): Promise<${o.operationResultType}> {
   return withWrapper((wrappedRequestHeaders) => client.request<${o.operationResultType}>(${docVarName}, variables, {...requestHeaders, ...wrappedRequestHeaders}), '${operationName}', '${operationType}');
 }`;
         })

package/esm/index.js

@@ -1,7 +1,7 @@
-import { oldVisit } from '@graphql-codegen/plugin-helpers';
+import { extname } from 'path';
 import { concatAST, Kind } from 'graphql';
+import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { GraphQLRequestVisitor } from './visitor.js';
-import { extname } from 'path';
 export const plugin = (schema, documents, config) => {
     const allAst = concatAST(documents.map(v => v.document));
     const allFragments = [

package/esm/visitor.js

@@ -1,6 +1,6 @@
-import { ClientSideBaseVisitor, DocumentMode, getConfigValue, indentMultiline, } from '@graphql-codegen/visitor-plugin-common';
 import autoBind from 'auto-bind';
 import { Kind, print } from 'graphql';
+import { ClientSideBaseVisitor, DocumentMode, getConfigValue, indentMultiline, } from '@graphql-codegen/visitor-plugin-common';
 const additionalExportedTypes = `
 export type SdkFunctionWrapper = <T>(action: (requestHeaders?:Record<string, string>) => Promise<T>, operationName: string, operationType?: string) => Promise<T>;
 `;
@@ -14,12 +14,15 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor {
         autoBind(this);
         const typeImport = this.config.useTypeImports ? 'import type' : 'import';
         const fileExtension = this.config.emitLegacyCommonJSImports ? '' : '.js';
+        const buildPath = this.config.emitLegacyCommonJSImports ? 'cjs' : 'esm';
         this._additionalImports.push(`${typeImport} { GraphQLClient } from 'graphql-request';`);
-        this._additionalImports.push(`${typeImport} * as Dom from 'graphql-request/dist/types.dom${fileExtension}';`);
+        this._additionalImports.push(`${typeImport} { GraphQLClientRequestHeaders } from 'graphql-request/build/${buildPath}/types${fileExtension}';`);
         if (this.config.rawRequest && this.config.documentMode !== DocumentMode.string) {
             this._additionalImports.push(`import { print } from 'graphql'`);
         }
-        this._externalImportPrefix = this.config.importOperationTypesFrom ? `${this.config.importOperationTypesFrom}.` : '';
+        this._externalImportPrefix = this.config.importOperationTypesFrom
+            ? `${this.config.importOperationTypesFrom}.`
+            : '';
     }
     OperationDefinition(node) {
         var _a;
@@ -64,11 +67,11 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor {
                     docArg = `${docVarName}String`;
                     extraVariables.push(`const ${docArg} = print(${docVarName});`);
                 }
-                return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: Dom.RequestInit["headers"]): Promise<{ data: ${o.operationResultType}; extensions?: ${this.config.extensionsType}; headers: Dom.Headers; status: number; }> {
+                return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: GraphQLClientRequestHeaders): Promise<{ data: ${o.operationResultType}; extensions?: ${this.config.extensionsType}; headers: Dom.Headers; status: number; }> {
     return withWrapper((wrappedRequestHeaders) => client.rawRequest<${o.operationResultType}>(${docArg}, variables, {...requestHeaders, ...wrappedRequestHeaders}), '${operationName}', '${operationType}');
 }`;
             }
-            return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: Dom.RequestInit["headers"]): Promise<${o.operationResultType}> {
+            return `${operationName}(variables${optionalVariables ? '?' : ''}: ${o.operationVariablesTypes}, requestHeaders?: GraphQLClientRequestHeaders): Promise<${o.operationResultType}> {
   return withWrapper((wrappedRequestHeaders) => client.request<${o.operationResultType}>(${docVarName}, variables, {...requestHeaders, ...wrappedRequestHeaders}), '${operationName}', '${operationType}');
 }`;
         })

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@graphql-codegen/typescript-graphql-request",
-  "version": "4.6.0-alpha-20220922145742-1e7fe329a",
+  "version": "5.0.0-alpha-20230518131850-e3b2bc819",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use SDK based on graphql-request and GraphQL operations",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "graphql-request": "^3.4.0 || ^4.0.0 || ^5.0.0",
+    "graphql-request": "^6.0.0",
     "graphql-tag": "^2.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^2.7.1",
-    "@graphql-codegen/visitor-plugin-common": "2.12.1",
+    "@graphql-codegen/plugin-helpers": "^3.0.0",
+    "@graphql-codegen/visitor-plugin-common": "2.13.1",
     "auto-bind": "~4.0.0",
     "tslib": "~2.4.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/dotansimha/graphql-code-generator.git",
+    "url": "https://github.com/dotansimha/graphql-code-generator-community.git",
     "directory": "packages/plugins/typescript/graphql-request"
   },
   "license": "MIT",

package/typings/config.d.cts

@@ -8,15 +8,21 @@ export interface RawGraphQLRequestPluginConfig extends RawClientSideBasePluginCo
      * @default false
      *
      * @exampleMarkdown
-     * ```yaml
-     * generates:
-     *   path/to/file.ts:
-     *     plugins:
-     *       - typescript
-     *       - typescript-operations
-     *       - typescript-graphql-request
-     *     config:
-     *       rawRequest: true
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript', 'typescript-operations', 'typescript-graphql-request'],
+     *        config: {
+     *          rawRequest: true
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
      * ```
      */
     rawRequest?: boolean;
@@ -25,10 +31,22 @@ export interface RawGraphQLRequestPluginConfig extends RawClientSideBasePluginCo
      * @default any
      *
      * @exampleMarkdown
-     * ```yaml
-     * config:
-     *   rawRequest: true
-     *   extensionsType: unknown
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript', 'typescript-operations', 'typescript-graphql-request'],
+     *        config: {
+     *          rawRequest: true,
+     *          extensionsType: 'unknown'
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
      * ```
      */
     extensionsType?: string;

package/typings/config.d.ts

@@ -8,15 +8,21 @@ export interface RawGraphQLRequestPluginConfig extends RawClientSideBasePluginCo
      * @default false
      *
      * @exampleMarkdown
-     * ```yaml
-     * generates:
-     *   path/to/file.ts:
-     *     plugins:
-     *       - typescript
-     *       - typescript-operations
-     *       - typescript-graphql-request
-     *     config:
-     *       rawRequest: true
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript', 'typescript-operations', 'typescript-graphql-request'],
+     *        config: {
+     *          rawRequest: true
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
      * ```
      */
     rawRequest?: boolean;
@@ -25,10 +31,22 @@ export interface RawGraphQLRequestPluginConfig extends RawClientSideBasePluginCo
      * @default any
      *
      * @exampleMarkdown
-     * ```yaml
-     * config:
-     *   rawRequest: true
-     *   extensionsType: unknown
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript', 'typescript-operations', 'typescript-graphql-request'],
+     *        config: {
+     *          rawRequest: true,
+     *          extensionsType: 'unknown'
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
      * ```
      */
     extensionsType?: string;

package/typings/index.d.cts

@@ -1,6 +1,6 @@
-import { PluginValidateFn, PluginFunction } from '@graphql-codegen/plugin-helpers';
-import { GraphQLRequestVisitor } from './visitor.cjs';
+import { PluginFunction, PluginValidateFn } from '@graphql-codegen/plugin-helpers';
 import { RawGraphQLRequestPluginConfig } from './config.cjs';
+import { GraphQLRequestVisitor } from './visitor.cjs';
 export declare const plugin: PluginFunction<RawGraphQLRequestPluginConfig>;
 export declare const validate: PluginValidateFn<any>;
 export { GraphQLRequestVisitor };

package/typings/index.d.ts

@@ -1,6 +1,6 @@
-import { PluginValidateFn, PluginFunction } from '@graphql-codegen/plugin-helpers';
-import { GraphQLRequestVisitor } from './visitor.js';
+import { PluginFunction, PluginValidateFn } from '@graphql-codegen/plugin-helpers';
 import { RawGraphQLRequestPluginConfig } from './config.js';
+import { GraphQLRequestVisitor } from './visitor.js';
 export declare const plugin: PluginFunction<RawGraphQLRequestPluginConfig>;
 export declare const validate: PluginValidateFn<any>;
 export { GraphQLRequestVisitor };

package/typings/visitor.d.cts

@@ -1,5 +1,5 @@
-import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { GraphQLSchema, OperationDefinitionNode } from 'graphql';
+import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { RawGraphQLRequestPluginConfig } from './config.cjs';
 export interface GraphQLRequestPluginConfig extends ClientSideBasePluginConfig {
     rawRequest: boolean;

package/typings/visitor.d.ts

@@ -1,5 +1,5 @@
-import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { GraphQLSchema, OperationDefinitionNode } from 'graphql';
+import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { RawGraphQLRequestPluginConfig } from './config.js';
 export interface GraphQLRequestPluginConfig extends ClientSideBasePluginConfig {
     rawRequest: boolean;