update typescript (#9004)

* update typescript

* fix some stuff

---------

Co-authored-by: Dimitri POSTOLOV <dmytropostolov@gmail.com>

examples/react/apollo-client/package.json

@@ -16,7 +16,7 @@
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.10",
     "react-scripts": "^5.0.1",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
     "start-server-and-test": "1.15.4"

examples/react/babel-optimized/package.json

@@ -61,7 +61,7 @@
   "devDependencies": {
     "@graphql-codegen/client-preset": "^2.0.0",
     "@graphql-codegen/cli": "^3.0.0",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "scripts": {
     "start": "node scripts/start.js",

examples/react/graphql-request/package.json

@@ -15,7 +15,7 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.10",
     "react-scripts": "^5.0.1",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
     "start-server-and-test": "1.15.4"

examples/react/nextjs-swr/package.json

@@ -27,6 +27,6 @@
     "@types/react-dom": "^18.0.10",
     "eslint": "^8.21.0",
     "eslint-config-next": "^13.0.0",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   }
 }

examples/react/tanstack-react-query/package.json

@@ -16,7 +16,7 @@
     "@types/node": "^18.11.18",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.10",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
     "start-server-and-test": "1.15.4"

examples/react/urql/package.json

@@ -15,7 +15,7 @@
     "@types/react-dom": "^18.0.10",
     "@graphql-codegen/cli": "^3.1.0",
     "@graphql-codegen/client-preset": "^2.1.0",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
     "start-server-and-test": "1.15.4"

package.json

@@ -59,7 +59,8 @@
     "ts-jest": "28.0.8",
     "ts-node": "10.9.1",
     "tslib": "2.5.0",
-    "typescript": "4.7.4"
+    "tsx": "3.12.3",
+    "typescript": "4.9.5"
   },
   "lint-staged": {
     "packages/**/src/**/*.{ts,tsx}": [
@@ -81,6 +82,6 @@
     "**/apollo-language-server/graphql": "^16.0.0",
     "**/@types/graphql-upload/graphql": "^16.0.0",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   }
 }

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -59,7 +59,7 @@ export interface ParsedResolversConfig extends ParsedConfig {
     [typeName: string]: ParsedMapper;
   };
   defaultMapper: ParsedMapper | null;
-  avoidOptionals: AvoidOptionalsConfig;
+  avoidOptionals: AvoidOptionalsConfig | boolean;
   addUnderscoreToArgsType: boolean;
   enumValues: ParsedEnumValuesMap;
   resolverTypeWrapperSignature: string;
@@ -1198,7 +1198,10 @@ export class BaseResolversVisitor<
 
       const resolverType = isSubscriptionType ? 'SubscriptionResolver' : directiveMappings[0] ?? 'Resolver';
 
-      const avoidOptionals = this.config.avoidOptionals?.resolvers ?? this.config.avoidOptionals === true;
+      const avoidOptionals =
+        typeof this.config.avoidOptionals === 'object'
+          ? this.config.avoidOptionals?.resolvers
+          : this.config.avoidOptionals === true;
       const signature: {
         name: string;
         modifier: string;

packages/plugins/other/visitor-plugin-common/src/selection-set-processor/base.ts

@@ -14,7 +14,7 @@ export type SelectionSetProcessorConfig = {
   scalars: ScalarsMap;
   formatNamedField(name: string, type?: GraphQLOutputType | GraphQLNamedType | null, isConditional?: boolean): string;
   wrapTypeWithModifiers(baseType: string, type: GraphQLOutputType | GraphQLNamedType): string;
-  avoidOptionals?: AvoidOptionalsConfig;
+  avoidOptionals?: AvoidOptionalsConfig | boolean;
 };
 
 export class BaseSelectionSetProcessor<Config extends SelectionSetProcessorConfig> {

packages/plugins/typescript/operations/src/ts-selection-set-processor.ts

@@ -39,9 +39,11 @@ export class TypeScriptSelectionSetProcessor extends BaseSelectionSetProcessor<S
       const avoidOptional =
         // TODO: check type and exec only if relevant
         this.config.avoidOptionals === true ||
-        this.config.avoidOptionals.field ||
-        this.config.avoidOptionals.inputValue ||
-        this.config.avoidOptionals.object;
+        (typeof this.config.avoidOptionals === 'object' &&
+          (this.config.avoidOptionals.field ||
+            this.config.avoidOptionals.inputValue ||
+            this.config.avoidOptionals.object));
+
       const transform = avoidOptional ? 'MakeMaybe' : 'MakeOptional';
       resString = `${
         this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : ''

packages/plugins/typescript/resolvers/src/visitor.ts

@@ -74,7 +74,10 @@ export class TypeScriptResolversVisitor extends BaseResolversVisitor<
   }
 
   protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string {
-    const avoidOptionals = this.config.avoidOptionals?.resolvers ?? this.config.avoidOptionals === true;
+    const avoidOptionals =
+      typeof this.config.avoidOptionals === 'object'
+        ? this.config.avoidOptionals?.resolvers
+        : !!this.config.avoidOptionals === true;
     return `${schemaTypeName}${avoidOptionals ? '' : '?'}: ${resolverType}${this.getPunctuation(declarationKind)}`;
   }
 

website/package.json

@@ -7,7 +7,7 @@
     "start": "next start",
     "build": "yarn generate-json-config && next build && next-sitemap --config next-sitemap.config.cjs && next export",
     "dev": "next",
-    "generate-json-config": "node --loader ts-node/esm --experimental-specifier-resolution=node generate-config-json-schema.ts"
+    "generate-json-config": "tsx generate-config-json-schema.ts"
   },
   "devDependencies": {
     "@theguild/algolia": "1.1.2",