Merge pull request #14 from mraineri/master

Added Annotation as a valid element of an Annotation
pboyd04 · Jul 18, 2019 · ea5735f · ea5735f
2 parents aa3aa20 + e9bc8de
commit ea5735f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/Annotation.js b/lib/Annotation.js
@@ -3,18 +3,21 @@ const ParserCommon = require('./ParserCommon');
 class Annotation extends ParserCommon {
   constructor(element) {
     super();
+    this.Annotations = {};
     this.validElements = {
       'Collection': {parent: this, name: 'Collection'},
       'Record': {parent: this, name: 'Record'},
-      'String': {parent: this, name: 'String', getText: true}
+      'String': {parent: this, name: 'String', getText: true},
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'}
     };
     this.validAttributes = {
       'Term': {alreadyHandeled: true},
       'Qualifier': {},
       'String': {},
       'EnumMember': {},
       'Bool': {bool: true},
-      'Int': {integer: true}
+      'Int': {integer: true},
+      'Decimal': {decimal: true}
     };
     this.init(element, 'Term');
   }

diff --git a/lib/EnumType.js b/lib/EnumType.js
@@ -14,7 +14,8 @@ class EnumType extends ParserCommon {
     };
     this.validAttributes = {
       'IsFlags': {bool: true},
-      'Name': {alreadyHandeled: true}
+      'Name': {alreadyHandeled: true},
+      'UnderlyingType': {}
     };
 
     this.init(element, 'Name');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CSDLParser",
-  "version": "0.2.00",
+  "version": "0.2.1",
   "description": "CSDL Metadata Parser",
   "main": "./index.js",
   "scripts": {