Merge branch 'refs/heads/main' into improve-query-type-handling

# Conflicts:
#	src/annotations/build-description-annotation.ts
#	src/config/build-config-with-defaults.ts
#	src/config/find-type-in-resolver-interfaces-config.ts
#	src/definitions/object.ts

Author: danadajian

.husky/pre-commit

@@ -1 +1 @@
-bun lint && bun format && git add .
+bun lint:fix && bun format && git add .

eslint.config.js

@@ -20,6 +20,6 @@ export default [
     },
   },
   {
-    ignores: ["build", "dist", "docs"],
+    ignores: ["build", "dist", "docs", "scripts"],
   },
 ];

package.json

@@ -43,7 +43,8 @@
     "format": "prettier --write .",
     "format-check": "prettier --check .",
     "integration": "bun run build && graphql-codegen && ./gradlew graphqlGenerateSDL && bun test ./test/integration.test.ts",
-    "lint": "eslint .",
+    "lint": "bun ./scripts/check-headers.ts && eslint .",
+    "lint:fix": "bun ./scripts/fix-headers.ts && eslint --fix .",
     "prepack": "bun run build",
     "prepare": "husky",
     "unit": "bun test ./test/plugin.test.ts"

scripts/check-headers.ts

@@ -0,0 +1,18 @@
+import { Glob } from "bun";
+
+const filePaths = new Glob("src/**/*.ts").scan();
+
+let filesWithoutCopyrightHeader: string[] = [];
+for await (const filePath of filePaths) {
+  const fileContents = await Bun.file(filePath).text();
+  if (!fileContents.startsWith("/*\nCopyright")) {
+    filesWithoutCopyrightHeader.push(filePath);
+  }
+}
+
+if (filesWithoutCopyrightHeader.length) {
+  console.error(
+    `\nThe following files are missing a valid copyright header:${filesWithoutCopyrightHeader.map((file) => `\n   • ${file}`).join()}`,
+  );
+  process.exit(1);
+}

scripts/fix-headers.ts

@@ -0,0 +1,24 @@
+import { Glob } from "bun";
+
+const copyrightHeader = `/*
+Copyright 2024 Expedia, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+`;
+
+const filePaths = new Glob("src/**/*.ts").scan();
+for await (const filePath of filePaths) {
+  const fileContents = await Bun.file(filePath).text();
+  if (!fileContents.startsWith("/*\nCopyright")) {
+    await Bun.write(filePath, `${copyrightHeader}${fileContents}`);
+  }
+}

src/annotations/build-description-annotation.ts

@@ -1,3 +1,16 @@
+/*
+Copyright 2024 Expedia, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import { CodegenConfigWithDefaults } from "../config/build-config-with-defaults";
 import { TypeMetadata } from "../utils/build-type-metadata";
 import { indent } from "@graphql-codegen/visitor-plugin-common";

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

@@ -1,3 +1,16 @@
+/*
+Copyright 2024 Expedia, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import { GraphQLKotlinCodegenConfig } from "../plugin";
 import { buildPackageNameFromPath } from "@graphql-codegen/java-common";
 import { dirname, normalize } from "path";

src/config/find-type-in-resolver-interfaces-config.ts

@@ -1,5 +1,18 @@
+/*
+Copyright 2024 Expedia, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import { InterfaceTypeDefinitionNode, ObjectTypeDefinitionNode } from "graphql";
-import { CodegenConfigWithDefaults } from "../config/build-config-with-defaults";
+import { CodegenConfigWithDefaults } from "./build-config-with-defaults";
 
 export function findTypeInResolverInterfacesConfig(
   node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,

src/utils/input-type-has-matching-output-type.ts

@@ -1,3 +1,16 @@
+/*
+Copyright 2024 Expedia, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    https://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import {
   GraphQLSchema,
   InputObjectTypeDefinitionNode,