Merge branch 'master' into chore/simplify-variable-initialization

asyncapi · Oct 8, 2024 · 3b43b8d · 3b43b8d
2 parents 60119fa + 5c28787
commit 3b43b8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,7 +13,7 @@ extends:
   - plugin:sonarjs/recommended
 
 parserOptions:
-  ecmaVersion: 2018
+  ecmaVersion: 2020
   sourceType: module
   ecmaFeatures: 
     jsx: true

diff --git a/apps/nunjucks-filters/src/customFilters.js b/apps/nunjucks-filters/src/customFilters.js
@@ -198,7 +198,7 @@ function replaceServerVariablesWithValues(url, serverVariables) {
   const getVariableValue = (object, variable) => {
     const keyValue = object[variable]._json;
 
-    if (keyValue) return keyValue.default || (keyValue.enum && keyValue.enum[0]);
+    if (keyValue) return keyValue.default ?? keyValue.enum?.[0];
   };
 
   const urlVariables = getVariablesNamesFromUrl(url);