@lblod/graph-rdfa-processor 2.1.3 → 2.1.5

package/dist/rdfa-graph.js

@@ -556,7 +556,7 @@ function () {
           var l = this.objects[i].value.toString();
 
           if (l.indexOf("\n") >= 0 || l.indexOf("\r") >= 0) {
-            s += '"""' + l.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"""/g, '\\"\\"\\"') + '"""';
+            s += '"""' + l.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"/g, '\\"') + '"""';
           } else {
             s += '"' + l.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"/g, '\\"') + '"';
           }

package/dist/rdfa-processor.js

@@ -397,6 +397,10 @@ function (_URIResolver) {
           baseURI = options.baseURIMap(baseURI);
         }
 
+        if (baseURI == "about:blank") {
+          baseURI = options.baseURI;
+        }
+
         return baseURI;
       };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/graph-rdfa-processor",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Green turtle GraphRdfaProcessor extracted and available as a commonJS module",
   "main": "dist/index.js",
   "module": "src/index.js",

package/src/rdfa-graph.js

@@ -4,10 +4,10 @@ export class RDFaGraph {
   constructor() {
     var dataContext = this;
     this.curieParser = {
-      trim: function (str) {
+      trim: function(str) {
         return str.replace(/^\s\s*/, "").replace(/\s\s*$/, "");
       },
-      parse: function (value, resolve) {
+      parse: function(value, resolve) {
         value = this.trim(value);
         if (value.charAt(0) == "[" && value.charAt(value.length - 1) == "]") {
           value = value.substring(1, value.length - 1);
@@ -34,19 +34,19 @@ export class RDFaGraph {
       },
     };
     this.base = null;
-    this.toString = function (requestOptions) {
+    this.toString = function(requestOptions) {
       var options =
         requestOptions && requestOptions.shorten
           ? { graph: this, shorten: true, prefixesUsed: {} }
           : null;
       if (requestOptions && requestOptions.blankNodePrefix) {
-        options.filterBlankNode = function (id) {
+        options.filterBlankNode = function(id) {
           return "_:" + requestOptions.blankNodePrefix + id.substring(2);
         };
       }
       if (requestOptions && requestOptions.numericalBlankNodePrefix) {
         var onlyNumbers = /^[0-9]+$/;
-        options.filterBlankNode = function (id) {
+        options.filterBlankNode = function(id) {
           var label = id.substring(2);
           return onlyNumbers.test(label)
             ? "_:" + requestOptions.numericalBlankNodePrefix + label
@@ -72,7 +72,7 @@ export class RDFaGraph {
       return prolog.length == 0 ? s : prolog + "\n" + s;
     };
     this.blankNodeCounter = 0;
-    this.clear = function () {
+    this.clear = function() {
       this.subjects = {};
       this.prefixes = {};
       this.terms = {};
@@ -130,7 +130,7 @@ export class RDFaGraph {
     Object.defineProperty(this, "tripleCount", {
       enumerable: true,
       configurable: false,
-      get: function () {
+      get: function() {
         var count = 0;
         for (var s in this.subjects) {
           var snode = this.subjects[s];
@@ -480,12 +480,11 @@ export class RDFaPredicate {
         }
       } else {
         var l = this.objects[i].value.toString();
+
         if (l.indexOf("\n") >= 0 || l.indexOf("\r") >= 0) {
           s +=
             '"""' +
-            l
-              .replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\")
-              .replace(/"""/g, '\\"\\"\\"') +
+            l.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"/g, '\\"') +
             '"""';
         } else {
           s +=
@@ -507,7 +506,7 @@ export class RDFaPredicate {
   }
 }
 
-RDFaPredicate.getPrefixMap = function (e) {
+RDFaPredicate.getPrefixMap = function(e) {
   var prefixMap = {};
   while (e.attributes) {
     for (var i = 0; i < e.attributes.length; i++) {

package/src/rdfa-processor.js

@@ -208,9 +208,9 @@ export default class RDFaProcessor extends URIResolver {
       if (node.ownerDocument.doctype) {
         if (
           node.ownerDocument.doctype.publicId ==
-            "-//W3C//DTD XHTML+RDFa 1.0//EN" &&
+          "-//W3C//DTD XHTML+RDFa 1.0//EN" &&
           node.ownerDocument.doctype.systemId ==
-            "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"
+          "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"
         ) {
           console.log(
             "WARNING: RDF 1.0 is not supported.  Defaulting to HTML5 mode.",
@@ -218,9 +218,9 @@ export default class RDFaProcessor extends URIResolver {
           this.setHTMLContext();
         } else if (
           node.ownerDocument.doctype.publicId ==
-            "-//W3C//DTD XHTML+RDFa 1.1//EN" &&
+          "-//W3C//DTD XHTML+RDFa 1.1//EN" &&
           node.ownerDocument.doctype.systemId ==
-            "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd"
+          "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd"
         ) {
           this.setXHTMLContext();
         } else {
@@ -329,11 +329,11 @@ export default class RDFaProcessor extends URIResolver {
       "http://www.w3.org/1999/xhtml/vocab#transformation";
   }
 
-  init() {}
+  init() { }
 
-  newSubjectOrigin(origin, subject) {}
+  newSubjectOrigin(origin, subject) { }
 
-  addTriple(origin, subject, predicate, object) {}
+  addTriple(origin, subject, predicate, object) { }
 
   process(node, options) {
     if (node.nodeType == Node.DOCUMENT_NODE) {
@@ -344,7 +344,7 @@ export default class RDFaProcessor extends URIResolver {
     }
     var queue = [];
     // Fix for Firefox that includes the hash in the base URI
-    var removeHash = function (baseURI) {
+    var removeHash = function(baseURI) {
       var hash = baseURI.indexOf("#");
       if (hash >= 0) {
         baseURI = baseURI.substring(0, hash);
@@ -352,6 +352,9 @@ export default class RDFaProcessor extends URIResolver {
       if (options && options.baseURIMap) {
         baseURI = options.baseURIMap(baseURI);
       }
+      if (baseURI == "about:blank") {
+        baseURI = options.baseURI;
+      }
       return baseURI;
     };
     queue.push({
@@ -864,18 +867,18 @@ export default class RDFaProcessor extends URIResolver {
             datatypeAtt.value == ""
               ? RDFaProcessor.PlainLiteralURI
               : this.parseTermOrCURIEOrAbsURI(
-                  datatypeAtt.value,
-                  vocabulary,
-                  context.terms,
-                  prefixes,
-                  base,
-                );
+                datatypeAtt.value,
+                vocabulary,
+                context.terms,
+                prefixes,
+                base,
+              );
           if (datetimeAtt && !contentAtt) {
             content = datetimeAtt.value;
           } else {
             content =
               datatype == RDFaProcessor.XMLLiteralURI ||
-              datatype == RDFaProcessor.HTMLLiteralURI
+                datatype == RDFaProcessor.HTMLLiteralURI
                 ? null
                 : contentAtt
                   ? contentAtt.value
@@ -943,10 +946,10 @@ export default class RDFaProcessor extends URIResolver {
                   datatype == RDFaProcessor.HTMLLiteralURI
                   ? { type: datatype, value: current.childNodes }
                   : {
-                      type: datatype ? datatype : RDFaProcessor.PlainLiteralURI,
-                      value: content,
-                      language: language,
-                    },
+                    type: datatype ? datatype : RDFaProcessor.PlainLiteralURI,
+                    value: content,
+                    language: language,
+                  },
               );
             } else {
               if (
@@ -1073,7 +1076,7 @@ export default class RDFaProcessor extends URIResolver {
     }
   }
 
-  copyProperties() {}
+  copyProperties() { }
 
   push(parent, subject) {
     return {
@@ -1108,7 +1111,7 @@ RDFaProcessor.NCNAME = new RegExp(
   "^" + RDFaProcessor.nameStartChar + RDFaProcessor.nameChar + "*$",
 );
 
-RDFaProcessor.trim = function (str) {
+RDFaProcessor.trim = function(str) {
   return str.replace(/^\s\s*/, "").replace(/\s\s*$/, "");
 };
 
@@ -1144,7 +1147,7 @@ RDFaProcessor.dateTimeTypes = [
   },
 ];
 
-RDFaProcessor.deriveDateTimeType = function (value) {
+RDFaProcessor.deriveDateTimeType = function(value) {
   for (var i = 0; i < RDFaProcessor.dateTimeTypes.length; i++) {
     //console.log("Checking "+value+" against "+RDFaProcessor.dateTimeTypes[i].type);
     var matched = RDFaProcessor.dateTimeTypes[i].pattern.exec(value);

package/test/test.js

@@ -2,7 +2,7 @@ import { jsdom } from "jsdom";
 import assert from "assert";
 import getRDFaGraph from "../src";
 import { readFileSync, writeFileSync } from "fs";
-describe("getRDFaGraph", function () {
+describe("getRDFaGraph", function() {
   let html = `<div typeof="rdfs:Class" resource="http://schema.org/CreativeWork">
         <span class="h" property="rdfs:label">CreativeWork</span>
         <span property="rdfs:comment">The most generic kind of creative work, including books, movies, photographs, software programs, etc.</span>
@@ -17,14 +17,14 @@ describe("getRDFaGraph", function () {
  <http://purl.org/dc/terms/source> <http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews> .
 `;
 
-  it("should getRDFaGraph from a document", function () {
+  it("should getRDFaGraph from a document", function() {
     let { document } = jsdom(html).defaultView.window;
     let graph = getRDFaGraph(document, { baseURI: "http://localhost" });
     assert.equal(graph.toString(), expected);
   });
 
-  it.only("whatever", () => {
-    let ht = readFileSync("./bug.html");
+  it("whatever", () => {
+    let ht = readFileSync("./bug4.html");
     let { document } = jsdom(ht).defaultView.window;
 
     let graph = getRDFaGraph(document, {
@@ -40,7 +40,7 @@ describe("getRDFaGraph", function () {
     writeFileSync("/tmp/x.ttl", graph.toString(), "utf8");
   });
 
-  it("should getRDFaGraph from a node", function () {
+  it("should getRDFaGraph from a node", function() {
     let { document } = jsdom(html).defaultView.window;
     let graph = getRDFaGraph(document.getElementsByTagName("div")[0], {
       baseURI: "http://localhost",