@entity-access/entity-access 1.0.345 → 1.0.347

package/src/query/parser/ArrowToExpression.ts

@@ -1,5 +1,5 @@
 import { parseExpression } from "@babel/parser";
-import { ArrowFunctionExpression, BinaryExpression, BooleanLiteral, BracketExpression, CallExpression, CoalesceExpression, ConditionalExpression, Constant, Expression, ExpressionAs, Identifier, MemberExpression, NewObjectExpression, NotExpression, NullExpression, NumberLiteral, ParameterExpression, StringLiteral, TemplateLiteral } from "../ast/Expressions.js";
+import { ArrowFunctionExpression, BinaryExpression, BooleanLiteral, BracketExpression, CallExpression, CoalesceExpression, ConditionalExpression, Constant, Expression, ExpressionAs, Identifier, MemberExpression, NegateExpression, NewObjectExpression, NotExpression, NullExpression, NumberLiteral, ParameterExpression, StringLiteral, TemplateLiteral } from "../ast/Expressions.js";
 import { BabelVisitor } from "./BabelVisitor.js";
 import * as bpe from "@babel/types";
 import Restructure from "./Restructure.js";
@@ -129,6 +129,10 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
     }
 
     visitUnaryExpression(node: bpe.UnaryExpression): Expression {
+        switch(node.operator) {
+            case "-":
+                return NegateExpression.create({ expression: this.visit(node.argument)});
+        }
         return NotExpression.create({ expression: this.visit(node.argument)});
     }
 

package/src/query/parser/Restructure.ts

@@ -8,6 +8,11 @@ export default class Restructure extends TransformVisitor {
     private map: Map<string, bpe.Node> = new Map();
 
     visitUnaryExpression(node: bpe.UnaryExpression): bpe.Node {
+        if (node.operator === "-") {
+            if (node.argument.type === "NumericLiteral") {
+                return bpe.numericLiteral(-node.argument.value);
+            }
+        }
         return node;
     }
 

package/src/tests/expressions/simple/parse-complex.ts

@@ -0,0 +1,20 @@
+import assert from "assert";
+import Sql from "../../../sql/Sql.js";
+import QueryCompiler from "../../../compiler/QueryCompiler.js";
+
+export default function () {
+
+    const compiler = QueryCompiler.instance;
+
+    const name = "Akash";
+
+    let r = compiler.execute({ name }, (p) => (x) => x.id ? 1 : -1);
+    assert.equal("(CASE WHEN x.id THEN 1 ELSE -1 END)", r.text);
+
+    r = compiler.execute({ name }, (p) => (x) => x.id ? 1 : -(5*1));
+    assert.equal("(CASE WHEN x.id THEN 1 ELSE (-5 * 1) END)", r.text);
+
+
+}
+
+type KeyCode = { name: string, code: number, key: string };