Merge pull request #11 from pboyd04/NativeParser

Switch to Non-Native XML Parser
pboyd04 · Feb 27, 2019 · a926387 · a926387
2 parents 3098c91 + 6a991e0
commit a926387
Show file tree

Hide file tree

Showing 35 changed files with 1,098 additions and 667 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,5 @@
 ---
 language: node_js
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
 sudo: false
 node_js:
   - "stable"

diff --git a/lib/Action.js b/lib/Action.js
@@ -1,24 +1,24 @@
 const ParserCommon = require('./ParserCommon');
 
-function Action(xml) {
-  this.Annotations = {};
-  this.Parameters = {};
-  this.ReturnType = null;
+class Action extends ParserCommon {
+  constructor(element) {
+    super();
+    this.Annotations = {};
+    this.Parameters = {};
+    this.ReturnType = null;
 
-  this.validElements = {
-    'Annotation': {parent: this.Annotations, nameProp: 'Term'},
-    'Parameter': {parent: this.Parameters, nameProp: 'Name'},
-    'ReturnType': {name: 'ReturnType'}
-  };
-  this.validAttributes = {
-    'IsBound': {bool: true},
-    'Name': {alreadyHandeled: true}
-  };
+    this.validElements = {
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'},
+      'Parameter': {parent: this.Parameters, nameProp: 'Name'},
+      'ReturnType': {name: 'ReturnType'}
+    };
+    this.validAttributes = {
+      'IsBound': {bool: true},
+      'Name': {alreadyHandeled: true}
+    };
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'Action', 'Name');
-
-  return this;
+    this.init(element, 'Name');
+  }
 }
 
 module.exports = Action;

diff --git a/lib/ActionImport.js b/lib/ActionImport.js
@@ -1,22 +1,20 @@
 const ParserCommon = require('./ParserCommon');
 
-const Annotation = require('./Annotation');
+class ActionImport extends ParserCommon {
+  constructor(element) {
+    super();
+    this.Annotations = {};
 
-function ActionImport(xml) {
-  this.Annotations = {};
-
-  this.validElements = {
-    'Annotation': {parent: this.Annotations, nameProp: 'Term'}
-  };
-  this.validAttributes = {
-    'Action': {},
-    'EntitySet': {},
-    'Name': {alreadyHandeled: true}
-  };
-
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'ActionImport', 'Name');
-  return this;
+    this.validElements = {
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'}
+    };
+    this.validAttributes = {
+      'Action': {},
+      'EntitySet': {},
+      'Name': {alreadyHandeled: true}
+    };
+    this.init(element, 'Name');
+  }
 }
 
 module.exports = ActionImport;

diff --git a/lib/Annotation.js b/lib/Annotation.js
@@ -1,23 +1,23 @@
 const ParserCommon = require('./ParserCommon');
 
-function Annotation(xml) {
-  this.validElements = {
-    'Collection': {parent: this, name: 'Collection'},
-    'Record': {parent: this, name: 'Record'},
-    'String': {parent: this, name: 'String', getText: true}
-  };
-  this.validAttributes = {
-    'Term': {alreadyHandeled: true},
-    'Qualifier': {},
-    'String': {},
-    'EnumMember': {},
-    'Bool': {bool: true},
-    'Int': {integer: true}
-  };
-
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'Action', 'Term');
-  return this;
+class Annotation extends ParserCommon {
+  constructor(element) {
+    super();
+    this.validElements = {
+      'Collection': {parent: this, name: 'Collection'},
+      'Record': {parent: this, name: 'Record'},
+      'String': {parent: this, name: 'String', getText: true}
+    };
+    this.validAttributes = {
+      'Term': {alreadyHandeled: true},
+      'Qualifier': {},
+      'String': {},
+      'EnumMember': {},
+      'Bool': {bool: true},
+      'Int': {integer: true}
+    };
+    this.init(element, 'Term');
+  }
 }
 
 module.exports = Annotation;

