fix: avoid conflict and reserved word

Author: Azzerty23

packages/schema/src/plugins/enhancer/policy/policy-guard-generator.ts

@@ -211,43 +211,48 @@ export class PolicyGenerator {
             returnType: 'any',
             statements: (writer) => {
                 writer.write(`
-                const assertions: any[] = [];
-  if ('OR' in args) {
-    const tempAssertions: any[] = [];
-    for (const arg of args.OR) {
-      tempAssertions.push(buildAssertion(z3, variables, arg, user, fieldStringValueMap));
-    }
-    const orAssertion = z3.Or(...tempAssertions);
-    assertions.push(orAssertion);
-  }
-
-  // handle string conditions
-  // TODO: handle string conditions for user properties
-  const condition = checkStringCondition(args, fieldStringValueMap);
-  if (condition === false) {
-    return z3.Bool.val(false);
-  }
-
-  const tempAssertions: any[] = [];
-
-  for (const property of Object.keys(args)) {  
-    const condition = args[property];
-    // TODO: handle nested properties
-    const variable = variables[property];
-    if (variable) {
-      tempAssertions.push(...processCondition(variable, condition, z3));
-    }
-  }
+                    const processedVariables = Object.keys(variables).reduce((acc, key) => {
+                        const newKey = key.replace(/^_/, '');
+                        acc[newKey] = variables[key];
+                        return acc;
+                    }, {} as Record<string, any>);
+                    const assertions: any[] = [];
+                    if ('OR' in args) {
+                        const tempAssertions: any[] = [];
+                        for (const arg of args.OR) {
+                            tempAssertions.push(buildAssertion(z3, processedVariables, arg, user, fieldStringValueMap));
+                        }
+                        const orAssertion = z3.Or(...tempAssertions);
+                        assertions.push(orAssertion);
+                    }
+
+                    // handle string conditions
+                    // TODO: handle string conditions for user properties
+                    const condition = checkStringCondition(args, fieldStringValueMap);
+                    if (condition === false) {
+                    return z3.Bool.val(false);
+                    }
+
+                    const tempAssertions: any[] = [];
 
-  // avoid empty assertions in case of unique value or boolean
-  if (tempAssertions.length > 1) {
-    const andAssertion = z3.And(...tempAssertions);
-    assertions.push(andAssertion);
-  } else if (tempAssertions.length === 1) {
-    assertions.push(...tempAssertions);
-  }
+                    for (const property of Object.keys(args)) {  
+                    const condition = args[property];
+                    // TODO: handle nested properties
+                    const variable = processedVariables[property];
+                    if (variable) {
+                        tempAssertions.push(...processCondition(variable, condition, z3));
+                    }
+                    }
 
-  return z3.And(...assertions);
+                    // avoid empty assertions in case of unique value or boolean
+                    if (tempAssertions.length > 1) {
+                    const andAssertion = z3.And(...tempAssertions);
+                    assertions.push(andAssertion);
+                    } else if (tempAssertions.length === 1) {
+                    assertions.push(...tempAssertions);
+                    }
+
+                    return z3.And(...assertions);
                 `);
             },
         });
@@ -1052,17 +1057,15 @@ export class PolicyGenerator {
         expressions.forEach((expr) => {
             const variables = this.collectVariablesTypes(expr);
             Object.keys(variables).forEach((key) => {
-                if (!result[key]) {
-                    switch (variables[key]) {
-                        case 'NumberLiteral':
-                            result[key] = `z3.Int.const("${key}")`;
-                            break;
-                        case 'BooleanLiteral':
-                            result[key] = `z3.Bool.const("${key}")`;
-                            break;
-                        default:
-                            break;
-                    }
+                switch (variables[key]) {
+                    case 'NumberLiteral':
+                        result[`_${key}`] = `z3.Int.const("${key}")`;
+                        break;
+                    case 'BooleanLiteral':
+                        result[`_${key}`] = `z3.Bool.const("${key}")`;
+                        break;
+                    default:
+                        break;
                 }
             });
         });

packages/sdk/src/z3-expression-transformer.ts

@@ -286,9 +286,7 @@ export class Z3ExpressionTransformer {
             // const formattedName = `${lowerCaseFirst(expr.target.ref.$container.name)}${upperCaseFirst(
             //     expr.target.ref.name
             // )}`;
-            return this.options?.fieldReferenceContext
-                ? `${this.options.fieldReferenceContext}?.${expr.target.ref.name}`
-                : expr.target.ref.name;
+            return `_${expr.target.ref.name}`;
         }
     }
 
@@ -342,8 +340,12 @@ export class Z3ExpressionTransformer {
         // }
         if (this.isModelType(expr.left) && this.isModelType(expr.right)) {
             // comparison between model type values, map to id comparison
-            left = isAuthInvocation(expr.left) ? `(${left}?.id)` : `((args.${left}?.id || args.${left}Id))`;
-            right = isAuthInvocation(expr.right) ? `(${right}.id)` : `((args.${right}?.id || args.${right}Id))`;
+            left = isAuthInvocation(expr.left)
+                ? `(${left}?.id)`
+                : `((${this.withArgs(left)}?.id || ${this.withArgs(left)}Id))`;
+            right = isAuthInvocation(expr.right)
+                ? `(${right}.id)`
+                : `((${this.withArgs(right)}?.id || ${this.withArgs(right)}Id))`;
             let assertion = `${left} ${expr.operator} ${right}`;
 
             // only args values need implies
@@ -371,10 +373,12 @@ export class Z3ExpressionTransformer {
         // TODO: for other type we could want to add a constraint to the auth model => we have to create a variable for it
         if (this.isAuthComparison(left, right)) {
             left =
-                isMemberAccessExpr(expr.left) && !this.isAuthMemberAccessExpr(expr.left, left) ? `args.${left}` : left;
+                isMemberAccessExpr(expr.left) && !this.isAuthMemberAccessExpr(expr.left, left)
+                    ? `${this.withArgs(left)}`
+                    : left;
             right =
                 isMemberAccessExpr(expr.right) && !this.isAuthMemberAccessExpr(expr.right, right)
-                    ? `args.${right}`
+                    ? `${this.withArgs(right)}`
                     : right;
             let assertion = `${left} ${expr.operator} ${right}`;
             if (this.isAuthMemberAccessExpr(expr.left, left)) {
@@ -459,6 +463,13 @@ export class Z3ExpressionTransformer {
         return assertion;
     }
 
+    private withArgs(str: string) {
+        if (str.startsWith('_')) {
+            str = str.substring(1);
+        }
+        return `args.${str}`;
+    }
+
     // private isAuthProperty(expr: Expression) {
     //     return isMemberAccessExpr(expr) && expr.member.ref?.$container.name === 'User'; // TODO: how to get auth model name?
     // }