Linting fixes (dotansimha#8796)

* linting for generated files * add changeset Co-authored-by: Dimitri POSTOLOV <dmytropostolov@gmail.com>
MichaelDeBoey · Jan 9, 2023 · 9024516 · 9024516
1 parent a39d7a0
commit 9024516
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 46 deletions.
diff --git a/.changeset/soft-pumpkins-smile.md b/.changeset/soft-pumpkins-smile.md
@@ -0,0 +1,7 @@
+---
+'@graphql-codegen/gql-tag-operations': patch
+'@graphql-codegen/client-preset': patch
+'@graphql-codegen/gql-tag-operations-preset': patch
+---
+
+remove extra asterisk and add missing semicolon in generated output
diff --git a/dev-test/gql-tag-operations-masking-star-wars/gql/gql.ts b/dev-test/gql-tag-operations-masking-star-wars/gql/gql.ts
@@ -30,7 +30,7 @@ const documents = {
  *
  * The query argument is unknown!
  * Please regenerate the types.
- **/
+ */
 export function gql(source: string): unknown;
 
 /**

diff --git a/dev-test/gql-tag-operations-masking/gql/gql.ts b/dev-test/gql-tag-operations-masking/gql/gql.ts
@@ -33,7 +33,7 @@ const documents = {
  *
  * The query argument is unknown!
  * Please regenerate the types.
- **/
+ */
 export function gql(source: string): unknown;
 
 /**

diff --git a/dev-test/gql-tag-operations/gql/gql.ts b/dev-test/gql-tag-operations/gql/gql.ts
@@ -29,7 +29,7 @@ const documents = {
  *
  * The query argument is unknown!
  * Please regenerate the types.
- **/
+ */
 export function gql(source: string): unknown;
 
 /**

diff --git a/dev-test/gql-tag-operations/graphql/gql.ts b/dev-test/gql-tag-operations/graphql/gql.ts
@@ -29,7 +29,7 @@ const documents = {
  *
  * The query argument is unknown!
  * Please regenerate the types.
- **/
+ */
 export function graphql(source: string): unknown;
 
 /**

diff --git a/packages/plugins/typescript/gql-tag-operations/src/index.ts b/packages/plugins/typescript/gql-tag-operations/src/index.ts
@@ -58,7 +58,7 @@ export const plugin: PluginFunction<{
         ' * ```\n *\n',
         ` * The query argument is unknown!\n`,
         ` * Please regenerate the types.\n`,
-        `**/\n`,
+        ` */\n`,
         `export function ${gqlTagName}(source: string): unknown;\n`,
         `\n`,
       ].join('')

diff --git a/packages/presets/client/src/fragment-masking-plugin.ts b/packages/presets/client/src/fragment-masking-plugin.ts
@@ -59,9 +59,10 @@ const createUnmaskFunctionTypeDefinitions = (unmaskFunctionName = defaultUnmaskF
 ];
 
 const createUnmaskFunction = (unmaskFunctionName = defaultUnmaskFunctionName) => `
-${createUnmaskFunctionTypeDefinitions(unmaskFunctionName).join(';\n')}
-${createUnmaskFunctionTypeDefinition(unmaskFunctionName, { nullable: true, list: 'with-list' })} {
-  return fragmentType as any
+${createUnmaskFunctionTypeDefinitions(unmaskFunctionName)
+  .concat(createUnmaskFunctionTypeDefinition(unmaskFunctionName, { nullable: true, list: 'with-list' }))
+  .join(';\n')} {
+  return fragmentType as any;
 }
 `;
 

diff --git a/packages/presets/client/src/index.ts b/packages/presets/client/src/index.ts
@@ -184,7 +184,7 @@ export const preset: Types.OutputPreset<ClientPresetConfig> = {
         plugins: [
           {
             [`add`]: {
-              content: reexports.map(moduleName => `export * from "./${moduleName}${reexportsExtension}"`).join('\n'),
+              content: reexports.map(moduleName => `export * from "./${moduleName}${reexportsExtension}";`).join('\n'),
             },
           },
         ],

diff --git a/packages/presets/client/tests/client-preset.spec.ts b/packages/presets/client/tests/client-preset.spec.ts
@@ -29,8 +29,8 @@ describe('client-preset', () => {
     expect(result).toHaveLength(4);
     // index.ts (re-exports)
     const indexFile = result.find(file => file.filename === 'out1/index.ts');
-    expect(indexFile.content).toEqual(`export * from "./gql"
-export * from "./fragment-masking"`);
+    expect(indexFile.content).toEqual(`export * from "./gql";
+export * from "./fragment-masking";`);
 
     // gql.ts
     const gqlFile = result.find(file => file.filename === 'out1/gql.ts');
@@ -66,7 +66,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -117,8 +117,8 @@ export * from "./fragment-masking"`);
     expect(result).toHaveLength(4);
     // index.ts (re-exports)
     const indexFile = result.find(file => file.filename === 'out1/index.ts');
-    expect(indexFile.content).toEqual(`export * from "./gql"
-export * from "./fragment-masking"`);
+    expect(indexFile.content).toEqual(`export * from "./gql";
+export * from "./fragment-masking";`);
 
     // gql.ts
     const gqlFile = result.find(file => file.filename === 'out1/gql.ts');
@@ -154,7 +154,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -234,7 +234,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -315,7 +315,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -444,7 +444,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -564,7 +564,7 @@ export * from "./fragment-masking"`);
      *
      * The query argument is unknown!
      * Please regenerate the types.
-    **/
+     */
     export function graphql(source: string): unknown;
 
     /**
@@ -644,7 +644,7 @@ export * from "./fragment-masking"`);
       expect(fileNames).toContain('out1/graphql.ts');
 
       const indexFile = result.find(file => file.filename === 'out1/index.ts');
-      expect(indexFile.content).toMatchInlineSnapshot(`"export * from "./gql""`);
+      expect(indexFile.content).toMatchInlineSnapshot(`"export * from "./gql";"`);
       const gqlFile = result.find(file => file.filename === 'out1/gql.ts');
       expect(gqlFile.content).toMatchInlineSnapshot(`
       "/* eslint-disable */
@@ -678,7 +678,7 @@ export * from "./fragment-masking"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -789,12 +789,12 @@ export * from "./fragment-masking"`);
         export function iLikeTurtles<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
-        ): ReadonlyArray<TType> | null | undefined
+        ): ReadonlyArray<TType> | null | undefined;
         export function iLikeTurtles<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: FragmentType<DocumentNode<TType, any>> | ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
         ): TType | ReadonlyArray<TType> | null | undefined {
-          return fragmentType as any
+          return fragmentType as any;
         }
 
 
