Merge branch 'master' into patch-1

.changeset/gentle-ladybugs-speak.md

@@ -0,0 +1,6 @@
+---
+'@graphql-codegen/visitor-plugin-common': patch
+'@graphql-codegen/typescript-resolvers': patch
+---
+
+Add \_ prefix to generated `RefType` in `ResolversInterfaceTypes` and `ResolversUnionTypes` as it is sometimes unused

.eslintrc.cjs

@@ -50,11 +50,19 @@ module.exports = {
         '@typescript-eslint/no-unused-vars': 'off',
       },
     },
+    {
+      files: ['packages/**/*.{,c,m}ts{,x}'],
+      parserOptions: {
+        project: ['./tsconfig.json'],
+      },
+    },
   ],
   ignorePatterns: [
     'dev-test',
     'website',
-    'examples/**/gql/**',
+    'examples/**',
+    '**/tests/test-files/**',
+    '**/tests/test-documents/**',
     '**/react-app-env.d.ts',
     'packages/presets/swc-plugin/tests/fixtures/simple-uppercase-operation-name.js',
     'packages/presets/swc-plugin/tests/fixtures/simple-uppercase-operation-name.other-dir.js',

.github/workflows/main.yml

@@ -110,7 +110,6 @@ jobs:
     needs:
       - lint
       - prettier-check
-      - dev-tests
       - esm
     strategy:
       matrix:

dev-test/modules/types.ts

@@ -165,7 +165,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 ) => TResult | Promise<TResult>;
 
 /** Mapping of union types */
-export type ResolversUnionTypes<RefType extends Record<string, unknown>> = {
+export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = {
   PaymentOption: CreditCard | Paypal;
 };
 

examples/persisted-documents-string-mode/package.json

@@ -3,17 +3,17 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "graphql-yoga": "4.0.4",
-    "@graphql-yoga/plugin-persisted-operations": "2.0.4"
+    "graphql-yoga": "5.3.1",
+    "@graphql-yoga/plugin-persisted-operations": "3.3.1"
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.6.4",
     "@graphql-codegen/cli": "5.0.2",
-    "@babel/core": "7.23.9",
-    "@babel/preset-env": "7.23.9",
-    "@babel/preset-typescript": "7.23.3"
+    "@babel/core": "7.24.5",
+    "@babel/preset-env": "7.24.5",
+    "@babel/preset-typescript": "7.24.1"
   },
   "scripts": {
     "test": "jest",

examples/persisted-documents/package.json

@@ -3,17 +3,17 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "graphql-yoga": "4.0.4",
-    "@graphql-yoga/plugin-persisted-operations": "2.0.4"
+    "graphql-yoga": "5.3.1",
+    "@graphql-yoga/plugin-persisted-operations": "3.3.1"
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.6.4",
     "@graphql-codegen/cli": "5.0.2",
-    "@babel/core": "7.23.9",
-    "@babel/preset-env": "7.23.9",
-    "@babel/preset-typescript": "7.23.3"
+    "@babel/core": "7.24.5",
+    "@babel/preset-env": "7.24.5",
+    "@babel/preset-typescript": "7.24.1"
   },
   "scripts": {
     "test": "jest",

examples/programmatic-typescript/package.json

@@ -24,7 +24,7 @@
     "prettier": "2.8.8"
   },
   "devDependencies": {
-    "@types/node": "18.19.21",
+    "@types/node": "18.19.33",
     "tsup": "7.2.0"
   }
 }

examples/programmatic-typescript/src/gql.generated.ts

@@ -9,16 +9,16 @@ export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> =
 export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: string;
-  String: string;
-  Boolean: boolean;
-  Int: number;
-  Float: number;
+  ID: { input: string; output: string };
+  String: { input: string; output: string };
+  Boolean: { input: boolean; output: boolean };
+  Int: { input: number; output: number };
+  Float: { input: number; output: number };
 };
 
 export type Query = {
   __typename?: 'Query';
-  hello: Scalars['String'];
+  hello: Scalars['String']['output'];
 };
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
@@ -94,15 +94,15 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   Query: ResolverTypeWrapper<{}>;
-  String: ResolverTypeWrapper<Scalars['String']>;
-  Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
+  String: ResolverTypeWrapper<Scalars['String']['output']>;
+  Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
 
 /** Mapping between all available schema types and the resolvers parents */
 export type ResolversParentTypes = {
   Query: {};
-  String: Scalars['String'];
-  Boolean: Scalars['Boolean'];
+  String: Scalars['String']['output'];
+  Boolean: Scalars['Boolean']['output'];
 };
 
 export type QueryResolvers<

