@expo/entity 0.45.0 → 0.46.0

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 {

package/src/__tests__/EntityFields-test.ts

@@ -1,19 +1,20 @@
+import { describe, expect, it, test } from '@jest/globals';
 import { v1 as uuidv1, v3 as uuidv3, v4 as uuidv4, v5 as uuidv5 } from 'uuid';
 
 import { EntityFieldDefinition } from '../EntityFieldDefinition';
 import {
-  StringField,
-  UUIDField,
-  DateField,
   BooleanField,
-  IntField,
+  DateField,
+  EnumField,
   FloatField,
-  StringArrayField,
+  IntField,
   JSONObjectField,
-  EnumField,
   StrictEnumField,
+  StringArrayField,
+  StringField,
+  UUIDField,
 } from '../EntityFields';
-import describeFieldTestCase from '../utils/__testfixtures__/describeFieldTestCase';
+import { describeFieldTestCase } from '../utils/__testfixtures__/describeFieldTestCase';
 
 class TestFieldDefinition extends EntityFieldDefinition<string, false> {
   protected validateInputValueInternal(value: string): boolean {

package/src/__tests__/EntityLoader-test.ts

@@ -1,9 +1,11 @@
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
-import EnforcingEntityLoader from '../EnforcingEntityLoader';
-import EntityLoader from '../EntityLoader';
-import EntityLoaderUtils from '../EntityLoaderUtils';
-import ViewerContext from '../ViewerContext';
-import SimpleTestEntity from '../utils/__testfixtures__/SimpleTestEntity';
+import { describe, expect, it } from '@jest/globals';
+
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
+import { EnforcingEntityLoader } from '../EnforcingEntityLoader';
+import { EntityLoader } from '../EntityLoader';
+import { EntityLoaderUtils } from '../EntityLoaderUtils';
+import { ViewerContext } from '../ViewerContext';
+import { SimpleTestEntity } from '../utils/__testfixtures__/SimpleTestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityLoader, () => {

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

@@ -1,13 +1,15 @@
-import Entity from '../Entity';
+import { describe, test } from '@jest/globals';
+
+import { Entity } from '../Entity';
 import { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
 import { EntityMutationType, EntityTriggerMutationInfo } from '../EntityMutationInfo';
 import { EntityNonTransactionalMutationTrigger } from '../EntityMutationTriggerConfiguration';
-import EntityMutatorFactory from '../EntityMutatorFactory';
-import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
-import ViewerContext from '../ViewerContext';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
+import { EntityMutatorFactory } from '../EntityMutatorFactory';
+import { EntityPrivacyPolicy } from '../EntityPrivacyPolicy';
+import { ViewerContext } from '../ViewerContext';
+import { AlwaysAllowPrivacyPolicyRule } from '../rules/AlwaysAllowPrivacyPolicyRule';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 type BlahFields = {

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

@@ -1,6 +1,8 @@
-import EntityMutatorFactory from '../EntityMutatorFactory';
-import ViewerContext from '../ViewerContext';
-import TestEntity from '../utils/__testfixtures__/TestEntity';
+import { describe, expect, test } from '@jest/globals';
+
+import { EntityMutatorFactory } from '../EntityMutatorFactory';
+import { ViewerContext } from '../ViewerContext';
+import { TestEntity } from '../utils/__testfixtures__/TestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityMutatorFactory, () => {

package/src/__tests__/EntityMutator-test.ts

@@ -1,55 +1,59 @@
 import { enforceAsyncResult } from '@expo/results';
+import { describe, expect, it } from '@jest/globals';
 import {
+  anyOfClass,
+  anything,
+  deepEqual,
+  instance,
   mock,
+  objectContaining,
   spy,
   verify,
-  anyOfClass,
-  instance,
   when,
-  anything,
-  objectContaining,
-  deepEqual,
 } from 'ts-mockito';
 import { v4 as uuidv4 } from 'uuid';
 
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
-import EntityCompanionProvider from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
-import EntityDatabaseAdapter from '../EntityDatabaseAdapter';
-import EntityLoaderFactory from '../EntityLoaderFactory';
-import EntityLoaderUtils from '../EntityLoaderUtils';
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
+import { EntityCompanionProvider } from '../EntityCompanionProvider';
+import { EntityConfiguration } from '../EntityConfiguration';
+import { EntityDatabaseAdapter } from '../EntityDatabaseAdapter';
+import { EntityLoaderFactory } from '../EntityLoaderFactory';
+import { EntityLoaderUtils } from '../EntityLoaderUtils';
 import {
   EntityMutationType,
   EntityTriggerMutationInfo,
   EntityValidatorMutationInfo,
 } from '../EntityMutationInfo';
-import EntityMutationTriggerConfiguration, {
+import {
   EntityMutationTrigger,
+  EntityMutationTriggerConfiguration,
   EntityNonTransactionalMutationTrigger,
 } from '../EntityMutationTriggerConfiguration';
-import EntityMutationValidator from '../EntityMutationValidator';
-import EntityMutatorFactory from '../EntityMutatorFactory';
+import { EntityMutationValidator } from '../EntityMutationValidator';
+import { EntityMutatorFactory } from '../EntityMutatorFactory';
 import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
-import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
-import IEntityDatabaseAdapterProvider from '../IEntityDatabaseAdapterProvider';
-import ViewerContext from '../ViewerContext';
+import { EntityQueryContext, EntityTransactionalQueryContext } from '../EntityQueryContext';
+import { IEntityDatabaseAdapterProvider } from '../IEntityDatabaseAdapterProvider';
+import { ViewerContext } from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
-import EntityDataManager from '../internal/EntityDataManager';
-import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
-import IEntityMetricsAdapter, { EntityMetricsMutationType } from '../metrics/IEntityMetricsAdapter';
-import NoOpEntityMetricsAdapter from '../metrics/NoOpEntityMetricsAdapter';
-import SimpleTestEntity, {
+import { EntityDataManager } from '../internal/EntityDataManager';
+import { ReadThroughEntityCache } from '../internal/ReadThroughEntityCache';
+import { EntityMetricsMutationType, IEntityMetricsAdapter } from '../metrics/IEntityMetricsAdapter';
+import { NoOpEntityMetricsAdapter } from '../metrics/NoOpEntityMetricsAdapter';
+import {
+  SimpleTestEntity,
   simpleTestEntityConfiguration,
   SimpleTestEntityPrivacyPolicy,
   SimpleTestFields,
 } from '../utils/__testfixtures__/SimpleTestEntity';
 import { NoCacheStubCacheAdapterProvider } from '../utils/__testfixtures__/StubCacheAdapter';
-import StubDatabaseAdapter from '../utils/__testfixtures__/StubDatabaseAdapter';
-import StubQueryContextProvider from '../utils/__testfixtures__/StubQueryContextProvider';
-import TestEntity, {
-  TestFields,
-  TestEntityPrivacyPolicy,
+import { StubDatabaseAdapter } from '../utils/__testfixtures__/StubDatabaseAdapter';
+import { StubQueryContextProvider } from '../utils/__testfixtures__/StubQueryContextProvider';
+import {
+  TestEntity,
   testEntityConfiguration,
+  TestEntityPrivacyPolicy,
+  TestFields,
 } from '../utils/__testfixtures__/TestEntity';
 
 class TestMutationTrigger extends EntityMutationTrigger<
@@ -1148,7 +1152,7 @@ describe(EntityMutatorFactory, () => {
         .forCreate(viewerContext, queryContext)
         .setField('stringField', 10 as any)
         .createAsync(),
-    ).rejects.toThrowError('Entity field not valid: TestEntity (stringField = 10)');
+    ).rejects.toThrow('Entity field not valid: TestEntity (stringField = 10)');
 
     const createdEntity = await enforceAsyncResult(
       entityMutatorFactory
@@ -1162,7 +1166,7 @@ describe(EntityMutatorFactory, () => {
         .forUpdate(createdEntity, queryContext)
         .setField('stringField', 10 as any)
         .updateAsync(),
-    ).rejects.toThrowError('Entity field not valid: TestEntity (stringField = 10)');
+    ).rejects.toThrow('Entity field not valid: TestEntity (stringField = 10)');
   });
 
   it('returns error result when not authorized to create', async () => {

package/src/__tests__/EntityPrivacyPolicy-test.ts

@@ -1,25 +1,28 @@
-import { mock, instance, spy, verify, anyOfClass, anything, objectContaining } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { anyOfClass, anything, instance, mock, objectContaining, spy, verify } from 'ts-mockito';
 
-import Entity from '../Entity';
+import { Entity } from '../Entity';
 import { EntityCompanionDefinition } from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
+import { EntityConfiguration } from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
-import EntityPrivacyPolicy, {
-  EntityPrivacyPolicyEvaluator,
+import {
   EntityAuthorizationAction,
-  EntityPrivacyPolicyEvaluationMode,
+  EntityPrivacyPolicy,
   EntityPrivacyPolicyEvaluationContext,
+  EntityPrivacyPolicyEvaluationMode,
+  EntityPrivacyPolicyEvaluator,
 } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
-import ViewerContext from '../ViewerContext';
-import EntityNotAuthorizedError from '../errors/EntityNotAuthorizedError';
-import IEntityMetricsAdapter, {
+import { ViewerContext } from '../ViewerContext';
+import { EntityNotAuthorizedError } from '../errors/EntityNotAuthorizedError';
+import {
   EntityMetricsAuthorizationResult,
+  IEntityMetricsAdapter,
 } from '../metrics/IEntityMetricsAdapter';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import AlwaysDenyPrivacyPolicyRule from '../rules/AlwaysDenyPrivacyPolicyRule';
-import AlwaysSkipPrivacyPolicyRule from '../rules/AlwaysSkipPrivacyPolicyRule';
-import PrivacyPolicyRule, { RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
+import { AlwaysAllowPrivacyPolicyRule } from '../rules/AlwaysAllowPrivacyPolicyRule';
+import { AlwaysDenyPrivacyPolicyRule } from '../rules/AlwaysDenyPrivacyPolicyRule';
+import { AlwaysSkipPrivacyPolicyRule } from '../rules/AlwaysSkipPrivacyPolicyRule';
+import { PrivacyPolicyRule, RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
 
 type BlahFields = {
   id: string;
@@ -470,7 +473,7 @@ describe(EntityPrivacyPolicy, () => {
           entity,
           metricsAdapter,
         ),
-      ).rejects.toThrowError('WooHoo!');
+      ).rejects.toThrow('WooHoo!');
       verify(metricsAdapterMock.logAuthorizationEvent(anything())).never();
     });
   });
@@ -587,7 +590,7 @@ describe(EntityPrivacyPolicy, () => {
           entity,
           metricsAdapter,
         ),
-      ).rejects.toThrowError('WooHoo!');
+      ).rejects.toThrow('WooHoo!');
 
       verify(policySpy.denyHandler(anyOfClass(EntityNotAuthorizedError))).never();
 
@@ -708,7 +711,7 @@ describe(EntityPrivacyPolicy, () => {
           entity,
           metricsAdapter,
         ),
-      ).rejects.toThrowError('WooHoo!');
+      ).rejects.toThrow('WooHoo!');
 
       verify(policySpy.denyHandler(anyOfClass(EntityNotAuthorizedError))).never();
 

package/src/__tests__/EntityQueryContext-test.ts

@@ -1,18 +1,19 @@
+import { describe, expect, it, jest } from '@jest/globals';
 import assert from 'assert';
 import invariant from 'invariant';
 
-import EntityCompanionProvider from '../EntityCompanionProvider';
+import { EntityCompanionProvider } from '../EntityCompanionProvider';
 import {
   EntityQueryContext,
   TransactionalDataLoaderMode,
   TransactionConfig,
   TransactionIsolationLevel,
 } from '../EntityQueryContext';
-import EntityQueryContextProvider from '../EntityQueryContextProvider';
-import ViewerContext from '../ViewerContext';
-import NoOpEntityMetricsAdapter from '../metrics/NoOpEntityMetricsAdapter';
+import { EntityQueryContextProvider } from '../EntityQueryContextProvider';
+import { ViewerContext } from '../ViewerContext';
+import { NoOpEntityMetricsAdapter } from '../metrics/NoOpEntityMetricsAdapter';
 import { InMemoryFullCacheStubCacheAdapterProvider } from '../utils/__testfixtures__/StubCacheAdapter';
-import StubDatabaseAdapterProvider from '../utils/__testfixtures__/StubDatabaseAdapterProvider';
+import { StubDatabaseAdapterProvider } from '../utils/__testfixtures__/StubDatabaseAdapterProvider';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityQueryContext, () => {
@@ -83,7 +84,7 @@ describe(EntityQueryContext, () => {
             queryContext.appendPreCommitCallback(preCommitCallback, 0);
           },
         ),
-      ).rejects.toThrowError('wat');
+      ).rejects.toThrow('wat');
 
       expect(preCommitCallback).toHaveBeenCalledTimes(1);
       expect(postCommitCallback).toHaveBeenCalledTimes(0);

package/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -1,9 +1,11 @@
+import { describe, expect, it } from '@jest/globals';
 import { anyOfClass, anything, deepEqual, instance, mock, spy, verify, when } from 'ts-mockito';
 
 import { EntityNonTransactionalQueryContext } from '../EntityQueryContext';
-import EntitySecondaryCacheLoader, { ISecondaryEntityCache } from '../EntitySecondaryCacheLoader';
-import ViewerContext from '../ViewerContext';
-import SimpleTestEntity, {
+import { EntitySecondaryCacheLoader, ISecondaryEntityCache } from '../EntitySecondaryCacheLoader';
+import { ViewerContext } from '../ViewerContext';
+import {
+  SimpleTestEntity,
   SimpleTestEntityPrivacyPolicy,
   SimpleTestFields,
 } from '../utils/__testfixtures__/SimpleTestEntity';

package/src/__tests__/EntitySelfReferentialEdges-test.ts

@@ -1,14 +1,16 @@
-import Entity from '../Entity';
+import { describe, expect, it } from '@jest/globals';
+
+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 EntityPrivacyPolicy from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicy } from '../EntityPrivacyPolicy';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
 import { SingleFieldHolder, SingleFieldValueHolder } from '../internal/SingleFieldHolder';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
+import { AlwaysAllowPrivacyPolicyRule } from '../rules/AlwaysAllowPrivacyPolicyRule';
 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 CategoryFields {

package/src/__tests__/GenericEntityCacheAdapter-test.ts

@@ -1,7 +1,8 @@
-import { mock, when, instance, anything, verify, deepEqual } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { anything, deepEqual, instance, mock, verify, when } from 'ts-mockito';
 
-import GenericEntityCacheAdapter from '../GenericEntityCacheAdapter';
-import IEntityGenericCacher from '../IEntityGenericCacher';
+import { GenericEntityCacheAdapter } from '../GenericEntityCacheAdapter';
+import { IEntityGenericCacher } from '../IEntityGenericCacher';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
 import {
   SingleFieldHolder,

package/src/__tests__/ReadonlyEntity-test.ts

@@ -1,14 +1,15 @@
+import { describe, expect, it } from '@jest/globals';
 import { instance, mock } from 'ts-mockito';
 
-import AuthorizationResultBasedEntityAssociationLoader from '../AuthorizationResultBasedEntityAssociationLoader';
-import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
-import EnforcingEntityAssociationLoader from '../EnforcingEntityAssociationLoader';
-import EnforcingEntityLoader from '../EnforcingEntityLoader';
-import EntityLoaderUtils from '../EntityLoaderUtils';
-import ReadonlyEntity from '../ReadonlyEntity';
-import ViewerContext from '../ViewerContext';
-import SimpleTestEntity from '../utils/__testfixtures__/SimpleTestEntity';
-import TestEntity from '../utils/__testfixtures__/TestEntity';
+import { AuthorizationResultBasedEntityAssociationLoader } from '../AuthorizationResultBasedEntityAssociationLoader';
+import { AuthorizationResultBasedEntityLoader } from '../AuthorizationResultBasedEntityLoader';
+import { EnforcingEntityAssociationLoader } from '../EnforcingEntityAssociationLoader';
+import { EnforcingEntityLoader } from '../EnforcingEntityLoader';
+import { EntityLoaderUtils } from '../EntityLoaderUtils';
+import { ReadonlyEntity } from '../ReadonlyEntity';
+import { ViewerContext } from '../ViewerContext';
+import { SimpleTestEntity } from '../utils/__testfixtures__/SimpleTestEntity';
+import { TestEntity } from '../utils/__testfixtures__/TestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(ReadonlyEntity, () => {

package/src/__tests__/ViewerContext-test.ts

@@ -1,5 +1,7 @@
+import { describe, expect, it } from '@jest/globals';
+
 import { EntityQueryContext } from '../EntityQueryContext';
-import ViewerContext from '../ViewerContext';
+import { ViewerContext } from '../ViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(ViewerContext, () => {

package/src/__tests__/ViewerScopedEntityCompanion-test.ts

@@ -1,13 +1,15 @@
-import { mock, instance } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { instance, mock } from 'ts-mockito';
 
-import EntityCompanion from '../EntityCompanion';
-import ViewerContext from '../ViewerContext';
-import ViewerScopedEntityCompanion from '../ViewerScopedEntityCompanion';
-import ViewerScopedEntityLoaderFactory from '../ViewerScopedEntityLoaderFactory';
-import ViewerScopedEntityMutatorFactory from '../ViewerScopedEntityMutatorFactory';
-import TestEntity, {
-  TestFields,
+import { EntityCompanion } from '../EntityCompanion';
+import { ViewerContext } from '../ViewerContext';
+import { ViewerScopedEntityCompanion } from '../ViewerScopedEntityCompanion';
+import { ViewerScopedEntityLoaderFactory } from '../ViewerScopedEntityLoaderFactory';
+import { ViewerScopedEntityMutatorFactory } from '../ViewerScopedEntityMutatorFactory';
+import {
+  TestEntity,
   TestEntityPrivacyPolicy,
+  TestFields,
 } from '../utils/__testfixtures__/TestEntity';
 
 describe(ViewerScopedEntityCompanion, () => {

package/src/__tests__/ViewerScopedEntityCompanionProvider-test.ts

@@ -1,10 +1,11 @@
-import { mock, instance } from 'ts-mockito';
+import { describe, expect, it } from '@jest/globals';
+import { instance, mock } from 'ts-mockito';
 
-import EntityCompanionProvider from '../EntityCompanionProvider';
-import ViewerContext from '../ViewerContext';
-import ViewerScopedEntityCompanion from '../ViewerScopedEntityCompanion';
-import ViewerScopedEntityCompanionProvider from '../ViewerScopedEntityCompanionProvider';
-import TestEntity from '../utils/__testfixtures__/TestEntity';
+import { EntityCompanionProvider } from '../EntityCompanionProvider';
+import { ViewerContext } from '../ViewerContext';
+import { ViewerScopedEntityCompanion } from '../ViewerScopedEntityCompanion';
+import { ViewerScopedEntityCompanionProvider } from '../ViewerScopedEntityCompanionProvider';
+import { TestEntity } from '../utils/__testfixtures__/TestEntity';
 
 describe(ViewerScopedEntityCompanionProvider, () => {
   it('returns viewer scoped entity companion', () => {

package/src/__tests__/ViewerScopedEntityLoaderFactory-test.ts

@@ -1,10 +1,11 @@
-import { mock, verify, instance } from 'ts-mockito';
+import { describe, it } from '@jest/globals';
+import { instance, mock, verify } from 'ts-mockito';
 
-import EntityLoaderFactory from '../EntityLoaderFactory';
+import { EntityLoaderFactory } from '../EntityLoaderFactory';
 import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
-import ViewerContext from '../ViewerContext';
-import ViewerScopedEntityLoaderFactory from '../ViewerScopedEntityLoaderFactory';
+import { ViewerContext } from '../ViewerContext';
+import { ViewerScopedEntityLoaderFactory } from '../ViewerScopedEntityLoaderFactory';
 
 describe(ViewerScopedEntityLoaderFactory, () => {
   it('correctly scopes viewer to entity loads', async () => {

package/src/__tests__/ViewerScopedEntityMutatorFactory-test.ts

@@ -1,12 +1,14 @@
-import { mock, instance, verify } from 'ts-mockito';
+import { describe, it } from '@jest/globals';
+import { instance, mock, verify } from 'ts-mockito';
 
-import EntityMutatorFactory from '../EntityMutatorFactory';
+import { EntityMutatorFactory } from '../EntityMutatorFactory';
 import { EntityQueryContext } from '../EntityQueryContext';
-import ViewerContext from '../ViewerContext';
-import ViewerScopedEntityMutatorFactory from '../ViewerScopedEntityMutatorFactory';
-import TestEntity, {
-  TestFields,
+import { ViewerContext } from '../ViewerContext';
+import { ViewerScopedEntityMutatorFactory } from '../ViewerScopedEntityMutatorFactory';
+import {
+  TestEntity,
   TestEntityPrivacyPolicy,
+  TestFields,
 } from '../utils/__testfixtures__/TestEntity';
 
 describe(ViewerScopedEntityMutatorFactory, () => {

package/src/__tests__/cases/TwoEntitySameTableDisjointRows-test.ts

@@ -1,11 +1,13 @@
-import Entity from '../../Entity';
+import { describe, expect, test } from '@jest/globals';
+
+import { Entity } from '../../Entity';
 import { EntityCompanionDefinition } from '../../EntityCompanionProvider';
-import EntityConfiguration from '../../EntityConfiguration';
-import { StringField, StrictEnumField, UUIDField } from '../../EntityFields';
-import EntityPrivacyPolicy from '../../EntityPrivacyPolicy';
-import ViewerContext from '../../ViewerContext';
-import { successfulResults, failedResults } from '../../entityUtils';
-import AlwaysAllowPrivacyPolicyRule from '../../rules/AlwaysAllowPrivacyPolicyRule';
+import { EntityConfiguration } from '../../EntityConfiguration';
+import { StrictEnumField, StringField, UUIDField } from '../../EntityFields';
+import { EntityPrivacyPolicy } from '../../EntityPrivacyPolicy';
+import { ViewerContext } from '../../ViewerContext';
+import { failedResults, successfulResults } from '../../entityUtils';
+import { AlwaysAllowPrivacyPolicyRule } from '../../rules/AlwaysAllowPrivacyPolicyRule';
 import { createUnitTestEntityCompanionProvider } from '../../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe('Two entities backed by the same table', () => {
@@ -27,13 +29,13 @@ describe('Two entities backed by the same table', () => {
     expect(one).toBeInstanceOf(OneTestEntity);
     expect(two).toBeInstanceOf(TwoTestEntity);
 
-    await expect(
-      TwoTestEntity.loader(viewerContext).loadByIDAsync(one.getID()),
-    ).rejects.toThrowError('TwoTestEntity must be instantiated with two data');
+    await expect(TwoTestEntity.loader(viewerContext).loadByIDAsync(one.getID())).rejects.toThrow(
+      'TwoTestEntity must be instantiated with two data',
+    );
 
-    await expect(
-      OneTestEntity.loader(viewerContext).loadByIDAsync(two.getID()),
-    ).rejects.toThrowError('OneTestEntity must be instantiated with one data');
+    await expect(OneTestEntity.loader(viewerContext).loadByIDAsync(two.getID())).rejects.toThrow(
+      'OneTestEntity must be instantiated with one data',
+    );
 
     const manyResults = await OneTestEntity.loaderWithAuthorizationResults(
       viewerContext,

package/src/__tests__/cases/TwoEntitySameTableOverlappingRows-test.ts

@@ -1,10 +1,12 @@
-import Entity from '../../Entity';
+import { describe, expect, test } from '@jest/globals';
+
+import { Entity } from '../../Entity';
 import { EntityCompanionDefinition } from '../../EntityCompanionProvider';
-import EntityConfiguration from '../../EntityConfiguration';
+import { EntityConfiguration } from '../../EntityConfiguration';
 import { StringField, UUIDField } from '../../EntityFields';
-import EntityPrivacyPolicy from '../../EntityPrivacyPolicy';
-import ViewerContext from '../../ViewerContext';
-import AlwaysAllowPrivacyPolicyRule from '../../rules/AlwaysAllowPrivacyPolicyRule';
+import { EntityPrivacyPolicy } from '../../EntityPrivacyPolicy';
+import { ViewerContext } from '../../ViewerContext';
+import { AlwaysAllowPrivacyPolicyRule } from '../../rules/AlwaysAllowPrivacyPolicyRule';
 import { createUnitTestEntityCompanionProvider } from '../../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe('Two entities backed by the same table', () => {