Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(grpc): type and field names for config from protobuf generation #1895

Merged
merged 24 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3b527a4
test: cleanup protobuf tests
meskill May 7, 2024
89c395a
refactor graphql type
meskill May 7, 2024
b05e589
fix generation for external types
meskill May 8, 2024
d571c4f
Merge remote-tracking branch 'origin/main' into fix/grpc-generation
meskill May 8, 2024
1041b38
fix lint
meskill May 8, 2024
7b610e0
Merge remote-tracking branch 'origin/main' into fix/grpc-generation
meskill May 9, 2024
982da4c
fix build
meskill May 9, 2024
b284205
Merge remote-tracking branch 'origin/main' into fix/grpc-generation
meskill May 9, 2024
5dee66a
fix(grpc): empty scalar validation (#1902)
meskill May 9, 2024
a11094f
Merge branch 'main' into fix/grpc-generation
tusharmath May 9, 2024
00754c6
update function name
tusharmath May 9, 2024
be7e3ab
restore some unit tests
meskill May 10, 2024
d961a44
Merge remote-tracking branch 'origin/main' into fix/grpc-generation
meskill May 10, 2024
e907110
fix(grpc): add body to generated config (#1903)
meskill May 10, 2024
d01949f
fix(grpc): proper generation for nested message and enum (#1905)
meskill May 10, 2024
dccb3ad
update tests
tusharmath May 11, 2024
7328a50
Merge branch 'main' into fix/grpc-generation
tusharmath May 13, 2024
5c9c037
Merge branch 'main' into fix/grpc-generation
tusharmath May 15, 2024
84eb21b
feat(grpc): gen google types (#1914)
meskill May 15, 2024
9b2df41
Merge branch 'main' into fix/grpc-generation
tusharmath May 15, 2024
b701c9e
fix compilation issues
tusharmath May 15, 2024
5042412
Merge branch 'main' into fix/grpc-generation
tusharmath May 16, 2024
a261f2f
Merge remote-tracking branch 'origin/main' into fix/grpc-generation
meskill May 16, 2024
74cdff5
bring back @tag to generated types
meskill May 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion generated/.tailcallrc.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,9 @@
"enum": [
"Str",
"Num",
"Bool"
"Bool",
"Empty",
"Any"
tusharmath marked this conversation as resolved.
Show resolved Hide resolved
]
},
{
Expand Down
9 changes: 5 additions & 4 deletions src/core/blueprint/from_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ where
JsonSchema::Enum(type_enum_.variants.to_owned())
} else {
match type_of {
"String" => JsonSchema::Str {},
"Int" => JsonSchema::Num {},
"Boolean" => JsonSchema::Bool {},
"String" => JsonSchema::Str,
"Int" => JsonSchema::Num,
"Boolean" => JsonSchema::Bool,
"Empty" => JsonSchema::Empty,
"JSON" => JsonSchema::Obj(HashMap::new()),
_ => JsonSchema::Str {},
_ => JsonSchema::Any,
}
};

Expand Down
10 changes: 5 additions & 5 deletions src/core/config/config_module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,11 @@ mod tests {

let expected = hashset![
"Query",
"OUT_NEWS_NEWS",
"IN_NEWS_NEWS",
"NEWS_MULTIPLE_NEWS_ID",
"NEWS_NEWS_ID",
"NEWS_NEWS_LIST",
"news__News",
"news__NewsList",
"news__NewsInput",
"news__NewsId",
"news__MultipleNewsId"
];
assert_eq!(actual, expected);
Ok(())
Expand Down
Loading
Loading