@expo/entity 0.41.0 → 0.43.0

package/src/__tests__/EntityPrivacyPolicy-test.ts

@@ -25,22 +25,23 @@ type BlahFields = {
   id: string;
 };
 
-class BlahEntity extends Entity<BlahFields, string, ViewerContext> {
+class BlahEntity extends Entity<BlahFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity,
     any
   > {
     return {
       entityClass: BlahEntity,
-      entityConfiguration: new EntityConfiguration<BlahFields>({
+      entityConfiguration: new EntityConfiguration<BlahFields, 'id'>({
         idField: 'id',
         tableName: 'blah_table',
         schema: {
           id: new UUIDField({
             columnName: 'id',
+            cache: false,
           }),
         },
         databaseAdapterFlavor: 'postgres',
@@ -51,30 +52,30 @@ class BlahEntity extends Entity<BlahFields, string, ViewerContext> {
   }
 }
 
-class AlwaysDenyPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext, BlahEntity> {
+class AlwaysDenyPolicy extends EntityPrivacyPolicy<BlahFields, 'id', ViewerContext, BlahEntity> {
   protected override readonly createRules = [
-    new AlwaysDenyPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysDenyPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly readRules = [
-    new AlwaysDenyPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysDenyPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysDenyPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysDenyPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysDenyPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysDenyPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
 }
 
 class DryRunAlwaysDenyPolicy extends AlwaysDenyPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -88,12 +89,12 @@ class DryRunAlwaysDenyPolicy extends AlwaysDenyPolicy {
 class LoggingEnforceAlwaysDenyPolicy extends AlwaysDenyPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -104,30 +105,30 @@ class LoggingEnforceAlwaysDenyPolicy extends AlwaysDenyPolicy {
   }
 }
 
-class AlwaysAllowPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext, BlahEntity> {
+class AlwaysAllowPolicy extends EntityPrivacyPolicy<BlahFields, 'id', ViewerContext, BlahEntity> {
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysAllowPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysAllowPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysAllowPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysAllowPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
 }
 
 class DryRunAlwaysAllowPolicy extends AlwaysAllowPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -141,12 +142,12 @@ class DryRunAlwaysAllowPolicy extends AlwaysAllowPolicy {
 class LoggingEnforceAlwaysAllowPolicy extends AlwaysAllowPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -157,24 +158,24 @@ class LoggingEnforceAlwaysAllowPolicy extends AlwaysAllowPolicy {
   }
 }
 
-class SkipAllPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext, BlahEntity> {
+class SkipAllPolicy extends EntityPrivacyPolicy<BlahFields, 'id', ViewerContext, BlahEntity> {
   protected override readonly createRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly readRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
 }
 
 class InvalidCreateRuleResultPolicy extends EntityPrivacyPolicy<
   BlahFields,
-  string,
+  'id',
   ViewerContext,
   BlahEntity
 > {
@@ -186,19 +187,19 @@ class InvalidCreateRuleResultPolicy extends EntityPrivacyPolicy<
     },
   ];
   protected override readonly readRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysSkipPrivacyPolicyRule<BlahFields, string, ViewerContext, BlahEntity>(),
+    new AlwaysSkipPrivacyPolicyRule<BlahFields, 'id', ViewerContext, BlahEntity>(),
   ];
 }
 
 class AlwaysThrowPrivacyPolicyRule extends PrivacyPolicyRule<
   BlahFields,
-  string,
+  'id',
   ViewerContext,
   BlahEntity
 > {
@@ -207,7 +208,7 @@ class AlwaysThrowPrivacyPolicyRule extends PrivacyPolicyRule<
     _queryContext: EntityQueryContext,
     _evaluationContext: EntityPrivacyPolicyEvaluationContext<
       BlahFields,
-      string,
+      'id',
       ViewerContext,
       BlahEntity
     >,
@@ -217,7 +218,7 @@ class AlwaysThrowPrivacyPolicyRule extends PrivacyPolicyRule<
   }
 }
 
-class ThrowAllPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext, BlahEntity> {
+class ThrowAllPolicy extends EntityPrivacyPolicy<BlahFields, 'id', ViewerContext, BlahEntity> {
   protected override readonly createRules = [new AlwaysThrowPrivacyPolicyRule()];
   protected override readonly readRules = [new AlwaysThrowPrivacyPolicyRule()];
   protected override readonly updateRules = [new AlwaysThrowPrivacyPolicyRule()];
@@ -227,12 +228,12 @@ class ThrowAllPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerConte
 class DryRunThrowAllPolicy extends ThrowAllPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -246,12 +247,12 @@ class DryRunThrowAllPolicy extends ThrowAllPolicy {
 class LoggingEnforceThrowAllPolicy extends ThrowAllPolicy {
   // public method for test spying
   public denyHandler(
-    _error: EntityNotAuthorizedError<BlahFields, string, ViewerContext, BlahEntity>,
+    _error: EntityNotAuthorizedError<BlahFields, 'id', ViewerContext, BlahEntity>,
   ): void {}
 
   protected override getPrivacyPolicyEvaluator(): EntityPrivacyPolicyEvaluator<
     BlahFields,
-    string,
+    'id',
     ViewerContext,
     BlahEntity
   > {
@@ -262,7 +263,7 @@ class LoggingEnforceThrowAllPolicy extends ThrowAllPolicy {
   }
 }
 
-class EmptyPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext, BlahEntity> {
+class EmptyPolicy extends EntityPrivacyPolicy<BlahFields, 'id', ViewerContext, BlahEntity> {
   protected override readonly createRules = [];
   protected override readonly readRules = [];
   protected override readonly updateRules = [];
@@ -276,9 +277,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -315,9 +314,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -353,9 +350,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -392,9 +387,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -421,9 +414,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -460,9 +451,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -492,9 +481,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -536,9 +523,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -580,9 +565,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -618,9 +601,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -663,9 +644,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
@@ -707,9 +686,7 @@ describe(EntityPrivacyPolicy, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const privacyPolicyEvaluationContext =
         instance(
-          mock<
-            EntityPrivacyPolicyEvaluationContext<BlahFields, string, ViewerContext, BlahEntity>
-          >(),
+          mock<EntityPrivacyPolicyEvaluationContext<BlahFields, 'id', ViewerContext, BlahEntity>>(),
         );
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);

package/src/__tests__/EntityQueryContext-test.ts

@@ -2,7 +2,7 @@ import invariant from 'invariant';
 
 import { EntityQueryContext, TransactionIsolationLevel } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityQueryContext, () => {
   describe('callbacks', () => {

package/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -6,15 +6,15 @@ import ViewerContext from '../ViewerContext';
 import SimpleTestEntity, {
   SimpleTestEntityPrivacyPolicy,
   SimpleTestFields,
-} from '../testfixtures/SimpleTestEntity';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+} from '../utils/__testfixtures__/SimpleTestEntity';
+import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 type TestLoadParams = { id: string };
 
 class TestSecondaryRedisCacheLoader extends EntitySecondaryCacheLoader<
   TestLoadParams,
   SimpleTestFields,
-  string,
+  'id',
   ViewerContext,
   SimpleTestEntity,
   SimpleTestEntityPrivacyPolicy

package/src/__tests__/EntitySelfReferentialEdges-test.ts

@@ -5,10 +5,11 @@ import { EntityEdgeDeletionBehavior } from '../EntityFieldDefinition';
 import { UUIDField } from '../EntityFields';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
+import { SingleFieldHolder, SingleFieldValueHolder } from '../internal/SingleFieldHolder';
 import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import TestViewerContext from '../testfixtures/TestViewerContext';
-import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+import { InMemoryFullCacheStubCacheAdapter } from '../utils/__testfixtures__/StubCacheAdapter';
+import TestViewerContext from '../utils/__testfixtures__/TestViewerContext';
+import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 interface CategoryFields {
   id: string;
@@ -17,31 +18,31 @@ interface CategoryFields {
 
 class CategoryPrivacyPolicy extends EntityPrivacyPolicy<
   CategoryFields,
-  string,
+  'id',
   TestViewerContext,
   any,
   any
 > {
   protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<CategoryFields, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<CategoryFields, 'id', TestViewerContext, any, any>(),
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<CategoryFields, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<CategoryFields, 'id', TestViewerContext, any, any>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<CategoryFields, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<CategoryFields, 'id', TestViewerContext, any, any>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<CategoryFields, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<CategoryFields, 'id', TestViewerContext, any, any>(),
   ];
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const makeEntityClass = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
-  class CategoryEntity extends Entity<CategoryFields, string, TestViewerContext> {
+  class CategoryEntity extends Entity<CategoryFields, 'id', TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       CategoryFields,
-      string,
+      'id',
       TestViewerContext,
       CategoryEntity,
       CategoryPrivacyPolicy
@@ -54,7 +55,7 @@ const makeEntityClass = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
     }
   }
 
-  const categoryEntityConfiguration = new EntityConfiguration<CategoryFields>({
+  const categoryEntityConfiguration = new EntityConfiguration<CategoryFields, 'id'>({
     idField: 'id',
     tableName: 'categories',
     inboundEdges: [CategoryEntity],
@@ -245,30 +246,40 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
       CategoryEntity,
     )['entityCompanion']['tableDataCoordinator'][
       'cacheAdapter'
-    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields>;
-    const subCategoryCachedBefore = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      parentCategory.getID(),
-    ]);
-    expect(subCategoryCachedBefore.get(parentCategory.getID())?.status).toEqual(CacheStatus.HIT);
+    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields, 'id'>;
+    const subCategoryCachedBefore = await categoryCacheAdapter.loadManyAsync(
+      new SingleFieldHolder('parent_category_id'),
+      [new SingleFieldValueHolder(parentCategory.getID())],
+    );
+    expect(
+      subCategoryCachedBefore.get(new SingleFieldValueHolder(parentCategory.getID()))?.status,
+    ).toEqual(CacheStatus.HIT);
 
     const subSubCategoryCachedBefore = await categoryCacheAdapter.loadManyAsync(
-      'parent_category_id',
-      [subCategory.getID()],
+      new SingleFieldHolder('parent_category_id'),
+      [new SingleFieldValueHolder(subCategory.getID())],
     );
-    expect(subSubCategoryCachedBefore.get(subCategory.getID())?.status).toEqual(CacheStatus.HIT);
+    expect(
+      subSubCategoryCachedBefore.get(new SingleFieldValueHolder(subCategory.getID()))?.status,
+    ).toEqual(CacheStatus.HIT);
 
     await CategoryEntity.deleter(parentCategory).deleteAsync();
 
-    const subCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      parentCategory.getID(),
-    ]);
-    expect(subCategoryCachedAfter.get(parentCategory.getID())?.status).toEqual(CacheStatus.MISS);
+    const subCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync(
+      new SingleFieldHolder('parent_category_id'),
+      [new SingleFieldValueHolder(parentCategory.getID())],
+    );
+    expect(
+      subCategoryCachedAfter.get(new SingleFieldValueHolder(parentCategory.getID()))?.status,
+    ).toEqual(CacheStatus.MISS);
 
     const subSubCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync(
-      'parent_category_id',
-      [subCategory.getID()],
+      new SingleFieldHolder('parent_category_id'),
+      [new SingleFieldValueHolder(subCategory.getID())],
     );
-    expect(subSubCategoryCachedAfter.get(subCategory.getID())?.status).toEqual(CacheStatus.MISS);
+    expect(
+      subSubCategoryCachedAfter.get(new SingleFieldValueHolder(subCategory.getID()))?.status,
+    ).toEqual(CacheStatus.MISS);
 
     await expect(
       CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID()),
@@ -314,21 +325,35 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
       CategoryEntity,
     )['entityCompanion']['tableDataCoordinator'][
       'cacheAdapter'
-    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields>;
-    const categoriesCachedBefore = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      categoryA.getID(),
-      categoryB.getID(),
-    ]);
-    expect(categoriesCachedBefore.get(categoryA.getID())?.status).toEqual(CacheStatus.HIT);
-    expect(categoriesCachedBefore.get(categoryB.getID())?.status).toEqual(CacheStatus.HIT);
+    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields, 'id'>;
+    const categoriesCachedBefore = await categoryCacheAdapter.loadManyAsync(
+      new SingleFieldHolder('parent_category_id'),
+      [
+        new SingleFieldValueHolder(categoryA.getID()),
+        new SingleFieldValueHolder(categoryB.getID()),
+      ],
+    );
+    expect(
+      categoriesCachedBefore.get(new SingleFieldValueHolder(categoryA.getID()))?.status,
+    ).toEqual(CacheStatus.HIT);
+    expect(
+      categoriesCachedBefore.get(new SingleFieldValueHolder(categoryB.getID()))?.status,
+    ).toEqual(CacheStatus.HIT);
 
     await CategoryEntity.deleter(categoryA).deleteAsync();
 
-    const categoriesCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      categoryA.getID(),
-      categoryB.getID(),
-    ]);
-    expect(categoriesCachedAfter.get(categoryA.getID())?.status).toEqual(CacheStatus.MISS);
-    expect(categoriesCachedAfter.get(categoryB.getID())?.status).toEqual(CacheStatus.MISS);
+    const categoriesCachedAfter = await categoryCacheAdapter.loadManyAsync(
+      new SingleFieldHolder('parent_category_id'),
+      [
+        new SingleFieldValueHolder(categoryA.getID()),
+        new SingleFieldValueHolder(categoryB.getID()),
+      ],
+    );
+    expect(
+      categoriesCachedAfter.get(new SingleFieldValueHolder(categoryA.getID()))?.status,
+    ).toEqual(CacheStatus.MISS);
+    expect(
+      categoriesCachedAfter.get(new SingleFieldValueHolder(categoryB.getID()))?.status,
+    ).toEqual(CacheStatus.MISS);
   });
 });