Prevent errors from invalid XPaths

fizzyduck · Dec 5, 2015 · 142a3a3 · 142a3a3
1 parent b1291db
commit 142a3a3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 npm-debug.log
 node_modules
+.imdone
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.7.5
 * Merge attributes from extension types.
 * Throw errors to console to not annoy the user.
+* Prevent error from invalid XPaths.
 
 ## 0.7.4
 * Fix using a root type as children too.

diff --git a/lib/xsd.coffee b/lib/xsd.coffee
@@ -78,7 +78,7 @@ module.exports =
     type = xsdParser.roots[xpath[0]]
     xpath.shift()  # Remove root node.
 
-    while xpath && xpath.length > 0
+    while xpath && xpath.length > 0 && type
       nextTag = xpath.shift()
       nextTypeName = @findTypeFromTag nextTag, type
       type = @types[nextTypeName]

diff --git a/lib/xsdParser.coffee b/lib/xsdParser.coffee
@@ -58,12 +58,11 @@ module.exports =
 
     # TODO: Process all Attributes definition.
     # TODO: Process all AttributeGroup
-    # TODO: Process all Group
 
     # Post parse the nodes and resolve links.
     @postParsing()
 
-    console.log @types
+    # Return calling the complete callback.
     complete()