@lblod/graph-rdfa-processor 2.1.2 → 2.1.4

package/dist/rdfa-graph.js

@@ -383,7 +383,7 @@ function () {
       }
 
       s += " .";
-      return s.replaceAll("\\", "\\\\");
+      return s;
     }
   }, {
     key: "toObject",
@@ -544,21 +544,21 @@ function () {
             }
           }
 
-          s += '"""' + value.replace(/"""/g, '\\"\\"\\"') + '"""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral>';
+          s += '"""' + value.replace(/([^\\]|^)(\\)(?!\\)/g, "$1\\\\").replace(/"""/g, '\\"\\"\\"') + '"""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral>';
         } else if (this.objects[i].type == "http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML") {
           // We can use innerHTML as a shortcut from the parentNode if the list is not empty
           if (this.objects[i].value.length == 0) {
             s += '""""""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML>';
           } else {
-            s += '"""' + this.objects[i].value[0].parentNode.innerHTML.replace(/"""/g, '\\"\\"\\"') + '"""^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML>';
+            s += '"""' + 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 != "http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/graph-rdfa-processor",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "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];
@@ -307,7 +307,7 @@ export class RDFaSubject {
       s += " " + this.predicates[predicate].toString(options);
     }
     s += " .";
-    return s.replaceAll("\\", "\\\\");
+    return s;
   }
 
   toObject() {
@@ -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,24 @@ 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 +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/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("./bug2.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",