fix(oas3): support empty yaml !!map

Author: kylef

packages/fury-adapter-oas3-parser/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Fury OAS3 Parser Changelog
 
+## Master
+
+### Bug Fixes
+
+- Fix handling of empty `!!set` and `!!map` in YAML parsing.
+
 ## 0.5.2 (19-02-19)
 
 ### Enhancements

packages/fury-adapter-oas3-parser/lib/parser/parseYAML.js

@@ -29,11 +29,15 @@ function copySourceMap(startMark, endMark, element, namespace) {
 }
 
 function yamlToObject(node, annotations, context) {
-  return new context.namespace.elements.Object(node.value.map((nodes) => {
-    const key = convert(nodes[0], annotations, context);
-    const value = convert(nodes[1], annotations, context);
-    return new context.namespace.elements.Member(key, value);
-  }));
+  if (node.value) {
+    return new context.namespace.elements.Object(node.value.map((nodes) => {
+      const key = convert(nodes[0], annotations, context);
+      const value = convert(nodes[1], annotations, context);
+      return new context.namespace.elements.Member(key, value);
+    }));
+  }
+
+  return new context.namespace.elements.Object();
 }
 
 function yamlToArray(node, annotations, context) {

packages/fury-adapter-oas3-parser/test/unit/parser/parseYAML-test.js

@@ -128,44 +128,104 @@ describe('#parseYAML', () => {
     expect(array.first).to.have.sourceMapEndColumn(9);
   });
 
-  it('can parse a dictionary into an object element', () => {
-    const element = parseYAML('key: value', context);
-
-    expect(element).to.be.instanceof(namespace.elements.ParseResult);
-    expect(element.length).to.equal(1);
-
-    const object = element.first;
-
-    expect(object).to.be.instanceof(namespace.elements.Object);
-    expect(object.toValue()).to.deep.equal({ key: 'value' });
-    expect(object).to.have.sourceMapStart(0);
-    expect(object).to.have.sourceMapOffset(10);
-    expect(object).to.have.sourceMapStartLine(1);
-    expect(object).to.have.sourceMapStartColumn(1);
-    expect(object).to.have.sourceMapEndLine(1);
-    expect(object).to.have.sourceMapEndColumn(11);
+  describe('map', () => {
+    it('can parse a dictionary into an object element', () => {
+      const element = parseYAML('key: value', context);
+
+      expect(element).to.be.instanceof(namespace.elements.ParseResult);
+      expect(element.length).to.equal(1);
+
+      const object = element.first;
+
+      expect(object).to.be.instanceof(namespace.elements.Object);
+      expect(object.toValue()).to.deep.equal({ key: 'value' });
+      expect(object).to.have.sourceMapStart(0);
+      expect(object).to.have.sourceMapOffset(10);
+      expect(object).to.have.sourceMapStartLine(1);
+      expect(object).to.have.sourceMapStartColumn(1);
+      expect(object).to.have.sourceMapEndLine(1);
+      expect(object).to.have.sourceMapEndColumn(11);
+
+      const member = object.first;
+
+      expect(member).to.be.instanceof(namespace.elements.Member);
+
+      expect(member.key).to.be.instanceof(namespace.elements.String);
+      expect(member.key.toValue()).to.equal('key');
+      expect(member.key).to.have.sourceMapStart(0);
+      expect(member.key).to.have.sourceMapOffset(3);
+      expect(member.key).to.have.sourceMapStartLine(1);
+      expect(member.key).to.have.sourceMapStartColumn(1);
+      expect(member.key).to.have.sourceMapEndLine(1);
+      expect(member.key).to.have.sourceMapEndColumn(4);
+
+      expect(member.value).to.be.instanceof(namespace.elements.String);
+      expect(member.value.toValue()).to.equal('value');
+      expect(member.value).to.have.sourceMapStart(5);
+      expect(member.value).to.have.sourceMapOffset(5);
+      expect(member.value).to.have.sourceMapStartLine(1);
+      expect(member.value).to.have.sourceMapStartColumn(6);
+      expect(member.value).to.have.sourceMapEndLine(1);
+      expect(member.value).to.have.sourceMapEndColumn(11);
+    });
 
-    const member = object.first;
+    it('can parse a map into an object element', () => {
+      const parseResult = parseYAML('!!map\n  key : value', context);
 
-    expect(member).to.be.instanceof(namespace.elements.Member);
+      expect(parseResult).to.be.instanceof(namespace.elements.ParseResult);
+      expect(parseResult.length).to.equal(1);
+
+      const object = parseResult.first;
+
+      expect(object).to.be.instanceof(namespace.elements.Object);
+      expect(object.toValue()).to.deep.equal({ key: 'value' });
+      expect(object).to.have.sourceMapStart(0);
+      expect(object).to.have.sourceMapOffset(19);
+      expect(object).to.have.sourceMapStartLine(1);
+      expect(object).to.have.sourceMapStartColumn(1);
+      expect(object).to.have.sourceMapEndLine(2);
+      expect(object).to.have.sourceMapEndColumn(14);
+
+      const member = object.first;
+
+      expect(member).to.be.instanceof(namespace.elements.Member);
+
+      expect(member.key).to.be.instanceof(namespace.elements.String);
+      expect(member.key.toValue()).to.equal('key');
+      expect(member.key).to.have.sourceMapStart(8);
+      expect(member.key).to.have.sourceMapOffset(3);
+      expect(member.key).to.have.sourceMapStartLine(2);
+      expect(member.key).to.have.sourceMapStartColumn(3);
+      expect(member.key).to.have.sourceMapEndLine(2);
+      expect(member.key).to.have.sourceMapEndColumn(6);
+
+      expect(member.value).to.be.instanceof(namespace.elements.String);
+      expect(member.value.toValue()).to.equal('value');
+      expect(member.value).to.have.sourceMapStart(14);
+      expect(member.value).to.have.sourceMapOffset(5);
+      expect(member.value).to.have.sourceMapStartLine(2);
+      expect(member.value).to.have.sourceMapStartColumn(9);
+      expect(member.value).to.have.sourceMapEndLine(2);
+      expect(member.value).to.have.sourceMapEndColumn(14);
+    });
 
-    expect(member.key).to.be.instanceof(namespace.elements.String);
-    expect(member.key.toValue()).to.equal('key');
-    expect(member.key).to.have.sourceMapStart(0);
-    expect(member.key).to.have.sourceMapOffset(3);
-    expect(member.key).to.have.sourceMapStartLine(1);
-    expect(member.key).to.have.sourceMapStartColumn(1);
-    expect(member.key).to.have.sourceMapEndLine(1);
-    expect(member.key).to.have.sourceMapEndColumn(4);
+    it('can parse an empty map into an object element', () => {
+      const parseResult = parseYAML('!!map', context);
 
-    expect(member.value).to.be.instanceof(namespace.elements.String);
-    expect(member.value.toValue()).to.equal('value');
-    expect(member.value).to.have.sourceMapStart(5);
-    expect(member.value).to.have.sourceMapOffset(5);
-    expect(member.value).to.have.sourceMapStartLine(1);
-    expect(member.value).to.have.sourceMapStartColumn(6);
-    expect(member.value).to.have.sourceMapEndLine(1);
-    expect(member.value).to.have.sourceMapEndColumn(11);
+      expect(parseResult).to.be.instanceof(namespace.elements.ParseResult);
+      expect(parseResult.length).to.equal(1);
+
+      const object = parseResult.first;
+
+      expect(object).to.be.instanceof(namespace.elements.Object);
+      expect(object.length).to.equal(0);
+      expect(object).to.have.sourceMapStart(0);
+      expect(object).to.have.sourceMapOffset(5);
+      expect(object).to.have.sourceMapStartLine(1);
+      expect(object).to.have.sourceMapStartColumn(1);
+      expect(object).to.have.sourceMapEndLine(1);
+      expect(object).to.have.sourceMapEndColumn(6);
+    });
   });
 
   it('can parse a binary into a string element', () => {