@expo/entity 0.40.0 → 0.41.0

package/src/__tests__/EntityEdges-test.ts

@@ -527,42 +527,36 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete
@@ -651,44 +645,38 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
-      const loadedChild = await ChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(child.getID());
+      const loadedChild = await ChildEntity.loader(viewerContext).loadByIDAsync(child.getID());
       expect(loadedChild.getField('parent_id')).toBeNull();
 
-      const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(grandchild.getID());
+      const loadedGrandchild = await GrandChildEntity.loader(viewerContext).loadByIDAsync(
+        grandchild.getID(),
+      );
       expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
 
       // two calls for only parent trigger, one beforeDelete, one afterDelete
@@ -766,28 +754,22 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID()),
+        ChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID()),
+        GrandChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
@@ -809,7 +791,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
@@ -821,17 +803,15 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.HIT);
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
-      const loadedChild = await ChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(child.getID());
+      const loadedChild = await ChildEntity.loader(viewerContext).loadByIDAsync(child.getID());
       expect(loadedChild).not.toBeNull();
 
-      const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(grandchild.getID());
+      const loadedGrandchild = await GrandChildEntity.loader(viewerContext).loadByIDAsync(
+        grandchild.getID(),
+      );
       expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
 
       // two calls for only parent trigger, one beforeDelete, one afterDelete
@@ -907,28 +887,22 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID()),
+        ChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID()),
+        GrandChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
@@ -950,7 +924,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
@@ -962,15 +936,13 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.MISS);
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete

package/src/__tests__/EntityLoader-test.ts

@@ -11,9 +11,7 @@ describe(EntityLoader, () => {
     it('creates a new EnforcingEntityLoader', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).enforcing()).toBeInstanceOf(
-        EnforcingEntityLoader,
-      );
+      expect(SimpleTestEntity.loader(viewerContext)).toBeInstanceOf(EnforcingEntityLoader);
     });
   });
 
@@ -21,7 +19,7 @@ describe(EntityLoader, () => {
     it('creates a new AuthorizationResultBasedEntityLoader', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).withAuthorizationResults()).toBeInstanceOf(
+      expect(SimpleTestEntity.loaderWithAuthorizationResults(viewerContext)).toBeInstanceOf(
         AuthorizationResultBasedEntityLoader,
       );
     });
@@ -31,7 +29,7 @@ describe(EntityLoader, () => {
     it('returns a instance of EntityLoaderUtils', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).utils()).toBeInstanceOf(EntityLoaderUtils);
+      expect(SimpleTestEntity.loaderUtils(viewerContext)).toBeInstanceOf(EntityLoaderUtils);
     });
   });
 });

package/src/__tests__/EntityMutator-MutationCacheConsistency-test.ts

@@ -76,9 +76,9 @@ class TestNonTransactionalMutationTrigger extends EntityNonTransactionalMutation
     mutationInfo: EntityTriggerMutationInfo<BlahFields, string, ViewerContext, BlahEntity>,
   ): Promise<void> {
     if (mutationInfo.type === EntityMutationType.DELETE) {
-      const entityLoaded = await BlahEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(entity.getID());
+      const entityLoaded = await BlahEntity.loader(viewerContext).loadByIDNullableAsync(
+        entity.getID(),
+      );
       if (entityLoaded) {
         throw new Error(
           'should not have been able to re-load the entity after delete. this means the cache has not been cleared',
@@ -94,11 +94,9 @@ describe(EntityMutatorFactory, () => {
     const viewerContext = new ViewerContext(companionProvider);
 
     // put it in cache
-    const entity = await BlahEntity.creator(viewerContext).enforcing().createAsync();
-    const entityLoaded = await BlahEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity.getID());
+    const entity = await BlahEntity.creator(viewerContext).createAsync();
+    const entityLoaded = await BlahEntity.loader(viewerContext).loadByIDAsync(entity.getID());
 
-    await BlahEntity.deleter(entityLoaded).enforcing().deleteAsync();
+    await BlahEntity.deleter(entityLoaded).deleteAsync();
   });
 });

package/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -32,7 +32,7 @@ describe(EntitySecondaryCacheLoader, () => {
     it('calls into secondary cache with correct params', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -44,7 +44,7 @@ describe(EntitySecondaryCacheLoader, () => {
 
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
         secondaryEntityCache,
-        SimpleTestEntity.loader(vc1).withAuthorizationResults(),
+        SimpleTestEntity.loaderWithAuthorizationResults(vc1),
       );
 
       await secondaryCacheLoader.loadManyAsync([loadParams]);
@@ -57,7 +57,7 @@ describe(EntitySecondaryCacheLoader, () => {
     it('constructs and authorizes entities', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -67,7 +67,7 @@ describe(EntitySecondaryCacheLoader, () => {
       ).thenResolve(new Map([[loadParams, createdEntity.getAllFields()]]));
       const secondaryEntityCache = instance(secondaryEntityCacheMock);
 
-      const loader = SimpleTestEntity.loader(vc1).withAuthorizationResults();
+      const loader = SimpleTestEntity.loaderWithAuthorizationResults(vc1);
       const spiedPrivacyPolicy = spy(loader.utils['privacyPolicy']);
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
 
@@ -90,13 +90,13 @@ describe(EntitySecondaryCacheLoader, () => {
     it('calls invalidate on the secondary cache', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
         mock<ISecondaryEntityCache<SimpleTestFields, TestLoadParams>>();
       const secondaryEntityCache = instance(secondaryEntityCacheMock);
-      const loader = SimpleTestEntity.loader(vc1).withAuthorizationResults();
+      const loader = SimpleTestEntity.loaderWithAuthorizationResults(vc1);
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
       await secondaryCacheLoader.invalidateManyAsync([loadParams]);
 

package/src/__tests__/EntitySelfReferentialEdges-test.ts

@@ -87,44 +87,34 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const parentCategory = await CategoryEntity.creator(viewerContext).createAsync();
     const subCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', parentCategory.getID())
       .createAsync();
     const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', subCategory.getID())
       .createAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID()),
     ).resolves.not.toBeNull();
 
-    await CategoryEntity.deleter(parentCategory).enforcing().deleteAsync();
+    await CategoryEntity.deleter(parentCategory).deleteAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID()),
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID()),
     ).resolves.toBeNull();
   });
 
@@ -134,23 +124,21 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const categoryA = await CategoryEntity.creator(viewerContext).createAsync();
     const categoryB = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', categoryA.getID())
       .createAsync();
     await CategoryEntity.updater(categoryA)
-      .enforcing()
       .setField('parent_category_id', categoryB.getID())
       .updateAsync();
 
-    await CategoryEntity.deleter(categoryA).enforcing().deleteAsync();
+    await CategoryEntity.deleter(categoryA).deleteAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryA.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(categoryA.getID()),
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryB.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(categoryB.getID()),
     ).resolves.toBeNull();
   });
 });
