graphql-codegen-plugin-typescript-swr 0.7.0 → 0.8.1

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "graphql-codegen-plugin-typescript-swr",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "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",
   "module": "build/module/index.js",
   "repository": "https://github.com/croutonn/graphql-codegen-plugin-typescript-swr",
   "license": "MIT",
+  "engines": {
+    "node": ">=12.0.0"
+  },
   "keywords": [
     "graphql",
     "codegen",
@@ -30,13 +33,12 @@
     "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"
+    "graphql": "<17.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^1.18.7",
-    "@graphql-codegen/visitor-plugin-common": "^1.21.0",
+    "@graphql-codegen/plugin-helpers": "^2.3.1",
+    "@graphql-codegen/visitor-plugin-common": "^2.5.1",
     "@types/micromatch": "^4.0.1",
-    "auto-bind": "^4.0.0",
     "graphql-request": "^3.4.0",
     "micromatch": "^4.0.4",
     "pascal-case": "^3.1.2",
@@ -45,22 +47,23 @@
   },
   "devDependencies": {
     "@graphql-codegen/testing": "^1.17.7",
-    "@graphql-codegen/typescript": "^1.22.1",
-    "@graphql-codegen/typescript-graphql-request": "^3.2.1",
-    "@graphql-codegen/typescript-operations": "^1.18.0",
+    "@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/node": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "eslint": "^7.18.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-airbnb-typescript": "^12.3.1",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "eslint": "^8.0.0",
+    "eslint-config-airbnb": "^19.0.0",
+    "eslint-config-airbnb-typescript": "^16.0.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-typescript": "^2.4.0",
     "eslint-plugin-import": "^2.23.3",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "graphql": "^15.5.0",
+    "graphql": "<17.0.0",
     "jest": "^27.0.6",
     "jest-docblock": "^27.0.6",
     "jest-junit": "^13.0.0",

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

@@ -5,7 +5,6 @@ import {
   LoadedFragment,
   ParsedConfig,
 } from '@graphql-codegen/visitor-plugin-common'
-import autoBind from 'auto-bind'
 import { GraphQLSchema, Kind, OperationDefinitionNode } from 'graphql'
 import glob from 'micromatch'
 import { pascalCase } from 'pascal-case'
@@ -111,8 +110,6 @@ export class SWRVisitor extends ClientSideBaseVisitor<
       (Array.isArray(this.config.useSWRInfinite) &&
         this.config.useSWRInfinite.length > 0)
 
-    autoBind(this)
-
     const typeImport = this.config.useTypeImports ? 'import type' : 'import'
 
     this._additionalImports.push(
@@ -127,8 +124,9 @@ export class SWRVisitor extends ClientSideBaseVisitor<
         this._additionalImports.push(
           `import type { SWRInfiniteConfiguration } from 'swr/infinite';`
         )
+        this._additionalImports.push(`import useSWR from 'swr';`)
         this._additionalImports.push(
-          `import useSWR, { useSWRInfinite } from 'swr';`
+          `import useSWRInfinite from 'swr/infinite';`
         )
       } else {
         this._additionalImports.push(
@@ -138,10 +136,10 @@ export class SWRVisitor extends ClientSideBaseVisitor<
       }
     } else if (this._enabledInfinite) {
       this._additionalImports.push(
-        `import useSWR, { useSWRInfinite, SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
+        `import useSWR, { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
       )
       this._additionalImports.push(
-        `import { SWRInfiniteConfiguration } from 'swr/infinite';`
+        `import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite';`
       )
     } else {
       this._additionalImports.push(

package/tests/swr.spec.ts

@@ -234,10 +234,10 @@ async function test() {
       const usage = basicUsage
       const output = await validate(content, config, docs, schema, usage)
       expect(content.prepend).toContain(
-        `import useSWR, { useSWRInfinite, SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
+        `import useSWR, { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
       )
       expect(content.prepend).toContain(
-        `import { SWRInfiniteConfiguration } from 'swr/infinite';`
+        `import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite';`
       )
       expect(output).toContain(readOutput('infinite'))
     })

package/tests/visitor.spec.ts

@@ -0,0 +1,19 @@
+import { GraphQLSchema } from 'graphql';
+import { SWRVisitor } from '../src/visitor'
+
+describe('SWRVisitor', () => {
+  describe('sdkContent', () => {
+      it('should export SWRInfiniteKeyLoader', () => {
+          const schema = new GraphQLSchema({
+          })
+          const visitor = new SWRVisitor(
+                schema,
+                [],
+                {
+                    useSWRInfinite: ['_query_']
+                }
+          )
+          expect(visitor.sdkContent).toContain('export type SWRInfiniteKeyLoader<Data = unknown,')
+      })
+  })
+});