fix(oas3): set default property as attribute

Author: Marco Friso

packages/openapi3-parser/lib/parser/oas/parseServerVariableObject.js

@@ -56,7 +56,7 @@ const parseServerVariableObject = (context, element) => pipeParseResult(context.
   (object) => {
     const variable = R.or(object.get('enum'), new context.namespace.elements.String());
 
-    variable.default = object.getValue('default');
+    variable.attributes.set('default', object.get('default'));
 
     if (object.hasKey('description')) {
       variable.description = object.getValue('description');

packages/openapi3-parser/test/unit/parser/oas/parseOpenAPIObject-test.js

@@ -57,7 +57,13 @@ describe('#parseOpenAPIObject', () => {
       paths: {},
       servers: [
         {
-          url: 'https://user.server.com/1.0',
+          url: 'https://{username}.server.com/1.0',
+          variables: {
+            username: {
+              default: 'Mario',
+              enum: ['Tony', 'Nina'],
+            },
+          },
         },
         {
           url: 'https://user.server.com/2.0',
@@ -77,9 +83,23 @@ describe('#parseOpenAPIObject', () => {
     expect(hostsCategory.classes.toValue()).to.deep.equal(['hosts']);
     expect(hostsCategory.length).to.equal(2);
 
-    const firstServer = hostsCategory.get(0);
-    expect(firstServer).to.be.instanceof(namespace.elements.Resource);
-    expect(firstServer.href.toValue()).to.equal('https://user.server.com/1.0');
+    const firstHost = hostsCategory.get(0);
+    expect(firstHost).to.be.instanceof(namespace.elements.Resource);
+    expect(firstHost.href.toValue()).to.equal('https://{username}.server.com/1.0');
+
+    const { hrefVariables } = firstHost;
+    expect(hrefVariables).to.be.instanceof(namespace.elements.HrefVariables);
+    expect(hrefVariables.length).to.equal(1);
+
+    const hrefVariable = hrefVariables.content.content[0];
+    expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
+    expect(hrefVariable.key.toValue()).to.equal('username');
+    expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
+
+    const { enumerations } = hrefVariable.value;
+    expect(enumerations).to.be.instanceof(namespace.elements.Array);
+    expect(enumerations.length).to.equal(2);
+    expect(enumerations.toValue()).to.deep.equal(['Tony', 'Nina']);
   });
 
   describe('with schema components', () => {

packages/openapi3-parser/test/unit/parser/oas/parseOperationObject-test.js

@@ -571,7 +571,7 @@ describe('Operation Object', () => {
       const hrefVariable = hrefVariables.content.content[0];
       expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(hrefVariable.key.toValue()).to.equal('username');
-      expect(hrefVariable.value.default).to.equal('Mario');
+      expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
 
       const { enumerations } = hrefVariable.value;
       expect(enumerations).to.be.instanceof(namespace.elements.Array);

packages/openapi3-parser/test/unit/parser/oas/parsePathItemObject-test.js

@@ -481,7 +481,7 @@ describe('Path Item Object', () => {
       const hrefVariable = hrefVariables.content.content[0];
       expect(hrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(hrefVariable.key.toValue()).to.equal('username');
-      expect(hrefVariable.value.default).to.equal('Mario');
+      expect(hrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
 
       const { enumerations } = hrefVariable.value;
       expect(enumerations).to.be.instanceof(namespace.elements.Array);

packages/openapi3-parser/test/unit/parser/oas/parseServerObject-test.js

@@ -136,12 +136,12 @@ describe('#parseServerObject', () => {
 
       expect(firstHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(firstHrefVariable.key.toValue()).to.equal('username');
-      expect(firstHrefVariable.value.default).to.equal('Mario');
+      expect(firstHrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
       expect(firstHrefVariable.value.description.toValue()).to.equal('API user name');
 
       expect(secondHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(secondHrefVariable.key.toValue()).to.equal('version');
-      expect(secondHrefVariable.value.default).to.equal('1.0');
+      expect(secondHrefVariable.value.attributes.get('default').toValue()).to.equal('1.0');
     });
 
     it('warns when variables is defined, but no variables are in the url', () => {
@@ -195,12 +195,12 @@ describe('#parseServerObject', () => {
 
       expect(firstHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(firstHrefVariable.key.toValue()).to.equal('username');
-      expect(firstHrefVariable.value.default).to.equal('Mario');
+      expect(firstHrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
       expect(firstHrefVariable.value.description.toValue()).to.equal('API user name');
 
       expect(secondHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(secondHrefVariable.key.toValue()).to.equal('version');
-      expect(secondHrefVariable.value.default).to.equal('1.0');
+      expect(secondHrefVariable.value.attributes.get('default').toValue()).to.equal('1.0');
     });
 
     it('parse server object with variables', () => {
@@ -233,12 +233,12 @@ describe('#parseServerObject', () => {
 
       expect(firstHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(firstHrefVariable.key.toValue()).to.equal('username');
-      expect(firstHrefVariable.value.default).to.equal('Mario');
+      expect(firstHrefVariable.value.attributes.get('default').toValue()).to.equal('Mario');
       expect(firstHrefVariable.value.description.toValue()).to.equal('API user name');
 
       expect(secondHrefVariable).to.be.instanceof(namespace.elements.Member);
       expect(secondHrefVariable.key.toValue()).to.equal('version');
-      expect(secondHrefVariable.value.default).to.equal('1.0');
+      expect(secondHrefVariable.value.attributes.get('default').toValue()).to.equal('1.0');
     });
   });
 });

packages/openapi3-parser/test/unit/parser/oas/parseServerVariableObject-test.js

@@ -51,7 +51,7 @@ describe('#parseServerVariableObject', () => {
 
       const member = parseResult.get(0);
       expect(member).to.be.instanceof(namespace.elements.String);
-      expect(member.default).to.be.equal('Mario');
+      expect(member.attributes.get('default').toValue()).to.be.equal('Mario');
     });
   });