clean up some mistakes, ensure existing tests pass
This commit is contained in:
parent
3c6076a469
commit
95b4e613b1
|
@ -113,10 +113,10 @@ impl Registry {
|
||||||
|
|
||||||
if options.federation {
|
if options.federation {
|
||||||
if self.enable_apollo_link {
|
if self.enable_apollo_link {
|
||||||
writeln!("extend schema @link(").ok();
|
writeln!(sdl, "extend schema @link(").ok();
|
||||||
writelin!("\turl: \"https://specs.apollo.dev/federation/v2.0\",").ok();
|
writeln!(sdl, "\turl: \"https://specs.apollo.dev/federation/v2.0\",").ok();
|
||||||
writeln!("\timport: [\"@key\", \"@tag\", \"@shareable\", \"@inaccessible\", \"@override\", \"@external\", \"@provides\", \"@requires\"]").ok();
|
writeln!(sdl, "\timport: [\"@key\", \"@tag\", \"@shareable\", \"@inaccessible\", \"@override\", \"@external\", \"@provides\", \"@requires\"]").ok();
|
||||||
writeln!(")").ok();
|
writeln!(sdl, ")").ok();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
writeln!(sdl, "schema {{").ok();
|
writeln!(sdl, "schema {{").ok();
|
||||||
|
|
|
@ -413,11 +413,6 @@ pub struct MetaDirective {
|
||||||
pub visible: Option<MetaVisibleFn>,
|
pub visible: Option<MetaVisibleFn>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct ApolloLinkConfig {
|
|
||||||
pub extend_schema: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct Registry {
|
pub struct Registry {
|
||||||
pub types: BTreeMap<String, MetaType>,
|
pub types: BTreeMap<String, MetaType>,
|
||||||
|
|
|
@ -30,7 +30,6 @@ use crate::{
|
||||||
InputType, ObjectType, OutputType, QueryEnv, Request, Response, ServerError, ServerResult,
|
InputType, ObjectType, OutputType, QueryEnv, Request, Response, ServerError, ServerResult,
|
||||||
SubscriptionType, Variables, ID,
|
SubscriptionType, Variables, ID,
|
||||||
};
|
};
|
||||||
use crate::registry::ApolloLinkConfig;
|
|
||||||
|
|
||||||
/// Introspection mode
|
/// Introspection mode
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||||
|
@ -389,6 +388,7 @@ where
|
||||||
},
|
},
|
||||||
introspection_mode: IntrospectionMode::Enabled,
|
introspection_mode: IntrospectionMode::Enabled,
|
||||||
enable_federation: false,
|
enable_federation: false,
|
||||||
|
enable_apollo_link: false,
|
||||||
federation_subscription: false,
|
federation_subscription: false,
|
||||||
ignore_name_conflicts,
|
ignore_name_conflicts,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue