@expo/entity 0.40.0 → 0.42.0

package/src/utils/__tests__/EntityPrivacyUtils-test.ts

@@ -23,7 +23,7 @@ import {
   getCanViewerDeleteResultAsync,
   getCanViewerUpdateResultAsync,
 } from '../EntityPrivacyUtils';
-import { createUnitTestEntityCompanionProvider } from '../testing/createUnitTestEntityCompanionProvider';
+import { createUnitTestEntityCompanionProvider } from '../__testfixtures__/createUnitTestEntityCompanionProvider';
 
 function assertEntityPrivacyEvaluationResultFailure(
   evaluationResult: EntityPrivacyEvaluationResult,
@@ -50,9 +50,7 @@ describe(canViewerUpdateAsync, () => {
   it('appropriately executes update privacy policy', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyDeleteEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyDeleteEntity.creator(viewerContext).createAsync();
     const canViewerUpdate = await canViewerUpdateAsync(SimpleTestDenyDeleteEntity, testEntity);
     expect(canViewerUpdate).toBe(true);
     const canViewerUpdateResult = await getCanViewerUpdateResultAsync(
@@ -65,9 +63,7 @@ describe(canViewerUpdateAsync, () => {
   it('denies when policy denies', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     const canViewerUpdate = await canViewerUpdateAsync(SimpleTestDenyUpdateEntity, testEntity);
     expect(canViewerUpdate).toBe(false);
     const canViewerUpdateResult = await getCanViewerUpdateResultAsync(
@@ -83,9 +79,7 @@ describe(canViewerUpdateAsync, () => {
   it('rethrows non-authorization errors', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestThrowOtherErrorEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestThrowOtherErrorEntity.creator(viewerContext).createAsync();
     await expect(canViewerUpdateAsync(SimpleTestThrowOtherErrorEntity, testEntity)).rejects.toThrow(
       'update error',
     );
@@ -99,9 +93,7 @@ describe(canViewerDeleteAsync, () => {
   it('appropriately executes update privacy policy', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     const canViewerDelete = await canViewerDeleteAsync(SimpleTestDenyUpdateEntity, testEntity);
     expect(canViewerDelete).toBe(true);
     const canViewerDeleteResult = await getCanViewerDeleteResultAsync(
@@ -114,9 +106,7 @@ describe(canViewerDeleteAsync, () => {
   it('denies when policy denies', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyDeleteEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyDeleteEntity.creator(viewerContext).createAsync();
     const canViewerDelete = await canViewerDeleteAsync(SimpleTestDenyDeleteEntity, testEntity);
     expect(canViewerDelete).toBe(false);
     const canViewerDeleteResult = await getCanViewerDeleteResultAsync(
@@ -132,12 +122,9 @@ describe(canViewerDeleteAsync, () => {
   it('denies when recursive policy denies for CASCADE_DELETE', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     // add another entity referencing testEntity that would cascade deletion to itself when testEntity is deleted
     const leafEntity = await LeafDenyDeleteEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_deny_update_cascade_delete_id', testEntity.getID())
       .createAsync();
     const canViewerDelete = await canViewerDeleteAsync(SimpleTestDenyUpdateEntity, testEntity);
@@ -155,12 +142,9 @@ describe(canViewerDeleteAsync, () => {
   it('denies when recursive policy denies for SET_NULL', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     // add another entity referencing testEntity that would set null to its column when testEntity is deleted
     const leafEntity = await LeafDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_deny_update_set_null_id', testEntity.getID())
       .createAsync();
     const canViewerDelete = await canViewerDeleteAsync(SimpleTestDenyUpdateEntity, testEntity);
@@ -178,17 +162,13 @@ describe(canViewerDeleteAsync, () => {
   it('allows when recursive policy allows for CASCADE_DELETE and SET_NULL', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     // add another entity referencing testEntity that would cascade deletion to itself when testEntity is deleted
     await LeafDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_deny_update_cascade_delete_id', testEntity.getID())
       .createAsync();
     // add another entity referencing testEntity that would set null to its column when testEntity is deleted
     await LeafDenyDeleteEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_deny_update_set_null_id', testEntity.getID())
       .createAsync();
 
@@ -204,9 +184,7 @@ describe(canViewerDeleteAsync, () => {
   it('rethrows non-authorization errors', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestThrowOtherErrorEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestThrowOtherErrorEntity.creator(viewerContext).createAsync();
     await expect(
       canViewerDeleteAsync(SimpleTestThrowOtherErrorEntity, testEntity),
     ).rejects.toThrowError('delete error');
@@ -218,11 +196,8 @@ describe(canViewerDeleteAsync, () => {
   it('returns false when edge cannot be read', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     const leafEntity = await LeafDenyReadEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_id', testEntity.getID())
       .createAsync();
     const canViewerDelete = await canViewerDeleteAsync(SimpleTestDenyUpdateEntity, testEntity);
@@ -240,11 +215,8 @@ describe(canViewerDeleteAsync, () => {
   it('rethrows non-authorization edge read errors', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
-    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext)
-      .enforcing()
-      .createAsync();
+    const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext).createAsync();
     await SimpleTestThrowOtherErrorEntity.creator(viewerContext)
-      .enforcing()
       .setField('simple_test_id', testEntity.getID())
       .createAsync();
     await expect(canViewerDeleteAsync(SimpleTestDenyUpdateEntity, testEntity)).rejects.toThrowError(
@@ -261,11 +233,11 @@ describe(canViewerDeleteAsync, () => {
     const canViewerDelete = await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
       'postgres',
       async (queryContext) => {
-        const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext, queryContext)
-          .enforcing()
-          .createAsync();
+        const testEntity = await SimpleTestDenyUpdateEntity.creator(
+          viewerContext,
+          queryContext,
+        ).createAsync();
         await LeafDenyReadEntity.creator(viewerContext, queryContext)
-          .enforcing()
           .setField('simple_test_id', testEntity.getID())
           .createAsync();
         // this would fail if transactions weren't supported or correctly passed through
@@ -277,11 +249,11 @@ describe(canViewerDeleteAsync, () => {
     const canViewerDeleteResult = await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
       'postgres',
       async (queryContext) => {
-        const testEntity = await SimpleTestDenyUpdateEntity.creator(viewerContext, queryContext)
-          .enforcing()
-          .createAsync();
+        const testEntity = await SimpleTestDenyUpdateEntity.creator(
+          viewerContext,
+          queryContext,
+        ).createAsync();
         await LeafDenyReadEntity.creator(viewerContext, queryContext)
-          .enforcing()
           .setField('simple_test_id', testEntity.getID())
           .createAsync();
         // this would fail if transactions weren't supported or correctly passed through
@@ -324,54 +296,54 @@ type TestEntityThrowOtherErrorFields = {
 };
 
 class DenyUpdateEntityPrivacyPolicy<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<'id', any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
-> extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+> extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields> {
   protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysDenyPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysDenyPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
 }
 
 class DenyDeleteEntityPrivacyPolicy<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<'id', any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
-> extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+> extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields> {
   protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysDenyPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysDenyPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
 }
 
 class ThrowOtherErrorEntityPrivacyPolicy<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<'id', any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
-> extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+> extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields> {
   protected override readonly readRules = [
     {
       async evaluateAsync(
@@ -379,7 +351,7 @@ class ThrowOtherErrorEntityPrivacyPolicy<
         _queryContext: EntityQueryContext,
         evaluationContext: EntityPrivacyPolicyEvaluationContext<
           TFields,
-          TID,
+          TIDField,
           TViewerContext,
           TEntity,
           TSelectedFields
@@ -392,10 +364,10 @@ class ThrowOtherErrorEntityPrivacyPolicy<
         return RuleEvaluationResult.SKIP;
       },
     },
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly updateRules = [
     {
@@ -414,12 +386,12 @@ class ThrowOtherErrorEntityPrivacyPolicy<
 }
 
 class DenyReadEntityPrivacyPolicy<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<'id', any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
-> extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+> extends EntityPrivacyPolicy<TFields, TIDField, TViewerContext, TEntity, TSelectedFields> {
   protected override readonly readRules = [
     {
       async evaluateAsync(
@@ -427,7 +399,7 @@ class DenyReadEntityPrivacyPolicy<
         queryContext: EntityQueryContext,
         evaluationContext: EntityPrivacyPolicyEvaluationContext<
           TFields,
-          TID,
+          TIDField,
           TViewerContext,
           TEntity,
           TSelectedFields
@@ -444,37 +416,38 @@ class DenyReadEntityPrivacyPolicy<
     },
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>(),
+    new AlwaysAllowPrivacyPolicyRule<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>(),
   ];
 }
 
-class LeafDenyUpdateEntity extends Entity<TestLeafDenyUpdateFields, string, ViewerContext> {
+class LeafDenyUpdateEntity extends Entity<TestLeafDenyUpdateFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestLeafDenyUpdateFields,
-    string,
+    'id',
     ViewerContext,
     LeafDenyUpdateEntity,
     DenyUpdateEntityPrivacyPolicy<
       TestLeafDenyUpdateFields,
-      string,
+      'id',
       ViewerContext,
       LeafDenyUpdateEntity
     >
   > {
     return {
       entityClass: LeafDenyUpdateEntity,
-      entityConfiguration: new EntityConfiguration<TestLeafDenyUpdateFields>({
+      entityConfiguration: new EntityConfiguration<TestLeafDenyUpdateFields, 'id'>({
         idField: 'id',
         tableName: 'leaf_1',
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
           // to ensure edge traversal doesn't process other edges
           unused_other_association: new UUIDField({
@@ -509,27 +482,28 @@ class LeafDenyUpdateEntity extends Entity<TestLeafDenyUpdateFields, string, View
   }
 }
 
-class LeafDenyDeleteEntity extends Entity<TestLeafDenyDeleteFields, string, ViewerContext> {
+class LeafDenyDeleteEntity extends Entity<TestLeafDenyDeleteFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestLeafDenyDeleteFields,
-    string,
+    'id',
     ViewerContext,
     LeafDenyDeleteEntity,
     DenyDeleteEntityPrivacyPolicy<
       TestLeafDenyDeleteFields,
-      string,
+      'id',
       ViewerContext,
       LeafDenyDeleteEntity
     >
   > {
     return {
       entityClass: LeafDenyDeleteEntity,
-      entityConfiguration: new EntityConfiguration<TestLeafDenyDeleteFields>({
+      entityConfiguration: new EntityConfiguration<TestLeafDenyDeleteFields, 'id'>({
         idField: 'id',
         tableName: 'leaf_2',
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
           // deletion behavior should fail since this entity can't be deleted
           simple_test_deny_update_cascade_delete_id: new UUIDField({
@@ -556,23 +530,24 @@ class LeafDenyDeleteEntity extends Entity<TestLeafDenyDeleteFields, string, View
   }
 }
 
-class LeafDenyReadEntity extends Entity<TestLeafDenyReadFields, string, ViewerContext> {
+class LeafDenyReadEntity extends Entity<TestLeafDenyReadFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestLeafDenyReadFields,
-    string,
+    'id',
     ViewerContext,
     LeafDenyReadEntity,
-    DenyReadEntityPrivacyPolicy<TestLeafDenyReadFields, string, ViewerContext, LeafDenyReadEntity>
+    DenyReadEntityPrivacyPolicy<TestLeafDenyReadFields, 'id', ViewerContext, LeafDenyReadEntity>
   > {
     return {
       entityClass: LeafDenyReadEntity,
-      entityConfiguration: new EntityConfiguration<TestLeafDenyReadFields>({
+      entityConfiguration: new EntityConfiguration<TestLeafDenyReadFields, 'id'>({
         idField: 'id',
         tableName: 'leaf_4',
         inboundEdges: [],
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
           simple_test_id: new UUIDField({
             columnName: 'simple_test_id',
@@ -591,22 +566,17 @@ class LeafDenyReadEntity extends Entity<TestLeafDenyReadFields, string, ViewerCo
   }
 }
 
-class SimpleTestDenyUpdateEntity extends Entity<TestEntityFields, string, ViewerContext> {
+class SimpleTestDenyUpdateEntity extends Entity<TestEntityFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestEntityFields,
-    string,
+    'id',
     ViewerContext,
     SimpleTestDenyUpdateEntity,
-    DenyUpdateEntityPrivacyPolicy<
-      TestEntityFields,
-      string,
-      ViewerContext,
-      SimpleTestDenyUpdateEntity
-    >
+    DenyUpdateEntityPrivacyPolicy<TestEntityFields, 'id', ViewerContext, SimpleTestDenyUpdateEntity>
   > {
     return {
       entityClass: SimpleTestDenyUpdateEntity,
-      entityConfiguration: new EntityConfiguration<TestEntityFields>({
+      entityConfiguration: new EntityConfiguration<TestEntityFields, 'id'>({
         idField: 'id',
         tableName: 'blah',
         inboundEdges: [
@@ -618,6 +588,7 @@ class SimpleTestDenyUpdateEntity extends Entity<TestEntityFields, string, Viewer
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
         },
         databaseAdapterFlavor: 'postgres',
@@ -628,22 +599,17 @@ class SimpleTestDenyUpdateEntity extends Entity<TestEntityFields, string, Viewer
   }
 }
 
-class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, string, ViewerContext> {
+class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, 'id', ViewerContext> {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestEntityFields,
-    string,
+    'id',
     ViewerContext,
     SimpleTestDenyDeleteEntity,
-    DenyDeleteEntityPrivacyPolicy<
-      TestEntityFields,
-      string,
-      ViewerContext,
-      SimpleTestDenyDeleteEntity
-    >
+    DenyDeleteEntityPrivacyPolicy<TestEntityFields, 'id', ViewerContext, SimpleTestDenyDeleteEntity>
   > {
     return {
       entityClass: SimpleTestDenyDeleteEntity,
-      entityConfiguration: new EntityConfiguration<TestEntityFields>({
+      entityConfiguration: new EntityConfiguration<TestEntityFields, 'id'>({
         idField: 'id',
         tableName: 'blah_2',
         inboundEdges: [
@@ -655,6 +621,7 @@ class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, string, Viewer
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
         },
         databaseAdapterFlavor: 'postgres',
@@ -667,30 +634,31 @@ class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, string, Viewer
 
 class SimpleTestThrowOtherErrorEntity extends Entity<
   TestEntityThrowOtherErrorFields,
-  string,
+  'id',
   ViewerContext
 > {
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestEntityThrowOtherErrorFields,
-    string,
+    'id',
     ViewerContext,
     SimpleTestThrowOtherErrorEntity,
     ThrowOtherErrorEntityPrivacyPolicy<
       TestEntityThrowOtherErrorFields,
-      string,
+      'id',
       ViewerContext,
       SimpleTestThrowOtherErrorEntity
     >
   > {
     return {
       entityClass: SimpleTestThrowOtherErrorEntity,
-      entityConfiguration: new EntityConfiguration<TestEntityThrowOtherErrorFields>({
+      entityConfiguration: new EntityConfiguration<TestEntityThrowOtherErrorFields, 'id'>({
         idField: 'id',
         tableName: 'blah_3',
         inboundEdges: [],
         schema: {
           id: new UUIDField({
             columnName: 'custom_id',
+            cache: false,
           }),
           simple_test_id: new UUIDField({
             columnName: 'simple_test_id',