@expo/entity 0.45.0 → 0.47.0

package/src/ReadonlyEntity.ts

@@ -1,16 +1,16 @@
 import invariant from 'invariant';
 
-import AuthorizationResultBasedEntityAssociationLoader from './AuthorizationResultBasedEntityAssociationLoader';
-import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
-import EnforcingEntityAssociationLoader from './EnforcingEntityAssociationLoader';
-import EnforcingEntityLoader from './EnforcingEntityLoader';
+import { AuthorizationResultBasedEntityAssociationLoader } from './AuthorizationResultBasedEntityAssociationLoader';
+import { AuthorizationResultBasedEntityLoader } from './AuthorizationResultBasedEntityLoader';
+import { EnforcingEntityAssociationLoader } from './EnforcingEntityAssociationLoader';
+import { EnforcingEntityLoader } from './EnforcingEntityLoader';
 import { IEntityClass } from './Entity';
-import EntityAssociationLoader from './EntityAssociationLoader';
-import EntityLoader from './EntityLoader';
-import EntityLoaderUtils from './EntityLoaderUtils';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import { EntityAssociationLoader } from './EntityAssociationLoader';
+import { EntityLoader } from './EntityLoader';
+import { EntityLoaderUtils } from './EntityLoaderUtils';
+import { EntityPrivacyPolicy } from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
-import ViewerContext from './ViewerContext';
+import { ViewerContext } from './ViewerContext';
 
 /**
  * A readonly entity exposes only the read functionality of an Entity. Used as the base
@@ -20,7 +20,7 @@ import ViewerContext from './ViewerContext';
  * - Entities representing SQL views.
  * - Entities representing immutable tables.
  */
-export default abstract class ReadonlyEntity<
+export abstract class ReadonlyEntity<
   TFields extends Record<string, any>,
   TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,

package/src/ViewerContext.ts

@@ -1,14 +1,14 @@
 import { IEntityClass } from './Entity';
-import EntityCompanionProvider, { DatabaseAdapterFlavor } from './EntityCompanionProvider';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import { DatabaseAdapterFlavor, EntityCompanionProvider } from './EntityCompanionProvider';
+import { EntityPrivacyPolicy } from './EntityPrivacyPolicy';
 import {
   EntityQueryContext,
   EntityTransactionalQueryContext,
   TransactionConfig,
 } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerScopedEntityCompanion from './ViewerScopedEntityCompanion';
-import ViewerScopedEntityCompanionProvider from './ViewerScopedEntityCompanionProvider';
+import { ReadonlyEntity } from './ReadonlyEntity';
+import { ViewerScopedEntityCompanion } from './ViewerScopedEntityCompanion';
+import { ViewerScopedEntityCompanionProvider } from './ViewerScopedEntityCompanionProvider';
 
 /**
  * A viewer context encapsulates all information necessary to evaluate an EntityPrivacyPolicy.
@@ -16,7 +16,7 @@ import ViewerScopedEntityCompanionProvider from './ViewerScopedEntityCompanionPr
  * In combination with an EntityCompanionProvider, a viewer context is the
  * entry point into the Entity framework.
  */
