@entity-access/entity-access 1.0.302 → 1.0.304

package/src/query/ast/Expressions.ts

@@ -214,6 +214,11 @@ export class CallExpression extends Expression {
     arguments: Expression[];
 }
 
+export class BracketExpression extends Expression {
+    readonly type = "BracketExpression";
+    target: Expression;
+}
+
 export class ParameterExpression extends Expression {
     readonly type = "ParameterExpression";
     name: string;
@@ -239,6 +244,7 @@ export class MemberExpression extends Expression {
     target: Expression;
     property: Expression;
     computed: boolean;
+    isCollectionMethod: boolean;
 }
 
 export class ArrowFunctionExpression extends Expression {
@@ -477,5 +483,6 @@ export type ExpressionType =
     NotExits |
     UnionAllStatement |
     NotExpression |
+    BracketExpression |
     TemplateElement
 ;

package/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 } 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 } from "./Expressions.js";
 
 
 export default abstract class Visitor<T = any> {
@@ -75,10 +75,15 @@ export default abstract class Visitor<T = any> {
                 return this.visitUpsertStatement(e);
             case "NotExpression":
                 return this.visitNotExpression(e);
+            case "BracketExpression":
+                return this.visitBracketExpression(e);
         }
         const c: never = e;
         throw new Error(`${e1.type} Not implemented`);
     }
+    visitBracketExpression(e: BracketExpression): T {
+        throw new Error("Method not implemented.");
+    }
     visitNotExpression(e: NotExpression): T {
         throw new Error("Method not implemented.");
     }

package/src/query/parser/ArrowToExpression.ts

@@ -1,5 +1,5 @@
 import { parseExpression } from "@babel/parser";
