@entity-access/entity-access 1.0.5 → 1.0.6

package/src/query/parser/ArrowToExpression.ts

@@ -2,21 +2,27 @@ import { parseExpression } from "@babel/parser";
 import { ArrowFunctionExpression, BinaryExpression, CallExpression, CoalesceExpression, ConditionalExpression, Constant, Expression, ExpressionAs, Identifier, MemberExpression, NewObjectExpression, NullExpression, NumberLiteral, ParameterExpression, QuotedLiteral, StringLiteral, TemplateLiteral } from "../ast/Expressions.js";
 import { BabelVisitor } from "./BabelVisitor.js";
 import * as bpe from "@babel/types";
-import EntityType from "../../entity-query/EntityType.js";
-import { EntitySource } from "../../model/EntitySource.js";
 import Restructure from "./Restructure.js";
 import { NotSupportedError } from "./NotSupportedError.js";
+import TimedCache from "../../common/cache/TimedCache.js";
 
 type IQueryFragment = string | { name?: string, value?: any };
-type IQueryFragments = IQueryFragment[];
+
+const parsedCache = new TimedCache<string, bpe.Node>();
 
 export default class ArrowToExpression extends BabelVisitor<Expression> {
 
     public static transform(fx: (p: any) => (x: any) => any, target?: ParameterExpression) {
+        const key = fx.toString();
+        const node = parsedCache.getOrCreate(key, fx, (k, f) => {
+            const rs = new Restructure();
+            return rs.visit(parseExpression(f.toString()));
+        });
+        return this.transformUncached(node, target);
+    }
 
-        const rs = new Restructure();
+    private static transformUncached(node: bpe.Node, target?: ParameterExpression) {
 
-        const node = rs.visit(parseExpression(fx.toString()));
         if (node.type !== "ArrowFunctionExpression") {
             throw new Error("Expecting an arrow function");
         }
@@ -66,7 +72,12 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
         for (const iterator of params) {
             this.targetStack.set(iterator.name, iterator);
         }
-        this.targetStack.set(targetName ?? target.name, target);
+        if (targetName) {
+            this.targetStack.set(targetName, target);
+        }
+        if (target?.name) {
+            this.targetStack.set(target.name, target);
+        }
     }
 
     visitBigIntLiteral({ value }: bpe.BigIntLiteral) {
@@ -129,6 +140,10 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
         return BinaryExpression.create({ left, operator, right });
     }
 
+    visitArrayExpression(node: bpe.ArrayExpression): Expression {
+        return Expression.array(node.elements.map((e) => this.visit(e)));
+    }
+
     visitBinaryExpression(node: bpe.BinaryExpression) {
         let operator = node.operator as string;
         switch(node.operator) {
@@ -194,7 +209,7 @@ export default class ArrowToExpression extends BabelVisitor<Expression> {
                 throw new NotSupportedError();
             }
             names.push(iterator.name);
-            const p = ParameterExpression.create({ value: iterator.name });
+            const p = ParameterExpression.create({ name: iterator.name });
             this.targetStack.set(iterator.name, p);
             params.push(p);
         }

package/src/query/parser/BabelVisitor.ts

@@ -39,11 +39,16 @@ export abstract class BabelVisitor<T> {
                 return this.visitObjectProperty(node);
             case "TemplateElement":
                 return this.visitTemplateElement(node);
+            case "ArrayExpression":
+                return this.visitArrayExpression(node);
             case "RegExpLiteral":
             default:
                 throw new Error(`Translation from ${node.type} not supported`);
         }
     }
+    visitArrayExpression(node: bpe.ArrayExpression): T {
+        throw new Error("Method not implemented.");
+    }
     abstract visitTemplateElement(node: bpe.TemplateElement): T;
     visitObjectProperty(node: bpe.ObjectProperty): T {
         throw new Error("Method not implemented.");

package/src/tests/expressions/left-joins/child-joins.ts

@@ -5,41 +5,64 @@ import { assertSqlMatch, trimInternal } from "../trimInternal.js";
 import PostgreSqlDriver from "../../../drivers/postgres/PostgreSqlDriver.js";
 
 const sql1 = `SELECT
-"P1"."productID","P1"."name","P1"."ownerID","P1"."status"
-FROM "Products" AS "P1"
+"p1"."productID",
+"p1"."name",
+"p1"."ownerID",
+"p1"."status"
+FROM "Products" AS "p1"
 WHERE EXISTS (SELECT
 1
-FROM "OrderItems" AS "O0"
-WHERE ("P1"."productID" = "O0"."productID") AND ("O0"."productID" = $1))`;
+FROM "OrderItems" AS "o"
+WHERE ("p1"."productID" = "o"."productID") AND ("o"."productID" = $1))`;
 
 const sql2 = `SELECT
-"P1"."productID","P1"."name","P1"."ownerID","P1"."status"
-FROM "Products" AS "P1"
+"p1"."productID",
+"p1"."name",
+"p1"."ownerID",
+"p1"."status"
+FROM "Products" AS "p1"
 WHERE EXISTS (SELECT
 1
-FROM "OrderItems" AS "O1"
-WHERE ("P1"."productID" = "O1"."productID") AND ("O1"."productID" = $1)) AND EXISTS (SELECT
+FROM "OrderItems" AS "o"
+WHERE ("p1"."productID" = "o"."productID") AND ("o"."productID" = $1)) AND EXISTS (SELECT
 1
-FROM "OrderItems" AS "O2"
-WHERE ("P1"."productID" = "O2"."productID") AND ("O2"."amount" > $2))`;
+FROM "OrderItems" AS "o1"
+WHERE ("p1"."productID" = "o1"."productID") AND ("o1"."amount" > $2))`;
 
 const sql3 = `SELECT
-"P1"."productID","P1"."name","P1"."ownerID","P1"."status"
-FROM "Products" AS "P1"
+"p1"."productID",
+"p1"."name",
+"p1"."ownerID",
+"p1"."status"
+FROM "Products" AS "p1"
 WHERE EXISTS (SELECT
 1
-FROM "OrderItems" AS "O1"
-WHERE ("P1"."productID" = "O1"."productID") AND ("O1"."productID" = $1)) AND EXISTS (SELECT
+FROM "OrderItems" AS "o"
+WHERE ("p1"."productID" = "o"."productID") AND ("o"."productID" = $1)) AND EXISTS (SELECT
 1
-FROM "OrderItems" AS "O2"
- INNER JOIN "Orders" AS "O0" ON "O2"."orderID" = "O0"."orderID"
-WHERE ("P1"."productID" = "O2"."productID") AND ("O0"."orderDate" > $2))`;
+FROM "OrderItems" AS "o1"
+ INNER JOIN "Orders" AS "o2" ON "o1"."orderID" = "o2"."orderID"
+WHERE ("p1"."productID" = "o1"."productID") AND ("o2"."orderDate" > $2))`;
 
 const productJoin = `SELECT
