graphql-codegen-plugin-typescript-swr 0.7.2 → 0.8.2

package/jest.config.js

@@ -1,5 +1,5 @@
 const { resolve } = require('path')
-const { pathsToModuleNameMapper } = require('ts-jest/utils')
+const { pathsToModuleNameMapper } = require('ts-jest')
 
 const pkg = require('./package.json')
 const tsconfig = require('./tsconfig.json')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-codegen-plugin-typescript-swr",
-  "version": "0.7.2",
+  "version": "0.8.2",
   "description": "A GraphQL code generator plug-in that automatically generates utility functions for SWR.",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -33,13 +33,13 @@
     "watch:build": "tsc -p tsconfig.json -w"
   },
   "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": "<17.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^2.0.0",
-    "@graphql-codegen/visitor-plugin-common": "^2.0.0",
+    "@graphql-codegen/plugin-helpers": "^2.3.1",
+    "@graphql-codegen/visitor-plugin-common": "^2.5.1",
     "@types/micromatch": "^4.0.1",
-    "graphql-request": "^3.4.0",
+    "graphql-request": "^4.0.0",
     "micromatch": "^4.0.4",
     "pascal-case": "^3.1.2",
     "swr": "^1.0.0",
@@ -50,7 +50,7 @@
     "@graphql-codegen/typescript": "^2.0.0",
     "@graphql-codegen/typescript-graphql-request": "^4.0.0",
     "@graphql-codegen/typescript-operations": "^2.0.0",
-    "@types/jest": "^27.0.0",
+    "@types/jest": "^28.0.0",
     "@types/node": "^16.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.4.0",
@@ -63,14 +63,14 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "graphql": "^15.5.0 <16.0.0",
-    "jest": "^27.0.6",
-    "jest-docblock": "^27.0.6",
-    "jest-junit": "^13.0.0",
+    "graphql": "<17.0.0",
+    "jest": "^28.0.0",
+    "jest-docblock": "^28.0.0",
+    "jest-junit": "^14.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "react": "^17.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^28.0.0",
     "typescript": "^4.1.3"
   },
   "files": [

package/src/index.ts

@@ -4,15 +4,10 @@ import {
   Types,
   PluginValidateFn,
   PluginFunction,
+  oldVisit,
 } from '@graphql-codegen/plugin-helpers'
 import { LoadedFragment } from '@graphql-codegen/visitor-plugin-common'
-import {
-  visit,
-  GraphQLSchema,
-  concatAST,
-  Kind,
-  FragmentDefinitionNode,
-} from 'graphql'
+import { GraphQLSchema, concatAST, Kind, FragmentDefinitionNode } from 'graphql'
 
 import { RawSWRPluginConfig } from './config'
 import { SWRVisitor } from './visitor'
@@ -38,7 +33,7 @@ export const plugin: PluginFunction<RawSWRPluginConfig> = (
   ]
 
   const visitor = new SWRVisitor(schema, allFragments, config)
-  visit(allAst, { leave: visitor })
+  oldVisit(allAst, { leave: visitor })
   return {
     prepend: visitor.getImports(),
     content: visitor.sdkContent,

package/src/visitor.ts

@@ -219,8 +219,10 @@ export class SWRVisitor extends ClientSideBaseVisitor<
     if (this._enabledInfinite) {
       codes.push(`  const utilsForInfinite = {
     generateGetKey: <Data = unknown, Variables = unknown>(
-      id: string,
-      getKey: ${config.typesPrefix}SWRInfiniteKeyLoader${config.typesSuffix}<Data, Variables>
+      id: ${config.autogenSWRKey ? 'SWRKeyInterface' : 'string'},
+      getKey: ${config.typesPrefix}SWRInfiniteKeyLoader${
+        config.typesSuffix
+      }<Data, Variables>
     ) => (pageIndex: number, previousData: Data | null) => {
       const key = getKey(pageIndex, previousData)
       return key ? [id, ...key] : null

package/tests/outputs/autogenSWRKey.ts

@@ -2,7 +2,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
   const sdk = getSdk(client, withWrapper);
   const utilsForInfinite = {
     generateGetKey: <Data = unknown, Variables = unknown>(
-      id: string,
+      id: SWRKeyInterface,
       getKey: SWRInfiniteKeyLoader<Data, Variables>
     ) => (pageIndex: number, previousData: Data | null) => {
       const key = getKey(pageIndex, previousData)