Merge new-model-changes feature branch to main (#171)

* Adds new model changes for `Structure` (#138)
* Adds new model changes for scalar (#143)
* Adds changes for sequence data type (#144)
* Adds tests for new model changes (#146)
* Adds new model changes for Rust code generation (#147)
* Adds changes for optional/required fields in Java code generation (#148)
* Modifies generated setter API to take nested types instead of nested properties (#153)
* Adds support for builder API generation in Java (#154)
* Adds support for Java enum generation (#158)
* Adds namespace fix for nested sequence and adds support for nested types in Sequence and Scalar ADT (#163)
* Adds changes for nested type naming (#166)
* Adds support for imports in code generation (#169)

Cargo.toml

@@ -36,6 +36,7 @@ thiserror = "1.0.50"
 zstd = "0.13.0"
 termcolor = "1.4.1"
 derive_builder = "0.20.0"
+itertools = "0.13.0"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 pager = "0.16.1"

code-gen-projects/input/bad/enum_type/invalid_case_enum_varaint.ion

@@ -0,0 +1 @@
+FoobarBaz // expected FooBarBaz, found FoobarBaz

code-gen-projects/input/bad/enum_type/invalid_enum_variant.ion

@@ -0,0 +1 @@
+hello // expected (foo, bar, baz or FooBarBaz) found hello

code-gen-projects/input/bad/enum_type/mismatched_enum_type.ion

@@ -0,0 +1 @@
+"foo" // expected a symbol value foo for enum, found string "foo"

code-gen-projects/input/bad/nested_struct/mismatched_sequence_type.ion

@@ -6,4 +6,4 @@
     D: false,
     E: (1 2 3) // expected list
  }
-}
+}

code-gen-projects/input/bad/scalar/mismatched_type.ion

@@ -1 +1 @@
-12 // expected string
+12 // expected string

code-gen-projects/input/bad/sequence/mismatched_sequence_element_type.ion

@@ -0,0 +1 @@
+[1, 2, 3] // expected list of strings

code-gen-projects/input/bad/sequence/mismatched_sequence_type.ion

@@ -1 +1 @@
-("foo" "bar" "baz") // expected list
+("foo" "bar" "baz") // expected list

code-gen-projects/input/bad/sequence_with_enum_element/invalid_value.ion

@@ -0,0 +1 @@
+[foobar] // expected values are either foo , bar or baz, found foobar.

code-gen-projects/input/bad/sequence_with_import/mismatched_sequence_element_type.ion

@@ -0,0 +1 @@
+[ mango ] // expected apple, banana or strawberry, found mango

code-gen-projects/input/bad/sequence_with_import/mismatched_sequence_type.ion

@@ -0,0 +1 @@
+(apple banana) // expected list, found sexp

code-gen-projects/input/bad/struct_with_fields/mismatched_sequence_element.ion → code-gen-projects/input/bad/struct_with_enum_fields/mismatched_sequence_element_type.ion

@@ -2,7 +2,6 @@
 {
  A: "hello",
  B: 12,
- C: (1 2 3),
+ C: (1 2 3), // expected sexpression of strings
  D: 10e2
 }
-

code-gen-projects/input/bad/struct_with_enum_fields/mismatched_sequence_type.ion

@@ -0,0 +1,7 @@
+// simple struct with type mismatched sequence type
+{
+ A: "hello",
+ B: 12,
+ C: ["foo", "bar", "baz"], // expected sexp
+ D: 10e2
+}

code-gen-projects/input/bad/struct_with_enum_fields/mismatched_type.ion

@@ -0,0 +1,7 @@
+// simple struct with type mismatched fields
+{
+ A: "hello",
+ B: false, // expected field type: int
+ C: ("foo" "bar" "baz"),
+ D: 10e2
+}

code-gen-projects/input/bad/struct_with_enum_fields/missing_required_fields.ion

@@ -0,0 +1,7 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: 12,
+ // C: ("foo" "bar" "baz"), // since `C` is a required field, this is an invalid struct
+ D: 10e2
+}

code-gen-projects/input/bad/struct_with_fields/mismatched_sequence_element_type.ion

@@ -0,0 +1,7 @@
+// struct with mismatched sequence element
+{
+ A: "hello",
+ B: 12,
+ C: (1 2 3), // expected sexpression of strings
+ D: 10e2
+}

code-gen-projects/input/bad/struct_with_fields/mismatched_type.ion

@@ -5,4 +5,3 @@
  C: ("foo" "bar" "baz"),
  D: 10e2
 }
-

code-gen-projects/input/bad/struct_with_fields/missing_required_fields.ion

@@ -0,0 +1,7 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: 12,
+ // C: ("foo" "bar" "baz"), // since `C` is a required field, this is an invalid struct
+ D: 10e2
+}

code-gen-projects/input/bad/struct_with_inline_import/mismatched_import_type.ion

@@ -0,0 +1,5 @@
+// simple struct with type mismatched import field
+{
+ A: "hello",
+ B: false, // expected field type symbol
+}

code-gen-projects/input/good/enum_type/valid_value_1.ion

@@ -0,0 +1 @@
+foo

code-gen-projects/input/good/enum_type/valid_value_2.ion

@@ -0,0 +1 @@
+bar

code-gen-projects/input/good/enum_type/valid_value_3.ion

@@ -0,0 +1 @@
+baz

code-gen-projects/input/good/enum_type/valid_value_4.ion

@@ -0,0 +1 @@
+FooBarBaz

code-gen-projects/input/good/nested_struct/valid_optional_fields.ion

@@ -0,0 +1,9 @@
+// nested struct with some optional fields that are not provided
+{
+ A: "hello",
+ // B: 12, // since `B` is optional field, this is a valid struct
+ C: {
+    D: false,
+    E: [1, 2, 3]
+ }
+}

code-gen-projects/input/good/nested_struct/valid_unordered_fields.ion

@@ -7,4 +7,3 @@
     E: [1, 2, 3]
  }
 }
-

code-gen-projects/input/good/scalar/empty_value.ion

@@ -1,2 +1,2 @@
 // empty string
-""
+""

code-gen-projects/input/good/scalar/valid_value.ion

@@ -1,2 +1,2 @@
 // a scalar value of string type
-"Hello World!"
+"Hello World!"

code-gen-projects/input/good/sequence/empty_sequence.ion

@@ -1 +1 @@
-[]
+[]

code-gen-projects/input/good/sequence/valid_elements.ion

@@ -1 +1 @@
-["foo", "bar", "baz"]
+["foo", "bar", "baz"]

code-gen-projects/input/good/sequence_with_enum_element/valid_value.ion

@@ -0,0 +1 @@
+[foo, bar, baz]

code-gen-projects/input/good/sequence_with_import/empty_sequence.ion

@@ -0,0 +1 @@
+[]

code-gen-projects/input/good/sequence_with_import/valid_elements.ion

@@ -0,0 +1 @@
+[ apple, strawberry ]

code-gen-projects/input/good/struct_with_enum_fields/empty_values.ion

@@ -0,0 +1,7 @@
+// struct with empty list, empty string and zeros
+{
+ C: (),
+ A: "",
+ B: 0,
+ D: 0e0,
+}

code-gen-projects/input/good/struct_with_enum_fields/valid_fields.ion

@@ -0,0 +1,8 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: 12,
+ C: ("foo" "bar" "baz"),
+ D: 10e2,
+ E: foo
+}

code-gen-projects/input/good/struct_with_enum_fields/valid_optional_fields.ion

@@ -0,0 +1,8 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: 12,
+ C: ("foo" "bar" "baz"),
+ // D: 10e2, // since `D` is optional field, this is a valid struct
+ E: foo,
+}

code-gen-projects/input/good/struct_with_enum_fields/valid_unordered_fields.ion

@@ -0,0 +1,8 @@
+// struct with unordered fields
+{
+ C: ("foo" "bar" "baz"),
+ A: "hello",
+ B: 12,
+ E: foo,
+ D: 10e2,
+}

code-gen-projects/input/good/struct_with_fields/valid_optional_fields.ion

@@ -0,0 +1,7 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: 12,
+ C: ("foo" "bar" "baz"),
+ // D: 10e2, // since `D` is optional field, this is a valid struct
+}

code-gen-projects/input/good/struct_with_fields/valid_unordered_fields.ion

@@ -1,4 +1,3 @@
-
 // struct with unordered fields
 {
  C: ("foo" "bar" "baz"),

code-gen-projects/input/good/struct_with_inline_import/valid_fields.ion

@@ -0,0 +1,5 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ B: apple,
+}

code-gen-projects/input/good/struct_with_inline_import/valid_optional_fields.ion

@@ -0,0 +1,5 @@
+// simple struct with all valid fields
+{
+ A: "hello",
+ // B: apple, // since `B` is an optional field, this is a valid struct
+}

code-gen-projects/input/good/struct_with_inline_import/valid_unordered_fields.ion

@@ -0,0 +1,5 @@
+// struct with unordered fields
+{
+ B: banana,
+ A: "hello",
+}