Skip to content

Feat: sorted features & versioning #3

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
khalidbelk merged 3 commits into from
Feb 17, 2025
Merged

Feat: sorted features & versioning #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b31dad4
feat: sort features by type, attributes first and operations second
khalidbelk Feb 17, 2025
01dbb54
feat(ci): trigger CI builds on PR's to main branch as well
khalidbelk Feb 17, 2025
13bb984
feat: add puml2xml versioning to XMI header
khalidbelk Feb 17, 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
2 changes: 2 additions & 0 deletions .github/workflows/build-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Build (macOS)
on:
push:
branches: [main, dev]
pull_request:
branches: [main]

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Build (Ubuntu)
on:
push:
branches: [main, dev]
pull_request:
branches: [main]

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: 🐳 Docker Build
on:
push:
branches: [main, dev, testCI]
pull_request:
branches: [main]

jobs:

Expand Down
1 change: 1 addition & 0 deletions src/xml_chunks.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ let xml_header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><XMI xmlns:UML=\"hre
<XMI.exporter>PlantUML</XMI.exporter>
<XMI.exporterVersion>1.2024.7</XMI.exporterVersion>
<XMI.creator>puml2xml</XMI.creator>
<XMI.creatorVersion>1.2.0</XMI.creatorVersion>
</XMI.documentation>
<XMI.metamodel xmi.name=\"UML\" xmi.version=\"1.4\"/>
</XMI.header>
Expand Down
28 changes: 18 additions & 10 deletions src/xml_gen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,22 @@ let feature_to_xml feature =
feature.visibility
feature.id

let get_formatted_features features =
features
|> List.sort (fun f1 f2 ->
match f1.feature_type, f2.feature_type with
| Attribute, Method -> -1
| Method, Attribute -> 1
| _ -> 0)
|> List.fold_left (fun acc f -> acc ^ "\n" ^ indent 4 ^ feature_to_xml f) ""

let class_to_xml uml_class =
let features_xml = List.fold_left (fun acc f ->
acc ^ "\n" ^ indent 4 ^ feature_to_xml f) "" uml_class.features in
Printf.sprintf "%s<UML:Class name=\"%s\" xmi.id=\"%s\">\n%s<UML:Classifier.feature>%s\n%s</UML:Classifier.feature>\n%s</UML:Class>"
(indent 4)
uml_class.name
uml_class.id
(indent 5)
features_xml
(indent 5)
(indent 4)
let features_xml = get_formatted_features uml_class.features in
Printf.sprintf "%s<UML:Class name=\"%s\" xmi.id=\"%s\">\n%s<UML:Classifier.feature>%s\n%s</UML:Classifier.feature>\n%s</UML:Class>"
(indent 4)
uml_class.name
uml_class.id
(indent 5)
features_xml
(indent 5)
(indent 4)