@entity-access/entity-access 1.0.301 → 1.0.302

package/src/query/parser/ArrowToExpression.ts

@@ -215,6 +215,8 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
         // we need to sanitize callee
         this.sanitize(callee);
 
+        // change Sql.coll. with arrow functions to move it inside
+
         return CallExpression.create({
             callee: callee ? this.visit(callee) : void 0,
             arguments: args ? args.map((x) => this.visit(x)) : []
@@ -302,6 +304,11 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
                     throw new Error(`Unknown identifier ${name}`);
                 }
                 return;
+            case "CallExpression":
+                for (const iterator of node.arguments) {
+                    this.visit(iterator as bpe.Expression);
+                }
+                return;
             case "MemberExpression":
             case "OptionalMemberExpression":
                 return this.sanitize(node.object);

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

@@ -0,0 +1,38 @@
+import assert from "assert";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext, headPhoneCategory } from "../../model/createContext.js";
+import Sql from "../../../sql/Sql.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    let report;
+    // report  = await context.users.all()
+    //     .where({}, (p) => (x) => x.orders.some((oi) => oi.customerID  > 0))
+    //     .map({}, (p) => (x) => ({
+    //             total: Sql.coll.sum(x.orders.map((o) => Sql.coll.sum(o.orderItems.map((oi) => oi.amount))))
+    //         })
+    //     )
+    //     .trace(console.log)
+    //     .first();
+
+    // assert.notEqual(null, report);
+
+    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))))
+            })
+        )
+        .trace(console.log)
+        .first();
+
+    assert.notEqual(null, report);
+}

package/src/tests/model/ShoppingContext.ts

@@ -342,6 +342,9 @@ export class Order {
     @Column({ dataType: "Char", length: 200, nullable: true})
     public purchaseOrder: string;
 
+    @Column({ dataType: "Char", length: 20, default: () => "pending"})
+    public status: string;
+
     public orderItems: OrderItem[];
 
     public customer: User;