Merge pull request #160 from eitoball/swr-1.0.x

croutonn · web-flow · commit eea8792c0fa7 · 2021-11-08T19:32:55.000+09:00
Update for SWR 1.0.x
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "graphql-request": "^3.4.0",
     "micromatch": "^4.0.4",
     "pascal-case": "^3.1.2",
-    "swr": "^0.5.6",
+    "swr": "^1.0.0",
     "tslib": "^2.2.0"
   },
   "devDependencies": {
diff --git a/src/index.ts b/src/index.ts
@@ -25,9 +25,11 @@ export const plugin: PluginFunction<RawSWRPluginConfig> = (
   const allAst = concatAST(documents.map((v) => v.document))
 
   const allFragments: LoadedFragment[] = [
-    ...(allAst.definitions.filter(
-      (d) => d.kind === Kind.FRAGMENT_DEFINITION
-    ) as FragmentDefinitionNode[]).map((fragmentDef) => ({
+    ...(
+      allAst.definitions.filter(
+        (d) => d.kind === Kind.FRAGMENT_DEFINITION
+      ) as FragmentDefinitionNode[]
+    ).map((fragmentDef) => ({
       node: fragmentDef,
       name: fragmentDef.name.value,
       onType: fragmentDef.typeCondition.name.value,
diff --git a/src/visitor.ts b/src/visitor.ts
@@ -71,7 +71,7 @@ const composeQueryHandler = (
       config.autogenKey ? '' : 'id: string, '
     }getKey: ${config.typesPrefix}SWRInfiniteKeyLoader${
       config.typesSuffix
-    }<${responseType}, ${variablesType}>, variables${optionalVariables}: ${variablesType}, config?: SWRInfiniteConfigInterface<${responseType}, ClientError>) {
+    }<${responseType}, ${variablesType}>, variables${optionalVariables}: ${variablesType}, config?: SWRInfiniteConfiguration<${responseType}, ClientError>) {
   return useSWRInfinite<${responseType}, ClientError>(
     utilsForInfinite.generateGetKey<${responseType}, ${variablesType}>(${
       config.autogenKey
@@ -122,24 +122,30 @@ export class SWRVisitor extends ClientSideBaseVisitor<
     if (this.config.useTypeImports) {
       if (this._enabledInfinite) {
         this._additionalImports.push(
-          `import type { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface, SWRInfiniteConfigInterface } from 'swr';`
+          `import type { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
+        )
+        this._additionalImports.push(
+          `import type { SWRInfiniteConfiguration } from 'swr/infinite';`
         )
         this._additionalImports.push(
           `import useSWR, { useSWRInfinite } from 'swr';`
         )
       } else {
         this._additionalImports.push(
-          `import type { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
+          `import type { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
         )
         this._additionalImports.push(`import useSWR from 'swr';`)
       }
     } else if (this._enabledInfinite) {
       this._additionalImports.push(
-        `import useSWR, { useSWRInfinite, ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface, SWRInfiniteConfigInterface } from 'swr';`
+        `import useSWR, { useSWRInfinite, SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
+      )
+      this._additionalImports.push(
+        `import { SWRInfiniteConfiguration } from 'swr/infinite';`
       )
     } else {
       this._additionalImports.push(
-        `import useSWR, { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
+        `import useSWR, { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
       )
     }
   }
diff --git a/tests/outputs/autogenSWRKey.ts b/tests/outputs/autogenSWRKey.ts
@@ -23,7 +23,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
     useFeed2(variables: Feed2QueryVariables, config?: SWRConfigInterface<Feed2Query, ClientError>) {
       return useSWR<Feed2Query, ClientError>(genKey<Feed2QueryVariables>('Feed2', variables), () => sdk.feed2(variables), config);
     },
-    useFeed2Infinite(getKey: SWRInfiniteKeyLoader<Feed2Query, Feed2QueryVariables>, variables: Feed2QueryVariables, config?: SWRInfiniteConfigInterface<Feed2Query, ClientError>) {
+    useFeed2Infinite(getKey: SWRInfiniteKeyLoader<Feed2Query, Feed2QueryVariables>, variables: Feed2QueryVariables, config?: SWRInfiniteConfiguration<Feed2Query, ClientError>) {
       return useSWRInfinite<Feed2Query, ClientError>(
         utilsForInfinite.generateGetKey<Feed2Query, Feed2QueryVariables>(genKey<Feed2QueryVariables>('Feed2', variables), getKey),
         utilsForInfinite.generateFetcher<Feed2Query, Feed2QueryVariables>(sdk.feed2, variables),
@@ -35,7 +35,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
     useFeed4(variables?: Feed4QueryVariables, config?: SWRConfigInterface<Feed4Query, ClientError>) {
       return useSWR<Feed4Query, ClientError>(genKey<Feed4QueryVariables>('Feed4', variables), () => sdk.feed4(variables), config);
     },
-    useFeed4Infinite(getKey: SWRInfiniteKeyLoader<Feed4Query, Feed4QueryVariables>, variables?: Feed4QueryVariables, config?: SWRInfiniteConfigInterface<Feed4Query, ClientError>) {
+    useFeed4Infinite(getKey: SWRInfiniteKeyLoader<Feed4Query, Feed4QueryVariables>, variables?: Feed4QueryVariables, config?: SWRInfiniteConfiguration<Feed4Query, ClientError>) {
       return useSWRInfinite<Feed4Query, ClientError>(
         utilsForInfinite.generateGetKey<Feed4Query, Feed4QueryVariables>(genKey<Feed4QueryVariables>('Feed4', variables), getKey),
         utilsForInfinite.generateFetcher<Feed4Query, Feed4QueryVariables>(sdk.feed4, variables),
diff --git a/tests/outputs/infinite.ts b/tests/outputs/infinite.ts
@@ -26,7 +26,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
     useFeed2(key: SWRKeyInterface, variables: Feed2QueryVariables, config?: SWRConfigInterface<Feed2Query, ClientError>) {
       return useSWR<Feed2Query, ClientError>(key, () => sdk.feed2(variables), config);
     },
-    useFeed2Infinite(id: string, getKey: SWRInfiniteKeyLoader<Feed2Query, Feed2QueryVariables>, variables: Feed2QueryVariables, config?: SWRInfiniteConfigInterface<Feed2Query, ClientError>) {
+    useFeed2Infinite(id: string, getKey: SWRInfiniteKeyLoader<Feed2Query, Feed2QueryVariables>, variables: Feed2QueryVariables, config?: SWRInfiniteConfiguration<Feed2Query, ClientError>) {
       return useSWRInfinite<Feed2Query, ClientError>(
         utilsForInfinite.generateGetKey<Feed2Query, Feed2QueryVariables>(id, getKey),
         utilsForInfinite.generateFetcher<Feed2Query, Feed2QueryVariables>(sdk.feed2, variables),
@@ -38,7 +38,7 @@ export function getSdkWithHooks(client: GraphQLClient, withWrapper: SdkFunctionW
     useFeed4(key: SWRKeyInterface, variables?: Feed4QueryVariables, config?: SWRConfigInterface<Feed4Query, ClientError>) {
       return useSWR<Feed4Query, ClientError>(key, () => sdk.feed4(variables), config);
     },
-    useFeed4Infinite(id: string, getKey: SWRInfiniteKeyLoader<Feed4Query, Feed4QueryVariables>, variables?: Feed4QueryVariables, config?: SWRInfiniteConfigInterface<Feed4Query, ClientError>) {
+    useFeed4Infinite(id: string, getKey: SWRInfiniteKeyLoader<Feed4Query, Feed4QueryVariables>, variables?: Feed4QueryVariables, config?: SWRInfiniteConfiguration<Feed4Query, ClientError>) {
       return useSWRInfinite<Feed4Query, ClientError>(
         utilsForInfinite.generateGetKey<Feed4Query, Feed4QueryVariables>(id, getKey),
         utilsForInfinite.generateFetcher<Feed4Query, Feed4QueryVariables>(sdk.feed4, variables),
diff --git a/tests/swr.spec.ts b/tests/swr.spec.ts
@@ -107,7 +107,7 @@ async function test() {
       })) as Types.ComplexPluginOutput
 
       expect(content.prepend).toContain(
-        `import useSWR, { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
+        `import useSWR, { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
       )
 
       await validate(content, config, docs, schema, usage)
@@ -124,7 +124,7 @@ async function test() {
 
       expect(content.prepend).toContain(`import useSWR from 'swr';`)
       expect(content.prepend).toContain(
-        `import type { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
+        `import type { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
       )
 
       await validate(content, config, docs, schema, usage)
@@ -234,7 +234,10 @@ async function test() {
       const usage = basicUsage
       const output = await validate(content, config, docs, schema, usage)
       expect(content.prepend).toContain(
-        `import useSWR, { useSWRInfinite, ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface, SWRInfiniteConfigInterface } from 'swr';`
+        `import useSWR, { useSWRInfinite, SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
+      )
+      expect(content.prepend).toContain(
+        `import { SWRInfiniteConfiguration } from 'swr/infinite';`
       )
       expect(output).toContain(readOutput('infinite'))
     })

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ const composeQueryHandler = (`
`71`	`71`	`config.autogenKey ? '' : 'id: string, '`
`72`	`72`	`}getKey: ${config.typesPrefix}SWRInfiniteKeyLoader${`
`73`	`73`	`config.typesSuffix`
`74`		`- }<${responseType}, ${variablesType}>, variables${optionalVariables}: ${variablesType}, config?: SWRInfiniteConfigInterface<${responseType}, ClientError>) {`
	`74`	`+ }<${responseType}, ${variablesType}>, variables${optionalVariables}: ${variablesType}, config?: SWRInfiniteConfiguration<${responseType}, ClientError>) {`
`75`	`75`	`return useSWRInfinite<${responseType}, ClientError>(`
`76`	`76`	`utilsForInfinite.generateGetKey<${responseType}, ${variablesType}>(${`
`77`	`77`	`config.autogenKey`
`@@ -122,24 +122,30 @@ export class SWRVisitor extends ClientSideBaseVisitor<`
`122`	`122`	`if (this.config.useTypeImports) {`
`123`	`123`	`if (this._enabledInfinite) {`
`124`	`124`	`this._additionalImports.push(`
`125`		- `import type { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface, SWRInfiniteConfigInterface } from 'swr';`
	`125`	+ `import type { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
	`126`	`+ )`
	`127`	`+ this._additionalImports.push(`
	`128`	+ `import type { SWRInfiniteConfiguration } from 'swr/infinite';`
`126`	`129`	`)`
`127`	`130`	`this._additionalImports.push(`
`128`	`131`	`import useSWR, { useSWRInfinite } from 'swr';`
`129`	`132`	`)`
`130`	`133`	`} else {`
`131`	`134`	`this._additionalImports.push(`
`132`		- `import type { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
	`135`	+ `import type { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
`133`	`136`	`)`
`134`	`137`	this._additionalImports.push(`import useSWR from 'swr';`)
`135`	`138`	`}`
`136`	`139`	`} else if (this._enabledInfinite) {`
`137`	`140`	`this._additionalImports.push(`
`138`		- `import useSWR, { useSWRInfinite, ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface, SWRInfiniteConfigInterface } from 'swr';`
	`141`	+ `import useSWR, { useSWRInfinite, SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
	`142`	`+ )`
	`143`	`+ this._additionalImports.push(`
	`144`	+ `import { SWRInfiniteConfiguration } from 'swr/infinite';`
`139`	`145`	`)`
`140`	`146`	`} else {`
`141`	`147`	`this._additionalImports.push(`
`142`		- `import useSWR, { ConfigInterface as SWRConfigInterface, keyInterface as SWRKeyInterface } from 'swr';`
	`148`	+ `import useSWR, { SWRConfiguration as SWRConfigInterface, Key as SWRKeyInterface } from 'swr';`
`143`	`149`	`)`
`144`	`150`	`}`
`145`	`151`	`}`