@@ -162,46 +150,38 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const parentCategory = await CategoryEntity.creator(viewerContext).createAsync();
     const subCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', parentCategory.getID())
       .createAsync();
     const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', subCategory.getID())
       .createAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID()),
     ).resolves.not.toBeNull();
 
-    await CategoryEntity.deleter(parentCategory).enforcing().deleteAsync();
+    await CategoryEntity.deleter(parentCategory).deleteAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.toBeNull();
 
-    const loadedSubCategory = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(subCategory.getID());
+    const loadedSubCategory = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+      subCategory.getID(),
+    );
     expect(loadedSubCategory.getField('parent_category_id')).toBeNull();
 
-    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(subSubCategory.getID());
+    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+      subSubCategory.getID(),
+    );
     expect(loadedSubSubCategory.getField('parent_category_id')).not.toBeNull();
   });
 
@@ -211,21 +191,19 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const categoryA = await CategoryEntity.creator(viewerContext).createAsync();
     const categoryB = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', categoryA.getID())
       .createAsync();
     await CategoryEntity.updater(categoryA)
-      .enforcing()
       .setField('parent_category_id', categoryB.getID())
       .updateAsync();
 
-    await CategoryEntity.deleter(categoryA).enforcing().deleteAsync();
+    await CategoryEntity.deleter(categoryA).deleteAsync();
 
-    const loadedCategoryB = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(categoryB.getID());
+    const loadedCategoryB = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+      categoryB.getID(),
+    );
     expect(loadedCategoryB.getField('parent_category_id')).toBeNull();
   });
 });
@@ -239,30 +217,28 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const parentCategory = await CategoryEntity.creator(viewerContext).createAsync();
     const subCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', parentCategory.getID())
       .createAsync();
     const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', subCategory.getID())
       .createAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+        'parent_category_id',
+        parentCategory.getID(),
+      ),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', subCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+        'parent_category_id',
+        subCategory.getID(),
+      ),
     ).resolves.not.toBeNull();
 
     const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
@@ -281,7 +257,7 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     );
     expect(subSubCategoryCachedBefore.get(subCategory.getID())?.status).toEqual(CacheStatus.HIT);
 
-    await CategoryEntity.deleter(parentCategory).enforcing().deleteAsync();
+    await CategoryEntity.deleter(parentCategory).deleteAsync();
 
     const subCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
       parentCategory.getID(),
@@ -295,17 +271,13 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     expect(subSubCategoryCachedAfter.get(subCategory.getID())?.status).toEqual(CacheStatus.MISS);
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID()),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID()),
+      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID()),
     ).resolves.not.toBeNull();
   });
 
@@ -317,25 +289,25 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(viewerContext).enforcing().createAsync();
+    const categoryA = await CategoryEntity.creator(viewerContext).createAsync();
     const categoryB = await CategoryEntity.creator(viewerContext)
-      .enforcing()
       .setField('parent_category_id', categoryA.getID())
       .createAsync();
     await CategoryEntity.updater(categoryA)
-      .enforcing()
       .setField('parent_category_id', categoryB.getID())
       .updateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', categoryA.getID()),
+      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+        'parent_category_id',
+        categoryA.getID(),
+      ),
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', categoryB.getID()),
+      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+        'parent_category_id',
+        categoryB.getID(),
+      ),
     ).resolves.not.toBeNull();
 
     const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
@@ -350,7 +322,7 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     expect(categoriesCachedBefore.get(categoryA.getID())?.status).toEqual(CacheStatus.HIT);
     expect(categoriesCachedBefore.get(categoryB.getID())?.status).toEqual(CacheStatus.HIT);
 
-    await CategoryEntity.deleter(categoryA).enforcing().deleteAsync();
+    await CategoryEntity.deleter(categoryA).deleteAsync();
 
     const categoriesCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
       categoryA.getID(),