Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest async-graphql-{parser,value} and Add repeatable to all @filter's #458

Merged
merged 2 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 30 additions & 108 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ license = "Apache-2.0"
# The dependencies below are part of our public API.
# Bumping a major version here requires our own major version bump.
anyhow = "1.0.71"
async-graphql-parser = "2.11.3"
async-graphql-value = "2.11.3"
serde = "1.0.164,<1.0.172" # https://github.com/obi1kenobi/trustfall/issues/451
async-graphql-parser = "6.0.4"
async-graphql-value = "6.0.4"
serde = "1.0.164,<1.0.172" # https://github.com/obi1kenobi/trustfall/issues/451
serde_json = "1.0.96"
thiserror = "1.0.30"
regex = "1.9.1"
Expand Down
2 changes: 1 addition & 1 deletion demo-hytradboi/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ directive @filter(
op: String!
"""List of string operands for the operator."""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""Name to apply to the given property field."""
name: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ directive @filter(
List of string operands for the operator.
"""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""
Name to apply to the given property field.
Expand Down
12 changes: 6 additions & 6 deletions experiments/schemaless/src/schema_inference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down Expand Up @@ -712,7 +712,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down Expand Up @@ -781,7 +781,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down Expand Up @@ -853,7 +853,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down Expand Up @@ -932,7 +932,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down Expand Up @@ -988,7 +988,7 @@ schema {
query: RootSchemaQuery
}

directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down
2 changes: 1 addition & 1 deletion experiments/trustfall_rustdoc/src/rustdoc_schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ directive @filter(
List of string operands for the operator.
"""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""
Name to apply to the given property field.
Expand Down
2 changes: 1 addition & 1 deletion pytrustfall/numbers.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ directive @filter(
op: String!
"""List of string operands for the operator."""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""Name to apply to the given property field."""
name: String
Expand Down
2 changes: 1 addition & 1 deletion pytrustfall/trustfall/tests/test_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
schema {
query: RootSchemaQuery
}
directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down
2 changes: 1 addition & 1 deletion trustfall/examples/feeds/feeds.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ directive @filter(
List of string operands for the operator.
"""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""
Name to apply to the given property field.
Expand Down
2 changes: 1 addition & 1 deletion trustfall/examples/hackernews/hackernews.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ directive @filter(
op: String!
"""List of string operands for the operator."""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""Name to apply to the given property field."""
name: String
Expand Down
2 changes: 1 addition & 1 deletion trustfall/examples/weather/metar_weather.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ directive @filter(
op: String!
"""List of string operands for the operator."""
value: [String!]
) on FIELD | INLINE_FRAGMENT
) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(
"""Name to apply to the given property field."""
name: String
Expand Down
2 changes: 1 addition & 1 deletion trustfall/tests/helper_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fn main() {
schema {
query: RootSchemaQuery
}
directive @filter(op: String!, value: [String!]) on FIELD | INLINE_FRAGMENT
directive @filter(op: String!, value: [String!]) repeatable on FIELD | INLINE_FRAGMENT
directive @tag(name: String) on FIELD
directive @output(name: String) on FIELD
directive @optional on FIELD
Expand Down
Loading