Cleanup after rebase

Author: eddeee888

.prettierignore

@@ -34,3 +34,7 @@ packages/presets/swc-plugin/tests/fixtures
 # Ignore intentional error files
 packages/graphql-codegen-cli/tests/test-files/schema-dir/error-schema.graphql
 packages/graphql-codegen-cli/tests/test-files/error-document.graphql
+
+# Ignore dev-tests with no prettier requirement
+dev-test/test-schema/flow-types.flow.js
+dev-test-apollo-tooling/src/__generated__/

dev-test-apollo-tooling/README.md

@@ -1,20 +1,23 @@
-The `dev-test-apollo-tooling` package is an example of migrating from Apollo tooling to GraphQL Codegen. It attempts to generate output as close as possible to Apollo tooling’s output. Note: **this package is a work in progress** and currently requires a patch to `near-operation-file`. We will fix this package soon.
+The `dev-test-apollo-tooling` package is an example of migrating from Apollo tooling to GraphQL
+Codegen. It attempts to generate output as close as possible to Apollo tooling’s output. Note:
+**this package is a work in progress** and currently requires a patch to `near-operation-file`. We
+will fix this package soon.
 
 How to run this package:
 
-1. Make sure you have the correct Yarn version installed (check the root package.json, `packageManager` entry). Otherwise, you might run into unexplained bugs.
+1. Make sure you have the correct Yarn version installed (check the root package.json,
+   `packageManager` entry). Otherwise, you might run into unexplained bugs.
 2. In the monorepo root, run:
 
 yarn clean && yarn install && yarn build
 
-3. Patch `near-operation-file` manually (the automatic patch doesn’t always work). In the monorepo root, run:
+3. Patch `near-operation-file` manually (the automatic patch doesn’t always work). In the monorepo
+   root, run:
 
 yarn postinstall
 
 4. Go to the `dev-test-apollo-tooling` directory and run:
 
-cd dev-test-apollo-tooling
-yarn install
-yarn start
+cd dev-test-apollo-tooling yarn install yarn start
 
 This will generate type files in `dev-test-apollo-tooling/src/__generated__/*`.

dev-test-apollo-tooling/cli/index.ts

@@ -1,5 +1,4 @@
 #!/usr/bin/env ts-node
-
 import { generate } from '@graphql-codegen/cli';
 import type { Types } from '@graphql-codegen/plugin-helpers';
 
