dev-test/githunt/types.urql.tsx

@@ -2,7 +2,9 @@ import {
   Resolver as GraphCacheResolver,
   UpdateResolver as GraphCacheUpdateResolver,
   OptimisticMutationResolver as GraphCacheOptimisticMutationResolver,
+  StorageAdapter as GraphCacheStorageAdapter,
 } from '@urql/exchange-graphcache';
+import { IntrospectionData } from '@urql/exchange-graphcache/dist/types/ast';
 import gql from 'graphql-tag';
 import * as Urql from 'urql';
 export type Maybe<T> = T | null;
@@ -1064,8 +1066,10 @@ export type GraphCacheUpdaters = {
 };
 
 export type GraphCacheConfig = {
+  schema?: IntrospectionData;
   updates?: GraphCacheUpdaters;
   keys?: GraphCacheKeysConfig;
   optimistic?: GraphCacheOptimisticUpdaters;
   resolvers?: GraphCacheResolvers;
+  storage?: GraphCacheStorageAdapter;
 };

dev-test/modules/types.ts

@@ -94,6 +94,10 @@ export type User = {
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
   fragment: string;
   resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
@@ -108,6 +112,7 @@ export type StitchingResolver<TResult, TParent, TContext, TArgs> =
   | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>;
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

dev-test/test-schema/resolvers-federation.ts

@@ -57,6 +57,10 @@ type NullableCheck<T, S> = Maybe<T> extends T ? Maybe<ListCheck<NonNullable<T>,
 type ListCheck<T, S> = T extends (infer U)[] ? NullableCheck<U, S>[] : GraphQLRecursivePick<T, S>;
 export type GraphQLRecursivePick<T, S> = { [K in keyof T & keyof S]: ScalarCheck<T[K], S[K]> };
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
   fragment: string;
   resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
@@ -71,6 +75,7 @@ export type StitchingResolver<TResult, TParent, TContext, TArgs> =
   | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>;
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

dev-test/test-schema/resolvers-root.ts

@@ -44,6 +44,10 @@ export type User = {
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
   fragment: string;
   resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
@@ -58,6 +62,7 @@ export type StitchingResolver<TResult, TParent, TContext, TArgs> =
   | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>;
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

dev-test/test-schema/resolvers-types.ts

@@ -41,6 +41,10 @@ export type User = {
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
   fragment: string;
   resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
@@ -55,6 +59,7 @@ export type StitchingResolver<TResult, TParent, TContext, TArgs> =
   | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>;
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

dev-test/test-schema/typings.ts

@@ -33,6 +33,10 @@ export type User = {
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
 
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
   fragment: string;
   resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
@@ -47,6 +51,7 @@ export type StitchingResolver<TResult, TParent, TContext, TArgs> =
   | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
+  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>;
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

package.json

@@ -39,38 +39,38 @@
     ]
   },
   "devDependencies": {
-    "@apollo/client": "3.3.20",
+    "@apollo/client": "3.3.21",
     "@babel/core": "7.14.6",
     "@babel/preset-env": "7.14.7",
     "@babel/preset-typescript": "7.14.5",
     "@changesets/cli": "2.16.0",
     "@graphql-typed-document-node/core": "3.1.0",
     "@reduxjs/toolkit": "1.6.0",
-    "@types/common-tags": "1.8.0",
-    "@types/jest": "26.0.23",
-    "@types/mkdirp": "1.0.1",
-    "@types/node": "14.17.4",
-    "@types/react": "17.0.11",
-    "@types/webpack-env": "1.16.0",
-    "@urql/exchange-graphcache": "4.1.4",
-    "@typescript-eslint/eslint-plugin": "4.28.1",
-    "@typescript-eslint/parser": "4.28.1",
-    "@vue/apollo-composable": "4.0.0-alpha.12",
-    "@vue/composition-api": "1.0.0-rc.12",
+    "@types/common-tags": "1.8.1",
+    "@types/jest": "26.0.24",
+    "@types/mkdirp": "1.0.2",
+    "@types/node": "14.17.5",
+    "@types/react": "17.0.14",
+    "@types/webpack-env": "1.16.2",
+    "@urql/exchange-graphcache": "4.2.1",
+    "@typescript-eslint/eslint-plugin": "4.28.3",
+    "@typescript-eslint/parser": "4.28.3",
+    "@vue/apollo-composable": "4.0.0-alpha.13",
+    "@vue/composition-api": "1.0.0-rc.14",
     "apollo-client": "2.6.10",
-    "apollo-server": "2.25.2",
+    "apollo-server": "3.0.0",
     "auto-bind": "4.0.0",
     "babel-jest": "27.0.6",
     "bob-the-bundler": "1.2.1",
-    "eslint": "7.29.0",
+    "eslint": "7.30.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-config-standard": "16.0.3",
     "eslint-plugin-import": "2.23.4",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "5.1.0",
     "eslint-plugin-react-hooks": "4.2.0",
-    "flow-bin": "0.154.0",
-    "flow-parser": "0.154.0",
+    "flow-bin": "0.155.0",
+    "flow-parser": "0.155.0",
     "fs-extra": "10.0.0",
     "graphql": "15.5.1",
     "graphql-tag": "2.12.5",
@@ -88,7 +88,7 @@
     "stencil-apollo": "0.1.6",
     "ts-jest": "27.0.3",
     "tslib": "2.3.0",
-    "typescript": "4.3.4",
+    "typescript": "4.3.5",
     "urql": "2.0.4",
     "vue": "2.6.14",
     "vue-apollo-smart-ops": "0.0.3"

packages/graphql-cli-codegen-plugin/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-cli/codegen
 
+## 1.17.26
+
+### Patch Changes
+
+- Updated dependencies [470336a1]
+  - @graphql-codegen/cli@1.21.7
+
 ## 1.17.25
 
 ### Patch Changes

packages/graphql-cli-codegen-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-cli/codegen",
-  "version": "1.17.25",
+  "version": "1.17.26",
   "description": "GraphQL Code Generator's GraphQL CLI plugin. GraphQL Code Generator is a tool that generates code from your GraphQL schema and documents for your backend or frontend with flexible support for custom plugins and templates.",
   "license": "MIT",
   "keywords": [
@@ -26,7 +26,7 @@
     "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"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "1.21.6",
+    "@graphql-codegen/cli": "1.21.7",
     "@graphql-cli/common": "4.1.0"
   },
   "main": "dist/index.cjs.js",

packages/graphql-codegen-cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphql-codegen/cli
 
+## 1.21.7
+
+### Patch Changes
+
+- 470336a1: don't require plugins for for config if preset provides plugin. Instead the preset should throw if no plugins were provided.
+- Updated dependencies [470336a1]
+  - @graphql-codegen/plugin-helpers@1.18.8
+
 ## 1.21.6
 
 ### Patch Changes

packages/graphql-codegen-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "1.21.6",
+  "version": "1.21.7",
   "license": "MIT",
   "bin": {
     "gql-gen": "dist/bin.js",
@@ -41,7 +41,7 @@
   "homepage": "https://github.com/dotansimha/graphql-code-generator#readme",
   "dependencies": {
     "@graphql-codegen/core": "1.17.10",
-    "@graphql-codegen/plugin-helpers": "^1.18.7",
+    "@graphql-codegen/plugin-helpers": "^1.18.8",
     "@graphql-tools/apollo-engine-loader": "^6.2.5",
     "@graphql-tools/code-file-loader": "^6.3.1",
     "@graphql-tools/git-loader": "^6.2.6",
@@ -82,13 +82,13 @@
   },
   "devDependencies": {
     "@types/debounce": "1.2.0",
-    "@types/glob": "7.1.3",
-    "@types/inquirer": "7.3.2",
-    "@types/is-glob": "4.0.1",
-    "@types/js-yaml": "4.0.1",
-    "@types/listr": "0.14.3",
-    "@types/minimatch": "3.0.4",
-    "@types/mkdirp": "1.0.1",
+    "@types/glob": "7.1.4",
+    "@types/inquirer": "7.3.3",
+    "@types/is-glob": "4.0.2",
+    "@types/js-yaml": "4.0.2",
+    "@types/listr": "0.14.4",
+    "@types/minimatch": "3.0.5",
+    "@types/mkdirp": "1.0.2",
     "@types/valid-url": "1.0.3",
     "bdd-stdin": "0.2.0",
     "dotenv": "10.0.0",

packages/graphql-codegen-cli/src/codegen.ts

@@ -124,9 +124,9 @@ export async function executeCodegen(input: CodegenContext | Types.Config): Prom
     }
 
     for (const filename of generateKeys) {
-      generates[filename] = normalizeOutputParam(config.generates[filename]);
+      const output = (generates[filename] = normalizeOutputParam(config.generates[filename]));
 
-      if (generates[filename].plugins.length === 0) {
+      if (!output.preset && (!output.plugins || output.plugins.length === 0)) {
         throw new DetailedError(
           'Invalid Codegen Configuration!',
           `

packages/plugins/c-sharp/c-sharp-operations/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphql-codegen/c-sharp-operations
 
+## 1.19.5
+
+### Patch Changes
+
+- Updated dependencies [df19a4ed]
+- Updated dependencies [470336a1]
+- Updated dependencies [9005cc17]
+  - @graphql-codegen/visitor-plugin-common@1.22.0
+  - @graphql-codegen/plugin-helpers@1.18.8
+
 ## 1.19.4
 
 ### Patch Changes

packages/plugins/c-sharp/c-sharp-operations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/c-sharp-operations",
-  "version": "1.19.4",
+  "version": "1.19.5",
   "description": "GraphQL Code Generator plugin for generating CSharp code based on GraphQL operations",
   "repository": "git@github.com:dotansimha/graphql-code-generator.git",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "graphql-tag": "2.12.5"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^1.18.7",
-    "@graphql-codegen/visitor-plugin-common": "1.21.3",
+    "@graphql-codegen/plugin-helpers": "^1.18.8",
+    "@graphql-codegen/visitor-plugin-common": "1.22.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"

packages/plugins/c-sharp/c-sharp/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphql-codegen/c-sharp
 
+## 3.0.2
+
+### Patch Changes
+
+- Updated dependencies [df19a4ed]
+- Updated dependencies [470336a1]
+- Updated dependencies [9005cc17]
+  - @graphql-codegen/visitor-plugin-common@1.22.0
+  - @graphql-codegen/plugin-helpers@1.18.8
+
 ## 3.0.1
 
 ### Patch Changes

packages/plugins/c-sharp/c-sharp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/c-sharp",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "GraphQL Code Generator plugin for generating CSharp code based on a GraphQL schema",
   "repository": "git@github.com:dotansimha/graphql-code-generator.git",
   "license": "MIT",
@@ -10,8 +10,8 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^1.18.7",
-    "@graphql-codegen/visitor-plugin-common": "1.21.3",
+    "@graphql-codegen/plugin-helpers": "^1.18.8",
+    "@graphql-codegen/visitor-plugin-common": "1.22.0",
     "tslib": "~2.3.0",
     "unixify": "^1.0.0",
     "change-case-all": "1.0.14"

packages/plugins/flow/flow/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphql-codegen/flow
 
+## 1.19.5
+
+### Patch Changes
+
+- Updated dependencies [df19a4ed]
+- Updated dependencies [470336a1]
+- Updated dependencies [9005cc17]
+  - @graphql-codegen/visitor-plugin-common@1.22.0
+  - @graphql-codegen/plugin-helpers@1.18.8
+
 ## 1.19.4
 
 ### Patch Changes

packages/plugins/flow/flow/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/flow",
-  "version": "1.19.4",
+  "version": "1.19.5",
   "description": "GraphQL Code Generator plugin for generating Flow types",
   "repository": {
     "type": "git",
@@ -14,8 +14,8 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^1.18.7",
-    "@graphql-codegen/visitor-plugin-common": "1.21.3",
+    "@graphql-codegen/plugin-helpers": "^1.18.8",
+    "@graphql-codegen/visitor-plugin-common": "1.22.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },

packages/plugins/flow/operations/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @graphql-codegen/flow-operations
 
+## 1.18.13
+
+### Patch Changes
+
+- Updated dependencies [df19a4ed]
+- Updated dependencies [470336a1]
+- Updated dependencies [9005cc17]
+  - @graphql-codegen/visitor-plugin-common@1.22.0
+  - @graphql-codegen/plugin-helpers@1.18.8
+  - @graphql-codegen/flow@1.19.5
+
 ## 1.18.12
 
 ### Patch Changes