upgrade to prettier v3

dotansimha · Sep 5, 2024 · 49a2999 · 49a2999
1 parent a0f14ea
commit 49a2999
Show file tree

Hide file tree

Showing 27 changed files with 207 additions and 314 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -8,3 +8,5 @@ dist/
 CHANGELOG.md
 .husky/_/
 .changeset/*.md
+# Ignore all flow files cause it is just hard to maintain them
+*.flow.js
diff --git a/dev-test/githunt/types.urql.tsx b/dev-test/githunt/types.urql.tsx
@@ -1,8 +1,8 @@
 import { IntrospectionQuery } from 'graphql';
 import gql from 'graphql-tag';
 import * as Urql from 'urql';
-import { cacheExchange } from '@urql/exchange-graphcache';
 import {
+  cacheExchange,
   OptimisticMutationResolver as GraphCacheOptimisticMutationResolver,
   Resolver as GraphCacheResolver,
   UpdateResolver as GraphCacheUpdateResolver,

diff --git a/logo.svg b/logo.svg
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "@babel/preset-typescript": "7.24.7",
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.8",
-    "@theguild/prettier-config": "1.1.2",
+    "@theguild/prettier-config": "2.0.7",
     "@types/jest": "28.1.8",
     "@types/node": "20.16.5",
     "@typescript-eslint/eslint-plugin": "7.18.0",
@@ -53,7 +53,7 @@
     "jest-junit": "16.0.0",
     "lint-staged": "15.2.10",
     "patch-package": "8.0.0",
-    "prettier": "2.8.5",
+    "prettier": "3.3.3",
     "rimraf": "6.0.1",
     "ts-jest": "28.0.8",
     "ts-node": "10.9.2",
@@ -65,7 +65,6 @@
     "graphql": "16.9.0",
     "graphql-language-service-interface": "2.10.2",
     "jest-runner": "28.1.3",
-    "prettier": "2.8.5",
     "ts-node": "10.9.2"
   },
   "lint-staged": {

diff --git a/packages/plugins/c-sharp/c-sharp-operations/src/visitor.ts b/packages/plugins/c-sharp/c-sharp-operations/src/visitor.ts
@@ -514,8 +514,8 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor<
       this.config.dedupeOperationSuffix && node.name.value.toLowerCase().endsWith(node.operation)
         ? ''
         : !operationType
-        ? ''
-        : operationType;
+          ? ''
+          : operationType;
 
     const operationResultType: string = this.convertName(node, {
       suffix: operationTypeSuffix + this._parsedConfig.operationResultSuffix,
@@ -569,11 +569,11 @@ ${this._getOperationMethod(node)}
         return new GraphQLRequest {
           Query = ${this._getDocumentNodeVariable(node, documentVariableName)},
           OperationName = "${node.name.value}"${
-      hasInputArgs
-        ? `,
+            hasInputArgs
+              ? `,
           Variables = variables`
-        : ''
-    }
+              : ''
+          }
         };
       }
 

diff --git a/packages/plugins/c-sharp/c-sharp/src/visitor.ts b/packages/plugins/c-sharp/c-sharp/src/visitor.ts
@@ -62,7 +62,10 @@ export class CSharpResolversVisitor extends BaseVisitor<
 > {
   private readonly jsonAttributesConfiguration: JsonAttributesSourceConfiguration;
 
-  constructor(rawConfig: CSharpResolversPluginRawConfig, private _schema: GraphQLSchema) {
+  constructor(
+    rawConfig: CSharpResolversPluginRawConfig,
+    private _schema: GraphQLSchema,
+  ) {
     super(rawConfig, {
       enumValues: rawConfig.enumValues || {},
       listType: rawConfig.listType || 'List',

diff --git a/packages/plugins/dart/flutter-freezed/src/config/pattern.ts b/packages/plugins/dart/flutter-freezed/src/config/pattern.ts
@@ -222,8 +222,8 @@ export class Pattern {
     return patternType === 'TypeNamePattern'
       ? baseNamesForTypeNamePattern
       : patternType === 'FieldNamePattern'
-      ? baseNamesForFieldNamePattern
-      : [...baseNamesForTypeNamePattern, ...baseNamesForFieldNamePattern];
+        ? baseNamesForFieldNamePattern
+        : [...baseNamesForTypeNamePattern, ...baseNamesForFieldNamePattern];
   };
   //#endregion
 

diff --git a/packages/plugins/java/apollo-android/src/input-type-visitor.ts b/packages/plugins/java/apollo-android/src/input-type-visitor.ts
@@ -210,8 +210,8 @@ ${allMarshallers.join('\n')}
           isNonNull ? '' : '@Nullable '
         }${fieldType}) {
   this.${field.name.value} = ${
-          isNonNull ? field.name.value : `Input.fromNullable(${field.name.value})`
-        };
+    isNonNull ? field.name.value : `Input.fromNullable(${field.name.value})`
+  };
   return this;
 }`;
       })

diff --git a/packages/plugins/java/apollo-android/src/operation-visitor.ts b/packages/plugins/java/apollo-android/src/operation-visitor.ts
@@ -740,8 +740,8 @@ ${childFields
   @Override
   public void write(Object value, ResponseWriter.ListItemWriter listItemWriter) {
     listItemWriter.${writerMethod.name}(((${f.className}) value)${
-          writerMethod.useMarshaller ? '.marshaller()' : ''
-        });
+      writerMethod.useMarshaller ? '.marshaller()' : ''
+    });
   }
 });`,
         2,

diff --git a/packages/plugins/typescript/apollo-angular/src/visitor.ts b/packages/plugins/typescript/apollo-angular/src/visitor.ts
@@ -398,8 +398,8 @@ ${camelCase(o.node.name.value)}Watch(variables${
     const providedIn = this.config.serviceProvidedIn
       ? `{ providedIn: ${this._parseNgModule(this.config.serviceProvidedIn).module} }`
       : this.config.serviceProvidedInRoot === false
-      ? ''
-      : `{ providedIn: 'root' }`;
+        ? ''
+        : `{ providedIn: 'root' }`;
 
     // Generate these types only if they're going to be used,
     // to avoid "unused variable" compile errors in generated code

diff --git a/packages/plugins/typescript/apollo-client-helpers/src/index.ts b/packages/plugins/typescript/apollo-client-helpers/src/index.ts
@@ -25,39 +25,42 @@ function generateTypePoliciesSignature(
 ): Types.ComplexPluginOutput {
   const typeMap = schema.getTypeMap();
   const perTypePolicies: string[] = [];
-  const typedTypePolicies = Object.keys(typeMap).reduce((prev, typeName) => {
-    const type = typeMap[typeName];
+  const typedTypePolicies = Object.keys(typeMap).reduce(
+    (prev, typeName) => {
+      const type = typeMap[typeName];
 
-    if (!typeName.startsWith('__') && (isObjectType(type) || isInterfaceType(type))) {
-      const fieldsNames = Object.keys(type.getFields()).filter(f => !f.startsWith('__'));
-      const keySpecifierVarName = `${typeName}KeySpecifier`;
-      const fieldPolicyVarName = `${typeName}FieldPolicy`;
+      if (!typeName.startsWith('__') && (isObjectType(type) || isInterfaceType(type))) {
+        const fieldsNames = Object.keys(type.getFields()).filter(f => !f.startsWith('__'));
+        const keySpecifierVarName = `${typeName}KeySpecifier`;
+        const fieldPolicyVarName = `${typeName}FieldPolicy`;
 
-      perTypePolicies.push(
-        `export type ${keySpecifierVarName} = (${fieldsNames
-          .map(f => `'${f}'`)
-          .join(' | ')} | ${keySpecifierVarName})[];`,
-      );
+        perTypePolicies.push(
+          `export type ${keySpecifierVarName} = (${fieldsNames
+            .map(f => `'${f}'`)
+            .join(' | ')} | ${keySpecifierVarName})[];`,
+        );
 
-      perTypePolicies.push(`export type ${fieldPolicyVarName} = {
+        perTypePolicies.push(`export type ${fieldPolicyVarName} = {
 ${fieldsNames
   .map(fieldName => `\t${fieldName}?: FieldPolicy<any> | FieldReadFunction<any>`)
   .join(',\n')}
 };`);
 
-      return {
-        ...prev,
-        [typeName]: `Omit<TypePolicy, "fields" | "keyFields"> & {
+        return {
+          ...prev,
+          [typeName]: `Omit<TypePolicy, "fields" | "keyFields"> & {
 \t\tkeyFields${
-          config.requireKeyFields ? '' : '?'
-        }: false | ${keySpecifierVarName} | (() => undefined | ${keySpecifierVarName}),
+            config.requireKeyFields ? '' : '?'
+          }: false | ${keySpecifierVarName} | (() => undefined | ${keySpecifierVarName}),
 \t\tfields?: ${fieldPolicyVarName},
 \t}`,
-      };
-    }
+        };
+      }
 
-    return prev;
-  }, {} as Record<string, string>);
+      return prev;
+    },
+    {} as Record<string, string>,
+  );
 
   const rootTypes = [
     schema.getQueryType()?.name,

diff --git a/packages/plugins/typescript/enum-array/src/index.ts b/packages/plugins/typescript/enum-array/src/index.ts
@@ -18,7 +18,7 @@ function buildArrayDefinition(e: GraphQLEnumType, config: EnumArrayPluginConfig)
   const convert = convertFactory(config);
 
   const enumName = convert(e.astNode, {
-    prefix: config.enumPrefix ?? true ? config.typesPrefix : undefined,
+    prefix: (config.enumPrefix ?? true) ? config.typesPrefix : undefined,
     suffix: config.typesSuffix,
   });
 

diff --git a/packages/plugins/typescript/generic-sdk/src/visitor.ts b/packages/plugins/typescript/generic-sdk/src/visitor.ts
@@ -129,8 +129,8 @@ export class GenericSdkVisitor extends ClientSideBaseVisitor<
           o.operationVariablesTypes
         }, options?: C): ${returnType}<${resultData}> {
   return requester<${o.operationResultType}, ${
-          o.operationVariablesTypes
-        }>(${docVarName}, variables, options) as ${returnType}<${resultData}>;
+    o.operationVariablesTypes
+  }>(${docVarName}, variables, options) as ${returnType}<${resultData}>;
 }`;
       })
       .map(s => indentMultiline(s, 2));

diff --git a/packages/plugins/typescript/graphql-apollo/src/visitor.ts b/packages/plugins/typescript/graphql-apollo/src/visitor.ts
@@ -88,10 +88,10 @@ export class GraphQLApolloVisitor extends ClientSideBaseVisitor<
         x.operationType
       }(options: Partial<${optionType}<${genericParameter.join(', ')}>>) {
           return client.${GraphQLApolloVisitor.getApolloOperation(x.operationType)}<${generics.join(
-        ', ',
-      )}>({...options, ${GraphQLApolloVisitor.getDocumentFieldName(
-        x.operationType,
-      )}: ${documentVariableName}})
+            ', ',
+          )}>({...options, ${GraphQLApolloVisitor.getDocumentFieldName(
+            x.operationType,
+          )}: ${documentVariableName}})
       }`;
     });
     return `export const getSdk = (client: ApolloClient<any>) => ({

diff --git a/packages/plugins/typescript/mongodb/src/visitor.ts b/packages/plugins/typescript/mongodb/src/visitor.ts
@@ -61,7 +61,10 @@ export class TsMongoVisitor extends BaseVisitor<
   TypeScriptMongoPluginConfig,
   TypeScriptMongoPluginParsedConfig
 > {
-  constructor(private _schema: GraphQLSchema, pluginConfig: TypeScriptMongoPluginConfig) {
+  constructor(
+    private _schema: GraphQLSchema,
+    pluginConfig: TypeScriptMongoPluginConfig,
+  ) {
     super(pluginConfig, {
       dbTypeSuffix: pluginConfig.dbTypeSuffix || 'DbObject',
       dbInterfaceSuffix: pluginConfig.dbInterfaceSuffix || 'DbInterface',