resolve rdf:HTML in RDFa

Author: bourgeoa

package-lock.json

@@ -98,7 +98,7 @@
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",
     "test:clean": "rimraf tests/serialize/,*",
     "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
-    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13",
+    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15",
     "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
     "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml  -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
     "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml  -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -112,6 +112,8 @@
     "test:serialize:11": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/rdf+xml  -out=,structures.xml && node diff ,structures.xml t11-ref.xml",
     "test:serialize:12": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=text/turtle -out=,structures.ttl && node diff ,structures.ttl t12-ref.ttl",
     "test:serialize:13": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/n-triples -out=,structures.nt && node ./data.js -format=application/n-triples -in=,structures.nt -format=text/turtle -out=,structures.nt.ttl && node diff ,structures.nt.ttl t13-ref.ttl",
+    "test:serialize:14": "cd ./tests/serialize && node ./data.js -in=t14.html -format=text/turtle -out=,t14.ttl && node diff ,t14.ttl t14-ref.ttl",
+    "test:serialize:15": "cd ./tests/serialize && node ./data.js -in=t15.html -format=text/turtle -out=,t15.ttl && node diff ,t15.ttl t15-ref.ttl",
     "test:types": "tsc --noEmit --target es2019 --moduleResolution node tests/types/*.ts",
     "test:unit": "mocha --growl --require ./tests/babel-register.js tests/unit/**-test.*",
     "test:unit:egp": "mocha --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",

package.json

@@ -895,7 +895,7 @@ export default class RDFaProcessor {
       case RDFaProcessor.XMLLiteralURI:
       case RDFaProcessor.HTMLLiteralURI:
         var string = ''
-        Object.keys(x.value).forEach(function (i) {
+        Object.keys(x.value).forEach(i => {
           string += Util.domToString(x.value[i], this.htmlOptions)
         })
         return new Literal(string, '', new NamedNode(x.type))

src/rdfaparser.js

@@ -103,13 +103,13 @@ export function DOMParserFactory () {
 export function domToString (node, options) {
   options = options || {}
   var selfClosing = []
-  if ('selfClosing' in options) {
+  if (options && options.selfClosing) {
     options.selfClosing.split(' ').forEach(function (n) {
       selfClosing[n] = true
     })
   }
   var skipAttributes = []
-  if ('skipAttributes' in options) {
+  if (options && options.skipAttributes) {
     options.skipAttributes.split(' ').forEach(function (n) {
       skipAttributes[n] = true
     })
@@ -123,34 +123,34 @@ export function dumpNode (node, options, selfClosing, skipAttributes) {
   var noEsc = [ false ]
   if (typeof node.nodeType === 'undefined') return out
   if (node.nodeType === 1) {
-    if (node.hasAttribute('class') && 'classWithChildText' in options && node.matches(options.classWithChildText.class)) {
+    if (node.hasAttribute('class') && (options && options.classWithChildText) && node.matches(options.classWithChildText.class)) {
       out += node.querySelector(options.classWithChildText.element).textContent
-    } else if (!('skipNodeWithClass' in options && node.matches('.' + options.skipNodeWithClass))) {
+    } else if (!((options && options.skipNodeWithClass) && node.matches('.' + options.skipNodeWithClass))) {
       var ename = node.nodeName.toLowerCase()
       out += '<' + ename
 
       var attrList = []
       for (i = node.attributes.length - 1; i >= 0; i--) {
         var atn = node.attributes[i]
-        if (skipAttributes.length > 0 && skipAttributes[atn.name]) continue
+        if (skipAttributes && skipAttributes.length > 0 && skipAttributes[atn.name]) continue
         if (/^\d+$/.test(atn.name)) continue
-        if (atn.name === 'class' && 'replaceClassItemWith' in options && (atn.value.split(' ').indexOf(options.replaceClassItemWith.source) > -1)) {
+        if (atn.name === 'class' && (options && options.replaceClassItemWith) && (atn.value.split(' ').indexOf(options.replaceClassItemWith.source) > -1)) {
           var re = new RegExp(options.replaceClassItemWith.source, 'g')
           atn.value = atn.value.replace(re, options.replaceClassItemWith.target).trim()
         }
-        if (!(atn.name === 'class' && 'skipClassWithValue' in options && options.skipClassWithValue === atn.value)) {
+        if (!(atn.name === 'class' && (options && options.skipClassWithValue) && options.skipClassWithValue === atn.value)) {
           attrList.push(atn.name + '=\'' + atn.value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/'/g, '&quot;') + '\'')
         }
       }
       if (attrList.length > 0) {
-        if ('sortAttributes' in options && options.sortAttributes) {
+        if (options && options.sortAttributes) {
           attrList.sort(function (a, b) {
             return a.toLowerCase().localeCompare(b.toLowerCase())
           })
         }
         out += ' ' + attrList.join(' ')
       }
-      if (selfClosing[ename]) {
+      if (selfClosing && selfClosing.ename) {
         out += ' />'
       } else {
         out += '>'