fix(compiler): fix handling of orphan root type extensions (#993)

Author: dariuszkuc

crates/apollo-compiler/CHANGELOG.md

@@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Fixes
 
+- **Fix handling of orphan root type extensions - [dariuszkuc], [pull/993]**
 - **Fix possible stack overflow in validation of directive definition arguments with nested types - [dariuszkuc], [pull/987]**
 - **Fix `iter_origin()` to be a pub method- [duckki], [pull/989]**
 

crates/apollo-compiler/src/schema/from_ast.rs

@@ -285,6 +285,24 @@ impl SchemaBuilder {
             mut errors,
         } = self;
         schema.sources = errors.sources.clone();
+
+        // process orphan type extensions (https://github.com/apollographql/apollo-rs/pull/678) first,
+        // so they can be reflected on the implicit schema definition below
+        if adopt_orphan_extensions {
+            for (type_name, extensions) in orphan_type_extensions {
+                let type_def = adopt_type_extensions(&mut errors, &type_name, &extensions);
+                let previous = schema.types.insert(type_name, type_def);
+                assert!(previous.is_none());
+            }
+        } else {
+            for extensions in orphan_type_extensions.values() {
+                for ext in extensions {
+                    let name = ext.name().unwrap().clone();
+                    errors.push(name.location(), BuildError::OrphanTypeExtension { name })
+                }
+            }
+        }
+
         match schema_definition {
             SchemaDefinitionStatus::Found => {}
             SchemaDefinitionStatus::NoneSoFar { orphan_extensions } => {
@@ -323,21 +341,6 @@ impl SchemaBuilder {
                 }
             }
         }
-        // https://github.com/apollographql/apollo-rs/pull/678
-        if adopt_orphan_extensions {
-            for (type_name, extensions) in orphan_type_extensions {
-                let type_def = adopt_type_extensions(&mut errors, &type_name, &extensions);
-                let previous = schema.types.insert(type_name, type_def);
-                assert!(previous.is_none());
-            }
-        } else {
-            for extensions in orphan_type_extensions.values() {
-                for ext in extensions {
-                    let name = ext.name().unwrap().clone();
-                    errors.push(name.location(), BuildError::OrphanTypeExtension { name })
-                }
-            }
-        }
         (schema, errors)
     }
 }

crates/apollo-compiler/tests/schema.rs

@@ -1,3 +1,4 @@
+use apollo_compiler::schema::SchemaBuilder;
 use apollo_compiler::Schema;
 
 #[test]
@@ -226,3 +227,25 @@ fn test_default_root_op_name_ignored_with_explicit_schema_def() {
     let schema = Schema::parse_and_validate(input, "schema.graphql").unwrap();
     assert!(schema.schema_definition.mutation.is_none())
 }
+
+#[test]
+fn handles_implicit_root_types() {
+    let sdl = r#"
+extend type Query {
+  foo: String
+}
+
+extend type Mutation {
+  bar: String
+}
+"#;
+
+    let builder = SchemaBuilder::new().adopt_orphan_extensions();
+    let schema = builder
+        .parse(sdl, "schema.graphql")
+        .build()
+        .expect("schema parsed successfully");
+
+    assert!(schema.schema_definition.query.is_some());
+    assert!(schema.schema_definition.mutation.is_some());
+}