refactor

Author: danadajian

bun.lockb

@@ -22,6 +22,7 @@
     "@graphql-codegen/java-common": "3.0.0",
     "@graphql-codegen/plugin-helpers": "5.0.4",
     "@graphql-codegen/visitor-plugin-common": "5.2.0",
+    "ts-deepmerge": "7.0.0",
     "valibot": "0.30.0"
   },
   "devDependencies": {

package.json

@@ -14,14 +14,14 @@ limitations under the License.
 import { EnumTypeDefinitionNode, EnumValueDefinitionNode } from "graphql";
 import { indentMultiline } from "@graphql-codegen/visitor-plugin-common";
 import { buildAnnotations } from "../helpers/build-annotations";
-import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
+import { shouldExcludeTypeDefinition } from "../helpers/should-exclude-type-definition";
 import { CodegenConfigWithDefaults } from "../helpers/build-config-with-defaults";
 
 export function buildEnumTypeDefinition(
   node: EnumTypeDefinitionNode,
   config: CodegenConfigWithDefaults,
 ) {
-  if (!shouldIncludeTypeDefinition(node, config)) {
+  if (shouldExcludeTypeDefinition(node, config)) {
     return "";
   }
 

src/definitions/enum.ts

@@ -12,7 +12,7 @@ limitations under the License.
 */
 
 import { GraphQLSchema, InputObjectTypeDefinitionNode } from "graphql";
-import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
+import { shouldExcludeTypeDefinition } from "../helpers/should-exclude-type-definition";
 import { buildTypeMetadata } from "../helpers/build-type-metadata";
 import { buildAnnotations } from "../helpers/build-annotations";
 import { indent } from "@graphql-codegen/visitor-plugin-common";
@@ -24,7 +24,7 @@ export function buildInputObjectDefinition(
   schema: GraphQLSchema,
   config: CodegenConfigWithDefaults,
 ) {
-  if (!shouldIncludeTypeDefinition(node, config)) {
+  if (shouldExcludeTypeDefinition(node, config)) {
     return "";
   }
 

src/definitions/input.ts

@@ -14,7 +14,7 @@ limitations under the License.
 import { GraphQLSchema, InterfaceTypeDefinitionNode } from "graphql";
 import { buildAnnotations } from "../helpers/build-annotations";
 import { buildTypeMetadata } from "../helpers/build-type-metadata";
-import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
+import { shouldExcludeTypeDefinition } from "../helpers/should-exclude-type-definition";
 import { buildFieldDefinition } from "../helpers/build-field-definition";
 import { CodegenConfigWithDefaults } from "../helpers/build-config-with-defaults";
 import { getDependentInterfaceNames } from "../helpers/dependent-type-utils";
@@ -24,7 +24,7 @@ export function buildInterfaceDefinition(
   schema: GraphQLSchema,
   config: CodegenConfigWithDefaults,
 ) {
-  if (!shouldIncludeTypeDefinition(node, config)) {
+  if (shouldExcludeTypeDefinition(node, config)) {
     return "";
   }
 

src/definitions/interface.ts

@@ -19,7 +19,7 @@ import {
 } from "graphql";
 import { buildAnnotations } from "../helpers/build-annotations";
 import { buildTypeMetadata } from "../helpers/build-type-metadata";
-import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
+import { shouldExcludeTypeDefinition } from "../helpers/should-exclude-type-definition";
 import {
   getDependentInterfaceNames,
   getDependentUnionsForType,
@@ -34,7 +34,7 @@ export function buildObjectTypeDefinition(
   schema: GraphQLSchema,
   config: CodegenConfigWithDefaults,
 ) {
-  if (!shouldIncludeTypeDefinition(node, config)) {
+  if (shouldExcludeTypeDefinition(node, config)) {
     return "";
   }
 

src/definitions/object.ts

@@ -12,7 +12,7 @@ limitations under the License.
 */
 
 import { UnionTypeDefinitionNode } from "graphql";
-import { shouldIncludeTypeDefinition } from "../helpers/should-include-type-definition";
+import { shouldExcludeTypeDefinition } from "../helpers/should-exclude-type-definition";
 import { CodegenConfigWithDefaults } from "../helpers/build-config-with-defaults";
 import {
   buildAnnotations,
@@ -23,7 +23,7 @@ export function buildUnionTypeDefinition(
   node: UnionTypeDefinitionNode,
   config: CodegenConfigWithDefaults,
 ) {
-  if (!shouldIncludeTypeDefinition(node, config)) {
+  if (shouldExcludeTypeDefinition(node, config)) {
     return "";
   }
   const annotations = buildAnnotations({

src/definitions/union.ts

@@ -1,21 +1,22 @@
 import { GraphQLKotlinCodegenConfig } from "../plugin";
 import { buildPackageNameFromPath } from "@graphql-codegen/java-common";
 import { dirname, normalize } from "path";
+import { merge } from "ts-deepmerge";
 
 export function buildConfigWithDefaults(
   config: GraphQLKotlinCodegenConfig,
   outputFile: string,
 ) {
-  return {
+  const defaultConfig = {
     packageName: buildPackageNameFromPath(dirname(normalize(outputFile))),
     includeDependentTypes: true,
     unionGeneration: "MARKER_INTERFACE",
-    ...config,
-    extraImports: [
-      "com.expediagroup.graphql.generator.annotations.*",
-      ...(config.extraImports ?? []),
-    ],
+    extraImports: ["com.expediagroup.graphql.generator.annotations.*"],
+    resolverInterfaces: [{ typeName: "Query" }],
   } as const satisfies GraphQLKotlinCodegenConfig;
+
+  return merge(defaultConfig, config) as GraphQLKotlinCodegenConfig &
+    typeof defaultConfig;
 }
 
 export type CodegenConfigWithDefaults = ReturnType<

src/helpers/build-config-with-defaults.ts

@@ -5,7 +5,7 @@ export function findTypeInResolverInterfacesConfig(
   node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
   config: CodegenConfigWithDefaults,
 ) {
-  return config.resolverInterfaces?.find(
+  return config.resolverInterfaces.find(
     (resolverInterface) => resolverInterface.typeName === node.name.value,
   );
 }

src/helpers/findTypeInResolverInterfacesConfig.ts

@@ -14,9 +14,9 @@ limitations under the License.
 import { TypeDefinitionNode } from "graphql";
 import { CodegenConfigWithDefaults } from "./build-config-with-defaults";
 
-export function shouldIncludeTypeDefinition(
+export function shouldExcludeTypeDefinition(
   node: TypeDefinitionNode,
   config: CodegenConfigWithDefaults,
 ) {
-  return !config.onlyTypes || config.onlyTypes.includes(node.name.value);
+  return config.onlyTypes && !config.onlyTypes.includes(node.name.value);
 }