diff --git a/lib/CSDLSearch.js b/lib/CSDLSearch.js
@@ -94,9 +94,9 @@ function findByType(metadata, typeName) {
   var namespace = typeName.substring(0, index);
   var justType = typeName.substring(index+1);
   var schema = metadata[namespace];
-  if(schema === undefined) { 
-    schema = metadata._options.cache.getSchema(namespace);
-    if(schema === undefined) {
+  if(schema === undefined) {
+    let schemas = metadata._options.cache.getSchemas(namespace); 
+    if(schemas.length === 0) {
       if(metadata.References === undefined) {
         return null;
       }
@@ -108,6 +108,17 @@ function findByType(metadata, typeName) {
         return null;
       }
     }
+    else if(schemas.length === 1) {
+      schema = schemas[0];
+    }
+    else {
+      for(let i = 0; i < schemas.length; i++) {
+        if(schemas[i][justType] !== undefined) {
+          return schemas[i][justType];
+        }
+      }
+      return null;
+    }
   }
   return schema[justType];
 }

diff --git a/lib/Collection.js b/lib/Collection.js
@@ -1,28 +1,27 @@
 const ParserCommon = require('./ParserCommon');
 
-function Collection(xml) {
-  this.PropertyPaths = [];
-  this.Records = [];
-  this.Strings = [];
+class Collection extends ParserCommon {
+  constructor(element) {
+    super();
+    this.PropertyPaths = [];
+    this.Records = [];
+    this.Strings = [];
 
-  this.validElements = {
-    'PropertyPath': {parent: this.PropertyPaths, getText: true},
-    'Record': {parent: this.Records},
-    'String': {parent: this.Strings, passthru: true}
-  };
-  this.validAttributes = {
-  };
+    this.validElements = {
+      'PropertyPath': {parent: this.PropertyPaths, getText: true},
+      'Record': {parent: this.Records},
+      'String': {parent: this.Strings, passthru: true}
+    };
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'Collection');
-
-  if(this.PropertyPaths.length === 0) {
-    delete this.PropertyPaths;
-  }
-  if(this.Records.length === 0) {
-    delete this.Records;
+    this.init(element);
+
+    if(this.PropertyPaths.length === 0) {
+      delete this.PropertyPaths;
+    }
+    if(this.Records.length === 0) {
+      delete this.Records;
+    }
   }
-  return this;
 }
 
 module.exports = Collection;

diff --git a/lib/ComplexType.js b/lib/ComplexType.js
@@ -1,24 +1,26 @@
 const ParserCommon = require('./ParserCommon');
 
-function ComplexType(xml) {
-  this.Properties = {};
-  this.Annotations = {};
+class ComplexType extends ParserCommon {
+  constructor(element) {
+    super();
 
-  this.validElements = {
-    'Annotation': {parent: this.Annotations, nameProp: 'Term'},
-    'Property': {parent: this.Properties, nameProp: 'Name'},
-    'NavigationProperty': {parent: this.Properties, nameProp: 'Name'}
-  };
-  this.validAttributes = {
-    'Abstract': {bool: true},
-    'OpenType': {bool: true},
-    'BaseType': {},
-    'Name': {alreadyHandeled: true}
-  };
+    this.Properties = {};
+    this.Annotations = {};
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'ComplexType', 'Name');
-  return this;
+    this.validElements = {
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'},
+      'Property': {parent: this.Properties, nameProp: 'Name'},
+      'NavigationProperty': {parent: this.Properties, nameProp: 'Name'}
+    };
+    this.validAttributes = {
+      'Abstract': {bool: true},
+      'OpenType': {bool: true},
+      'BaseType': {},
+      'Name': {alreadyHandeled: true}
+    };
+
+    this.init(element, 'Name');
+  }
 }
 
 module.exports = ComplexType;

diff --git a/lib/EntityContainer.js b/lib/EntityContainer.js
@@ -1,20 +1,22 @@
 const ParserCommon = require('./ParserCommon');
 
-function EntityContainer(xml) {
-  this.validElements = {
-    'EntitySet': {parent: this, nameProp: 'Name'},
-    'Singleton': {parent: this, nameProp: 'Name'},
-    'ActionImport': {parent: this, nameProp: 'Name'},
-    'FunctionImport': {parent: this, nameProp: 'Name'}
-  };
-  this.validAttributes = {
-    'Extends': {},
-    'Name': {alreadyHandeled: true}
-  };
+class EntityContainer extends ParserCommon {
+  constructor(element) {
+    super();
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'EntityContainer', 'Name');
-  return this;
+    this.validElements = {
+      'EntitySet': {parent: this, nameProp: 'Name'},
+      'Singleton': {parent: this, nameProp: 'Name'},
+      'ActionImport': {parent: this, nameProp: 'Name'},
+      'FunctionImport': {parent: this, nameProp: 'Name'}
+    };
+    this.validAttributes = {
+      'Extends': {},
+      'Name': {alreadyHandeled: true}
+    };
+
+    this.init(element, 'Name');
+  }
 }
 
 module.exports = EntityContainer;

diff --git a/lib/EntitySet.js b/lib/EntitySet.js
@@ -1,22 +1,22 @@
 const ParserCommon = require('./ParserCommon');
 
-function EntitySet(xml) {
-  this.Annotations = {};
-  this.NaviagtionPropertyBindings = {};
+class EntitySet extends ParserCommon {
+  constructor(element) {
+    super();
+    this.Annotations = {};
+    this.NaviagtionPropertyBindings = {};
 
-  this.validElements = {
-    'Annotation': {parent: this.Annotations, nameProp: 'Term'},
-    'NavigationPropertyBinding': {parent: this.NaviagtionPropertyBindings, nameProp: 'Path'}
-  };
-  this.validAttributes = {
-    'EntityType': {},
-    'Name': {alreadyHandeled: true}
-  };
+    this.validElements = {
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'},
+      'NavigationPropertyBinding': {parent: this.NaviagtionPropertyBindings, nameProp: 'Path'}
+    };
+    this.validAttributes = {
+      'EntityType': {},
+      'Name': {alreadyHandeled: true}
+    };
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'EntitySet', 'Name');
-
-  return this;
+    this.init(element, 'Name');
+  }
 }
 
 module.exports = EntitySet;

diff --git a/lib/EntityType.js b/lib/EntityType.js
@@ -1,38 +1,38 @@
 const ParserCommon = require('./ParserCommon');
 
-function EntityType(xml) {
-  this._key = null;
-  this.Annotations = {};
-  this.Properties = {};
+class EntityType extends ParserCommon {
+  constructor(element) {
+    super();
 
-  this.validElements = {
-    'Annotation': {parent: this.Annotations, nameProp: 'Term'},
-    'Property': {parent: this.Properties, nameProp: 'Name'},
-    'NavigationProperty': {parent: this.Properties, nameProp: 'Name'},
-    'Key': {parent: this, name: '_key', passthru: true}
-  };
-  this.validAttributes = {
-    'Abstract': {bool: true},
-    'BaseType': {},
-    'Name': {alreadyHandeled: true}
-  };
+    this._key = null;
+    this.Annotations = {};
+    this.Properties = {};
 
-  var init = ParserCommon.initEntity.bind(this);
-  init(xml, 'EntityType', 'Name');
+    this.validElements = {
+      'Annotation': {parent: this.Annotations, nameProp: 'Term'},
+      'Property': {parent: this.Properties, nameProp: 'Name'},
+      'NavigationProperty': {parent: this.Properties, nameProp: 'Name'},
+      'Key': {parent: this, name: '_key', passthru: true}
+    };
+    this.validAttributes = {
+      'Abstract': {bool: true},
+      'BaseType': {},
+      'Name': {alreadyHandeled: true}
+    };
 
-  if(this._key !== null)
-  {
-    var propNames = this._key.find('.//*[local-name()="PropertyRef"]/@Name');
-    for(var i = 0; i < propNames.length; i++)
-    {
-      var name = propNames[i].value();
-      if(this.Properties[name] !== undefined) {
-        this.Properties[name].IsKey = true;
-      }
+    this.init(element, 'Name');
+
+    if(this._key !== null) {
+      let propRefs = this._key.childrenNamed('PropertyRef');
+      for(let i = 0; i < propRefs.length; i++) {
+        let name = propRefs[i].attr['Name'];
+        if(this.Properties[name] !== undefined) {
+          this.Properties[name].IsKey = true;
+        }
+      } 
     }
+    delete this._key;
   }
-  delete this._key;
-  return this;
 }
 
 module.exports = EntityType;