noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add basic enum support (#4576)

Browse source
This commit is contained in:
Raphael Darley 2024-08-22 15:31:00 -07:00 committed by GitHub
parent a9e6efd9b1
commit da308cc8c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/src/gql/schema.rs
View file

@ -4,6 +4,7 @@ use std::sync::Arc;
use crate::dbs::Session;
use crate::kvs::Datastore;
use crate::sql::kind::Literal;
use crate::sql::statements::{DefineFieldStatement, SelectStatement};
use crate::sql::Kind;
use crate::sql::{self, Table};
@ -590,9 +591,39 @@ fn kind_to_type(kind: Kind, types: &mut Vec<Type>) -> Result<TypeRef, GqlError>
}
kind_to_type(non_op_ty, types)?
}
Kind::Either(ts) => {
Kind::Either(ks) => {
let (ls, others): (Vec<Kind>, Vec<Kind>) =
ks.into_iter().partition(|k| matches!(k, Kind::Literal(Literal::String(_))));
let enum_ty = if ls.len() > 0 {
let vals: Vec<String> = ls
.into_iter()
.map(|l| {
let Kind::Literal(Literal::String(out)) = l else {
unreachable!(
"just checked that this is a Kind::Literal(Literal::String(_))"
);
};
out.0
})
.collect();
let mut tmp = Enum::new(vals.join("_or_"));
tmp = tmp.items(vals);
let enum_ty = tmp.type_name().to_string();
types.push(Type::Enum(tmp));
if others.len() == 0 {
return Ok(TypeRef::named(enum_ty));
}
Some(enum_ty)
} else {
None
};
let pos_names: Result<Vec<TypeRef>, GqlError> =
ts.into_iter().map(|k| kind_to_type(k, types)).collect();
others.into_iter().map(|k| kind_to_type(k, types)).collect();
let pos_names: Vec<String> = pos_names?.into_iter().map(|tr| tr.to_string()).collect();
let ty_name = pos_names.join("_or_");
@ -601,6 +632,10 @@ fn kind_to_type(kind: Kind, types: &mut Vec<Type>) -> Result<TypeRef, GqlError>
tmp_union = tmp_union.possible_type(n);
}
if let Some(ty) = enum_ty {
tmp_union = tmp_union.possible_type(ty);
}
types.push(Type::Union(tmp_union));
TypeRef::named(ty_name)
}
@ -608,6 +643,8 @@ fn kind_to_type(kind: Kind, types: &mut Vec<Type>) -> Result<TypeRef, GqlError>
Kind::Array(k, _) => TypeRef::List(Box::new(kind_to_type(*k, types)?)),
Kind::Function(_, _) => return Err(schema_error("Kind::Function is not yet supported")),
Kind::Range => return Err(schema_error("Kind::Range is not yet supported")),
// TODO(raphaeldarley): check if union is of literals and generate enum
// generate custom scalar from other literals?
Kind::Literal(_) => return Err(schema_error("Kind::Literal is not yet supported")),
};