Fix invalid handling of rdf:parseType=Collection and rdf:ID

Author: rubensworks

lib/RdfXmlParser.ts

@@ -379,12 +379,13 @@ while ${attribute.value} and ${activeSubjectValue} where found.`);
           const restTerm = this.dataFactory.namedNode(RdfXmlParser.RDF + 'rest');
 
           // Emit <x> <p> <current-chain> OR <previous-chain> <rdf:rest> <current-chain>
+          const isRestTerm = parentTag.childrenCollectionPredicate.equals(restTerm);
           this.emitTriple(parentTag.childrenCollectionSubject,
-            parentTag.childrenCollectionPredicate, linkTerm, parentTag.reifiedStatementId, parentTag.childrenTripleTerms, parentTag.childrenCollectionPredicate.equals(restTerm) ? null : parentTag.reifier);
+            parentTag.childrenCollectionPredicate, linkTerm, isRestTerm ? null : parentTag.reifiedStatementId, parentTag.childrenTripleTerms, isRestTerm ? null : parentTag.reifier);
 
           // Emit <current-chain> <rdf:first> value
           this.emitTriple(linkTerm, this.dataFactory.namedNode(RdfXmlParser.RDF + 'first'),
-            activeTag.subject, activeTag.reifiedStatementId, activeTag.childrenTripleTerms);
+            activeTag.subject, null, activeTag.childrenTripleTerms);
 
           // Store <current-chain> in the parent node
           parentTag.childrenCollectionSubject = linkTerm;
@@ -718,7 +719,7 @@ while ${attribute.value} and ${activeSubjectValue} where found.`);
     if (poppedTag.childrenCollectionSubject) {
       // Terminate the rdf:List
       this.emitTriple(poppedTag.childrenCollectionSubject, poppedTag.childrenCollectionPredicate,
-        this.dataFactory.namedNode(RdfXmlParser.RDF + 'nil'), poppedTag.reifiedStatementId, poppedTag.childrenTripleTerms);
+        this.dataFactory.namedNode(RdfXmlParser.RDF + 'nil'), null, poppedTag.childrenTripleTerms);
     } else if (poppedTag.predicate) {
       if (!poppedTag.hadChildren && poppedTag.childrenParseType !== ParseType.PROPERTY) {
         // Property element contains text

test/RdfXmlParser-test.ts

@@ -2175,6 +2175,38 @@ abc`)).rejects.toBeTruthy();
           ]);
       });
 
+      it('rdf:parseType="Collection" and rdf:ID', async () => {
+        const array = await parse(parser, `<?xml version="1.0"?>
+<rdf:RDF
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+    xmlns:eg="http://example.org/eg#"
+    xml:base="http://example.com/">
+
+    <rdf:Description rdf:about="http://example.org/eg#eric">
+        <rdf:type rdf:parseType="Resource">
+            <eg:intersectionOf rdf:ID="reif" rdf:parseType="Collection">
+                <rdf:Description rdf:about="http://example.org/eg#Person"/>
+                <rdf:Description rdf:about="http://example.org/eg#Male"/>
+            </eg:intersectionOf>
+        </rdf:type>
+    </rdf:Description>
+</rdf:RDF>`);
+        return expect(array)
+            .toBeRdfIsomorphic([
+              quad('http://example.org/eg#eric', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', '_:b99_a0'),
+              quad('_:b99_a0', 'http://example.org/eg#intersectionOf', '_:b99_a1'),
+              quad('http://example.com/#reif', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#subject', '_:b99_a0'),
+              quad('http://example.com/#reif', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate', 'http://example.org/eg#intersectionOf'),
+              quad('http://example.com/#reif', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#object', '_:b99_a1'),
+              quad('http://example.com/#reif', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement'),
+              quad('_:b99_a1', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#first', 'http://example.org/eg#Person'),
+              quad('_:b99_a1', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#rest', '_:b99_a2'),
+              quad('_:b99_a2', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#first', 'http://example.org/eg#Male'),
+              quad('_:b99_a2', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#rest', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'),
+            ]);
+      });
+
       // 2.17
       it('rdf:ID on a property with a literal to a reified statement', async () => {
         const array = await parse(parser, `<?xml version="1.0"?>