Use graphql utils from toolshed (#44)

agora/Cargo.toml

@@ -14,11 +14,11 @@ fraction = { version="0.6.3", features=["with-bigint"] }
 serde = { version="1.0.115", features = ["derive"] }
 serde_json = "1.0"
 tree-buf = "0.10.0"
-shellexpand = "2.0.0"
+shellexpand = "3.0.0"
 rayon = "1.4.0"
-rand = "0.7.3"
+rand = "0.8.5"
 structopt = "0.3.14"
 num-format = { version = "0.4.0", features = ["with-num-bigint"] }
-graphql-parser = "0.3.0"
+graphql-parser = "0.4.0"
 anyhow = "1.0.33"
 libflate = "1.1.0"

lang/Cargo.toml

@@ -7,15 +7,13 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# Include the consume_definition API and nameless operations fix
-graphql-parser = { git = "https://github.com/graphql-rust/graphql-parser", rev = "8a759df" }
-# graphql-parser = "0.3.0"
+lazy_static = "1.4.0"
 nom = "5.1.2"
 num-bigint = "0.2.6"
 num-traits = "0.2.12"
+firestorm = "0.5"
 fraction = { version = "0.6.3", features = ["with-bigint"] }
 serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0"
-lazy_static = "1.4.0"
 single = "1.0.0"
-firestorm = "0.4"
+toolshed = { git = "https://github.com/edgeandnode/toolshed", tag = "v0.1.1" }

lang/src/coercion.rs

@@ -1,7 +1,6 @@
-use graphql_parser::query as q;
-
 use fraction::BigFraction;
 use q::Value::*;
+use toolshed::graphql::graphql_parser::query as q;
 
 /// This is like TryInto, but more liberal
 pub trait Coerce<T> {

lang/src/context.rs

@@ -1,7 +1,6 @@
-use crate::graphql_utils::QueryVariables;
 use crate::prelude::*;
 use crate::{Captures, CostError};
-use graphql_parser::query as q;
+use toolshed::graphql::{graphql_parser::query as q, QueryVariables};
 
 pub struct Context<'a, T: q::Text<'a>> {
     pub operations: Vec<q::OperationDefinition<'a, T>>,

lang/src/expressions/primitives.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::coercion::Coerce;
-use crate::graphql_utils::StaticValue;
 use std::marker::PhantomData;
+use toolshed::graphql::StaticValue;
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 struct Unowned<T>(PhantomData<*const T>);

lang/src/language.rs

@@ -1,12 +1,11 @@
 use crate::coercion::Coerce;
 use crate::expressions::expr_stack::*;
 use crate::expressions::*;
-use crate::graphql_utils::{IntoStaticValue, QueryVariables, StaticValue};
 use crate::matching::{get_capture_names_field, match_query};
 use crate::prelude::*;
 use fraction::BigFraction;
-use graphql_parser::query as q;
 use std::collections::HashMap;
+use toolshed::graphql::{graphql_parser::query as q, IntoStaticValue, QueryVariables, StaticValue};
 
 #[derive(Debug, PartialEq)]
 pub struct Document<'a> {
@@ -324,7 +323,7 @@ impl Captures {
 #[cfg(test)]
 pub(crate) mod test_helpers {
     use super::*;
-    use crate::graphql_utils::IntoStaticValue;
+    use toolshed::graphql::IntoStaticValue;
 
     impl From<()> for Captures {
         fn from(_: ()) -> Captures {

lang/src/lib.rs

@@ -4,26 +4,23 @@ extern crate lazy_static;
 mod coercion;
 mod context;
 mod expressions;
-mod graphql_utils;
 mod language;
 mod matching;
 #[macro_use]
 mod parse_errors;
 mod parser;
-mod repeat;
 
 pub(crate) mod prelude;
 use prelude::*;
 
 use fraction::{BigFraction, GenericFraction, Sign};
-use graphql_parser::query as q;
 use language::*;
 use num_bigint::BigUint;
 use std::{error, fmt};
+use toolshed::graphql::graphql_parser::query as q;
+use toolshed::graphql::QueryVariables;
 
 pub use context::Context;
-// Hack for indexer selection
-pub use graphql_utils::QueryVariables;
 
 pub struct CostModel {
     // Rust does not have a memory model, nor does it have a proper `uintptr_t` equivalent. So a
@@ -93,7 +90,7 @@ pub(crate) fn parse_vars(vars: &str) -> Result<QueryVariables, serde_json::Error
 
     let vars = vars.trim();
     if ["{}", "null", ""].contains(&vars) {
-        Ok(graphql_utils::QueryVariables::new())
+        Ok(QueryVariables::default())
     } else {
         serde_json::from_str(vars)
     }

lang/src/matching.rs

@@ -1,10 +1,9 @@
-use crate::graphql_utils::{IntoStaticValue, QueryVariables};
 use crate::language::Captures;
 use crate::prelude::*;
-use graphql_parser::query as q;
 use single::Single as _;
 use std::borrow::Borrow;
 use std::collections::BTreeMap;
+use toolshed::graphql::{graphql_parser::query as q, IntoStaticValue, QueryVariables};
 
 struct MatchingContext<'var, 'cap, 'frag, 'fragt: 'frag, TF: q::Text<'fragt>> {
     fragments: &'frag [q::FragmentDefinition<'fragt, TF>],

lang/src/parse_errors.rs

@@ -1,11 +1,10 @@
 use crate::prelude::*;
-use crate::repeat::repeat;
-use graphql_parser::query::ParseError as GraphQLParseError;
 use nom::error::{ErrorKind, ParseError};
 use nom::{Err as NomErr, IResult, InputLength};
 use std::cmp::Ordering;
 use std::fmt;
 use std::ops::Deref;
+use toolshed::graphql::graphql_parser::query::ParseError as GraphQLParseError;
 
 /// If something failed, this notes what we were
 /// trying to do when it failed.
@@ -385,7 +384,7 @@ impl<'a> AgoraParseError<&'a str> {
         )?;
         writeln!(f, "{}", pos.line)?;
         // Write a caret indicating the position.
-        writeln!(f, "{}^", repeat(pos.column_number, " "))?;
+        writeln!(f, "{}^", " ".repeat(pos.column_number))?;
         Ok(())
     }
 }

lang/src/parser.rs

@@ -4,7 +4,6 @@ use crate::parse_errors::{
 use crate::prelude::*;
 use crate::{expressions::*, language::*, parse_errors::*};
 use fraction::BigFraction;
-use graphql_parser::query as q;
 use nom::{
     branch::alt,
     bytes::complete::{is_not, take_while1},
@@ -19,6 +18,7 @@ use nom::{
 use num_bigint::BigUint;
 use num_traits::Pow as _;
 use single::Single as _;
+use toolshed::graphql::graphql_parser::query as q;
 
 // Change Nom default error type from (I, ErrorKind) to ErrorAggregator<I>
 type IResult<I, O, E = ErrorAggregator<I>> = NomIResult<I, O, E>;