Merge branch 'main' into pse/fixed-input-field-default-missmatch

Author: PascalSenn

README.md

@@ -2,19 +2,15 @@
 >
 > This spec is in the proposal stage of active development, and can change
 > before reaching `Draft` stage. For more information, please see the
-> [Roadmap](ROADMAP.md) or [how to get involved](INTERESTED_DEVELOPERS.md).
+> [Roadmap](ROADMAP.md).
 
 ---
 
 # GraphQL Composite Schema Spec
 
-**Spec Location**
-
-The GraphQL Composite Schemas specification is edited in the
-[spec-md markdown file](./spec/Spec.md).
-
-In the future, we plan that you would be able to view the generated form of the
-specification as well.
+The GraphQL Composite Schema specification is edited in the markdown files found
+in [`/spec`](./spec) the latest release of which is published at
+https://graphql.github.io/composite-schemas-spec/.
 
 ### Contributing to this repo
 

rfcs/test-cases/requires-with-fragments-shareable/federation/_supergraph.graphql

@@ -0,0 +1,104 @@
+schema
+  @link(url: "https://specs.apollo.dev/link/v1.0")
+  @link(url: "https://specs.apollo.dev/join/v0.3", for: EXECUTION)
+  @link(url: "https://specs.apollo.dev/inaccessible/v0.2", for: SECURITY)
+{
+  query: Query
+}
+
+directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+
+directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
+
+directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
+
+directive @join__graph(name: String!, url: String!) on ENUM_VALUE
+
+directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
+
+directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true, isInterfaceObject: Boolean! = false) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+
+directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
+
+directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
+
+interface Bar implements Foo
+  @join__implements(graph: LOCATIONS, interface: "Foo")
+  @join__implements(graph: REVIEWS, interface: "Foo")
+  @join__type(graph: LOCATIONS)
+  @join__type(graph: REVIEWS)
+{
+  foo: String!
+  bar: String!
+}
+
+type Baz implements Foo & Bar
+  @join__implements(graph: LOCATIONS, interface: "Foo")
+  @join__implements(graph: LOCATIONS, interface: "Bar")
+  @join__implements(graph: REVIEWS, interface: "Foo")
+  @join__implements(graph: REVIEWS, interface: "Bar")
+  @join__type(graph: LOCATIONS)
+  @join__type(graph: REVIEWS)
+  @inaccessible
+{
+  foo: String!
+  bar: String!
+  baz: String!
+}
+
+type Entity
+  @join__type(graph: LOCATIONS, key: "id")
+  @join__type(graph: REVIEWS, key: "id")
+{
+  id: ID!
+  data: Foo @join__field(graph: LOCATIONS) @join__field(graph: REVIEWS, external: true)
+  requirer: String! @join__field(graph: REVIEWS, requires: "data { foo ... on Bar { bar ... on Baz { baz } ... on Qux { qux } } }")
+}
+
+interface Foo
+  @join__type(graph: LOCATIONS)
+  @join__type(graph: REVIEWS)
+{
+  foo: String!
+}
+
+scalar join__FieldSet
+
+enum join__Graph {
+  LOCATIONS @join__graph(name: "locations", url: "https://flyby-locations-sub.herokuapp.com/")
+  REVIEWS @join__graph(name: "reviews", url: "https://flyby-reviews-sub.herokuapp.com/")
+}
+
+scalar link__Import
+
+enum link__Purpose {
+  """
+  `SECURITY` features provide metadata necessary to securely resolve fields.
+  """
+  SECURITY
+
+  """
+  `EXECUTION` features provide metadata necessary for operation execution.
+  """
+  EXECUTION
+}
+
+type Query
+  @join__type(graph: LOCATIONS)
+  @join__type(graph: REVIEWS)
+{
+  dummy: Entity
+}
+
+type Qux implements Foo & Bar
+  @join__implements(graph: LOCATIONS, interface: "Foo")
+  @join__implements(graph: LOCATIONS, interface: "Bar")
+  @join__implements(graph: REVIEWS, interface: "Foo")
+  @join__implements(graph: REVIEWS, interface: "Bar")
+  @join__type(graph: LOCATIONS)
+  @join__type(graph: REVIEWS)
+{
+  foo: String!
+  bar: String!
+  qux: String!
+}

