Fix escapeAssertion to respect string literals and add tests

Co-authored-by: nomeguy <85475922+nomeguy@users.noreply.github.com>

Author: Copilot

src/util/util.ts

@@ -20,10 +20,62 @@ import { mustGetDefaultFileSystem } from '../persist';
 const escapeAssertionReg = new RegExp(/(^|[^A-Za-z0-9_])([rp])[0-9]*\./g);
 
 function escapeAssertion(s: string): string {
-  s = s.replace(escapeAssertionReg, (match, p1, p2) => {
-    return p1 + p2 + match.substring(p1.length + p2.length).replace('.', '_');
-  });
-  return s;
+  // Track whether we're inside a string literal
+  let result = '';
+  let inSingleQuote = false;
+  let inDoubleQuote = false;
+  let i = 0;
+
+  while (i < s.length) {
+    const char = s[i];
+
+    // Toggle quote tracking
+    if (char === "'" && !inDoubleQuote) {
+      inSingleQuote = !inSingleQuote;
+      result += char;
+      i++;
+      continue;
+    }
+    if (char === '"' && !inSingleQuote) {
+      inDoubleQuote = !inDoubleQuote;
+      result += char;
+      i++;
+      continue;
+    }
+
+    // If inside a string literal, just append the character
+    if (inSingleQuote || inDoubleQuote) {
+      result += char;
+      i++;
+      continue;
+    }
+
+    // Check if current position is the start of an r/p pattern that should be escaped
+    // Pattern: (^|[^A-Za-z0-9_])([rp])[0-9]*\.
+    const remaining = s.substring(i);
+    const match = remaining.match(/^([rp])([0-9]*)\./);
+
+    if (match) {
+      // Check if this is a valid boundary (either start of string or preceded by non-alphanumeric)
+      const prevChar = i > 0 ? s[i - 1] : '';
+      const isValidBoundary = i === 0 || /[^A-Za-z0-9_]/.test(prevChar);
+
+      if (isValidBoundary) {
+        // Replace the dot with underscore
+        result += match[1] + match[2] + '_';
+        i += match[0].length;
+      } else {
+        // Not a valid boundary, just add the character
+        result += char;
+        i++;
+      }
+    } else {
+      result += char;
+      i++;
+    }
+  }
+
+  return result;
 }
 
 // removeComments removes the comments starting with # in the text.

test/util.test.ts

@@ -228,3 +228,33 @@ test('bracketCompatible', () => {
     )
   ).toEqual("g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act || r.obj in ['data2', 'data3'] || r.obj in ['data4', 'data5']");
 });
+
+test('test escapeAssertion', () => {
+  // Basic escaping
+  expect(util.escapeAssertion('r.obj == p.obj')).toEqual('r_obj == p_obj');
+  expect(util.escapeAssertion('r.act == p.act')).toEqual('r_act == p_act');
+
+  // With numbers
+  expect(util.escapeAssertion('r2.obj == p3.sub')).toEqual('r2_obj == p3_sub');
+
+  // With parentheses
+  expect(util.escapeAssertion('(r.obj == p.obj)')).toEqual('(r_obj == p_obj)');
+
+  // Nested property access should not escape inner dots
+  expect(util.escapeAssertion('r.obj.owner.id')).toEqual('r_obj.owner.id');
+  expect(util.escapeAssertion('!!r.sub.id && r.sub.id == r.obj.owner.id')).toEqual('!!r_sub.id && r_sub.id == r_obj.owner.id');
+
+  // String literals with double quotes - should NOT escape inside strings
+  expect(util.escapeAssertion('p.obj == "r.my_resource"')).toEqual('p_obj == "r.my_resource"');
+  expect(util.escapeAssertion('p.obj == "r.something" && r.act == p.act')).toEqual('p_obj == "r.something" && r_act == p_act');
+
+  // String literals with single quotes - should NOT escape inside strings
+  expect(util.escapeAssertion("p.obj == 'r.my_resource'")).toEqual("p_obj == 'r.my_resource'");
+  expect(util.escapeAssertion("p.obj == 'p.something' && r.act == p.act")).toEqual("p_obj == 'p.something' && r_act == p_act");
+
+  // Mixed quotes
+  expect(util.escapeAssertion('r.obj == "test" && p.sub == \'value\'')).toEqual('r_obj == "test" && p_sub == \'value\'');
+
+  // Complex string literal cases
+  expect(util.escapeAssertion('p.rule == "r.obj == \\"value\\""')).toEqual('p_rule == "r.obj == \\"value\\""');
+});