Skip to content

Commit d6294c5

Browse files
chore(deps): update dependencies (#133)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dan Adajian <[email protected]>
1 parent 2abd79c commit d6294c5

File tree

14 files changed

+3558
-28
lines changed

14 files changed

+3558
-28
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.npmjs.org/

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ repositories {
55
}
66

77
plugins {
8-
kotlin("jvm") version "2.1.20"
9-
id("com.expediagroup.graphql") version "8.4.0"
8+
kotlin("jvm") version "2.1.21"
9+
id("com.expediagroup.graphql") version "8.7.0"
1010
}
1111

1212
dependencies {
13-
implementation("com.expediagroup", "graphql-kotlin-schema-generator", "8.4.0")
14-
implementation("com.expediagroup", "graphql-kotlin-server", "8.4.0")
15-
implementation("com.expediagroup", "graphql-kotlin-federation", "8.4.0")
13+
implementation("com.expediagroup", "graphql-kotlin-schema-generator", "8.7.0")
14+
implementation("com.expediagroup", "graphql-kotlin-server", "8.7.0")
15+
implementation("com.expediagroup", "graphql-kotlin-federation", "8.7.0")
1616
}
1717

1818
sourceSets {

bun.lock

Lines changed: 3511 additions & 0 deletions
Large diffs are not rendered by default.

bun.lockb

-712 KB
Binary file not shown.

docs/src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function HomepageHeader() {
5151
);
5252
}
5353

54-
export default function Home(): JSX.Element {
54+
export default function Home() {
5555
return (
5656
<Layout description="Description will go into a meta tag in <head />">
5757
<HomepageHeader />

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@expediagroup/graphql-kotlin-codegen",
3-
"packageManager": "[email protected].7",
3+
"packageManager": "[email protected].14",
44
"main": "dist/plugin.cjs",
55
"types": "dist/plugin.d.cts",
66
"files": [
@@ -22,19 +22,19 @@
2222
"@graphql-codegen/java-common": "3.0.0",
2323
"@graphql-codegen/plugin-helpers": "5.1.0",
2424
"@graphql-codegen/visitor-plugin-common": "5.8.0",
25-
"ts-deepmerge": "7.0.2",
26-
"valibot": "1.0.0"
25+
"ts-deepmerge": "7.0.3",
26+
"valibot": "1.1.0"
2727
},
2828
"devDependencies": {
29-
"@graphql-codegen/cli": "5.0.5",
29+
"@graphql-codegen/cli": "5.0.6",
3030
"@total-typescript/ts-reset": "0.6.1",
31-
"bun-types": "1.2.7",
32-
"eslint": "9.23.0",
31+
"bun-types": "1.2.14",
32+
"eslint": "9.27.0",
3333
"husky": "9.1.7",
3434
"prettier": "3.5.3",
35-
"tsup": "8.4.0",
36-
"typescript": "5.8.2",
37-
"typescript-eslint": "8.28.0"
35+
"tsup": "8.5.0",
36+
"typescript": "5.8.3",
37+
"typescript-eslint": "8.32.1"
3838
},
3939
"scripts": {
4040
"build": "tsup src/plugin.ts --clean --dts --external graphql",

src/annotations/build-description-annotation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ limitations under the License.
1414
import { CodegenConfigWithDefaults } from "../config/build-config-with-defaults";
1515
import { TypeMetadata } from "../utils/build-type-metadata";
1616
import { indent } from "@graphql-codegen/visitor-plugin-common";
17-
import { Kind } from "graphql/index";
17+
import { Kind } from "graphql";
1818
import { DefinitionNode, trimDescription } from "./build-annotations";
1919

2020
export function buildDescriptionAnnotation(

src/annotations/build-directive-annotations.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function getFederationDirectiveReplacement(directive: ConstDirectiveNode) {
9696
const federationDirectivePrefix =
9797
"com.expediagroup.graphql.generator.federation.directives.";
9898
switch (directive.name.value) {
99-
case "key":
99+
case FEDERATION_DIRECTIVES.key:
100100
if (
101101
directive.arguments?.[0] &&
102102
directive.arguments[0].value.kind === Kind.STRING
@@ -105,9 +105,15 @@ function getFederationDirectiveReplacement(directive: ConstDirectiveNode) {
105105
return `@${federationDirectivePrefix}KeyDirective(${federationDirectivePrefix}FieldSet("${fieldArg}"))`;
106106
}
107107
return undefined;
108-
case "extends":
108+
case FEDERATION_DIRECTIVES.extends:
109109
return `@${federationDirectivePrefix}ExtendsDirective`;
110-
case "external":
110+
case FEDERATION_DIRECTIVES.external:
111111
return `@${federationDirectivePrefix}ExternalDirective`;
112112
}
113113
}
114+
115+
export const FEDERATION_DIRECTIVES = {
116+
extends: "extends",
117+
external: "external",
118+
key: "key",
119+
} as const;

src/config/add-dependent-types-to-only-types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ limitations under the License.
1212
*/
1313

1414
import { CodegenConfigWithDefaults } from "./build-config-with-defaults";
15-
import { GraphQLSchema } from "graphql";
16-
import { TypeDefinitionNode } from "graphql/index";
15+
import { GraphQLSchema, TypeDefinitionNode } from "graphql";
1716
import {
1817
getDependentFieldTypeNames,
1918
getDependentInterfaceNames,

src/definitions/object.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { CodegenConfigWithDefaults } from "../config/build-config-with-defaults"
3131
import { shouldConsolidateTypes } from "../utils/should-consolidate-types";
3232
import { findTypeInResolverInterfacesConfig } from "../config/find-type-in-resolver-interfaces-config";
3333
import { sanitizeName } from "../utils/sanitize-name";
34+
import { titleCase } from "../utils/title-case";
3435

3536
export function buildObjectTypeDefinition(
3637
node: ObjectTypeDefinitionNode,
@@ -161,7 +162,3 @@ export function shouldGenerateFunctionsInClass(
161162
node.fields?.some((fieldNode) => fieldNode.arguments?.length),
162163
);
163164
}
164-
165-
function titleCase(str: string) {
166-
return str.charAt(0).toUpperCase() + str.slice(1);
167-
}

src/utils/title-case.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
Copyright 2024 Expedia, Inc.
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
https://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
*/
13+
14+
export function titleCase(str: string) {
15+
return str.charAt(0).toUpperCase() + str.slice(1);
16+
}

test/unit/should_honor_directiveReplacements_definitionType_config/codegen.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { GraphQLKotlinCodegenConfig } from "../../../src/plugin";
2-
import { Kind } from "graphql/index";
2+
import { Kind } from "graphql";
33

44
export default {
55
extraImports: ["should_honor_directiveReplacements_config.*"],

test/unit/should_ignore_filtered_directiveReplacements_for_consolidated_types/codegen.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { GraphQLKotlinCodegenConfig } from "../../../src/plugin";
2-
import { Kind } from "graphql/index";
2+
import { Kind } from "graphql";
33

44
export default {
55
extraImports: ["should_honor_directiveReplacements_config.*"],

0 commit comments

Comments
 (0)