Skip to content

Support NMTOKENS as built in type #38

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
Nuvindu merged 5 commits into from
Feb 18, 2026
Merged

Support NMTOKENS as built in type #38

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c742d5
Support NMTOKENS as built in type
Nuvindu Feb 6, 2026
fd90991
[Automated] Update the native jar versions
Nuvindu Feb 6, 2026
5687fd1
Include missing built-in types
Nuvindu Feb 6, 2026
10028e2
Validate new built-in types
Nuvindu Feb 17, 2026
0e51d26
Apply review suggestions
Nuvindu Feb 17, 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
4 changes: 2 additions & 2 deletions module-ballerina-xsd/BalTool.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
id = "xsd"

[[dependency]]
path = "../xsd-cli/build/libs/xsd-cli-1.2.0.jar"
path = "../xsd-cli/build/libs/xsd-cli-1.2.1-SNAPSHOT.jar"

[[dependency]]
path = "../xsd-core/build/libs/xsd-core-1.2.0.jar"
path = "../xsd-core/build/libs/xsd-core-1.2.1-SNAPSHOT.jar"

2 changes: 1 addition & 1 deletion module-ballerina-xsd/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
distribution = "2201.11.0"
org = "ballerina"
name = "xsdtool"
version = "1.2.0"
version = "1.2.1"
authors = ["Ballerina"]
keywords = ["xsd", "xsd-tool"]
repository = "https://github.com/ballerina-platform/xsd-tools"
Expand Down
2 changes: 1 addition & 1 deletion module-ballerina-xsd/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ distribution-version = "2201.11.0"
[[package]]
org = "ballerina"
name = "xsdtool"
version = "1.2.0"
version = "1.2.1"
modules = [
{org = "ballerina", packageName = "xsdtool", moduleName = "xsdtool"}
]
Expand Down
16 changes: 11 additions & 5 deletions xsd-core/src/main/java/io/ballerina/xsd/core/visitor/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ public final class Utils {
private static final String WHITESPACE_PATTERN = "\\s";
private static final String SPECIAL_CHARS_PATTERN = "[!@$%^&*()_\\-|]";
public static final String NMTOKEN = "NMTOKEN";
public static final String NMTOKENS = "NMTOKENS";
public static final String ENTITY = "ENTITY";
public static final String ENTITIES = "ENTITIES";
public static final String NAME = "Name";
public static final String IDREF = "IDREF";
public static final String IDREFS = "IDREFS";
public static final String ANYDATA = "anydata";
Expand Down Expand Up @@ -186,9 +190,9 @@ public static String deriveType(Node node) {

public static String typeGenerator(String typeName) {
switch (typeName) {
case TIME, DATE_TIME, DATE, G_YEAR_MONTH, G_YEAR, STRING, LANGUAGE,
DURATION, ANY_URI, G_MONTH_DAY, NMTOKEN, IDREF, IDREFS, G_DAY, G_MONTH, NORMALIZED_STRING,
TOKEN, NCNAME, QNAME, NOTATION, BASE64_BINARY, HEX_BINARY, BYTE, ID -> {
case TIME, DATE_TIME, DATE, G_YEAR_MONTH, G_YEAR, STRING, LANGUAGE, DURATION, ANY_URI, G_MONTH_DAY,
NMTOKEN, NMTOKENS, IDREF, IDREFS, G_DAY, G_MONTH, NORMALIZED_STRING, TOKEN, NCNAME, QNAME,
NOTATION, BASE64_BINARY, HEX_BINARY, BYTE, ID, URI, NAME, ENTITY, ENTITIES -> {
return STRING;
}
case INTEGER, LONG, NEGATIVE_INTEGER, NON_POSITIVE_INTEGER, POSITIVE_INTEGER, SHORT,
Expand Down Expand Up @@ -218,8 +222,10 @@ public static boolean isSimpleType(String type) {
String[] simpleTypes = {
TIME, DATE_TIME, DATE, G_YEAR_MONTH, G_YEAR, STRING, LANGUAGE, DURATION,
INTEGER, LONG, NEGATIVE_INTEGER, NON_POSITIVE_INTEGER, POSITIVE_INTEGER, SHORT,
UNSIGNED_LONG, UNSIGNED_INT, UNSIGNED_SHORT,
UNSIGNED_BYTE, INT, BASE64_BINARY, BOOLEAN, FLOAT, DOUBLE, DECIMAL, ANY_URI, NON_NEGATIVE_INTEGER
UNSIGNED_LONG, UNSIGNED_INT, UNSIGNED_SHORT, UNSIGNED_BYTE, INT, BASE64_BINARY,
BOOLEAN, FLOAT, DOUBLE, DECIMAL, ANY_URI, NON_NEGATIVE_INTEGER, G_MONTH_DAY, G_DAY,
G_MONTH, NORMALIZED_STRING, TOKEN, NCNAME, QNAME, NOTATION, NMTOKEN, NMTOKENS,
IDREF, IDREFS, ID, HEX_BINARY, BYTE, URI, NAME, ENTITY, ENTITIES
};
return Arrays.stream(simpleTypes).toList().contains(typeName);
}
Expand Down