Merge branch 'v8/develop' into feature/calculate-merkle-root-from-proof

Author: Zvonimir

index.cjs

@@ -289,8 +289,8 @@ function groupNquadsBySubject(nquadsArray, sort = false) {
       const nestedPredicate = subject.predicate.value;
       const nestedObject =
         subject.object.termType === "Literal"
-          ? `"""${subject.object.value}"""`
-          : `<${subject.object.value}>`;
+          ? `"${escapeLiteral(subject.object.value)}"`
+          : `<${escapeLiteral(subject.object.value)}>`;
       subjectKey = `<<<${nestedSubject}> <${nestedPredicate}> ${nestedObject}>>`;
     } else {
       subjectKey = `<${subject.value}>`;
@@ -301,7 +301,9 @@ function groupNquadsBySubject(nquadsArray, sort = false) {
     }
 
     const objectValue =
-      object.termType === "Literal" ? `"""${object.value}"""` : `<${object.value}>`;
+      object.termType === "Literal"
+        ? `"${escapeLiteral(object.value)}"`
+        : `<${escapeLiteral(object.value)}>`;
 
     const quadString = `${subjectKey} <${predicate.value}> ${objectValue} .`;
     grouped[subjectKey].push(quadString);
@@ -426,6 +428,20 @@ function isEmptyObject(obj) {
   return Object.keys(obj).length === 0 && obj.constructor === Object;
 }
 
+function escapeLiteral(value) {
+  const ESCAPE_MAP = {
+    '"': '\\"',
+    "\\": "\\\\",
+    "\b": "\\b",
+    "\f": "\\f",
+    "\n": "\\n",
+    "\r": "\\r",
+    "\t": "\\t",
+  };
+
+  return value.replace(/["\\\b\f\n\r\t]/g, (char) => ESCAPE_MAP[char]);
+}
+
 var knowledgeCollectionTools = /*#__PURE__*/Object.freeze({
   __proto__: null,
   calculateByteSize: calculateByteSize,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "assertion-tools",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Common assertion tools used in ot-node and dkg.js",
   "main": "index.js",
   "type": "module",

package.json

@@ -242,8 +242,8 @@ export function groupNquadsBySubject(nquadsArray, sort = false) {
       const nestedPredicate = subject.predicate.value;
       const nestedObject =
         subject.object.termType === "Literal"
-          ? `"${subject.object.value}"`
-          : `<${subject.object.value}>`;
+          ? `"${escapeLiteral(subject.object.value)}"`
+          : `<${escapeLiteral(subject.object.value)}>`;
       subjectKey = `<<<${nestedSubject}> <${nestedPredicate}> ${nestedObject}>>`;
     } else {
       subjectKey = `<${subject.value}>`;
@@ -254,7 +254,9 @@ export function groupNquadsBySubject(nquadsArray, sort = false) {
     }
 
     const objectValue =
-      object.termType === "Literal" ? `"${object.value}"` : `<${object.value}>`;
+      object.termType === "Literal"
+        ? `"${escapeLiteral(object.value)}"`
+        : `<${escapeLiteral(object.value)}>`;
 
     const quadString = `${subjectKey} <${predicate.value}> ${objectValue} .`;
     grouped[subjectKey].push(quadString);
@@ -378,3 +380,17 @@ export function generateMissingIdsForBlankNodes(nquadsArray) {
 function isEmptyObject(obj) {
   return Object.keys(obj).length === 0 && obj.constructor === Object;
 }
+
+function escapeLiteral(value) {
+  const ESCAPE_MAP = {
+    '"': '\\"',
+    "\\": "\\\\",
+    "\b": "\\b",
+    "\f": "\\f",
+    "\n": "\\n",
+    "\r": "\\r",
+    "\t": "\\t",
+  };
+
+  return value.replace(/["\\\b\f\n\r\t]/g, (char) => ESCAPE_MAP[char]);
+}