Remove check_reserved_name
This allows types to end in Connection or be named PageInfo. Addresses #126
This commit is contained in:
parent
215922ee1f
commit
afd28d8846
@ -1,5 +1,5 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::utils::{check_reserved_name, get_crate_name, get_rustdoc};
|
use crate::utils::{get_crate_name, get_rustdoc};
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use proc_macro2::{Ident, Span};
|
use proc_macro2::{Ident, Span};
|
||||||
@ -62,7 +62,6 @@ pub fn generate(enum_args: &args::Enum, input: &DeriveInput) -> Result<TokenStre
|
|||||||
}
|
}
|
||||||
|
|
||||||
let gql_typename = enum_args.name.clone().unwrap_or_else(|| ident.to_string());
|
let gql_typename = enum_args.name.clone().unwrap_or_else(|| ident.to_string());
|
||||||
check_reserved_name(&gql_typename, enum_args.internal)?;
|
|
||||||
|
|
||||||
let desc = enum_args
|
let desc = enum_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::utils::{check_reserved_name, get_crate_name, get_rustdoc};
|
use crate::utils::{get_crate_name, get_rustdoc};
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
@ -41,7 +41,6 @@ pub fn generate(object_args: &args::InputObject, input: &DeriveInput) -> Result<
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| ident.to_string());
|
.unwrap_or_else(|| ident.to_string());
|
||||||
check_reserved_name(&gql_typename, object_args.internal)?;
|
|
||||||
|
|
||||||
let desc = object_args
|
let desc = object_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::args::{InterfaceField, InterfaceFieldArgument};
|
use crate::args::{InterfaceField, InterfaceFieldArgument};
|
||||||
use crate::output_type::OutputType;
|
use crate::output_type::OutputType;
|
||||||
use crate::utils::{check_reserved_name, get_crate_name, get_rustdoc};
|
use crate::utils::{get_crate_name, get_rustdoc};
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use proc_macro2::{Ident, Span};
|
use proc_macro2::{Ident, Span};
|
||||||
@ -30,7 +30,6 @@ pub fn generate(interface_args: &args::Interface, input: &DeriveInput) -> Result
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| ident.to_string());
|
.unwrap_or_else(|| ident.to_string());
|
||||||
check_reserved_name(&gql_typename, interface_args.internal)?;
|
|
||||||
|
|
||||||
let desc = interface_args
|
let desc = interface_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::output_type::OutputType;
|
use crate::output_type::OutputType;
|
||||||
use crate::utils::{
|
use crate::utils::{feature_block, get_crate_name, get_param_getter_ident, get_rustdoc};
|
||||||
check_reserved_name, feature_block, get_crate_name, get_param_getter_ident, get_rustdoc,
|
|
||||||
};
|
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
@ -29,7 +27,6 @@ pub fn generate(object_args: &args::Object, item_impl: &mut ItemImpl) -> Result<
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| self_name.clone());
|
.unwrap_or_else(|| self_name.clone());
|
||||||
check_reserved_name(&gql_typename, object_args.internal)?;
|
|
||||||
|
|
||||||
let desc = object_args
|
let desc = object_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::utils::{check_reserved_name, get_crate_name, get_rustdoc};
|
use crate::utils::{get_crate_name, get_rustdoc};
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
use syn::{Error, ItemImpl, Result, Type};
|
use syn::{Error, ItemImpl, Result, Type};
|
||||||
@ -18,7 +18,6 @@ pub fn generate(scalar_args: &args::Scalar, item_impl: &mut ItemImpl) -> Result<
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| self_name.clone());
|
.unwrap_or_else(|| self_name.clone());
|
||||||
check_reserved_name(&gql_typename, scalar_args.internal)?;
|
|
||||||
let desc = scalar_args
|
let desc = scalar_args
|
||||||
.desc
|
.desc
|
||||||
.clone()
|
.clone()
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::utils::{check_reserved_name, feature_block, get_crate_name, get_rustdoc};
|
use crate::utils::{feature_block, get_crate_name, get_rustdoc};
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
@ -15,7 +15,6 @@ pub fn generate(object_args: &args::Object, input: &mut DeriveInput) -> Result<T
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| ident.to_string());
|
.unwrap_or_else(|| ident.to_string());
|
||||||
check_reserved_name(&gql_typename, object_args.internal)?;
|
|
||||||
|
|
||||||
let desc = object_args
|
let desc = object_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::output_type::OutputType;
|
use crate::output_type::OutputType;
|
||||||
use crate::utils::{
|
use crate::utils::{feature_block, get_crate_name, get_param_getter_ident, get_rustdoc};
|
||||||
check_reserved_name, feature_block, get_crate_name, get_param_getter_ident, get_rustdoc,
|
|
||||||
};
|
|
||||||
use inflector::Inflector;
|
use inflector::Inflector;
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
@ -31,7 +29,6 @@ pub fn generate(object_args: &args::Object, item_impl: &mut ItemImpl) -> Result<
|
|||||||
.name
|
.name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| self_name.clone());
|
.unwrap_or_else(|| self_name.clone());
|
||||||
check_reserved_name(&gql_typename, object_args.internal)?;
|
|
||||||
|
|
||||||
let desc = object_args
|
let desc = object_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::args;
|
use crate::args;
|
||||||
use crate::utils::{check_reserved_name, get_crate_name, get_rustdoc};
|
use crate::utils::{get_crate_name, get_rustdoc};
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
@ -22,7 +22,6 @@ pub fn generate(union_args: &args::Interface, input: &DeriveInput) -> Result<Tok
|
|||||||
let mut enum_items = HashSet::new();
|
let mut enum_items = HashSet::new();
|
||||||
let mut type_into_impls = Vec::new();
|
let mut type_into_impls = Vec::new();
|
||||||
let gql_typename = union_args.name.clone().unwrap_or_else(|| ident.to_string());
|
let gql_typename = union_args.name.clone().unwrap_or_else(|| ident.to_string());
|
||||||
check_reserved_name(&gql_typename, union_args.internal)?;
|
|
||||||
|
|
||||||
let desc = union_args
|
let desc = union_args
|
||||||
.desc
|
.desc
|
||||||
|
@ -11,24 +11,6 @@ pub fn get_crate_name(internal: bool) -> TokenStream {
|
|||||||
quote! { #id }
|
quote! { #id }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn check_reserved_name(name: &str, internal: bool) -> Result<()> {
|
|
||||||
if internal {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
if name.ends_with("Connection") {
|
|
||||||
Err(Error::new(
|
|
||||||
Span::call_site(),
|
|
||||||
"The name ending with 'Connection' is reserved",
|
|
||||||
))
|
|
||||||
} else if name == "PageInfo" {
|
|
||||||
Err(Error::new(
|
|
||||||
Span::call_site(),
|
|
||||||
"The name 'PageInfo' is reserved",
|
|
||||||
))
|
|
||||||
} else {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn parse_nested_validator(
|
fn parse_nested_validator(
|
||||||
crate_name: &TokenStream,
|
crate_name: &TokenStream,
|
||||||
nested_meta: &NestedMeta,
|
nested_meta: &NestedMeta,
|
||||||
|
Loading…
Reference in New Issue
Block a user