Fix: color in diagrams (#274)

* Fix: don't repeat color for relation to action/function parameter types * 0.24.1 * Bump dependencies * Changelog
oasis-tcs · Dec 20, 2023 · ed7df03 · ed7df03
1 parent bde9e2b
commit ed7df03
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.24.1] - 2023-12-20
+
+### Fixed
+
+- Complex types were sometimes wrongly colored in diagrams
+
 ## [0.24.0] - 2023-11-07
 
 ### Added

diff --git a/lib/diagram.js b/lib/diagram.js
@@ -171,7 +171,6 @@ function resourceDiagram(model) {
           comma +
           "[" +
           name +
-          color.resource +
           "]in-" +
           cardinality(param.$Type) +
           ">[" +

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "odata-openapi",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Convert OData CSDL XML or CSDL JSON to OpenAPI",
   "homepage": "https://github.com/oasis-tcs/odata-openapi/blob/master/lib/README.md",
   "bugs": "https://github.com/oasis-tcs/odata-openapi/issues",

diff --git a/test/annotations.test.js b/test/annotations.test.js
@@ -1187,7 +1187,7 @@ describe("Annotations", function () {
         "This service is located at [https://localhost/service-root/](https://localhost/service-root/)",
         "",
         "## Entity Data Model",
-        "![ER Diagram](https://yuml.me/diagram/class/[root{bg:lightslategray}],[act{bg:lawngreen}]->[root],[act{bg:lawngreen}]in->[root],[roots%20{bg:lawngreen}]++-*>[root])",
+        "![ER Diagram](https://yuml.me/diagram/class/[root{bg:lightslategray}],[act{bg:lawngreen}]->[root],[act]in->[root],[roots%20{bg:lawngreen}]++-*>[root])",
         "",
         "### Legend",
         "![Legend](https://yuml.me/diagram/plain;dir:TB;scale:60/class/[External.Type{bg:whitesmoke}],[ComplexType],[EntityType{bg:lightslategray}],[EntitySet/Singleton/Operation{bg:lawngreen}])",

diff --git a/test/csdl2openapi.test.js b/test/csdl2openapi.test.js
@@ -920,7 +920,7 @@ describe("Edge cases", function () {
         "This service is located at [https://localhost/service-root/](https://localhost/service-root/)",
         "",
         "## Entity Data Model",
-        "![ER Diagram](https://yuml.me/diagram/class/[Complex],[funO{bg:lawngreen}],[funO{bg:lawngreen}]in->[Complex],[funC{bg:lawngreen}],[funC{bg:lawngreen}]in->[Complex])",
+        "![ER Diagram](https://yuml.me/diagram/class/[Complex],[funO{bg:lawngreen}],[funO]in->[Complex],[funC{bg:lawngreen}],[funC]in->[Complex])",
         "",
         "### Legend",
         "![Legend](https://yuml.me/diagram/plain;dir:TB;scale:60/class/[External.Type{bg:whitesmoke}],[ComplexType],[EntityType{bg:lightslategray}],[EntitySet/Singleton/Operation{bg:lawngreen}])",
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,7 +171,6 @@ function resourceDiagram(model) { @@
               comma +
               "[" +
               name +
-              color.resource +
               "]in-" +
               cardinality(param.$Type) +
               ">[" +
@@ Expand Down @@