examples/react/apollo-client-defer/package.json

@@ -4,11 +4,11 @@
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.7.10",
-    "@graphql-yoga/plugin-defer-stream": "^2.0.0",
+    "@graphql-yoga/plugin-defer-stream": "^3.0.0",
     "graphql": "^16.6.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "graphql-yoga": "4.0.4"
+    "graphql-yoga": "5.3.1"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
@@ -18,7 +18,7 @@
     "@types/react-dom": "^18.0.10",
     "@vitejs/plugin-react": "^3.1.0",
     "cypress": "12.17.4",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "start-server-and-test": "2.0.3",
     "typescript": "5.2.2",
     "vite": "^4.1.0"

examples/react/apollo-client-swc-plugin/package.json

@@ -4,15 +4,15 @@
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.7.10",
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@graphql-codegen/client-preset-swc-plugin": "0.2.0",
     "@graphql-codegen/cli": "^5.0.2",
     "@vitejs/plugin-react-swc": "^3.3.0",
-    "@types/react": "18.2.60",
-    "@types/react-dom": "18.2.19",
+    "@types/react": "18.3.1",
+    "@types/react-dom": "18.3.0",
     "typescript": "5.2.2",
     "vite": "^4.1.0"
   },

examples/react/apollo-client/package.json

@@ -16,7 +16,7 @@
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.10",
     "typescript": "5.2.2",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3",
     "vite": "^4.1.0"

examples/react/http-executor/package.json

@@ -15,7 +15,7 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.10",
     "typescript": "5.2.2",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3",
     "vite": "^4.1.0"

examples/react/nextjs-swr/hooks/use-query.ts

@@ -20,7 +20,7 @@ export function useGraphQL<TResult, TVariables>(
       document.definitions.find(isOperationDefinition)?.name,
       variables,
     ] as const,
-    async (_key: string, variables: any) =>
+    async ([_key, variables]: any) =>
       executor({
         document,
         variables,

examples/react/nextjs-swr/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@graphql-tools/executor-http": "^1.0.0",
-    "next": "^13.3.0",
+    "next": "13.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "swr": "^2.0.0"

examples/react/tanstack-react-query/package.json

@@ -15,7 +15,7 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.10",
     "typescript": "5.2.2",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3",
     "vite": "^4.1.0"

examples/react/urql/package.json

@@ -13,7 +13,7 @@
     "@graphql-codegen/cli": "^5.0.2",
     "@vitejs/plugin-react": "^3.1.0",
     "typescript": "5.2.2",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3",
     "vite": "^4.1.0"

examples/typescript-graphql-request/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "graphql": "16.8.0",
-    "graphql-yoga": "4.0.4",
+    "graphql-yoga": "5.3.1",
     "graphql-request": "5.2.0"
   },
   "scripts": {

examples/typescript-graphql-request/src/main.ts

@@ -46,6 +46,3 @@ export const getPeople = async (first?: number) => {
   }
   return res?.allPeople?.edges;
 };
-
-getPeople().then(res => console.log(res));
-getPeople(10).then(res => console.log(res));

examples/typescript-resolvers/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "graphql": "16.8.0",
-    "graphql-yoga": "4.0.4"
+    "graphql-yoga": "5.3.1"
   },
   "scripts": {
     "codegen": "graphql-codegen --config codegen.ts",

examples/vue/apollo-composable/package.json

@@ -22,7 +22,7 @@
     "typescript": "^5.0.0",
     "vite": "^4.1.0",
     "vue-tsc": "^1.0.24",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3"
   }

examples/vue/urql/package.json

@@ -21,7 +21,7 @@
     "typescript": "^5.0.0",
     "vite": "^4.1.0",
     "vue-tsc": "^1.0.24",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3"
   }

examples/vue/villus/package.json

@@ -21,7 +21,7 @@
     "typescript": "^5.0.0",
     "vite": "^4.1.0",
     "vue-tsc": "^1.0.24",
-    "serve": "14.2.1",
+    "serve": "14.2.3",
     "cypress": "12.17.4",
     "start-server-and-test": "2.0.3"
   }

examples/yoga-tests/package.json

