Skip to content

feat: update with master #2161

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
merged 7 commits into from
Jan 27, 2025
Merged

feat: update with master #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4db3328
feat: add required field management in csharp newtonsoft serializer …
fr-th Jan 25, 2025
93cc628
chore(release): v3.11.0 (#2158)
asyncapi-bot Jan 25, 2025
122c8ea
docs: add fr-th as a contributor for code, test, and doc (#2157)
allcontributors[bot] Jan 25, 2025
61271d3
feat: improved inheritance handling for the Java Generator (#2148)
Jessewb786 Jan 26, 2025
c579393
chore(release): v3.12.0 (#2159)
asyncapi-bot Jan 26, 2025
a4fac8c
Merge branch 'master' into update_next
jonaslagoni Jan 27, 2025
8938979
chore: update snapshots
jonaslagoni Jan 27, 2025
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
1 change: 0 additions & 1 deletion examples/csharp-generate-newtonsoft-serializer/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public partial class Root
get { return name; }
set { this.name = value; }
}

public string Serialize()
{
return JsonConvert.SerializeObject(this);
Expand Down
41 changes: 20 additions & 21 deletions src/generators/csharp/presets/NewtonsoftSerializerPreset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,33 +87,32 @@ function renderDeserialize({
!(prop.property instanceof ConstrainedDictionaryModel) ||
prop.property.serializationType === 'normal'
);
const corePropsRead = coreProps
.map((prop) => {
const propertyAccessor = pascalCase(prop.propertyName);
let toValue = `jo["${prop.unconstrainedPropertyName}"].ToObject<${prop.property.type}>(serializer)`;
if (
prop.property instanceof ConstrainedReferenceModel &&
prop.property.ref instanceof ConstrainedEnumModel
) {
toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${
prop.unconstrainedPropertyName
}"].ToString())${prop.required ? '.Value' : ''}`;
}

if (
options?.enforceRequired !== undefined &&
options?.enforceRequired &&
prop.required
) {
return `if(jo["${prop.unconstrainedPropertyName}"] is null){
const corePropsRead = coreProps.map((prop) => {
const propertyAccessor = pascalCase(prop.propertyName);
let toValue = `jo["${prop.unconstrainedPropertyName}"].ToObject<${prop.property.type}>(serializer)`;
if (
prop.property instanceof ConstrainedReferenceModel &&
prop.property.ref instanceof ConstrainedEnumModel
) {
toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${
prop.unconstrainedPropertyName
}"].ToString())${prop.required ? '.Value' : ''}`;
}

if (
options?.enforceRequired !== undefined &&
options?.enforceRequired &&
prop.required
) {
return `if(jo["${prop.unconstrainedPropertyName}"] is null){
throw new JsonSerializationException("Required property '${prop.unconstrainedPropertyName}' is missing");
}

value.${propertyAccessor} = ${toValue};
`;
}
}

return `if(jo["${prop.unconstrainedPropertyName}"] != null) {
return `if(jo["${prop.unconstrainedPropertyName}"] != null) {
value.${propertyAccessor} = ${toValue};
}`;
})
Expand Down
1 change: 0 additions & 1 deletion test/generators/csharp/presets/__snapshots__/NewtonsoftSerializerPreset.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public class TestConverter : JsonConverter<Test>
if(jo[\\"string prop\\"] is null){
throw new JsonSerializationException(\\"Required property 'string prop' is missing\\");
}

value.StringProp = jo[\\"string prop\\"].ToObject<string>(serializer);

if(jo[\\"const string prop\\"] != null) {
Expand Down
Loading