-import { ArrowFunctionExpression, BinaryExpression, BooleanLiteral, 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, 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";
@@ -217,10 +217,74 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
 
         // change Sql.coll. with arrow functions to move it inside
 
-        return CallExpression.create({
+        const ce = CallExpression.create({
             callee: callee ? this.visit(callee) : void 0,
             arguments: args ? args.map((x) => this.visit(x)) : []
         });
+
+        // for Sql.Coll. , change it to coalesce
+        // and move Sql.Coll. inside the first map..
+        return this.reAssignCollectionMethods(ce);
+    }
+
+    /**
+     * We need to change Sql.coll.sum(p.orders.map((o) => o.total)
+     * to
+     * p.orders.sum((o) => o.total) ?? 0
+     * @param ce
+     * @returns
+     */
+    reAssignCollectionMethods(ce: CallExpression) {
+
+        if (ce.callee.type !== "MemberExpression") {
+            return ce;
+        }
+
+        const firstArg = ce.arguments[0] as CallExpression;
+        if (firstArg?.type !== "CallExpression") {
+            return ce;
+        }
+
+        const mapCallee = firstArg.callee as MemberExpression;
+        if (mapCallee?.type !== "MemberExpression") {
+            return ce;
+        }
+
+        const me = ce.callee as MemberExpression;
+        const method = (me.property as Identifier).value;
+
+        if (me.type !== "MemberExpression") {
+            return ce;
+        }
+
+        if(me.target.type !== "MemberExpression") {
+            return ce;
+        }
+
+        const collMember = me.target as MemberExpression;
+        if((collMember.property as Identifier).value !== "coll") {
+            return ce;
+        }
+
+        if((collMember.target as Identifier)?.value !== "Sql") {
+            return ce;
+        }
+
+        const left = CallExpression.create({
+            callee: MemberExpression.create({
+                target: mapCallee.target,
+                property: Expression.identifier(method),
+                isCollectionMethod: true
+            }),
+            arguments: firstArg.arguments
+        });
+
+        // move it inside...
+        const rewritten = CoalesceExpression.create({
+            left: BracketExpression.create({ target: left }) ,
+            right: NumberLiteral.zero
+        });
+        return rewritten;
     }
 
     visitIdentifier({ name: value }: bpe.Identifier): Expression {

package/src/tests/db-tests/tests/select-inverse-one-to-one.ts

@@ -19,14 +19,14 @@ export default async function(this: TestConfig) {
 
     // include inverse...
     let all = await context.users.all()
-        .where({} , (p) => (x) => x.profile.photos.some((a) => true) || x.profile.photos.some((a) => true))
+        .where({} , (p) => (x) => x.profile.photos.some((a) => a.photoID > 0) || x.profile.photos.some((a) => a.photoID > 0))
         .include((x) => x.profile.photos)
         .first();
 
     assert.equal(null, all);
 
     all = await context.users.all()
-        .where({} , (p) => (x) => x.files.some((a) => true))
+        .where({} , (p) => (x) => x.files.some((a) => a.fileID > 0))
         .include((x) => x.files)
         .first();
 

package/src/tests/db-tests/tests/select-items-sum.ts

@@ -12,6 +12,14 @@ export default async function(this: TestConfig) {
     const context = await createContext(this.driver);
 
     let report;
+
+    // const user = await context.users.all()
+    // .where({}, (p) => (x) => x.orders.some((oi) => oi.customerID  > 0))
+    // .trace(console.log)
+    // .first();
+
+    // assert.notEqual(null, user);
+
     // report  = await context.users.all()
     //     .where({}, (p) => (x) => x.orders.some((oi) => oi.customerID  > 0))
     //     .map({}, (p) => (x) => ({
@@ -23,12 +31,17 @@ export default async function(this: TestConfig) {
 
     // assert.notEqual(null, report);
 
+    await context.orders.asQuery()
+        .update(void 0, (p) => (x) => ({
+            total: Sql.coll.sum(x.orderItems.map((o) => o.amount ))
+        }));
+
     report = await context.users.all()
         .where({}, (p) => (x) => x.orders.some((oi) => oi.customerID  > 0))
         .map({}, (p) => (x) => ({
                 total: Sql.coll.sum(x.orders
                     .filter((o) => o.status === "pending")
-                    .map((o) => Sql.coll.sum(o.orderItems.map((oi) => oi.amount))))
+                    .map((o) => o.total))
             })
         )
         .trace(console.log)

package/src/tests/model/ShoppingContext.ts

@@ -345,6 +345,9 @@ export class Order {
     @Column({ dataType: "Char", length: 20, default: () => "pending"})
     public status: string;
 
+    @Column({ dataType: "Decimal", default: () => 0})
+    public total: number;
+
     public orderItems: OrderItem[];
 
     public customer: User;

package/src/tests/security/events/UserFileEvents.ts

@@ -5,7 +5,7 @@ import { UserFile } from "../../model/UseFile.js";
 export class UserFileEvents extends EntityEvents<UserFile> {
 
     filter(query: IEntityQuery<UserFile>): IEntityQuery<UserFile> {
-        return query.where({}, (p) => (x) => x.photoUsers.some((p1) => p1.orders.some((o1) => true)));
+        return query.where({}, (p) => (x) => x.photoUsers.some((p1) => p1.orders.some((o1) => true === true)));
     }
 
 }

package/src/tests/security/tests/test-events.ts

@@ -48,7 +48,7 @@ export default async function (this: TestConfig) {
     await context.saveChanges();
     assert.equal(true, p.afterInsertInvoked);
 
-    await context.userFiles.filtered("read").where({}, (_) => (x) => x.photoUsers.some((p1) => true))
+    await context.userFiles.filtered("read").where({}, (_) => (x) => x.photoUsers.some((p1) => true === true))
         .include((x) => x.user.profile).toArray();
 
 

package/tests/local-unit-tests/docker-compose.yml

@@ -0,0 +1,32 @@
+version: '3.4'
+name: local-pg-test
+services:
+  mssql:
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    container_name: sql-server
+    environment:
+      - ACCEPT_EULA=Y
+      - MSSQL_SA_PASSWORD=$$EntityAccess2023
+      - MSSQL_PID=Express
+    ports:
+      - 1433:1433
+  postgresdb:
+    image: postgres:alpine
+    container_name: pg-test
+    restart: unless-stopped
+    environment:
+      - POSTGRES_PASSWORD=abcd123
+    ports:
+      - 5432:5432
+  pgadmin:
+    image: dpage/pgadmin4
+    container_name: pg-admin
+    restart: unless-stopped
+    environment:
+      - PGADMIN_CONFIG_SERVER_MODE=False
+      - PGADMIN_DEFAULT_EMAIL=x@x.com
+      - PGADMIN_DEFAULT_PASSWORD=x
+      - PGADMIN_DISABLE_POSTFIX=True
+    ports:
+      - 9999:80
+