@@ -62,7 +61,10 @@ export const main = async () => {
 
   await generate({
     schema: localSchemaFilePath,
-    documents: [...includes.map((include: any) => `${include}/**/*.{js,jsx,ts,tsx}`), `!**/${GENERATED}/**`],
+    documents: [
+      ...includes.map((include: any) => `${include}/**/*.{js,jsx,ts,tsx}`),
+      `!**/${GENERATED}/**`,
+    ],
     config: GRAPHQL_CODEGEN_CONFIG,
     generates: generatePaths,
     silent: false,

dev-test-apollo-tooling/package.json

@@ -1,31 +1,31 @@
 {
   "name": "dev-test-apollo-tooling",
-  "private": true,
-  "description": "A setup which mimics Apollo tooling generation as close as possible",
   "version": "0.0.1",
   "type": "module",
+  "description": "A setup which mimics Apollo tooling generation as close as possible",
+  "private": true,
+  "files": [
+    "cli"
+  ],
+  "scripts": {
+    "start": "tsx cli/index.ts",
+    "start:debug": "NODE_OPTIONS='--trace-warnings' tsx cli/index.ts",
+    "start:verbose": "DEBUG='*' tsx cli/index.ts",
+    "test": "vitest --no-watch"
+  },
   "dependencies": {
     "@apollo/client": "3.13.8",
     "@graphql-codegen/cli": "*",
     "@graphql-codegen/plugin-helpers": "*",
+    "@graphql-codegen/typed-document-node": "*",
     "@graphql-codegen/typescript-operations": "*",
-    "@graphql-codegen/visitor-plugin-common": "*",
-    "@graphql-codegen/typed-document-node": "*"
+    "@graphql-codegen/visitor-plugin-common": "*"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
     "tsx": "4.7.0",
     "typescript": "^5.9.3",
     "vitest": "4.0.4"
   },
-  "files": [
-    "cli"
-  ],
-  "scripts": {
-    "start": "tsx cli/index.ts",
-    "start:debug": "NODE_OPTIONS='--trace-warnings' tsx cli/index.ts",
-    "start:verbose": "DEBUG='*' tsx cli/index.ts",
-    "test": "vitest --no-watch"
-  },
   "sideEffects": false
 }

dev-test-apollo-tooling/schema.graphql

@@ -20,7 +20,10 @@ directive @join__field(
   overrideLabel: String
 ) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 
-directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
+directive @join__implements(
+  graph: join__Graph!
+  interface: String!
+) repeatable on OBJECT | INTERFACE
 
 directive @join__type(
   graph: join__Graph!
@@ -32,7 +35,12 @@ directive @join__type(
 
 directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
 
-directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
+directive @link(
+  url: String
+  as: String
+  for: link__Purpose
+  import: [link__Import]
+) repeatable on SCHEMA
 
 directive @tag(
   name: String!
@@ -47,10 +55,15 @@ enum link__Purpose {
 }
 
 enum join__Graph {
-  SUPER_USER_MANAGER @join__graph(name: "super_user_management", url: "http://i.am.not.used.example.com")
-  GRAPHQL_MAIN__SHARD__BASE @join__graph(name: "graphql_main__shard__base", url: "http://i.am.not.used.example.com")
+  SUPER_USER_MANAGER
+    @join__graph(name: "super_user_management", url: "http://i.am.not.used.example.com")
+  GRAPHQL_MAIN__SHARD__BASE
+    @join__graph(name: "graphql_main__shard__base", url: "http://i.am.not.used.example.com")
   GRAPHQL_MAIN__SHARD__INTERNAL_TESTING
-    @join__graph(name: "graphql_main__shard__internal_testing", url: "http://i.am.not.used.example.com")
+    @join__graph(
+      name: "graphql_main__shard__internal_testing"
+      url: "http://i.am.not.used.example.com"
+    )
 }
 
 type Query {
@@ -203,8 +216,12 @@ enum ProcessableFeedbackSortBy
 enum ProcessableFeedbackSortOrder
   @join__type(graph: GRAPHQL_MAIN__SHARD__BASE)
   @join__type(graph: GRAPHQL_MAIN__SHARD__INTERNAL_TESTING) {
-  ASC @join__enumValue(graph: GRAPHQL_MAIN__SHARD__BASE) @join__enumValue(graph: GRAPHQL_MAIN__SHARD__INTERNAL_TESTING)
-  DESC @join__enumValue(graph: GRAPHQL_MAIN__SHARD__BASE) @join__enumValue(graph: GRAPHQL_MAIN__SHARD__INTERNAL_TESTING)
+  ASC
+    @join__enumValue(graph: GRAPHQL_MAIN__SHARD__BASE)
+    @join__enumValue(graph: GRAPHQL_MAIN__SHARD__INTERNAL_TESTING)
+  DESC
+    @join__enumValue(graph: GRAPHQL_MAIN__SHARD__BASE)
+    @join__enumValue(graph: GRAPHQL_MAIN__SHARD__INTERNAL_TESTING)
 }
 
 type FeedbackConnection @join__type(graph: GRAPHQL_MAIN__SHARD__BASE) {
@@ -229,7 +246,8 @@ type Thread implements Node
   @join__implements(graph: GRAPHQL_MAIN__SHARD__BASE, interface: "Node")
   @join__type(graph: GRAPHQL_MAIN__SHARD__BASE) {
   id: ID!
-  posts(after: String, first: Int): ThreadPostConnection @join__field(graph: GRAPHQL_MAIN__SHARD__BASE)
+  posts(after: String, first: Int): ThreadPostConnection
+    @join__field(graph: GRAPHQL_MAIN__SHARD__BASE)
 }
 
 type ThreadPostConnection @join__type(graph: GRAPHQL_MAIN__SHARD__BASE) {
@@ -253,7 +271,7 @@ union ThreadPostCreator
   @join__type(graph: GRAPHQL_MAIN__SHARD__BASE)
   @join__unionMember(graph: GRAPHQL_MAIN__SHARD__BASE, member: "OrgMember")
   @join__unionMember(graph: GRAPHQL_MAIN__SHARD__BASE, member: "EndUser") =
-    OrgMember
+  | OrgMember
   | EndUser
 
 type OrgMember @join__type(graph: GRAPHQL_MAIN__SHARD__BASE) {

dev-test-apollo-tooling/src/Component.ts

@@ -3,7 +3,7 @@
  * Check that `UserManagerRoleType` enum is generated in `__generated__/Component.ts`
  */
 
-import { useQuery, gql } from '@apollo/client';
+import { gql, useQuery } from '@apollo/client';
 import Helper from './Helper';
 
 export const getFooQuery = gql`

dev-test-apollo-tooling/tests/Component.test.ts

@@ -1,7 +1,7 @@
-import { describe, it, expect } from 'vitest';
 import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { describe, expect, it } from 'vitest';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 

dev-test-apollo-tooling/tests/Duplicates.test.ts

@@ -1,13 +1,16 @@
-import { describe, it, expect } from 'vitest';
 import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { describe, expect, it } from 'vitest';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 describe('Duplicates.ts', () => {
   it('ConfigTypeDefinitions types should be exported', () => {
-    const fileContent = readFileSync(join(__dirname, '../src/__generated__/Duplicates.ts'), 'utf-8');
+    const fileContent = readFileSync(
+      join(__dirname, '../src/__generated__/Duplicates.ts'),
+      'utf-8',
+    );
 
     expect(fileContent).toMatch(/export type ConfigTypeDefinitions_ConfigActionId\s*=/);
     expect(fileContent).toMatch(/export type ConfigTypeDefinitions_ConfigEnum\s*=/);
@@ -16,16 +19,19 @@ describe('Duplicates.ts', () => {
   });
 
   it('GetFeedbackData creator union type exports should exist', () => {
-    const fileContent = readFileSync(join(__dirname, '../src/__generated__/Duplicates.ts'), 'utf-8');
+    const fileContent = readFileSync(
+      join(__dirname, '../src/__generated__/Duplicates.ts'),
+      'utf-8',
+    );
 
     expect(fileContent).toMatch(
-      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator\s*=/
+      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator\s*=/,
     );
     expect(fileContent).toMatch(
-      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator_EndUser\s*=/
+      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator_EndUser\s*=/,
     );
     expect(fileContent).toMatch(
-      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator_OrgMember\s*=/
+      /export type GetFeedbackData_organization_internalOrgData_processableFeedback_edges_node_orgMemberThread_posts_edges_node_creator_OrgMember\s*=/,
     );
   });
 });

dev-test-apollo-tooling/vitest.config.ts

@@ -8,5 +8,5 @@ export default mergeConfig(
       name: 'dev-test-apollo-tooling',
       include: ['tests/**/*.spec.ts', 'tests/**/*.test.ts'],
     },
-  })
+  }),
 );

dev-test/test-schema/flow-types.flow.js

@@ -1,8 +1,7 @@
 // @flow
 
 import { type GraphQLResolveInfo } from 'graphql';
-export type $RequireFields<Origin, Keys> = $Diff<Origin, Keys> &
-  $ObjMapi<Keys, <Key>(k: Key) => $NonMaybeType<$ElementType<Origin, Key>>>;
+export type $RequireFields<Origin, Keys> = $Diff<Origin, Keys> & $ObjMapi<Keys, <Key>(k: Key) => $NonMaybeType<$ElementType<Origin, Key>>>;
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {|
   ID: string,
@@ -18,6 +17,7 @@ export type Query = {|
   userById?: ?User,
 |};
 
+
 export type QueryUserByIdArgs = {|
   id: $ElementType<Scalars, 'Int'>,
 |};
@@ -33,21 +33,21 @@ export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo,
+  info: GraphQLResolveInfo
 ) => Promise<Result> | Result;
 
 export type SubscriptionSubscribeFn<Result, Parent, Context, Args> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo,
+  info: GraphQLResolveInfo
 ) => AsyncIterator<Result> | Promise<AsyncIterator<Result>>;
 
 export type SubscriptionResolveFn<Result, Parent, Context, Args> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo,
+  info: GraphQLResolveInfo
 ) => Result | Promise<Result>;
 
 export interface SubscriptionSubscriberObject<Result, Key: string, Parent, Context, Args> {
@@ -71,14 +71,10 @@ export type SubscriptionResolver<Result, Key: string, Parent = {}, Context = {},
 export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
   parent: Parent,
   context: Context,
-  info: GraphQLResolveInfo,
+  info: GraphQLResolveInfo
 ) => ?Types | Promise<?Types>;
 
-export type IsTypeOfResolverFn<T = {}, Context = {}> = (
-  obj: T,
-  context: Context,
-  info: GraphQLResolveInfo,
-) => boolean | Promise<boolean>;
+export type IsTypeOfResolverFn<T = {}, Context = {}> = (obj: T, context: Context, info: GraphQLResolveInfo) => boolean | Promise<boolean>;
 
 export type NextResolverFn<T> = () => Promise<T>;
 
@@ -87,7 +83,7 @@ export type DirectiveResolverFn<Result = {}, Parent = {}, Args = {}, Context = {
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo,
+  info: GraphQLResolveInfo
 ) => Result | Promise<Result>;
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
@@ -110,23 +106,12 @@ export type ResolversParentTypes = {
   User: User,
 };
 
-export type QueryResolvers<
-  ContextType = any,
-  ParentType = $ElementType<ResolversParentTypes, 'Query'>,
-> = {
+export type QueryResolvers<ContextType = any, ParentType = $ElementType<ResolversParentTypes, 'Query'>> = {
   allUsers?: Resolver<Array<?$ElementType<ResolversTypes, 'User'>>, ParentType, ContextType>,
-  userById?: Resolver<
-    ?$ElementType<ResolversTypes, 'User'>,
-    ParentType,
-    ContextType,
-    $RequireFields<QueryUserByIdArgs, { id: * }>,
-  >,
+  userById?: Resolver<?$ElementType<ResolversTypes, 'User'>, ParentType, ContextType, $RequireFields<QueryUserByIdArgs, { id: * }>>,
 };
 
-export type UserResolvers<
-  ContextType = any,
-  ParentType = $ElementType<ResolversParentTypes, 'User'>,
-> = {
+export type UserResolvers<ContextType = any, ParentType = $ElementType<ResolversParentTypes, 'User'>> = {
   email?: Resolver<$ElementType<ResolversTypes, 'String'>, ParentType, ContextType>,
   id?: Resolver<$ElementType<ResolversTypes, 'Int'>, ParentType, ContextType>,
   name?: Resolver<$ElementType<ResolversTypes, 'String'>, ParentType, ContextType>,
@@ -137,3 +122,4 @@ export type Resolvers<ContextType = any> = {
   Query?: QueryResolvers<ContextType>,
   User?: UserResolvers<ContextType>,
 };
+