Skip to content

refactor: Enhance type emitter #74

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.

Sign up for GitHub

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

Merged
zharinov merged 1 commit into from
Dec 7, 2025
Merged

refactor: Enhance type emitter #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions crates/plotnik-lib/src/infer/emit/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fn emit_type_def(
let name = key.to_pascal_case();

match value {
TypeValue::Node | TypeValue::String | TypeValue::Unit => String::new(),
TypeValue::Node | TypeValue::String | TypeValue::Unit | TypeValue::Invalid => String::new(),

TypeValue::Struct(fields) => {
let mut out = emit_derives(config);
Expand Down Expand Up @@ -134,7 +134,7 @@ pub(crate) fn emit_type_ref(
let base = match table.get(key) {
Some(TypeValue::Node) => "Node".to_string(),
Some(TypeValue::String) => "String".to_string(),
Some(TypeValue::Unit) => "()".to_string(),
Some(TypeValue::Unit) | Some(TypeValue::Invalid) => "()".to_string(),
Some(TypeValue::Optional(inner)) => {
let inner_str = emit_type_ref(inner, table, config);
format!("Option<{}>", inner_str)
Expand Down Expand Up @@ -225,7 +225,7 @@ fn visit<'src>(

pub(crate) fn dependencies<'src>(value: &TypeValue<'src>) -> Vec<TypeKey<'src>> {
match value {
TypeValue::Node | TypeValue::String | TypeValue::Unit => vec![],
TypeValue::Node | TypeValue::String | TypeValue::Unit | TypeValue::Invalid => vec![],

TypeValue::Struct(fields) => fields.values().cloned().collect(),

Expand Down
60 changes: 30 additions & 30 deletions crates/plotnik-lib/src/infer/emit/rust_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fn emit_cyclic(input: &str, cyclic_types: &[&str]) -> String {

#[test]
fn emit_struct_single_field() {
let input = "Foo = { Node @value }";
let input = "Foo = { #Node @value }";
insta::assert_snapshot!(emit(input), @r"
#[derive(Debug, Clone)]
pub struct Foo {
Expand All @@ -35,7 +35,7 @@ fn emit_struct_single_field() {

#[test]
fn emit_struct_multiple_fields() {
let input = "Func = { string @name Node @body Node @params }";
let input = "Func = { #string @name #Node @body #Node @params }";
insta::assert_snapshot!(emit(input), @r"
#[derive(Debug, Clone)]
pub struct Func {
Expand Down Expand Up @@ -69,8 +69,8 @@ fn emit_struct_with_unit_field() {
#[test]
fn emit_struct_nested_refs() {
let input = indoc! {r#"
Inner = { Node @value }
Outer = { Inner @inner string @label }
Inner = { #Node @value }
Outer = { Inner @inner #string @label }
"#};
insta::assert_snapshot!(emit(input), @r"
#[derive(Debug, Clone)]
Expand All @@ -91,8 +91,8 @@ fn emit_struct_nested_refs() {
#[test]
fn emit_tagged_union_simple() {
let input = indoc! {r#"
AssignStmt = { Node @target Node @value }
CallStmt = { Node @func }
AssignStmt = { #Node @target #Node @value }
CallStmt = { #Node @func }
Stmt = [ Assign: AssignStmt Call: CallStmt ]
"#};
insta::assert_snapshot!(emit(input), @r"
Expand Down Expand Up @@ -123,7 +123,7 @@ fn emit_tagged_union_simple() {
#[test]
fn emit_tagged_union_with_empty_variant() {
let input = indoc! {r#"
ValueVariant = { Node @value }
ValueVariant = { #Node @value }
Expr = [ Some: ValueVariant None: () ]
"#};
insta::assert_snapshot!(emit(input), @r"
Expand Down Expand Up @@ -157,7 +157,7 @@ fn emit_tagged_union_all_empty() {

#[test]
fn emit_tagged_union_with_builtins() {
let input = "Value = [ Text: string Code: Node Empty: () ]";
let input = "Value = [ Text: #string Code: #Node Empty: () ]";
insta::assert_snapshot!(emit(input), @r"
#[derive(Debug, Clone)]
pub enum Value {
Expand All @@ -172,26 +172,26 @@ fn emit_tagged_union_with_builtins() {

#[test]
fn emit_optional() {
let input = "MaybeNode = Node?";
let input = "MaybeNode = #Node?";
insta::assert_snapshot!(emit(input), @"pub type MaybeNode = Option<Node>;");
}

#[test]
fn emit_list() {
let input = "Nodes = Node*";
let input = "Nodes = #Node*";
insta::assert_snapshot!(emit(input), @"pub type Nodes = Vec<Node>;");
}

#[test]
fn emit_non_empty_list() {
let input = "Nodes = Node+";
let input = "Nodes = #Node+";
insta::assert_snapshot!(emit(input), @"pub type Nodes = Vec<Node>;");
}

#[test]
fn emit_optional_named() {
let input = indoc! {r#"
Stmt = { Node @value }
Stmt = { #Node @value }
MaybeStmt = Stmt?
"#};
insta::assert_snapshot!(emit(input), @r"
Expand All @@ -207,7 +207,7 @@ fn emit_optional_named() {
#[test]
fn emit_list_named() {
let input = indoc! {r#"
Stmt = { Node @value }
Stmt = { #Node @value }
Stmts = Stmt*
"#};
insta::assert_snapshot!(emit(input), @r"
Expand All @@ -223,7 +223,7 @@ fn emit_list_named() {
#[test]
fn emit_nested_wrappers() {
let input = indoc! {r#"
Item = { Node @value }
Item = { #Node @value }
Items = Item*
MaybeItems = Items?
"#};
Expand All @@ -244,7 +244,7 @@ fn emit_nested_wrappers() {
#[test]
fn emit_cyclic_box() {
let input = indoc! {r#"
TreeNode = { Node @value TreeNode @left TreeNode @right }
TreeNode = { #Node @value TreeNode @left TreeNode @right }
"#};
insta::assert_snapshot!(emit_cyclic(input, &["TreeNode"]), @r"
#[derive(Debug, Clone)]
Expand All @@ -258,7 +258,7 @@ fn emit_cyclic_box() {

#[test]
fn emit_cyclic_rc() {
let input = "TreeNode = { Node @value TreeNode @child }";
let input = "TreeNode = { #Node @value TreeNode @child }";
let config = RustEmitConfig {
indirection: Indirection::Rc,
..Default::default()
Expand All @@ -276,7 +276,7 @@ fn emit_cyclic_rc() {

#[test]
fn emit_cyclic_arc() {
let input = "TreeNode = { Node @value TreeNode @child }";
let input = "TreeNode = { #Node @value TreeNode @child }";
let config = RustEmitConfig {
indirection: Indirection::Arc,
..Default::default()
Expand All @@ -296,7 +296,7 @@ fn emit_cyclic_arc() {

#[test]
fn emit_no_derives() {
let input = "Foo = { Node @value }";
let input = "Foo = { #Node @value }";
let config = RustEmitConfig {
derive_debug: false,
derive_clone: false,
Expand All @@ -312,7 +312,7 @@ fn emit_no_derives() {

#[test]
fn emit_debug_only() {
let input = "Foo = { Node @value }";
let input = "Foo = { #Node @value }";
let config = RustEmitConfig {
derive_debug: true,
derive_clone: false,
Expand All @@ -329,7 +329,7 @@ fn emit_debug_only() {

#[test]
fn emit_all_derives() {
let input = "Foo = { Node @value }";
let input = "Foo = { #Node @value }";
let config = RustEmitConfig {
derive_debug: true,
derive_clone: true,
Expand All @@ -349,11 +349,11 @@ fn emit_all_derives() {
#[test]
fn emit_complex_program() {
let input = indoc! {r#"
FuncInfo = { string @name Node @body }
Param = { string @name string @type_annotation }
FuncInfo = { #string @name #Node @body }
Param = { #string @name #string @type_annotation }
Params = Param*
FuncDecl = { FuncInfo @info Params @params }
ExprStmt = { Node @expr }
ExprStmt = { #Node @expr }
Stmt = [ Func: FuncDecl Expr: ExprStmt ]
Program = { Stmt @statements }
"#};
Expand Down Expand Up @@ -420,8 +420,8 @@ fn emit_synthetic_keys() {
#[test]
fn emit_mixed_wrappers_and_structs() {
let input = indoc! {r#"
Leaf = { string @text }
Branch = { Node @left Node @right }
Leaf = { #string @text }
Branch = { #Node @left #Node @right }
Tree = [ Leaf: Leaf Branch: Branch ]
Forest = Tree*
MaybeForest = Forest?
Expand Down Expand Up @@ -460,7 +460,7 @@ fn emit_mixed_wrappers_and_structs() {
#[test]
fn emit_single_variant_union() {
let input = indoc! {r#"
OnlyVariant = { Node @value }
OnlyVariant = { #Node @value }
Single = [ Only: OnlyVariant ]
"#};
insta::assert_snapshot!(emit(input), @r"
Expand All @@ -481,7 +481,7 @@ fn emit_single_variant_union() {
#[test]
fn emit_deeply_nested() {
let input = indoc! {r#"
A = { Node @val }
A = { #Node @val }
B = { A @a }
C = { B @b }
D = { C @c }
Expand Down Expand Up @@ -512,7 +512,7 @@ fn emit_deeply_nested() {
#[test]
fn emit_list_of_optionals() {
let input = indoc! {r#"
Item = { Node @value }
Item = { #Node @value }
MaybeItem = Item?
Items = MaybeItem*
"#};
Expand All @@ -531,8 +531,8 @@ fn emit_list_of_optionals() {
#[test]
fn emit_builtin_value_with_named_key() {
let input = indoc! {r#"
AliasNode = Node
AliasString = string
AliasNode = #Node
AliasString = #string
AliasUnit = ()
"#};
insta::assert_snapshot!(emit(input), @"");
Expand Down
6 changes: 3 additions & 3 deletions crates/plotnik-lib/src/infer/emit/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn emit_type_def(
};

match value {
TypeValue::Node | TypeValue::String | TypeValue::Unit => String::new(),
TypeValue::Node | TypeValue::String | TypeValue::Unit | TypeValue::Invalid => String::new(),

TypeValue::Struct(fields) => {
if config.use_type_alias {
Expand Down Expand Up @@ -166,7 +166,7 @@ pub(crate) fn emit_field_type(
match table.get(key) {
Some(TypeValue::Node) => (config.node_type_name.clone(), false),
Some(TypeValue::String) => ("string".to_string(), false),
Some(TypeValue::Unit) => ("{}".to_string(), false),
Some(TypeValue::Unit) | Some(TypeValue::Invalid) => ("{}".to_string(), false),

Some(TypeValue::Optional(inner)) => {
let (inner_str, _) = emit_field_type(inner, table, config);
Expand Down Expand Up @@ -279,7 +279,7 @@ fn visit<'src>(

pub(crate) fn dependencies<'src>(value: &TypeValue<'src>) -> Vec<TypeKey<'src>> {
match value {
TypeValue::Node | TypeValue::String | TypeValue::Unit => vec![],
TypeValue::Node | TypeValue::String | TypeValue::Unit | TypeValue::Invalid => vec![],
TypeValue::Struct(fields) => fields.values().cloned().collect(),
TypeValue::TaggedUnion(variants) => variants.values().cloned().collect(),
TypeValue::Optional(inner) | TypeValue::List(inner) | TypeValue::NonEmptyList(inner) => {
Expand Down
Loading