Skip to content

Commit e03069e

Browse files
dphmdphm
committed
Support query_string macro attribute
Add test for query string attribute
1 parent c52e89e commit e03069e

File tree

2 files changed

+170
-178
lines changed

2 files changed

+170
-178
lines changed

‎graphql_client_codegen/src/lib.rs‎

Lines changed: 78 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use lazy_static::*;
1010
use proc_macro2::TokenStream;
1111
use quote::*;
12+
use schema::Schema;
1213

1314
mod codegen;
1415
mod codegen_options;
@@ -44,67 +45,92 @@ impl std::error::Error for GeneralError {}
4445

4546
type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
4647
type CacheMap<T> = std::sync::Mutex<BTreeMap<std::path::PathBuf, T>>;
48+
type QueryDocument = graphql_parser::query::Document<'static, String>;
4749

4850
lazy_static! {
49-
static ref SCHEMA_CACHE: CacheMap<schema::Schema> = CacheMap::default();
50-
static ref QUERY_CACHE: CacheMap<(String, graphql_parser::query::Document<'static, String>)> =
51-
CacheMap::default();
51+
static ref SCHEMA_CACHE: CacheMap<Schema> = CacheMap::default();
52+
static ref QUERY_CACHE: CacheMap<(String, QueryDocument)> = CacheMap::default();
5253
}
5354

54-
/// Generates Rust code given a query document, a schema and options.
55+
fn get_set_cached<T: Clone>(
56+
cache: &CacheMap<T>,
57+
key: &std::path::Path,
58+
value_func: impl FnOnce() -> T,
59+
) -> T {
60+
let mut lock = cache.lock().expect("cache is poisoned");
61+
lock.entry(key.into()).or_insert_with(value_func).clone()
62+
}
63+
64+
fn query_document(query_string: &str) -> Result<QueryDocument, BoxError> {
65+
let document = graphql_parser::parse_query(query_string)
66+
.map_err(|err| GeneralError(format!("Query parser error: {}", err)))?
67+
.into_static();
68+
Ok(document)
69+
}
70+
71+
fn get_set_query_from_file(query_path: &std::path::Path) -> (String, QueryDocument) {
72+
get_set_cached(&QUERY_CACHE, query_path, || {
73+
let query_string = read_file(query_path).unwrap();
74+
let query_document = query_document(&query_string).unwrap();
75+
(query_string, query_document)
76+
})
77+
}
78+
79+
fn get_set_schema_from_file(schema_path: &std::path::Path) -> Schema {
80+
get_set_cached(&SCHEMA_CACHE, schema_path, move || {
81+
let schema_extension = schema_path
82+
.extension()
83+
.and_then(std::ffi::OsStr::to_str)
84+
.unwrap_or("INVALID");
85+
let schema_string = read_file(schema_path).unwrap();
86+
match schema_extension {
87+
"graphql" | "gql" => {
88+
let s = graphql_parser::schema::parse_schema::<&str>(&schema_string).map_err(|parser_error| GeneralError(format!("Parser error: {}", parser_error))).unwrap();
89+
Schema::from(s)
90+
}
91+
"json" => {
92+
let parsed: graphql_introspection_query::introspection_response::IntrospectionResponse = serde_json::from_str(&schema_string).unwrap();
93+
Schema::from(parsed)
94+
}
95+
extension => panic!("Unsupported extension for the GraphQL schema: {} (only .json and .graphql are supported)", extension)
96+
}
97+
})
98+
}
99+
100+
/// Generates Rust code given a path to a query file, a path to a schema file, and options.
55101
pub fn generate_module_token_stream(
56102
query_path: std::path::PathBuf,
57103
schema_path: &std::path::Path,
58104
options: GraphQLClientCodegenOptions,
59105
) -> Result<TokenStream, BoxError> {
60-
use std::collections::btree_map;
61-
62-
let schema_extension = schema_path
63-
.extension()
64-
.and_then(std::ffi::OsStr::to_str)
65-
.unwrap_or("INVALID");
66-
let schema_string;
67-
68-
// Check the schema cache.
69-
let schema: schema::Schema = {
70-
let mut lock = SCHEMA_CACHE.lock().expect("schema cache is poisoned");
71-
match lock.entry(schema_path.to_path_buf()) {
72-
btree_map::Entry::Occupied(o) => o.get().clone(),
73-
btree_map::Entry::Vacant(v) => {
74-
schema_string = read_file(v.key())?;
75-
let schema = match schema_extension {
76-
"graphql" | "gql" => {
77-
let s = graphql_parser::schema::parse_schema::<&str>(&schema_string).map_err(|parser_error| GeneralError(format!("Parser error: {}", parser_error)))?;
78-
schema::Schema::from(s)
79-
}
80-
"json" => {
81-
let parsed: graphql_introspection_query::introspection_response::IntrospectionResponse = serde_json::from_str(&schema_string)?;
82-
schema::Schema::from(parsed)
83-
}
84-
extension => return Err(GeneralError(format!("Unsupported extension for the GraphQL schema: {} (only .json and .graphql are supported)", extension)).into())
85-
};
86-
87-
v.insert(schema).clone()
88-
}
89-
}
90-
};
106+
let query = get_set_query_from_file(query_path.as_path());
107+
let schema = get_set_schema_from_file(schema_path);
91108

92-
// We need to qualify the query with the path to the crate it is part of
93-
let (query_string, query) = {
94-
let mut lock = QUERY_CACHE.lock().expect("query cache is poisoned");
95-
match lock.entry(query_path) {
96-
btree_map::Entry::Occupied(o) => o.get().clone(),
97-
btree_map::Entry::Vacant(v) => {
98-
let query_string = read_file(v.key())?;
99-
let query = graphql_parser::parse_query(&query_string)
100-
.map_err(|err| GeneralError(format!("Query parser error: {}", err)))?
101-
.into_static();
102-
v.insert((query_string, query)).clone()
103-
}
104-
}
105-
};
109+
generate_module_token_stream_inner(&query, &schema, &options)
110+
}
106111

107-
let query = crate::query::resolve(&schema, &query)?;
112+
/// Generates Rust code given a query string, a path to a schema file, and options.
113+
pub fn generate_module_token_stream_from_string(
114+
query_string: &str,
115+
schema_path: &std::path::Path,
116+
options: &GraphQLClientCodegenOptions,
117+
) -> Result<TokenStream, BoxError> {
118+
let query = (query_string.to_string(), query_document(query_string)?);
119+
let schema = get_set_schema_from_file(schema_path);
120+
121+
generate_module_token_stream_inner(&query, &schema, options)
122+
}
123+
124+
/// Generates Rust code given a query string and query document, a schema, and options.
125+
fn generate_module_token_stream_inner(
126+
query: &(String, QueryDocument),
127+
schema: &Schema,
128+
options: &GraphQLClientCodegenOptions,
129+
) -> Result<TokenStream, BoxError> {
130+
let (query_string, query_document) = query;
131+
132+
// We need to qualify the query with the path to the crate it is part of
133+
let query = crate::query::resolve(schema, query_document)?;
108134

109135
// Determine which operation we are generating code for. This will be used in operationName.
110136
let operations = options
@@ -131,10 +157,10 @@ pub fn generate_module_token_stream(
131157
for operation in &operations {
132158
let generated = generated_module::GeneratedModule {
133159
query_string: query_string.as_str(),
134-
schema: &schema,
160+
schema,
135161
resolved_query: &query,
136162
operation: &operation.1.name,
137-
options: &options,
163+
options,
138164
}
139165
.to_token_stream()?;
140166
modules.push(generated);

0 commit comments

Comments
 (0)