Merge pull request #9 from jacksierkstra/develop

Changed default xsd parser to be the pipeline and fixed a bug for the…

Author: jacksierkstra

src/core/main.ts

@@ -2,7 +2,7 @@ import { ValidationResult } from "@lib/types/validation";
 import { Validator, ValidatorImpl } from "@lib/validator/validator";
 import { XMLParser, XMLParserImpl } from "@lib/xml/parser";
 import { XSDParser } from "@lib/xsd/parser";
-import { XSDStandardParserImpl } from "@lib/xsd/standard";
+import { XSDPipelineParserImpl } from "@lib/xsd/pipeline/parser";
 
 export class Checkr {
 
@@ -12,7 +12,7 @@ export class Checkr {
 
     constructor() {
         this.xmlParser = new XMLParserImpl();
-        this.xsdParser = new XSDStandardParserImpl(this.xmlParser);
+        this.xsdParser = new XSDPipelineParserImpl(this.xmlParser);
         this.validator = new ValidatorImpl(this.xmlParser, this.xsdParser);
     }
 

src/xsd/parser.test.ts

@@ -402,6 +402,43 @@ const runCommonTests = (xsdParser: XSDParser) => {
     });
   });
 
+  it('should parse books xsd', async () => {
+    const xsd = `
+          <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  targetNamespace="urn:books"
+                  xmlns:bks="urn:books">
+
+        <xsd:element name="books" type="bks:BooksForm"/>
+
+        <xsd:complexType name="BooksForm">
+          <xsd:sequence>
+            <xsd:element name="book" 
+                        type="bks:BookForm" 
+                        minOccurs="0" 
+                        maxOccurs="unbounded"/>
+            </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:complexType name="BookForm">
+          <xsd:sequence>
+            <xsd:element name="author"   type="xsd:string"/>
+            <xsd:element name="title"    type="xsd:string"/>
+            <xsd:element name="genre"    type="xsd:string"/>
+            <xsd:element name="price"    type="xsd:float" />
+            <xsd:element name="pub_date" type="xsd:date" />
+            <xsd:element name="review"   type="xsd:string"/>
+          </xsd:sequence>
+          <xsd:attribute name="id"   type="xsd:string"/>
+        </xsd:complexType>
+      </xsd:schema>
+    `;
+    
+    await parseAndExpect(xsd, (schema) => {
+      expect(schema.elements).toHaveLength(0);
+    });
+
+  });
+
 };
 
 describe('XSDParser Implementations', () => {

src/xsd/standard.ts

@@ -9,7 +9,7 @@ export class XSDStandardParserImpl implements XSDParser {
         const doc = this.xmlParser.parse(xsd);
 
         // Ensure documentElement is valid
-        if (!doc.documentElement || doc.documentElement.tagName !== "xs:schema") {
+        if (!doc.documentElement || doc.documentElement.tagName.indexOf('schema') === -1) {
             throw new Error("Invalid XSD: Missing root <xs:schema>");
         }