Skip to content

fix: improve binary & unary expression applicability check #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 19, 2023
Merged

fix: improve binary & unary expression applicability check #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3146d12
fix: improve binary & unary expression applicability check
ymc9 Jul 19, 2023
6282554
fixes
ymc9 Jul 19, 2023
9e32fca
fix build
ymc9 Jul 19, 2023
6f29bb8
remove unary check
ymc9 Jul 19, 2023
52dec9c
resolve unary expression' type correctly
ymc9 Jul 19, 2023
0bc3f9b
fix test
ymc9 Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion packages/schema/src/language-server/validator/expression-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BinaryExpr, Expression, isBinaryExpr, isEnum } from '@zenstackhq/language/ast';
import { BinaryExpr, Expression, ExpressionType, isBinaryExpr, isEnum } from '@zenstackhq/language/ast';
import { ValidationAcceptor } from 'langium';
import { isAuthInvocation } from '../../utils/ast-utils';
import { AstValidator } from '../types';
Expand Down Expand Up @@ -48,6 +48,51 @@ export default class ExpressionValidator implements AstValidator<Expression> {
}
break;
}

case '>':
case '>=':
case '<':
case '<=':
case '&&':
case '||': {
let supportedShapes: ExpressionType[];
if (['>', '>=', '<', '<='].includes(expr.operator)) {
supportedShapes = ['Int', 'Float', 'DateTime', 'Any'];
} else {
supportedShapes = ['Boolean', 'Any'];
}

if (
typeof expr.left.$resolvedType?.decl !== 'string' ||
!supportedShapes.includes(expr.left.$resolvedType.decl)
) {
accept('error', `invalid operand type for "${expr.operator}" operator`, {
node: expr.left,
});
return;
}
if (
typeof expr.right.$resolvedType?.decl !== 'string' ||
!supportedShapes.includes(expr.right.$resolvedType.decl)
) {
accept('error', `invalid operand type for "${expr.operator}" operator`, {
node: expr.right,
});
return;
}

// DateTime comparison is only allowed between two DateTime values
if (expr.left.$resolvedType.decl === 'DateTime' && expr.right.$resolvedType.decl !== 'DateTime') {
accept('error', 'incompatible operand types', { node: expr });
} else if (
expr.right.$resolvedType.decl === 'DateTime' &&
expr.left.$resolvedType.decl !== 'DateTime'
) {
accept('error', 'incompatible operand types', { node: expr });
}

break;
}
}
}

Expand Down
8 changes: 7 additions & 1 deletion packages/schema/src/language-server/zmodel-linker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,13 @@ export class ZModelLinker extends DefaultLinker {

private resolveUnary(node: UnaryExpr, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
this.resolve(node.operand, document, extraScopes);
node.$resolvedType = node.operand.$resolvedType;
switch (node.operator) {
case '!':
this.resolveToBuiltinTypeOrDecl(node, 'Boolean');
break;
default:
throw Error(`Unsupported unary operator: ${node.operator}`);
}
}

private resolveObject(node: ObjectExpr, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
Expand Down
110 changes: 110 additions & 0 deletions packages/schema/tests/schema/validation/attribute-validation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,116 @@ describe('Attribute tests', () => {
).toContain(`Value is not assignable to parameter`);
});

it('policy expressions', async () => {
await loadModel(`
${prelude}
model A {
id String @id
x Int
x1 Int
y DateTime
y1 DateTime
z Float
z1 Decimal
foo Boolean
bar Boolean

@@allow('all', x > 0)
@@allow('all', x > x1)
@@allow('all', y >= y1)
@@allow('all', z < z1)
@@allow('all', z1 < z)
@@allow('all', x < z)
@@allow('all', x < z1)
@@allow('all', foo && bar)
@@allow('all', foo || bar)
@@allow('all', !foo)
}
`);

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
@@allow('all', x > 0)
}
`)
).toContain('invalid operand type for ">" operator');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
@@allow('all', x < 0)
}
`)
).toContain('invalid operand type for "<" operator');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
y String
@@allow('all', x < y)
}
`)
).toContain('invalid operand type for "<" operator');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
y String
@@allow('all', x <= y)
}
`)
).toContain('invalid operand type for "<=" operator');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x Int
y DateTime
@@allow('all', x <= y)
}
`)
).toContain('incompatible operand types');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
y String
@@allow('all', x && y)
}
`)
).toContain('invalid operand type for "&&" operator');

expect(
await loadModelWithError(`
${prelude}
model A {
id String @id
x String
y String
@@allow('all', x || y)
}
`)
).toContain('invalid operand type for "||" operator');
});

it('policy filter function check', async () => {
await loadModel(`
${prelude}
Expand Down