Skip to content

fix(codegen): update Level enum to include NONE value and adjust JSON… #243

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

Open
apoorv7g wants to merge 2 commits into
base: main
Choose a base branch
from
+118 −31
Open

fix(codegen): update Level enum to include NONE value and adjust JSON… #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd46c08
fix(codegen): update Level enum to include NONE value and adjust JSON…
apoorv7g Jun 4, 2026
2d590f4
test(codegen): add tests for non-empty and empty enum handling in JSO…
apoorv7g Jun 4, 2026
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
3 changes: 2 additions & 1 deletion lib/codegen/fromcto/jsonschema/jsonschemavisitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,9 @@ class JSONSchemaVisitor {
let mapKey = mapDeclaration.getModelFile().getType(mapDeclaration.getKey().getType());
let mapValue = mapDeclaration.getModelFile().getType(mapDeclaration.getValue().getType());

// Do not set $id on inlined map schemas: inherited fields (e.g. Person.nextOfKin
// on Employee, Contractor, Manager) would share the same $id and break Ajv.
const jsonSchema = {
$id: field.getFullyQualifiedName(),
schema: {
title: mapDeclaration.getName(),
description : `An instance of ${field.getFullyQualifiedTypeName()}`,
Expand Down
68 changes: 39 additions & 29 deletions test/codegen/__snapshots__/codegen.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ class \`org.acme.hr.base@1.0.0.Address\` {
}

\`org.acme.hr.base@1.0.0.Address\` "1" *-- "1" \`org.acme.hr.base@1.0.0.State\`
class \`org.acme.hr.base@1.0.0.Level\`
<< enumeration>> \`org.acme.hr.base@1.0.0.Level\`
class \`org.acme.hr.base@1.0.0.Level\` {
<< enumeration>>
+ NONE
}

class \`org.acme.hr@1.0.0.pii\` {
<< concept>>
Expand Down Expand Up @@ -248,6 +250,7 @@ class org.acme.hr.base_1_0_0.Address {
}
org.acme.hr.base_1_0_0.Address "1" *-- "1" org.acme.hr.base_1_0_0.State : state
class org.acme.hr.base_1_0_0.Level << (E,grey) >> {
+ NONE
}
class org.acme.hr_1_0_0.pii {
+ Boolean isPii
Expand Down Expand Up @@ -456,6 +459,7 @@ protocol MyProtocol {
}

enum Level {
NONE
}

}
Expand Down Expand Up @@ -735,6 +739,7 @@ public class Address : Concept {
}
[System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
public enum Level {
NONE,
}
[System.Text.Json.Serialization.JsonConverter(typeof(TimeJsonConverter))]
public readonly record struct Time(System.DateTime Value)
Expand Down Expand Up @@ -1031,6 +1036,7 @@ type Address struct {
}
type Level int
const (
NONE Level = 1 + iota
)
Comment on lines 1037 to 1040
",
}
Expand Down Expand Up @@ -1178,7 +1184,7 @@ type Address {
country: String!
}
enum Level {
_: Boolean
NONE
}
# namespace org.acme.hr@1.0.0
type pii @example @usedBy {
Expand Down Expand Up @@ -1655,6 +1661,7 @@ package org.acme.hr.base;
import com.fasterxml.jackson.annotation.*;
@JsonIgnoreProperties({"$class"})
public enum Level {
NONE,
}
",
}
Expand Down Expand Up @@ -2429,7 +2436,9 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"org.acme.hr.base@1.0.0.Level": {
"title": "Level",
"description": "An instance of org.acme.hr.base@1.0.0.Level",
"enum": []
"enum": [
"NONE"
]
},
"org.acme.hr.base@1.0.0.Time": {
"format": "date-time",
Expand Down Expand Up @@ -2532,7 +2541,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"$ref": "#/definitions/org.acme.hr.base@1.0.0.Address"
},
"companyProperties": {
"$id": "org.acme.hr@1.0.0.Company.companyProperties",
"schema": {
"title": "CompanyProperties",
"description": "An instance of org.acme.hr@1.0.0.CompanyProperties",
Expand All @@ -2546,7 +2554,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeDirectory": {
"$id": "org.acme.hr@1.0.0.Company.employeeDirectory",
"schema": {
"title": "EmployeeDirectory",
"description": "An instance of org.acme.hr@1.0.0.EmployeeDirectory",
Expand All @@ -2561,7 +2568,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeTShirtSizes": {
"$id": "org.acme.hr@1.0.0.Company.employeeTShirtSizes",
"schema": {
"title": "EmployeeTShirtSizes",
"description": "An instance of org.acme.hr.base@1.0.0.EmployeeTShirtSizes",
Expand All @@ -2576,7 +2582,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeProfiles": {
"$id": "org.acme.hr@1.0.0.Company.employeeProfiles",
"schema": {
"title": "EmployeeProfiles",
"description": "An instance of org.acme.hr@1.0.0.EmployeeProfiles",
Expand All @@ -2590,7 +2595,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeSocialSecurityNumbers": {
"$id": "org.acme.hr@1.0.0.Company.employeeSocialSecurityNumbers",
"schema": {
"title": "EmployeeSocialSecurityNumbers",
"description": "An instance of org.acme.hr@1.0.0.EmployeeSocialSecurityNumbers",
Expand Down Expand Up @@ -2743,7 +2747,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -2850,7 +2853,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -2949,7 +2951,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -3061,7 +3062,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -3242,7 +3242,9 @@ No fields.

### Level (Enumeration)

No values.
| Value | Description |
| ------ | ------------------- |
| NONE | |


## Diagram
Expand Down Expand Up @@ -3288,8 +3290,10 @@ class \`org.acme.hr.base@1.0.0.Address\` {
}

\`org.acme.hr.base@1.0.0.Address\` "1" *-- "1" \`org.acme.hr.base@1.0.0.State\`
class \`org.acme.hr.base@1.0.0.Level\`
<< enumeration>> \`org.acme.hr.base@1.0.0.Level\`
class \`org.acme.hr.base@1.0.0.Level\` {
<< enumeration>>
+ NONE
}

\`\`\`

Expand Down Expand Up @@ -3736,8 +3740,10 @@ class \`org.acme.hr.base@1.0.0.Address\` {

\`org.acme.hr.base@1.0.0.Address\` "1" *-- "1" \`org.acme.hr.base@1.0.0.State\`
\`org.acme.hr.base@1.0.0.Address\` --|> \`concerto@1.0.0.Concept\`
class \`org.acme.hr.base@1.0.0.Level\`
<< enumeration>> \`org.acme.hr.base@1.0.0.Level\`
class \`org.acme.hr.base@1.0.0.Level\` {
<< enumeration>>
+ NONE
}

\`org.acme.hr.base@1.0.0.Level\` --|> \`concerto@1.0.0.Concept\`
class \`org.acme.hr@1.0.0.pii\` {
Expand Down Expand Up @@ -4037,6 +4043,8 @@ exports[`codegen #formats check we can convert all formats from namespace versio
</Property>
</ComplexType>
<EnumType Name="Level">
<Member Name="NONE">
</Member>
</EnumType>
<EntityContainer Name="org.acme.hr.baseService">
</EntityContainer>
Expand Down Expand Up @@ -4344,7 +4352,9 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"org.acme.hr.base@1.0.0.Level": {
"title": "Level",
"description": "An instance of org.acme.hr.base@1.0.0.Level",
"enum": []
"enum": [
"NONE"
]
},
"org.acme.hr.base@1.0.0.Time": {
"format": "date-time",
Expand Down Expand Up @@ -4447,7 +4457,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"$ref": "#/components/schemas/org.acme.hr.base@1.0.0.Address"
},
"companyProperties": {
"$id": "org.acme.hr@1.0.0.Company.companyProperties",
"schema": {
"title": "CompanyProperties",
"description": "An instance of org.acme.hr@1.0.0.CompanyProperties",
Expand All @@ -4461,7 +4470,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeDirectory": {
"$id": "org.acme.hr@1.0.0.Company.employeeDirectory",
"schema": {
"title": "EmployeeDirectory",
"description": "An instance of org.acme.hr@1.0.0.EmployeeDirectory",
Expand All @@ -4476,7 +4484,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeTShirtSizes": {
"$id": "org.acme.hr@1.0.0.Company.employeeTShirtSizes",
"schema": {
"title": "EmployeeTShirtSizes",
"description": "An instance of org.acme.hr.base@1.0.0.EmployeeTShirtSizes",
Expand All @@ -4491,7 +4498,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeProfiles": {
"$id": "org.acme.hr@1.0.0.Company.employeeProfiles",
"schema": {
"title": "EmployeeProfiles",
"description": "An instance of org.acme.hr@1.0.0.EmployeeProfiles",
Expand All @@ -4505,7 +4511,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
}
},
"employeeSocialSecurityNumbers": {
"$id": "org.acme.hr@1.0.0.Company.employeeSocialSecurityNumbers",
"schema": {
"title": "EmployeeSocialSecurityNumbers",
"description": "An instance of org.acme.hr@1.0.0.EmployeeSocialSecurityNumbers",
Expand Down Expand Up @@ -4658,7 +4663,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -4765,7 +4769,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -4864,7 +4867,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -4976,7 +4978,6 @@ exports[`codegen #formats check we can convert all formats from namespace versio
"type": "string"
},
"nextOfKin": {
"$id": "org.acme.hr@1.0.0.Person.nextOfKin",
"schema": {
"title": "NextOfKin",
"description": "An instance of org.acme.hr@1.0.0.NextOfKin",
Expand Down Expand Up @@ -5372,6 +5373,7 @@ class org.acme.hr.base_1_0_0.Address {
org.acme.hr.base_1_0_0.Address "1" *-- "1" org.acme.hr.base_1_0_0.State : state
org.acme.hr.base_1_0_0.Address --|> concerto_1_0_0.Concept
class org.acme.hr.base_1_0_0.Level << (E,grey) >> {
+ NONE
}
org.acme.hr.base_1_0_0.Level --|> concerto_1_0_0.Concept
class org.acme.hr_1_0_0.pii {
Expand Down Expand Up @@ -5529,7 +5531,9 @@ message Address {
string zipCode = 5;
}

enum Level {}
enum Level {
Level_NONE = 0;
}

",
}
Expand Down Expand Up @@ -6153,6 +6157,8 @@ pub struct Address {

#[derive(Debug, Clone, Serialize, Deserialize)]
pub enum Level {
#[allow(non_camel_case_types)]
NONE,
}

",
Expand Down Expand Up @@ -6889,6 +6895,7 @@ export interface IAddress extends IConcept {
}

export enum Level {
NONE = 'NONE',
}

export type Time = Date;
Expand Down Expand Up @@ -7067,6 +7074,8 @@ declarations:
- zipCode: Zip Code of the Address
- country: Country of the Address
- Level: Level
properties:
- NONE: NONE of the Level
- Time: Time
- SSN: SSN
",
Expand Down Expand Up @@ -7344,6 +7353,7 @@ xmlns:concerto="concerto"
<xs:element name="Address" type="org.acme.hr.base:Address"/>
<xs:simpleType name="Level">
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
</xs:restriction>
</xs:simpleType>
<xs:element name="Level" type="org.acme.hr.base:Level"/>
Expand Down
4 changes: 3 additions & 1 deletion test/codegen/fromcto/data/model/hr_base.cto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ concept Address {
o String country
}

enum Level {}
enum Level {
o NONE
}

scalar Time extends DateTime
scalar SSN extends String default="000-00-0000" regex=/(\d{3}-\d{2}-\d{4})+/
Loading
Loading