@@ -828,14 +828,14 @@ export * from "./fragment-masking"`);
       export function iLikeTurtles<TType>(
         _documentNode: DocumentNode<TType, any>,
         fragmentType: ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
-      ): ReadonlyArray<TType> | null | undefined
+      ): ReadonlyArray<TType> | null | undefined;
       `);
       expect(gqlFile.content).toBeSimilarStringTo(`
       export function iLikeTurtles<TType>(
         _documentNode: DocumentNode<TType, any>,
         fragmentType: FragmentType<DocumentNode<TType, any>> | ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
       ): TType | ReadonlyArray<TType> | null | undefined {
-        return fragmentType as any
+        return fragmentType as any;
       }
       `);
     });
@@ -945,8 +945,8 @@ export * from "./fragment-masking"`);
     expect(result).toHaveLength(4);
     // index.ts (re-exports)
     const indexFile = result.find(file => file.filename === 'out1/index.ts');
-    expect(indexFile.content).toEqual(`export * from "./gql.js"
-export * from "./fragment-masking.js"`);
+    expect(indexFile.content).toEqual(`export * from "./gql.js";
+export * from "./fragment-masking.js";`);
 
     // gql.ts
     const gqlFile = result.find(file => file.filename === 'out1/gql.ts');
@@ -982,7 +982,7 @@ export * from "./fragment-masking.js"`);
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function graphql(source: string): unknown;
 
       /**
@@ -1034,8 +1034,8 @@ export * from "./fragment-masking.js"`);
       expect(result).toHaveLength(4);
       // index.ts (re-exports)
       const indexFile = result.find(file => file.filename === 'out1/index.ts');
-      expect(indexFile.content).toEqual(`export * from "./gql.js"
-export * from "./fragment-masking.js"`);
+      expect(indexFile.content).toEqual(`export * from "./gql.js";
+export * from "./fragment-masking.js";`);
 
       // gql.ts
       const gqlFile = result.find(file => file.filename === 'out1/gql.ts');
@@ -1056,7 +1056,7 @@ export * from "./fragment-masking.js"`);
          *
          * The query argument is unknown!
          * Please regenerate the types.
-        **/
+         */
         export function graphql(source: string): unknown;
 
         export function graphql(source: string) {

diff --git a/packages/presets/gql-tag-operations/src/fragment-masking-plugin.ts b/packages/presets/gql-tag-operations/src/fragment-masking-plugin.ts
@@ -51,9 +51,10 @@ const createUnmaskFunctionTypeDefinitions = (unmaskFunctionName = defaultUnmaskF
 ];
 
 const createUnmaskFunction = (unmaskFunctionName = defaultUnmaskFunctionName) => `
-${createUnmaskFunctionTypeDefinitions(unmaskFunctionName).join(';\n')}
-${createUnmaskFunctionTypeDefinition(unmaskFunctionName, { nullable: true, list: 'with-list' })} {
-  return fragmentType as any
+${createUnmaskFunctionTypeDefinitions(unmaskFunctionName)
+  .concat(createUnmaskFunctionTypeDefinition(unmaskFunctionName, { nullable: true, list: 'with-list' }))
+  .join(';\n')} {
+  return fragmentType as any;
 }
 `;
 

diff --git a/packages/presets/gql-tag-operations/tests/gql-tag-operations.spec.ts b/packages/presets/gql-tag-operations/tests/gql-tag-operations.spec.ts
@@ -65,7 +65,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**
@@ -152,7 +152,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**
@@ -232,7 +232,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**
@@ -313,7 +313,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**
@@ -438,7 +438,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**
@@ -558,12 +558,12 @@ describe('gql-tag-operations-preset', () => {
         export function useFragment<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
-        ): ReadonlyArray<TType> | null | undefined
+        ): ReadonlyArray<TType> | null | undefined;
         export function useFragment<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: FragmentType<DocumentNode<TType, any>> | ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
         ): TType | ReadonlyArray<TType> | null | undefined {
-          return fragmentType as any
+          return fragmentType as any;
         }
         "
       `);
@@ -656,12 +656,12 @@ describe('gql-tag-operations-preset', () => {
         export function iLikeTurtles<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
-        ): ReadonlyArray<TType> | null | undefined
+        ): ReadonlyArray<TType> | null | undefined;
         export function iLikeTurtles<TType>(
           _documentNode: DocumentNode<TType, any>,
           fragmentType: FragmentType<DocumentNode<TType, any>> | ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
         ): TType | ReadonlyArray<TType> | null | undefined {
-          return fragmentType as any
+          return fragmentType as any;
         }
         "
       `);
@@ -688,14 +688,14 @@ describe('gql-tag-operations-preset', () => {
       export function iLikeTurtles<TType>(
         _documentNode: DocumentNode<TType, any>,
         fragmentType: ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
-      ): ReadonlyArray<TType> | null | undefined
+      ): ReadonlyArray<TType> | null | undefined;
       `);
       expect(gqlFile.content).toBeSimilarStringTo(`
       export function iLikeTurtles<TType>(
         _documentNode: DocumentNode<TType, any>,
         fragmentType: FragmentType<DocumentNode<TType, any>> | ReadonlyArray<FragmentType<DocumentNode<TType, any>>> | null | undefined
       ): TType | ReadonlyArray<TType> | null | undefined {
-        return fragmentType as any
+        return fragmentType as any;
       }
       `);
     });
@@ -910,7 +910,7 @@ describe('gql-tag-operations-preset', () => {
        *
        * The query argument is unknown!
        * Please regenerate the types.
-      **/
+       */
       export function gql(source: string): unknown;
 
       /**