@entity-access/entity-access 1.0.157 → 1.0.159

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

@@ -20,7 +20,6 @@ export default async function(this: TestConfig) {
         await addNewOrder.call(this, customer, 1);
         assert.fail("No error thrown");
     } catch(error) {
-
     }
 
     await getNewOrders.call(this);
@@ -31,107 +30,99 @@ export default async function(this: TestConfig) {
 async function createInterests(this: TestConfig) {
     const global = new ServiceProvider();
     global.add(BaseDriver, this.driver);
-    const scope = global.createScope();
-    try {
-        const userID = 2;
-        const user = new UserInfo();
-        user.userID = userID;
-        ServiceCollection.register("Singleton", Logger, () => Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
-        const context = scope.create(ShoppingContext);
-        context.verifyFilters = false;
-        context.raiseEvents = false;
-
-        const headPhone = await context.products.all().include((x) => x.categories).firstOrFail();
-        const category = headPhone.categories[0];
-
-        context.userCategories.add({
-            userID,
-            categoryID: category.categoryID,
-            lastUpdated: DateTime.utcNow
-        });
-
-        await context.saveChanges();
-
-        const userCategories = await context.userCategories.where({ userID }, (p) => (x) => x.userID === p.userID).count();
-
-        assert.equal(1, userCategories);
-
-    } finally {
-        scope.dispose();
-    }
+    using scope = global.createScope();
+
+    const userID = 2;
+    const user = new UserInfo();
+    user.userID = userID;
+    ServiceCollection.register("Singleton", Logger, () => Logger.instance);
+    scope.add(BaseDriver, this.driver);
+    scope.add(UserInfo, user);
+    ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
+    const context = scope.create(ShoppingContext);
+    context.verifyFilters = false;
+    context.raiseEvents = false;
+
+    const headPhone = await context.products.all().include((x) => x.categories).firstOrFail();
+    const category = headPhone.categories[0];
+
+    context.userCategories.add({
+        userID,
+        categoryID: category.categoryID,
+        lastUpdated: DateTime.utcNow
+    });
+
+    await context.saveChanges();
+
+    const userCategories = await context.userCategories.where({ userID }, (p) => (x) => x.userID === p.userID).count();
+
+    assert.equal(1, userCategories);
+
 }
 
 async function getNewOrders(this: TestConfig) {
     const global = new ServiceProvider();
     global.add(BaseDriver, this.driver);
-    const scope = global.createScope();
-    try {
-        const user = new UserInfo();
-        user.userID = 2;
-        ServiceCollection.register("Singleton", Logger, () => Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        ServiceCollection.register("Singleton", 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();
-    }
+
+    using scope = global.createScope();
+
+    const user = new UserInfo();
+    user.userID = 2;
+    ServiceCollection.register("Singleton", Logger, () => Logger.instance);
+    scope.add(BaseDriver, this.driver);
+    scope.add(UserInfo, user);
+    ServiceCollection.register("Singleton", 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();
+
 }
 
 async function addNewOrder(this: TestConfig, customer: User, userID?) {
     const global = new ServiceProvider();
     global.add(BaseDriver, this.driver);
-    const scope = global.createScope();
-    try {
-        const user = new UserInfo();
-        user.userID = userID ?? customer.userID;
-        ServiceCollection.register("Singleton", Logger, () => Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
-        const context = scope.create(ShoppingContext);
-        context.verifyFilters = true;
-
-        // get first headphone...
-        const headPhone = await context.products.all().firstOrFail();
-        const headPhonePrice = await context.productPrices.where({ id: headPhone.productID }, (p) => (x) => x.productID === p.id).firstOrFail();
-
-        context.orders.add({
-            customer,
-            orderDate: new Date(),
-            orderItems: [
-                context.orderItems.add({
-                    product: headPhone,
-                    productPrice: headPhonePrice,
-                    amount: headPhonePrice.amount,
-                })
-            ]
-        });
-
-        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();
-    }
+
+    using scope = global.createScope();
+
+    const user = new UserInfo();
+    user.userID = userID ?? customer.userID;
+    ServiceCollection.register("Singleton", Logger, () => Logger.instance);
+    scope.add(BaseDriver, this.driver);
+    scope.add(UserInfo, user);
+    ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
+    const context = scope.create(ShoppingContext);
+    context.verifyFilters = true;
+
+    // get first headphone...
+    const headPhone = await context.products.all().firstOrFail();
+    const headPhonePrice = await context.productPrices.where({ id: headPhone.productID }, (p) => (x) => x.productID === p.id).firstOrFail();
+
+    context.orders.add({
+        customer,
+        orderDate: new Date(),
+        orderItems: [
+            context.orderItems.add({
+                product: headPhone,
+                productPrice: headPhonePrice,
+                amount: headPhonePrice.amount,
+            })
+        ]
+    });
+
+    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);
 }
 
 async function createUser(config: TestConfig) {

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

@@ -16,40 +16,36 @@ export default async function (this: TestConfig) {
 
     const global = new ServiceProvider();
     global.add(BaseDriver, this.driver);
-    const scope = global.createScope();
-
-    try {
-
-        const userID = 1;
-        const user = new UserInfo();
-        user.userID = userID;
-        scope.add(Logger, Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        scope.add(ContextEvents, new ShoppingContextEvents());
-        const context = scope.create(ShoppingContext);
-
-        const first = await context.products.all().first();
-        first.name = "First Product";
-        const fe = context.changeSet.getEntry(first);
-        await context.saveChanges();
-
-        assert.notStrictEqual(undefined, first.nameUpdated);
-        assert.equal(true, first.nameUpdated);
-        assert.equal(false, fe.isUpdated("name"));
-
-        const status = statusPublished;
-        // create new product...
-        const p = context.products.add({
-            name: "A",
-            status,
-            ownerID: userID
-        });
-        assert.equal(void 0, p.afterInsertInvoked);
-        await context.saveChanges();
-        assert.equal(true, p.afterInsertInvoked);
-    } finally {
-        scope.dispose();
-    }
+
+    using scope = global.createScope();
+
+    const userID = 1;
+    const user = new UserInfo();
+    user.userID = userID;
+    scope.add(Logger, Logger.instance);
+    scope.add(BaseDriver, this.driver);
+    scope.add(UserInfo, user);
+    scope.add(ContextEvents, new ShoppingContextEvents());
+    const context = scope.create(ShoppingContext);
+
+    const first = await context.products.all().first();
+    first.name = "First Product";
+    const fe = context.changeSet.getEntry(first);
+    await context.saveChanges();
+
+    assert.notStrictEqual(undefined, first.nameUpdated);
+    assert.equal(true, first.nameUpdated);
+    assert.equal(false, fe.isUpdated("name"));
+
+    const status = statusPublished;
+    // create new product...
+    const p = context.products.add({
+        name: "A",
+        status,
+        ownerID: userID
+    });
+    assert.equal(void 0, p.afterInsertInvoked);
+    await context.saveChanges();
+    assert.equal(true, p.afterInsertInvoked);
 
 }

package/tsconfig.json

@@ -1,17 +1,19 @@
 {
     "compilerOptions": {
-        "target": "ESNext",
+        "target": "ES2021",
         "module":"NodeNext",
         "incremental": true,
         "sourceMap": true,
         "declaration": true,
         "declarationMap": true,
+        "importHelpers": true,
         "outDir": "dist",
         "skipDefaultLibCheck": true,
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "lib": [
-            "ES2018"
+            "ES2018",
+            "esnext.disposable"
         ]
     },
     "include": [