rfcs/test-cases/requires-with-fragments-shareable/federation/a.graphql

@@ -0,0 +1,35 @@
+extend schema
+    @link(
+        url: "https://specs.apollo.dev/federation/v2.5",
+        import: ["@key", "@shareable"]
+    )
+
+type Query @shareable {
+    dummy: Entity
+}
+
+type Entity @key(fields: "id") {
+    id: ID!
+    data: Foo
+}
+
+interface Foo {
+    foo: String!
+}
+
+interface Bar implements Foo {
+    foo: String!
+    bar: String!
+}
+
+type Baz implements Foo & Bar @shareable {
+    foo: String!
+    bar: String!
+    baz: String!
+}
+
+type Qux implements Foo & Bar @shareable {
+    foo: String!
+    bar: String!
+    qux: String!
+}

rfcs/test-cases/requires-with-fragments-shareable/federation/b.graphql

@@ -0,0 +1,36 @@
+extend schema
+    @link(
+        url: "https://specs.apollo.dev/federation/v2.5",
+        import: ["@key", "@shareable", "@inaccessible", "@external", "@requires"]
+    )
+
+type Query @shareable {
+    dummy: Entity
+}
+
+type Entity @key(fields: "id") {
+    id: ID!
+    data: Foo @external
+    requirer: String! @requires(fields: "data { foo ... on Bar { bar ... on Baz { baz } ... on Qux { qux } } }")
+}
+
+interface Foo {
+    foo: String!
+}
+
+interface Bar implements Foo {
+    foo: String!
+    bar: String!
+}
+
+type Baz implements Foo & Bar @shareable @inaccessible {
+    foo: String!
+    bar: String!
+    baz: String!
+}
+
+type Qux implements Foo & Bar @shareable {
+    foo: String!
+    bar: String!
+    qux: String!
+}

spec/Appendix A -- Field Selection.md

@@ -385,17 +385,30 @@ mediaById<Book>.isbn
 
 SelectedValue ::
 
-- Path
-- SelectedObjectValue
+- SelectedValue | SelectedValueEntry
+- `|`? SelectedValueEntry
+
+SelectedValueEntry ::
+
+- Path [lookahead != `.`]
 - Path . SelectedObjectValue
-- SelectedValue | SelectedValue
+- Path SelectedListValue
+- SelectedObjectValue
+
+A {SelectedValue} consists of one or more {SelectedValueEntry} components, which
+may be joined by a pipe (`|`) operator to indicate alternative selections based
+on type.
 
-A {SelectedValue} is defined as either a {Path} or a {SelectedObjectValue}
+Each {SelectedValueEntry} may take one of the following forms:
 
-A {Path} is designed to point to only a single value, although it may reference
-multiple fields depending on the return type. To allow selection from different
-paths based on type, a {Path} can include multiple paths separated by a pipe
-(`|`).
+- A {Path} (when not immediately followed by a dot) that is designed to point to
+  a single value, although it may reference multiple fields depending on its
+  return type.
+- A {Path} immediately followed by a dot and a {SelectedObjectValue} to denote a
+  nested object selection.
+- A {Path} immediately followed by a {SelectedListValue} to denote selection
+  from a list.
+- A standalone {SelectedObjectValue}
 
 In the following example, the value could be `title` when referring to a `Book`
 and `movieTitle` when referring to a `Movie`.
@@ -425,6 +438,7 @@ SelectedObjectValue ::
 SelectedObjectField ::
 
 - Name: SelectedValue
+- Name
 
 {SelectedObjectValue} are unordered lists of keyed input values wrapped in
 curly-braces `{}`. It has to be used when the expected input type is an object
@@ -471,6 +485,7 @@ type Product {
 SelectedListValue ::
 
 - [ SelectedValue ]
+- [ SelectedListValue ]
 
 A {SelectedListValue} is an ordered list of {SelectedValue} wrapped in square
 brackets `[]`. It is used to express semantic equivalence between an argument
@@ -654,7 +669,7 @@ type context.
 
 **Explanatory Text**
 
-The {Path} literal is used to reference a specific output field from a input
+The {Path} literal is used to reference a specific output field from an input
 field. Each segment in the {Path} must correspond to a field that is valid
 within the current type scope.