-"P1"."productID","P1"."name","P1"."ownerID","P1"."status"
-FROM "Products" AS "P1"
- LEFT JOIN "Users" AS "U0" ON "P1"."ownerID" = "U0"."userID"
-WHERE "U0"."dateCreated" > $1`;
+"p1"."productID",
+"p1"."name",
+"p1"."ownerID",
+"p1"."status"
+FROM "Products" AS "p1"
+ LEFT JOIN "Users" AS "u" ON "p1"."ownerID" = "u"."userID"
+WHERE "u"."dateCreated" > $1`;
+
+
+const join2 = `SELECT
+"o1"."orderItemID",
+"o1"."orderID",
+"o1"."productID",
+"o1"."priceID",
+"o1"."amount"
+FROM "OrderItems" AS "o1"
+ INNER JOIN "Products" AS "p" ON "o1"."productID" = "p"."productID"
+WHERE ("o1"."productID" = $1) OR ("p"."ownerID" = $2)`;
 
 export default function() {
 
@@ -61,4 +84,8 @@ export default function() {
     query = context.products.where({ date: new Date()}, (p) => (x) => x.owner.dateCreated > p.date);
     r = query.toQuery();
     assertSqlMatch(productJoin, r.text);
+
+    const q = context.orderItems.where({ o: 1,  owner: 1}, (p) => (x) => x.productID === p.o || x.product.ownerID === p.owner);
+    r = q.toQuery();
+    assertSqlMatch(join2, r.text);
 }

package/src/tests/model/createContext.ts

@@ -1,6 +1,6 @@
 import { IClassOf } from "../../decorators/IClassOf.js";
 import { BaseDriver } from "../../drivers/base/BaseDriver.js";
-import { ShoppingContext, statusPublished } from "./ShoppingContext.js";
+import { ShoppingContext, User, statusPublished } from "./ShoppingContext.js";
 
 const status = statusPublished;
 
@@ -28,11 +28,16 @@ export async function createContext(driver: BaseDriver) {
 async function seed(context: ShoppingContext) {
     const now = new Date();
 
-    addHeadPhones(context, now);
+    // add admin user...
+    context.users.add({ dateCreated: new Date()});
+    // add seller
+    const seller = context.users.add({ dateCreated: new Date()});
 
-    const clothes = addMaleClothes(context);
+    addHeadPhones(context, now, seller);
 
-    addFemaleClothes(context);
+    const clothes = addMaleClothes(context, seller);
+
+    addFemaleClothes(context, seller);
 
     await context.saveChanges();
 
@@ -58,7 +63,7 @@ async function seed(context: ShoppingContext) {
     await context.saveChanges();
 }
 
-function addFemaleClothes(context: ShoppingContext) {
+function addFemaleClothes(context: ShoppingContext, owner: User) {
     const category = context.categories.add({
         name: "Female Clothes",
         categoryID: "clothes/female"
@@ -69,6 +74,7 @@ function addFemaleClothes(context: ShoppingContext) {
 
     context.products.add({
         name: "White T-Shirt",
+        owner,
         status,
         categories: [
             context.productCategories.add({
@@ -87,6 +93,7 @@ function addFemaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Red T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -104,6 +111,7 @@ function addFemaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Blue T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -121,6 +129,7 @@ function addFemaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Pink T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -136,7 +145,7 @@ function addFemaleClothes(context: ShoppingContext) {
     });
 }
 
-function addMaleClothes(context: ShoppingContext) {
+function addMaleClothes(context: ShoppingContext, owner: User) {
     const category = context.categories.add({
         name: "Male Clothes",
         categoryID: "clothes/male"
@@ -148,6 +157,7 @@ function addMaleClothes(context: ShoppingContext) {
     return [context.products.add({
         name: "White T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -164,6 +174,7 @@ function addMaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Red T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -180,6 +191,7 @@ function addMaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Blue T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -196,6 +208,7 @@ function addMaleClothes(context: ShoppingContext) {
     context.products.add({
         name: "Pink T-Shirt",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -212,7 +225,7 @@ function addMaleClothes(context: ShoppingContext) {
 }
 
 export const headPhoneCategory = "head-phones";
-function addHeadPhones(context: ShoppingContext, now: Date) {
+function addHeadPhones(context: ShoppingContext, now: Date, owner: User) {
     const category = context.categories.add({
         name: "Headphones",
         categoryID: headPhoneCategory
@@ -223,6 +236,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
 
     context.products.add({
         name: "Jabber Head Phones",
+        owner,
         status,
         categories: [
             context.productCategories.add({
@@ -240,6 +254,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
 
     context.products.add({
         name: "Sony Head Phones",
+        owner,
         status,
         categories: [
             context.productCategories.add({
@@ -258,6 +273,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
     context.products.add({
         name: "Sony Head Phones Black",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -274,6 +290,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
 
     context.products.add({
         name: "Sony Head Phones Blue",
+        owner,
         status,
         categories: [
             context.productCategories.add({
@@ -292,6 +309,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
     context.products.add({
         name: "Jabber Head Phones Black",
         status,
+        owner,
         categories: [
             context.productCategories.add({
                 category
@@ -308,6 +326,7 @@ function addHeadPhones(context: ShoppingContext, now: Date) {
 
     context.products.add({
         name: "Jabber Head Phones Blue",
+        owner,
         status,
         categories: [
             context.productCategories.add({

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

@@ -26,7 +26,13 @@ export class OrderEvents extends EntityEvents<Order> {
         }
         const { userID } = this.user;
         // user can only modify placed orders
-        return query.where({ userID }, (p) => (x) => x.customerID === p.userID);
+        return query.where({ userID }, (p) => (x) => x.customerID === p.userID || x.orderItems.some((item) => item.product.ownerID === p.userID));
+    }
+
+    onForeignKeyFilter(filter: ForeignKeyFilter<Order>): IEntityQuery<any> {
+        if (filter.is((x) => x.customer)) {
+            return filter.read();
+        }
     }
 }
 
@@ -52,7 +58,7 @@ export class OrderItemEvents extends EntityEvents<OrderItem> {
         }
         const { userID } = this.user;
         // user can only modify placed orders
-        return query.where({ userID }, (p) => (x) => x.order.customerID === p.userID);
+        return query.where({ userID }, (p) => (x) => x.order.customerID === p.userID || x.product.ownerID === p.userID);
     }
 
     onForeignKeyFilter(filter: ForeignKeyFilter<OrderItem>): IEntityQuery<any> {

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

@@ -13,6 +13,16 @@ export class UserEvents extends EntityEvents<User> {
             return null;
         }
         const { userID } = this.user;
-        return query.where({ userID }, (p) => (x) => x.userID === p.userID);
+        return query.where({ userID }, (p) => (x) => x.userID === p.userID
+            || x.orders.some(
+                (op) => op.orderItems.some((oi) => oi.product.ownerID === p.userID)));
+    }
+
+    modify(query: IEntityQuery<User>): IEntityQuery<User> {
+        if (this.user.admin) {
+            return null;
+        }
+        const { userID } = this.user;
+        return query.where({ userID}, (p) => (x) => x.userID === p.userID);
     }
 }

package/src/tests/security/tests/include-items.ts

@@ -0,0 +1,19 @@
+import assert from "assert";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext } from "../../model/createContext.js";
+import { ShoppingContext } from "../../model/ShoppingContext.js";
+import Logger from "../../../common/Logger.js";
+
+export default async function (this: TestConfig) {
+
+    const old = await createContext(this.driver);
+
+    const context = new ShoppingContext(old.driver, void 0, Logger.instance);
+    const order = await context.orders.all()
+        .where({id: 0}, (p) => (x) => x.orderID > p.id)
+        .include((x) => x.orderItems.forEach((oi) => oi.productPrice.product))
+        .first();
+
+    assert.notEqual(null, order);
+
+}

package/src/tests/security/tests/place-order.ts

@@ -21,8 +21,32 @@ export default async function(this: TestConfig) {
     } catch(error) {
 
     }
+
+    await getNewOrders.call(this);
+
 }
 
+async function getNewOrders(this: TestConfig) {
+    const scope = ServiceProvider.global.createScope();
+    try {
+        const user = new UserInfo();
+        user.userID = 2;
+        scope.add(Logger, Logger.instance);
+        scope.add(BaseDriver, this.driver);
+        scope.add(UserInfo, user);
+        scope.add(ContextEvents, new ShoppingContextEvents());
+        const context = scope.create(ShoppingContext);
+        context.verifyFilters = true;
+
+        const order = await context.orders.all().first();
+
+        order.orderDate = new Date();
+        await context.saveChanges();
+
+    } finally {
+        scope.dispose();
+    }
+}
 
 async function addNewOrder(this: TestConfig, customer: User, userID?) {
     const scope = ServiceProvider.global.createScope();
@@ -54,6 +78,15 @@ async function addNewOrder(this: TestConfig, customer: User, userID?) {
 
         await context.saveChanges();
 
+        // lets filter the orders
+
+        const f = context.orders.filtered();
+        const myOrders = await f.count();
+        assert.equal(1, myOrders);
+
+        const all = await context.orders.all().count();
+        assert.notEqual(all, myOrders);
+
     } finally {
         scope.dispose();
     }