@posiwise/common-services 0.1.99 → 0.2.0

package/fesm2022/posiwise-common-services.mjs

@@ -1489,10 +1489,8 @@ class PermissionService {
             return true;
         if (expr === 'false')
             return false;
-        // Recursively simplify: split on lowest-precedence operator at depth 0
-        // || has lower precedence than && in JS
         let depth = 0;
-        for (let i = 0; i <= expr.length - 2; i++) {
+        for (let i = 0; i < expr.length - 1; i++) {
             const c = expr[i];
             if (c === '(')
                 depth++;
@@ -1505,7 +1503,7 @@ class PermissionService {
             }
         }
         depth = 0;
-        for (let i = 0; i <= expr.length - 2; i++) {
+        for (let i = 0; i < expr.length - 1; i++) {
             const c = expr[i];
             if (c === '(')
                 depth++;
@@ -1517,18 +1515,23 @@ class PermissionService {
                 return (this.evaluateBooleanExpression(left) && this.evaluateBooleanExpression(right));
             }
         }
-        // Strip matching outer parens
+        // Strip matching outer parens - only when first ( and last ) are a pair
         if (expr.startsWith('(') && expr.endsWith(')')) {
-            let d = 0;
-            for (let j = 1; j < expr.length - 1; j++) {
+            let depth = 0;
+            for (let j = 0; j < expr.length; j++) {
                 if (expr[j] === '(')
-                    d++;
-                if (expr[j] === ')')
-                    d--;
-                if (d < 0)
-                    return false;
+                    depth++;
+                else if (expr[j] === ')')
+                    depth--;
+                if (depth === 0) {
+                    if (j === expr.length - 1) {
+                        return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
+                    }
+                    break; // First ( doesn't wrap entire expr
+                }
+                if (depth < 0)
+                    break;
             }
-            return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
         }
         // Unrecognized token - treat as false for safety
         return false;
@@ -1537,8 +1540,6 @@ class PermissionService {
         if (typeof permission !== 'boolean') {
             permission.split(' ').forEach(x => {
                 const raw = x.trim();
-                if (!raw)
-                    return; // Skip empty tokens (e.g. from double spaces) - avoids malformed expr
                 if (['||', '&&', '(', ')'].includes(raw)) {
                     expr += ` ${raw} `;
                 }