@lblod/graph-rdfa-processor 2.1.1 → 2.1.3

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];
@@ -459,7 +459,9 @@ export class RDFaPredicate {
         }
         s +=
           '"""' +
-          value.replace(/"""/g, '\\"\\"\\"') +
+          value
+            .replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\")
+            .replace(/"""/g, '\\"\\"\\"') +
           '"""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral>';
       } else if (
         this.objects[i].type ==
@@ -471,18 +473,25 @@ export class RDFaPredicate {
         } else {
           s +=
             '"""' +
-            this.objects[i].value[0].parentNode.innerHTML.replace(
-              /"""/g,
-              '\\"\\"\\"',
-            ) +
+            this.objects[i].value[0].parentNode.innerHTML
+              .replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\")
+              .replace(/"""/g, '\\"\\"\\"') +
             '"""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML>';
         }
       } else {
         var l = this.objects[i].value.toString();
         if (l.indexOf("\n") >= 0 || l.indexOf("\r") >= 0) {
-          s += '"""' + l.replace(/"""/g, '\\"\\"\\"') + '"""';
+          s +=
+            '"""' +
+            l
+              .replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\")
+              .replace(/"""/g, '\\"\\"\\"') +
+            '"""';
         } else {
-          s += '"' + l.replace(/"/g, '\\"') + '"';
+          s +=
+            '"' +
+            l.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"/g, '\\"') +
+            '"';
         }
         if (
           this.objects[i].type !=
@@ -498,7 +507,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

@@ -913,9 +913,7 @@ export default class RDFaProcessor extends URIResolver {
             content = typedResource;
           } else {
             content = current.textContent;
-            if (content.includes("\\")) {
-              content = content.replaceAll("\\", "\\\\");
-            }
+
             if (this.inHTMLMode && current.localName == "time") {
               datatype = RDFaProcessor.deriveDateTimeType(content);
             }

package/test/test.js

@@ -23,7 +23,7 @@ describe("getRDFaGraph", function () {
     assert.equal(graph.toString(), expected);
   });
 
-  it("whatever", () => {
+  it.only("whatever", () => {
     let ht = readFileSync("./bug.html");
     let { document } = jsdom(ht).defaultView.window;
 
@@ -37,7 +37,7 @@ describe("getRDFaGraph", function () {
         },
       ],
     });
-    writeFileSync("/tmp/x.out", graph.toString(), "utf8");
+    writeFileSync("/tmp/x.ttl", graph.toString(), "utf8");
   });
 
   it("should getRDFaGraph from a node", function () {