Merge pull request #640 from mulesoft/feat/oas3

Adds OAS 3.x support
mulesoft · Apr 28, 2020 · 0ffcc85 · 0ffcc85
2 parents b31cac9 + b53a6d5
commit 0ffcc85
Show file tree

Hide file tree

Showing 60 changed files with 2,681 additions and 2,364,177 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @mulesoft/team-api-console
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,6 @@ node_modules
 coverage
 demo/vendor.js
 dist/
+
+# AMF models
+demo/models/*.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js: stable
-sudo: required
 addons:
   chrome: stable
 script:

diff --git a/demo/api-console-master-styles.css b/demo/api-console-master-styles.css
@@ -13,7 +13,7 @@ html {
 
   --anypoint-listbox-background-color: #fff;
 
-  --arc-font-body1-font-size: 15px;
+  --arc-font-body1-font-size: 16px;
   --arc-font-body1-font-weight: 400;
   --arc-font-body1-line-height: 20px;
   --arc-font-code-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;

diff --git a/demo/apis.json b/demo/apis.json
@@ -11,5 +11,5 @@
   "models/console-445/console-445.raml": "RAML 1.0",
   "models/apic-80/apic-80.raml": "RAML 1.0",
   "models/apic-83/apic-83.raml": "RAML 1.0",
-  "models/apic-130/apic-130.raml": "RAML 1.0"
+  "models/multi-server/multi-server.yaml": { "type": "OAS 3.0", "mime": "application/yaml" }
 }
diff --git a/demo/demo-server/api.js b/demo/demo-server/api.js
@@ -26,6 +26,7 @@ async function apiRequest(ctx) {
     }
   } catch (e) {
     body = wrapError(e);
+    console.error(e);
   }
   /* eslint-disable require-atomic-updates */
   if (body.code) {

diff --git a/demo/demo-server/api/amf-service/api-search.js b/demo/demo-server/api/amf-service/api-search.js
@@ -134,7 +134,7 @@ export class ApiSearch {
         contentType: 'application/json'
       };
     }
-    const oasMatch = data.match(/openapi|swagger(?:\s*)?:(?:\s*)("|')?(\d\.\d*)("|')?/im);
+    const oasMatch = data.match(/(?:openapi|swagger)[^\s*]?:(?:\s*)("|')?(\d\.\d)("|')?/im);
     if (oasMatch) {
       const v = oasMatch[2].trim();
       return {