@@ -3,16 +3,16 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "graphql-yoga": "4.0.4"
+    "graphql-yoga": "5.3.1"
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.6.4",
     "@graphql-codegen/cli": "5.0.2",
-    "@babel/core": "7.23.9",
-    "@babel/preset-env": "7.23.9",
-    "@babel/preset-typescript": "7.23.3"
+    "@babel/core": "7.24.5",
+    "@babel/preset-env": "7.24.5",
+    "@babel/preset-typescript": "7.24.1"
   },
   "scripts": {
     "test": "jest",

package.json

@@ -43,12 +43,12 @@
     "examples/**/*"
   ],
   "devDependencies": {
-    "@babel/core": "7.23.9",
-    "@babel/preset-env": "7.23.9",
-    "@babel/preset-typescript": "7.23.3",
+    "@babel/core": "7.24.5",
+    "@babel/preset-env": "7.24.5",
+    "@babel/preset-typescript": "7.24.1",
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.1",
-    "@theguild/eslint-config": "0.11.3",
+    "@theguild/eslint-config": "0.11.8",
     "@theguild/prettier-config": "0.1.1",
     "@types/jest": "28.1.8",
     "babel-jest": "29.6.4",
@@ -67,7 +67,7 @@
     "ts-jest": "28.0.8",
     "ts-node": "10.9.1",
     "tslib": "2.6.2",
-    "tsx": "4.7.1",
+    "tsx": "4.9.3",
     "typescript": "5.2.2"
   },
   "lint-staged": {

packages/graphql-codegen-cli/package.json

@@ -77,7 +77,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@graphql-tools/merge": "9.0.3",
+    "@graphql-tools/merge": "9.0.4",
     "@parcel/watcher": "^2.1.0",
     "@types/debounce": "1.2.4",
     "@types/inquirer": "8.2.10",

packages/graphql-codegen-cli/tests/utils.ts

@@ -1,7 +1,7 @@
 import os from 'os';
 import { join, parse, relative, resolve } from 'path';
 import makeDir from 'make-dir';
-import rimraf from 'rimraf';
+import * as rimraf from 'rimraf';
 
 const fs = jest.requireActual('fs');
 

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -1040,7 +1040,7 @@ export class BaseResolversVisitor<
           //  - If there are fields to Omit, keep track of these "type with maybe Omit" to replace in original unionMemberValue
           const fieldsToOmit = this.getRelevantFieldsToOmit({
             schemaType: type,
-            getTypeToUse: baseType => `RefType['${baseType}']`,
+            getTypeToUse: baseType => `_RefType['${baseType}']`,
           });
           if (fieldsToOmit.length > 0) {
             typeValue = this.replaceFieldsInType(typeValue, fieldsToOmit);
@@ -1147,7 +1147,7 @@ export class BaseResolversVisitor<
     return new DeclarationBlock(this._declarationBlockConfig)
       .export()
       .asKind(declarationKind)
-      .withName(this.convertName('ResolversUnionTypes'), `<RefType extends Record<string, unknown>>`)
+      .withName(this.convertName('ResolversUnionTypes'), `<_RefType extends Record<string, unknown>>`)
       .withComment('Mapping of union types')
       .withBlock(
         Object.entries(this._resolversUnionTypes)
@@ -1165,7 +1165,7 @@ export class BaseResolversVisitor<
     return new DeclarationBlock(this._declarationBlockConfig)
       .export()
       .asKind(declarationKind)
-      .withName(this.convertName('ResolversInterfaceTypes'), `<RefType extends Record<string, unknown>>`)
+      .withName(this.convertName('ResolversInterfaceTypes'), `<_RefType extends Record<string, unknown>>`)
       .withComment('Mapping of interface types')
       .withBlock(
         Object.entries(this._resolversInterfaceTypes)

packages/plugins/other/visitor-plugin-common/src/base-types-visitor.ts

@@ -926,10 +926,7 @@ export class BaseTypesVisitor<
         let enumValue: string | number =
           typeof schemaEnumValue === 'undefined' ? (enumOption.name as any) : schemaEnumValue;
 
-        if (
-          this.config.enumValues[typeName]?.mappedValues &&
-          typeof this.config.enumValues[typeName].mappedValues[enumValue] !== 'undefined'
-        ) {
+        if (typeof this.config.enumValues[typeName]?.mappedValues?.[enumValue] !== 'undefined') {
           enumValue = this.config.enumValues[typeName].mappedValues[enumValue];
         }