Upgrade to jsep 1.4.0 (#16) Update expression-eval to use jsep 1.4.0 This allows for implementing nested brackets in node-casbin which is currently unsupported as mentioned here: https://github.com/apache/casbin-node-casbin/blob/2d90c7d8c3b522415605cf3d25481e763e73381e/src/util/util.ts#L193 jsep 1.4.0 does not support `LogicalExpression` and instead moves those under `BinaryExpression`. See jsep discussion here: https://github.com/EricSmekens/jsep/issues/100 Targets 1.4.0 as opposed to 1.6.0 as 1.6.0 requires Node 20 * Remove `jsep.LogicalExpression` as this is no longer supported by jsep * Check for passed in `string` or `jsep.Expression` as jsep no longer handles string. * Maintains compatibility with stored/serialized data from previous version that made use of `LogicalExpression` by adding local `LogicalExpression` type and handling
diff --git a/packages/utils/expression-eval/index.ts b/packages/utils/expression-eval/index.ts index e753d98..43c1ba4 100644 --- a/packages/utils/expression-eval/index.ts +++ b/packages/utils/expression-eval/index.ts
@@ -82,6 +82,14 @@ declare type unaryCallback = (a: operand) => operand; declare type binaryCallback = (a: operand, b: operand) => operand; +// Keep accepting logical nodes from jsep 0.3.x ASTs. +interface LogicalExpression extends jsep.Expression { + type: 'LogicalExpression'; + operator: string; + left: jsep.Expression; + right: jsep.Expression; +} + type AnyExpression = jsep.ArrayExpression | jsep.BinaryExpression | jsep.MemberExpression @@ -89,7 +97,7 @@ | jsep.ConditionalExpression | jsep.Identifier | jsep.Literal - | jsep.LogicalExpression + | LogicalExpression | jsep.ThisExpression | jsep.UnaryExpression; @@ -139,9 +147,6 @@ case 'ArrayExpression': return evaluateArray(node.elements, context); - case 'BinaryExpression': - return binops[node.operator](evaluate(node.left, context), evaluate(node.right, context)); - case 'CallExpression': { let caller, fn, assign; if (node.callee.type === 'MemberExpression') { @@ -166,7 +171,9 @@ case 'Literal': return node.value; - case 'LogicalExpression': + // jsep 1.x also represents && and || as binary expressions. + case 'BinaryExpression': + case 'LogicalExpression': { const leftValue = evaluate(node.left, context); if (node.operator === '||' && leftValue) { return leftValue; @@ -174,6 +181,7 @@ return leftValue; } return binops[node.operator](leftValue, evaluate(node.right, context)); + } case 'MemberExpression': return evaluateMember(node, context)[1]; @@ -201,14 +209,6 @@ case 'ArrayExpression': return await evaluateArrayAsync(node.elements, context); - case 'BinaryExpression': { - const [left, right] = await Promise.all([ - evalAsync(node.left, context), - evalAsync(node.right, context) - ]); - return binops[node.operator](left, right); - } - case 'CallExpression': { let caller, fn, assign; if (node.callee.type === 'MemberExpression') { @@ -238,6 +238,7 @@ case 'Literal': return node.value; + case 'BinaryExpression': case 'LogicalExpression': { if (node.operator === '||') { const left = await evalAsync(node.left, context); @@ -276,11 +277,13 @@ } function compile(expression: string | jsep.Expression): (context: object) => any { - return evaluate.bind(null, jsep(expression)); + const ast = typeof expression === 'string' ? jsep(expression) : expression; + return evaluate.bind(null, ast); } function compileAsync(expression: string | jsep.Expression): (context: object) => Promise<any> { - return evalAsync.bind(null, jsep(expression)); + const ast = typeof expression === 'string' ? jsep(expression) : expression; + return evalAsync.bind(null, ast); } // Added functions to inject Custom Unary Operators (and override existing ones)
diff --git a/packages/utils/expression-eval/package.json b/packages/utils/expression-eval/package.json index 7bb9245..5ea3597 100644 --- a/packages/utils/expression-eval/package.json +++ b/packages/utils/expression-eval/package.json
@@ -35,7 +35,7 @@ "author": "Node-Casbin", "license": "Apache-2.0", "dependencies": { - "jsep": "^0.3.0", + "jsep": "~1.4.0", "tslib": "^2.8.1" }, "devDependencies": {
diff --git a/packages/utils/expression-eval/test.js b/packages/utils/expression-eval/test.js index d64e176..69dc378 100644 --- a/packages/utils/expression-eval/test.js +++ b/packages/utils/expression-eval/test.js
@@ -44,6 +44,7 @@ {expr: '10%6', expected: 4}, {expr: '"a"+"b"', expected: 'ab'}, {expr: 'one + three', expected: 4}, + {expr: expr.parse('one + two'), expected: 3}, // call expression {expr: 'func(5)', expected: 6}, @@ -83,6 +84,20 @@ {expr: 'false || true', expected: true }, {expr: 'false && throw()', expected: false }, {expr: 'true && false', expected: false }, + { + expr: { + type: 'LogicalExpression', operator: '||', + left: expr.parse('true'), right: expr.parse('throw()'), + }, + expected: true, + }, + { + expr: { + type: 'LogicalExpression', operator: '&&', + left: expr.parse('false'), right: expr.parse('throw()'), + }, + expected: false, + }, // member expression {expr: 'foo.bar', expected: 'baz' },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6394a0a..b8b3366 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml
@@ -1050,8 +1050,8 @@ packages/utils/expression-eval: dependencies: jsep: - specifier: ^0.3.0 - version: 0.3.5 + specifier: ~1.4.0 + version: 1.4.0 tslib: specifier: ^2.8.1 version: 2.8.1 @@ -10044,6 +10044,10 @@ resolution: {integrity: sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA==} engines: {node: '>= 6.0.0'} + jsep@1.4.0: + resolution: {integrity: sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==} + engines: {node: '>= 10.16.0'} + jsesc@1.3.0: resolution: {integrity: sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==} hasBin: true @@ -29369,6 +29373,8 @@ jsep@0.3.5: {} + jsep@1.4.0: {} + jsesc@1.3.0: {} jsesc@3.1.0: {}