-export default class ViewerContext {
+export class ViewerContext {
   private readonly viewerScopedEntityCompanionProvider: ViewerScopedEntityCompanionProvider;
 
   constructor(public readonly entityCompanionProvider: EntityCompanionProvider) {

package/src/ViewerScopedEntityCompanion.ts

@@ -1,17 +1,17 @@
-import EntityCompanion from './EntityCompanion';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import EntityQueryContextProvider from './EntityQueryContextProvider';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-import ViewerScopedEntityLoaderFactory from './ViewerScopedEntityLoaderFactory';
-import ViewerScopedEntityMutatorFactory from './ViewerScopedEntityMutatorFactory';
-import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
+import { EntityCompanion } from './EntityCompanion';
+import { EntityPrivacyPolicy } from './EntityPrivacyPolicy';
+import { EntityQueryContextProvider } from './EntityQueryContextProvider';
+import { ReadonlyEntity } from './ReadonlyEntity';
+import { ViewerContext } from './ViewerContext';
+import { ViewerScopedEntityLoaderFactory } from './ViewerScopedEntityLoaderFactory';
+import { ViewerScopedEntityMutatorFactory } from './ViewerScopedEntityMutatorFactory';
+import { IEntityMetricsAdapter } from './metrics/IEntityMetricsAdapter';
 
 /**
  * Provides a simpler API for loading and mutating entities by injecting the ViewerContext
  * from the viewer-scoped entity companion provider.
  */
-export default class ViewerScopedEntityCompanion<
+export class ViewerScopedEntityCompanion<
   TFields extends Record<string, any>,
   TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,

package/src/ViewerScopedEntityCompanionProvider.ts

@@ -1,14 +1,14 @@
 import { IEntityClass } from './Entity';
-import EntityCompanionProvider from './EntityCompanionProvider';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-import ViewerScopedEntityCompanion from './ViewerScopedEntityCompanion';
+import { EntityCompanionProvider } from './EntityCompanionProvider';
+import { EntityPrivacyPolicy } from './EntityPrivacyPolicy';
+import { ReadonlyEntity } from './ReadonlyEntity';
+import { ViewerContext } from './ViewerContext';
+import { ViewerScopedEntityCompanion } from './ViewerScopedEntityCompanion';
 
 /**
  * Provides viewer-scoped entity companions providers for a simpler API.
  */
-export default class ViewerScopedEntityCompanionProvider {
+export class ViewerScopedEntityCompanionProvider {
   constructor(
     private readonly entityCompanionProvider: EntityCompanionProvider,
     private readonly viewerContext: ViewerContext,

package/src/ViewerScopedEntityLoaderFactory.ts

@@ -1,14 +1,14 @@
-import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
-import EntityLoaderFactory from './EntityLoaderFactory';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import { AuthorizationResultBasedEntityLoader } from './AuthorizationResultBasedEntityLoader';
+import { EntityLoaderFactory } from './EntityLoaderFactory';
+import { EntityPrivacyPolicy, EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
+import { ReadonlyEntity } from './ReadonlyEntity';
+import { ViewerContext } from './ViewerContext';
 
 /**
  * Provides a cleaner API for loading entities by passing through the ViewerContext.
  */
-export default class ViewerScopedEntityLoaderFactory<
+export class ViewerScopedEntityLoaderFactory<
   TFields extends Record<string, any>,
   TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,

package/src/ViewerScopedEntityMutatorFactory.ts

@@ -1,18 +1,19 @@
 import {
   AuthorizationResultBasedCreateMutator,
-  AuthorizationResultBasedUpdateMutator,
   AuthorizationResultBasedDeleteMutator,
+  AuthorizationResultBasedUpdateMutator,
 } from './AuthorizationResultBasedEntityMutator';
-import EntityMutatorFactory from './EntityMutatorFactory';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import { EntityCascadingDeletionInfo } from './EntityMutationInfo';
+import { EntityMutatorFactory } from './EntityMutatorFactory';
+import { EntityPrivacyPolicy } from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
+import { ReadonlyEntity } from './ReadonlyEntity';
+import { ViewerContext } from './ViewerContext';
 
 /**
  * Provides a cleaner API for mutating entities by passing through the ViewerContext.
  */
-export default class ViewerScopedEntityMutatorFactory<
+export class ViewerScopedEntityMutatorFactory<
   TFields extends Record<string, any>,
   TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
@@ -54,6 +55,7 @@ export default class ViewerScopedEntityMutatorFactory<
   forUpdate(
     existingEntity: TEntity,
     queryContext: EntityQueryContext,
+    cascadingDeleteCause: EntityCascadingDeletionInfo | null,
   ): AuthorizationResultBasedUpdateMutator<
     TFields,
     TIDField,
@@ -62,12 +64,13 @@ export default class ViewerScopedEntityMutatorFactory<
     TPrivacyPolicy,
     TSelectedFields
   > {
-    return this.entityMutatorFactory.forUpdate(existingEntity, queryContext);
+    return this.entityMutatorFactory.forUpdate(existingEntity, queryContext, cascadingDeleteCause);
   }
 
   forDelete(
     existingEntity: TEntity,
     queryContext: EntityQueryContext,
+    cascadingDeleteCause: EntityCascadingDeletionInfo | null,
   ): AuthorizationResultBasedDeleteMutator<
     TFields,
     TIDField,
@@ -76,6 +79,6 @@ export default class ViewerScopedEntityMutatorFactory<
     TPrivacyPolicy,
     TSelectedFields
   > {
-    return this.entityMutatorFactory.forDelete(existingEntity, queryContext);
+    return this.entityMutatorFactory.forDelete(existingEntity, queryContext, cascadingDeleteCause);
   }
 }

package/src/__tests__/AuthorizationResultBasedEntityAssociationLoader-test.ts

@@ -1,11 +1,12 @@
 import { enforceAsyncResult } from '@expo/results';
+import { describe, expect, it } from '@jest/globals';
 import { v4 as uuidv4 } from 'uuid';
 
-import AuthorizationResultBasedEntityAssociationLoader from '../AuthorizationResultBasedEntityAssociationLoader';
+import { AuthorizationResultBasedEntityAssociationLoader } from '../AuthorizationResultBasedEntityAssociationLoader';
 import { enforceResultsAsync } from '../entityUtils';
-import TestEntity from '../utils/__testfixtures__/TestEntity';
-import TestEntity2 from '../utils/__testfixtures__/TestEntity2';
-import TestViewerContext from '../utils/__testfixtures__/TestViewerContext';
+import { TestEntity } from '../utils/__testfixtures__/TestEntity';
+import { TestEntity2 } from '../utils/__testfixtures__/TestEntity2';
+import { TestViewerContext } from '../utils/__testfixtures__/TestViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(AuthorizationResultBasedEntityAssociationLoader, () => {

package/src/__tests__/AuthorizationResultBasedEntityLoader-constructor-test.ts

@@ -1,20 +1,21 @@
+import { describe, expect, it } from '@jest/globals';
 import { instance, mock } from 'ts-mockito';
 
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
-import Entity from '../Entity';
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
+import { Entity } from '../Entity';
 import { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { StringField } from '../EntityFields';
-import EntityLoaderUtils from '../EntityLoaderUtils';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
-import ViewerContext from '../ViewerContext';
-import EntityDataManager from '../internal/EntityDataManager';
-import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
-import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
+import { EntityLoaderUtils } from '../EntityLoaderUtils';
+import { EntityPrivacyPolicy, EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { ViewerContext } from '../ViewerContext';
+import { EntityDataManager } from '../internal/EntityDataManager';
+import { ReadThroughEntityCache } from '../internal/ReadThroughEntityCache';
+import { IEntityMetricsAdapter } from '../metrics/IEntityMetricsAdapter';
+import { AlwaysAllowPrivacyPolicyRule } from '../rules/AlwaysAllowPrivacyPolicyRule';
 import { NoCacheStubCacheAdapterProvider } from '../utils/__testfixtures__/StubCacheAdapter';
-import StubDatabaseAdapter from '../utils/__testfixtures__/StubDatabaseAdapter';
-import StubQueryContextProvider from '../utils/__testfixtures__/StubQueryContextProvider';
+import { StubDatabaseAdapter } from '../utils/__testfixtures__/StubDatabaseAdapter';
+import { StubQueryContextProvider } from '../utils/__testfixtures__/StubQueryContextProvider';
 
 export type TestFields = {
   id: string;
@@ -83,12 +84,7 @@ export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
 const ID_SENTINEL_THROW_LITERAL = 'throw_literal';
 const ID_SENTINEL_THROW_ERROR = 'throw_error';
 
-export default class TestEntity extends Entity<
-  TestFields,
-  'id',
-  ViewerContext,
-  TestFieldSelection
-> {
+export class TestEntity extends Entity<TestFields, 'id', ViewerContext, TestFieldSelection> {
   constructor(constructorParams: {
     viewerContext: ViewerContext;
     id: string;

package/src/__tests__/AuthorizationResultBasedEntityLoader-test.ts

@@ -1,30 +1,32 @@
 import { enforceAsyncResult } from '@expo/results';
-import { mock, instance, verify, spy, anyOfClass, anything, when } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { anyOfClass, anything, instance, mock, spy, verify, when } from 'ts-mockito';
 import { v4 as uuidv4 } from 'uuid';
 
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
 import { OrderByOrdering } from '../EntityDatabaseAdapter';
-import EntityLoaderUtils from '../EntityLoaderUtils';
+import { EntityLoaderUtils } from '../EntityLoaderUtils';
 import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
-import ViewerContext from '../ViewerContext';
+import { ViewerContext } from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
-import EntityNotFoundError from '../errors/EntityNotFoundError';
+import { EntityNotFoundError } from '../errors/EntityNotFoundError';
 import { CompositeFieldHolder, CompositeFieldValueHolder } from '../internal/CompositeFieldHolder';
-import EntityDataManager from '../internal/EntityDataManager';
-import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
+import { EntityDataManager } from '../internal/EntityDataManager';
+import { ReadThroughEntityCache } from '../internal/ReadThroughEntityCache';
 import {
   SingleFieldHolder,
   SingleFieldValueHolder,
   SingleFieldValueHolderMap,
 } from '../internal/SingleFieldHolder';
-import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
+import { IEntityMetricsAdapter } from '../metrics/IEntityMetricsAdapter';
 import { NoCacheStubCacheAdapterProvider } from '../utils/__testfixtures__/StubCacheAdapter';
-import StubDatabaseAdapter from '../utils/__testfixtures__/StubDatabaseAdapter';
-import StubQueryContextProvider from '../utils/__testfixtures__/StubQueryContextProvider';
+import { StubDatabaseAdapter } from '../utils/__testfixtures__/StubDatabaseAdapter';
+import { StubQueryContextProvider } from '../utils/__testfixtures__/StubQueryContextProvider';
 import { deepEqualEntityAware } from '../utils/__testfixtures__/TSMockitoExtensions';
-import TestEntity, {
-  TestFields,
+import {
+  TestEntity,
   TestEntityPrivacyPolicy,
+  TestFields,
   testEntityConfiguration,
 } from '../utils/__testfixtures__/TestEntity';
 
@@ -134,7 +136,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
       id2,
     ]);
 
-    await expect(entityLoader.loadByFieldEqualingAsync('stringField', 'huh')).rejects.toThrowError(
+    await expect(entityLoader.loadByFieldEqualingAsync('stringField', 'huh')).rejects.toThrow(
       'loadByFieldEqualing: Multiple entities of type TestEntity found for stringField=huh',
     );
 
@@ -150,7 +152,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
       EntityNotFoundError,
     );
 
-    await expect(entityLoader.loadByIDAsync('not-a-uuid')).rejects.toThrowError(
+    await expect(entityLoader.loadByIDAsync('not-a-uuid')).rejects.toThrow(
       'Entity field not valid: TestEntity (customIdField = not-a-uuid)',
     );
   });
@@ -295,7 +297,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
         stringField: 'huh',
         intField: 5,
       }),
-    ).rejects.toThrowError(
+    ).rejects.toThrow(
       'loadByCompositeFieldEqualing: Multiple entities of type TestEntity found for composite field (stringField,intField)={"stringField":"huh","intField":5}',
     );
 
@@ -434,7 +436,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
       entityLoader.loadManyByFieldEqualityConjunctionAsync([
         { fieldName: 'customIdField', fieldValue: 'not-a-uuid' },
       ]),
-    ).rejects.toThrowError('Entity field not valid: TestEntity (customIdField = not-a-uuid)');
+    ).rejects.toThrow('Entity field not valid: TestEntity (customIdField = not-a-uuid)');
   });
 
   it('loads entities with loadFirstByFieldEqualityConjunction', async () => {

package/src/__tests__/ComposedCacheAdapter-test.ts

@@ -1,7 +1,9 @@
-import ComposedEntityCacheAdapter from '../ComposedEntityCacheAdapter';
-import EntityConfiguration from '../EntityConfiguration';
+import { describe, expect, it } from '@jest/globals';
+
+import { ComposedEntityCacheAdapter } from '../ComposedEntityCacheAdapter';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
-import IEntityCacheAdapter from '../IEntityCacheAdapter';
+import { IEntityCacheAdapter } from '../IEntityCacheAdapter';
 import { IEntityLoadKey, IEntityLoadValue } from '../internal/EntityLoadInterfaces';
 import { CacheLoadResult, CacheStatus } from '../internal/ReadThroughEntityCache';
 import { SingleFieldHolder, SingleFieldValueHolder } from '../internal/SingleFieldHolder';

package/src/__tests__/ComposedSecondaryEntityCache-test.ts

@@ -1,7 +1,8 @@
+import { describe, expect, it } from '@jest/globals';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
-import ComposedSecondaryEntityCache from '../ComposedSecondaryEntityCache';
+import { ComposedSecondaryEntityCache } from '../ComposedSecondaryEntityCache';
 import { ISecondaryEntityCache } from '../EntitySecondaryCacheLoader';
 
 type TestFields = { id: string };

package/src/__tests__/EnforcingEntityAssociationLoader-test.ts

@@ -1,8 +1,9 @@
 import { result } from '@expo/results';
-import { mock, instance, when, anything } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { anything, instance, mock, when } from 'ts-mockito';
 
-import AuthorizationResultBasedEntityAssociationLoader from '../AuthorizationResultBasedEntityAssociationLoader';
-import EnforcingEntityAssociationLoader from '../EnforcingEntityAssociationLoader';
+import { AuthorizationResultBasedEntityAssociationLoader } from '../AuthorizationResultBasedEntityAssociationLoader';
+import { EnforcingEntityAssociationLoader } from '../EnforcingEntityAssociationLoader';
 
 describe(EnforcingEntityAssociationLoader, () => {
   describe('loadAssociatedEntityAsync', () => {

package/src/__tests__/EnforcingEntityLoader-test.ts

@@ -1,8 +1,9 @@
 import { result } from '@expo/results';
-import { mock, instance, when, anything } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { anything, instance, mock, when } from 'ts-mockito';
 
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
-import EnforcingEntityLoader from '../EnforcingEntityLoader';
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
+import { EnforcingEntityLoader } from '../EnforcingEntityLoader';
 import { CompositeFieldValueHolder } from '../internal/CompositeFieldHolder';
 import { CompositeFieldValueMap } from '../internal/CompositeFieldValueMap';
 

package/src/__tests__/Entity-test.ts

@@ -1,14 +1,16 @@
+import { describe, expect, it } from '@jest/globals';
+
 import {
   AuthorizationResultBasedCreateMutator,
   AuthorizationResultBasedDeleteMutator,
   AuthorizationResultBasedUpdateMutator,
 } from '../AuthorizationResultBasedEntityMutator';
-import EnforcingEntityCreator from '../EnforcingEntityCreator';
-import EnforcingEntityDeleter from '../EnforcingEntityDeleter';
-import EnforcingEntityUpdater from '../EnforcingEntityUpdater';
-import Entity from '../Entity';
-import ViewerContext from '../ViewerContext';
-import SimpleTestEntity from '../utils/__testfixtures__/SimpleTestEntity';
+import { EnforcingEntityCreator } from '../EnforcingEntityCreator';
+import { EnforcingEntityDeleter } from '../EnforcingEntityDeleter';
+import { EnforcingEntityUpdater } from '../EnforcingEntityUpdater';
+import { Entity } from '../Entity';
+import { ViewerContext } from '../ViewerContext';
+import { SimpleTestEntity } from '../utils/__testfixtures__/SimpleTestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(Entity, () => {

package/src/__tests__/EntityAssociationLoader-test.ts

@@ -1,8 +1,10 @@
-import AuthorizationResultBasedEntityAssociationLoader from '../AuthorizationResultBasedEntityAssociationLoader';
-import EnforcingEntityAssociationLoader from '../EnforcingEntityAssociationLoader';
-import EntityAssociationLoader from '../EntityAssociationLoader';
-import ViewerContext from '../ViewerContext';
-import SimpleTestEntity from '../utils/__testfixtures__/SimpleTestEntity';
+import { describe, expect, it } from '@jest/globals';
+
+import { AuthorizationResultBasedEntityAssociationLoader } from '../AuthorizationResultBasedEntityAssociationLoader';
+import { EnforcingEntityAssociationLoader } from '../EnforcingEntityAssociationLoader';
+import { EntityAssociationLoader } from '../EntityAssociationLoader';
+import { ViewerContext } from '../ViewerContext';
+import { SimpleTestEntity } from '../utils/__testfixtures__/SimpleTestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityAssociationLoader, () => {

package/src/__tests__/EntityCommonUseCases-test.ts

@@ -1,18 +1,19 @@
 import { enforceAsyncResult } from '@expo/results';
+import { expect, it } from '@jest/globals';
 import { v4 as uuidv4 } from 'uuid';
 
-import Entity from '../Entity';
-import EntityCompanionProvider, { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { Entity } from '../Entity';
+import { EntityCompanionDefinition, EntityCompanionProvider } from '../EntityCompanionProvider';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicy, EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
-import ViewerContext from '../ViewerContext';
+import { ViewerContext } from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
-import EntityNotAuthorizedError from '../errors/EntityNotAuthorizedError';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import AlwaysDenyPrivacyPolicyRule from '../rules/AlwaysDenyPrivacyPolicyRule';
-import PrivacyPolicyRule, { RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
+import { EntityNotAuthorizedError } from '../errors/EntityNotAuthorizedError';
+import { AlwaysAllowPrivacyPolicyRule } from '../rules/AlwaysAllowPrivacyPolicyRule';
+import { AlwaysDenyPrivacyPolicyRule } from '../rules/AlwaysDenyPrivacyPolicyRule';
+import { PrivacyPolicyRule, RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 class TestUserViewerContext extends ViewerContext {

package/src/__tests__/EntityCompanion-test.ts

@@ -1,17 +1,19 @@
+import { describe, expect, it } from '@jest/globals';
 import { instance, mock, when } from 'ts-mockito';
 
-import EntityCompanion from '../EntityCompanion';
-import EntityCompanionProvider from '../EntityCompanionProvider';
-import EntityLoaderFactory from '../EntityLoaderFactory';
-import EntityMutationTriggerConfiguration from '../EntityMutationTriggerConfiguration';
-import EntityMutatorFactory from '../EntityMutatorFactory';
-import ViewerContext from '../ViewerContext';
-import EntityTableDataCoordinator from '../internal/EntityTableDataCoordinator';
-import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
-import NoOpEntityMetricsAdapter from '../metrics/NoOpEntityMetricsAdapter';
-import TestEntityWithMutationTriggers, {
-  TestMTFields,
+import { EntityCompanion } from '../EntityCompanion';
+import { EntityCompanionProvider } from '../EntityCompanionProvider';
+import { EntityLoaderFactory } from '../EntityLoaderFactory';
+import { EntityMutationTriggerConfiguration } from '../EntityMutationTriggerConfiguration';
+import { EntityMutatorFactory } from '../EntityMutatorFactory';
+import { ViewerContext } from '../ViewerContext';
+import { EntityTableDataCoordinator } from '../internal/EntityTableDataCoordinator';
+import { IEntityMetricsAdapter } from '../metrics/IEntityMetricsAdapter';
+import { NoOpEntityMetricsAdapter } from '../metrics/NoOpEntityMetricsAdapter';
+import {
   testEntityMTConfiguration,
+  TestEntityWithMutationTriggers,
+  TestMTFields,
   TestMutationTrigger,
 } from '../utils/__testfixtures__/TestEntityWithMutationTriggers';
 

package/src/__tests__/EntityCompanionProvider-test.ts

@@ -1,9 +1,11 @@
-import Entity from '../Entity';
-import EntityCompanionProvider, { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { describe, expect, it } from '@jest/globals';
+
+import { Entity } from '../Entity';
+import { EntityCompanionDefinition, EntityCompanionProvider } from '../EntityCompanionProvider';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { StringField } from '../EntityFields';
-import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
-import ViewerContext from '../ViewerContext';
+import { EntityPrivacyPolicy } from '../EntityPrivacyPolicy';
+import { ViewerContext } from '../ViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 type BlahFields = {

package/src/__tests__/EntityConfiguration-test.ts

@@ -1,4 +1,6 @@
-import EntityConfiguration from '../EntityConfiguration';
+import { describe, expect, it, test } from '@jest/globals';
+
+import { EntityConfiguration } from '../EntityConfiguration';
 import { StringField, UUIDField } from '../EntityFields';
 import { CompositeFieldHolder } from '../internal/CompositeFieldHolder';
 

package/src/__tests__/EntityDatabaseAdapter-test.ts

@@ -1,8 +1,10 @@
+import { describe, expect, it } from '@jest/globals';
 import { instance, mock } from 'ts-mockito';
 
-import EntityDatabaseAdapter, {
-  TableFieldSingleValueEqualityCondition,
+import {
+  EntityDatabaseAdapter,
   TableFieldMultiValueEqualityCondition,
+  TableFieldSingleValueEqualityCondition,
 } from '../EntityDatabaseAdapter';
 import { EntityQueryContext } from '../EntityQueryContext';
 import { CompositeFieldHolder, CompositeFieldValueHolder } from '../internal/CompositeFieldHolder';
@@ -261,7 +263,7 @@ describe(EntityDatabaseAdapter, () => {
     it('throws when insert result count zero', async () => {
       const queryContext = instance(mock(EntityQueryContext));
       const adapter = new TestEntityDatabaseAdapter({ insertResults: [] });
-      await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrowError(
+      await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrow(
         'Empty results from database adapter insert',
       );
     });
@@ -271,7 +273,7 @@ describe(EntityDatabaseAdapter, () => {
       const adapter = new TestEntityDatabaseAdapter({
         insertResults: [{ string_field: 'hello' }, { string_field: 'hello2' }],
       });
-      await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrowError(
+      await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrow(
         'Excessive results from database adapter insert',
       );
     });
@@ -290,7 +292,7 @@ describe(EntityDatabaseAdapter, () => {
       const adapter = new TestEntityDatabaseAdapter({ updateResults: [] });
       await expect(
         adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any),
-      ).rejects.toThrowError('Empty results from database adapter update');
+      ).rejects.toThrow('Empty results from database adapter update');
     });
 
     it('throws when update result count greater than 1', async () => {
@@ -300,7 +302,7 @@ describe(EntityDatabaseAdapter, () => {
       });
       await expect(
         adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any),
-      ).rejects.toThrowError('Excessive results from database adapter update');
+      ).rejects.toThrow('Excessive results from database adapter update');
     });
   });
 
@@ -308,7 +310,7 @@ describe(EntityDatabaseAdapter, () => {
     it('throws when update result count greater than 1', async () => {
       const queryContext = instance(mock(EntityQueryContext));
       const adapter = new TestEntityDatabaseAdapter({ deleteCount: 2 });
-      await expect(adapter.deleteAsync(queryContext, 'customIdField', 'wat')).rejects.toThrowError(
+      await expect(adapter.deleteAsync(queryContext, 'customIdField', 'wat')).rejects.toThrow(
         'Excessive deletions from database adapter delet',
       );
     });

package/src/__tests__/EntityEdges-test.ts

@@ -1,22 +1,24 @@
+import { describe, expect, it } from '@jest/globals';
 import invariant from 'invariant';
 
-import Entity from '../Entity';
+import { Entity } from '../Entity';
 import { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { EntityEdgeDeletionBehavior } from '../EntityFieldDefinition';
 import { UUIDField } from '../EntityFields';
-import { EntityTriggerMutationInfo, EntityMutationType } from '../EntityMutationInfo';
+import { EntityMutationType, EntityTriggerMutationInfo } from '../EntityMutationInfo';
 import { EntityMutationTrigger } from '../EntityMutationTriggerConfiguration';
-import EntityPrivacyPolicy, {
-  EntityPrivacyPolicyEvaluationContext,
+import {
   EntityAuthorizationAction,
+  EntityPrivacyPolicy,
+  EntityPrivacyPolicyEvaluationContext,
 } from '../EntityPrivacyPolicy';
-import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
+import { EntityQueryContext, EntityTransactionalQueryContext } from '../EntityQueryContext';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
 import { SingleFieldHolder, SingleFieldValueHolder } from '../internal/SingleFieldHolder';
-import PrivacyPolicyRule, { RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
+import { PrivacyPolicyRule, RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
 import { InMemoryFullCacheStubCacheAdapter } from '../utils/__testfixtures__/StubCacheAdapter';
-import TestViewerContext from '../utils/__testfixtures__/TestViewerContext';
+import { TestViewerContext } from '../utils/__testfixtures__/TestViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 interface OtherFields {