Added negate

Author: ackava

src/query/ast/DebugStringVisitor.ts

@@ -1,4 +1,5 @@
-import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, BracketExpression, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, JoinExpression, MemberExpression, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement } from "./Expressions.js";
+/* eslint-disable @typescript-eslint/no-base-to-string */
+import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, BracketExpression, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, JoinExpression, MemberExpression, NegateExpression, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement } from "./Expressions.js";
 import Visitor from "./Visitor.js";
 
 const isBinary = (type) => /^(BinaryExpression|CoalesceExpression)$/.test(type);
@@ -133,6 +134,10 @@ export default class DebugStringVisitor extends Visitor<string> {
         return `DELETE FROM ${this.visit(e.table)}`;
     }
 
+    visitNegateExpression(e: NegateExpression): string {
+        return `-${this.visit(e.expression)}`;
+    }
+
     visitExistsExpression(e: ExistsExpression): string {
         return `EXISTS (${this.visit(e.target)})`;
     }

src/query/ast/ExpressionToSql.ts

@@ -4,7 +4,7 @@ import EntityType, { IEntityProperty } from "../../entity-query/EntityType.js";
 import EntityQuery from "../../model/EntityQuery.js";
 import { FilteredExpression, filteredSymbol } from "../../model/events/FilteredExpression.js";
 import { NotSupportedError } from "../parser/NotSupportedError.js";
-import { ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, ArrayExpression, BracketExpression } from "./Expressions.js";
+import { ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, ArrayExpression, BracketExpression, NegateExpression } from "./Expressions.js";
 import { ITextQuery, QueryParameter, joinMap, prepare, prepareJoin } from "./IStringTransformer.js";
 import ParameterScope from "./ParameterScope.js";
 import Visitor from "./Visitor.js";
@@ -158,6 +158,10 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         return [ " NOT (", this.visit(e.expression) ,  ")"];
     }
 
+    visitNegateExpression(e: NegateExpression): ITextQuery {
+        return ["(-", this.visit(e.expression), ")"];
+    }
+
     visitTemplateLiteral(e: TemplateLiteral): ITextQuery {
         const args = this.visitArray(e.value);
         return prepare `CONCAT(${args})`;

src/query/ast/Expressions.ts

@@ -203,6 +203,11 @@ export class NotExpression extends Expression {
     expression: Expression;
 }
 
+export class NegateExpression extends Expression {
+    readonly type = "NegateExpression";
+    expression: Expression;
+}
+
 export class ExistsExpression extends Expression {
     readonly type = "ExistsExpression";
     target: Expression;
@@ -485,6 +490,7 @@ export type ExpressionType =
     NotExits |
     UnionAllStatement |
     NotExpression |
+    NegateExpression |
     BracketExpression |
     TemplateElement
 ;

src/query/ast/Visitor.ts

@@ -1,5 +1,5 @@
 import { NotSupportedError } from "../parser/NotSupportedError.js";
-import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, BracketExpression } from "./Expressions.js";
+import { ArrayExpression, ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, ExpressionType, Identifier, InsertStatement, JoinExpression, MemberExpression, UpsertStatement, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateElement, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement, NotExpression, BracketExpression, NegateExpression } from "./Expressions.js";
 
 
 export default abstract class Visitor<T = any> {
@@ -77,10 +77,15 @@ export default abstract class Visitor<T = any> {
                 return this.visitNotExpression(e);
             case "BracketExpression":
                 return this.visitBracketExpression(e);
+            case "NegateExpression":
+                return this.visitNegateExpression(e);
         }
         const c: never = e;
         throw new Error(`${e1.type} Not implemented`);
     }
+    visitNegateExpression(e: NegateExpression): T {
+        throw new Error("Method not implemented.");
+    }
     visitBracketExpression(e: BracketExpression): T {
         throw new Error("Method not implemented.");
     }

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)});
     }
 

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;
     }