fix: address Copilot review on N3 PATCH parser

melvincarvalho · melvincarvalho · commit 4e0e8d6fd6de · 2026-03-16T06:46:46.000+01:00
- Skip '.' and ';' inside angle-bracket IRIs during statement splitting
- Remove 'a' → rdf:type from expandPredicate (only apply in N3 parsing)
- Assert inserted values in test, not just key existence
diff --git a/src/patch/n3-patch.js b/src/patch/n3-patch.js
@@ -113,24 +113,31 @@ function splitStatements(content) {
   let current = '';
   let inString = false;
   let stringChar = null;
+  let inIri = false;
 
   for (let i = 0; i < content.length; i++) {
     const char = content[i];
 
-    if (!inString && (char === '"' || char === "'")) {
+    if (!inString && !inIri && char === '<') {
+      inIri = true;
+      current += char;
+    } else if (inIri && char === '>') {
+      inIri = false;
+      current += char;
+    } else if (!inIri && !inString && (char === '"' || char === "'")) {
       inString = true;
       stringChar = char;
       current += char;
     } else if (inString && char === stringChar && content[i - 1] !== '\\') {
       inString = false;
       stringChar = null;
       current += char;
-    } else if (!inString && char === '.') {
+    } else if (!inString && !inIri && char === '.') {
       if (current.trim()) {
         statements.push(current);
       }
       current = '';
-    } else if (!inString && char === ';') {
+    } else if (!inString && !inIri && char === ';') {
       // Turtle shorthand - same subject, different predicate
       if (current.trim()) {
         statements.push(current);
@@ -440,7 +447,6 @@ function convertToJsonLd(object) {
  * Expand a potentially prefixed predicate to full URI
  */
 function expandPredicate(predicate) {
-  if (predicate === 'a') return 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
   const commonPrefixes = {
     'solid': SOLID_NS,
     'rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
diff --git a/test/patch.test.js b/test/patch.test.js
@@ -226,10 +226,25 @@ describe('PATCH Operations', () => {
       const data = await verify.json();
       const node = data['@graph'].find(n => n['@id'] && n['@id'].includes('#reg1'));
       assert.ok(node, 'Should have the reg1 node');
-      assert.ok(node['rdf:type'] || node['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'],
-        'Should have rdf:type (from "a" keyword)');
-      assert.ok(node['solid:forClass'], 'Should have solid:forClass');
-      assert.ok(node['solid:instance'], 'Should have solid:instance');
+
+      // Check rdf:type value (from 'a' keyword)
+      const rdfType = node['rdf:type'] || node['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'];
+      assert.ok(rdfType, 'Should have rdf:type (from "a" keyword)');
+      const typeId = rdfType['@id'] || rdfType;
+      assert.ok(String(typeId).includes('TypeRegistration'), `rdf:type should be TypeRegistration, got ${typeId}`);
+
+      // Check solid:forClass value
+      const forClass = node['solid:forClass'];
+      assert.ok(forClass, 'Should have solid:forClass');
+      const forClassId = forClass['@id'] || forClass;
+      assert.ok(String(forClassId).includes('Tracker'), `solid:forClass should be Tracker, got ${forClassId}`);
+
+      // Check solid:instance value (contains a dot in the IRI - tests IRI splitting)
+      const instance = node['solid:instance'];
+      assert.ok(instance, 'Should have solid:instance');
+      const instanceId = instance['@id'] || instance;
+      assert.strictEqual(instanceId, 'https://example.com/todo/data.jsonld#this',
+        'solid:instance should have full IRI preserved');
     });
   });
 
