Fix: term Validation.AllowedValues can be applied to all primitive ty…

…pes (#315) * AllowedValues on all types * 0.28.2 * Update CHANGELOG.md * Bump dependencies * Bump indirect dependencies
oasis-tcs · Oct 30, 2024 · 2dcaa9a · 2dcaa9a
1 parent 81c4b01
commit 2dcaa9a
Show file tree

Hide file tree

Showing 5 changed files with 272 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.28.2 - 2024-10-30
+
+### Fixed
+
+- Term `Validation.AllowedValues` can be applied to all (primitive) types
+
 ## 0.28.1 - 2024-08-29
 
 ### Fixed

diff --git a/lib/csdl2openapi.js b/lib/csdl2openapi.js
@@ -2649,7 +2649,6 @@ module.exports.csdl2openapi = function (
       case undefined:
         s.type = "string";
         if (element.$MaxLength) s.maxLength = element.$MaxLength;
-        allowedValues(s, element);
         pattern(s, element);
         break;
       case "Edm.Time":
@@ -2692,6 +2691,8 @@ module.exports.csdl2openapi = function (
         }
     }
 
+    allowedValues(s, element);
+
     if (element.$Nullable) {
       if (oas31) {
         if (s.$ref) s = { anyOf: [s, { type: "null" }] };