1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
//! Test for improved union array naming (fixing UnionArray1 -> contextual names)
use openapi_to_rust::test_helpers::*;
use serde_json::json;
#[test]
fn test_union_array_context_aware_naming() {
let spec = json!({
"openapi": "3.1.0",
"info": {
"title": "Test API",
"version": "1.0.0"
},
"components": {
"schemas": {
"RequestToolResultBlock": {
"type": "object",
"properties": {
"tool_use_id": {
"type": "string",
"pattern": "^[a-zA-Z0-9_-]+$"
},
"content": {
"anyOf": [
{ "type": "string" },
{
"type": "array",
"items": {
"oneOf": [
{ "$ref": "#/components/schemas/RequestTextBlock" },
{ "$ref": "#/components/schemas/RequestImageBlock" }
],
"discriminator": {
"propertyName": "type",
"mapping": {
"text": "#/components/schemas/RequestTextBlock",
"image": "#/components/schemas/RequestImageBlock"
}
}
}
}
]
}
},
"required": ["tool_use_id"]
},
"RequestTextBlock": {
"type": "object",
"properties": {
"type": { "const": "text" },
"text": { "type": "string" }
},
"required": ["type", "text"]
},
"RequestImageBlock": {
"type": "object",
"properties": {
"type": { "const": "image" },
"source": {
"type": "object",
"properties": {
"type": { "type": "string" },
"data": { "type": "string" }
}
}
},
"required": ["type", "source"]
},
"MessageContent": {
"anyOf": [
{ "type": "string" },
{
"type": "array",
"items": { "type": "string" }
},
{
"type": "array",
"items": {
"type": "object",
"properties": {
"text": { "type": "string" }
}
}
}
]
}
}
}
});
let result = test_generation("union_array_naming", spec).expect("Generation failed");
// Check that UnionArray1 is NOT present
assert!(
!result.contains("UnionArray1"),
"Should not contain generic UnionArray1 names"
);
assert!(
!result.contains("UnionArray2"),
"Should not contain generic UnionArray2 names"
);
// Check for context-aware array naming in RequestToolResultBlock
assert!(
result.contains("RequestToolResultBlockContentArray")
|| result.contains("RequestToolResultBlockArray"),
"Array variant in RequestToolResultBlock should have context-aware name"
);
// Check that the enum is properly structured
assert!(
result.contains("pub enum RequestToolResultBlockContent"),
"Should have RequestToolResultBlockContent enum"
);
// For MessageContent, should have context-aware array names
assert!(
result.contains("MessageContentArray")
|| result.contains("MessageContentStringArray")
|| result.contains("Vec<String>"),
"MessageContent arrays should have context-aware names"
);
}
#[test]
fn test_nested_union_array_naming() {
let spec = json!({
"openapi": "3.1.0",
"info": {
"title": "Test API",
"version": "1.0.0"
},
"components": {
"schemas": {
"ComplexContent": {
"anyOf": [
{
"type": "object",
"properties": {
"simple": { "type": "string" }
}
},
{
"type": "array",
"items": {
"anyOf": [
{ "type": "string" },
{ "$ref": "#/components/schemas/NestedItem" }
]
}
}
]
},
"NestedItem": {
"type": "object",
"properties": {
"id": { "type": "string" },
"value": { "type": "number" }
}
}
}
}
});
let result = test_generation("nested_union_array", spec).expect("Generation failed");
// Should not have generic numbered array names
assert!(
!result.contains("UnionArray"),
"Should not contain any UnionArray names"
);
// Should have context-aware names
assert!(
result.contains("ComplexContentArray") || result.contains("ComplexContentItemArray"),
"Nested array should have context-aware name"
);
}
#[test]
fn test_multiple_array_variants_naming() {
let spec = json!({
"openapi": "3.1.0",
"info": {
"title": "Test API",
"version": "1.0.0"
},
"components": {
"schemas": {
"MultiArrayContent": {
"anyOf": [
{ "type": "string" },
{
"type": "array",
"items": { "type": "string" }
},
{
"type": "array",
"items": { "type": "integer" }
},
{
"type": "array",
"items": { "$ref": "#/components/schemas/Item" }
}
]
},
"Item": {
"type": "object",
"properties": {
"name": { "type": "string" }
}
}
}
}
});
let result = test_generation("multi_array_variants", spec).expect("Generation failed");
// Should not have numbered array names
for i in 0..10 {
assert!(
!result.contains(&format!("UnionArray{i}")),
"Should not contain UnionArray{i} name"
);
}
// Arrays should either be inlined as Vec<T> or have descriptive names
assert!(
result.contains("Vec<String>") || result.contains("MultiArrayContentStringArray"),
"String array should be properly typed"
);
assert!(
result.contains("Vec<i32>")
|| result.contains("Vec<i64>")
|| result.contains("MultiArrayContentIntegerArray"),
"Integer array should be properly typed"
);
assert!(
result.contains("Vec<Item>")
|| result.contains("ItemArray")
|| result.contains("MultiArrayContentItemArray"),
"Item array should use referenced type name"
);
}