@expo/entity 0.41.0 → 0.42.0

package/src/ViewerScopedEntityMutatorFactory.ts

@@ -13,13 +13,13 @@ import ViewerContext from './ViewerContext';
  * Provides a cleaner API for mutating entities by passing through the ViewerContext.
  */
 export default class ViewerScopedEntityMutatorFactory<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, 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>,
   TPrivacyPolicy extends EntityPrivacyPolicy<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -29,7 +29,7 @@ export default class ViewerScopedEntityMutatorFactory<
   constructor(
     private readonly entityMutatorFactory: EntityMutatorFactory<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
@@ -42,7 +42,7 @@ export default class ViewerScopedEntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedCreateMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -56,7 +56,7 @@ export default class ViewerScopedEntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedUpdateMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -70,7 +70,7 @@ export default class ViewerScopedEntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedDeleteMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,

package/src/__tests__/AuthorizationResultBasedEntityAssociationLoader-test.ts

@@ -3,10 +3,10 @@ import { v4 as uuidv4 } from 'uuid';
 
 import AuthorizationResultBasedEntityAssociationLoader from '../AuthorizationResultBasedEntityAssociationLoader';
 import { enforceResultsAsync } from '../entityUtils';
-import TestEntity from '../testfixtures/TestEntity';
-import TestEntity2 from '../testfixtures/TestEntity2';
-import TestViewerContext from '../testfixtures/TestViewerContext';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+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, () => {
   describe('loadAssociatedEntityAsync', () => {

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

@@ -12,9 +12,9 @@ import EntityDataManager from '../internal/EntityDataManager';
 import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
 import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
 import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import { NoCacheStubCacheAdapterProvider } from '../utils/testing/StubCacheAdapter';
-import StubDatabaseAdapter from '../utils/testing/StubDatabaseAdapter';
-import StubQueryContextProvider from '../utils/testing/StubQueryContextProvider';
+import { NoCacheStubCacheAdapterProvider } from '../utils/__testfixtures__/StubCacheAdapter';
+import StubDatabaseAdapter from '../utils/__testfixtures__/StubDatabaseAdapter';
+import StubQueryContextProvider from '../utils/__testfixtures__/StubQueryContextProvider';
 
 export type TestFields = {
   id: string;
@@ -22,12 +22,13 @@ export type TestFields = {
 
 export type TestFieldSelection = keyof TestFields;
 
-export const testEntityConfiguration = new EntityConfiguration<TestFields>({
+export const testEntityConfiguration = new EntityConfiguration<TestFields, 'id'>({
   idField: 'id',
   tableName: 'test_entity_should_not_write_to_db',
   schema: {
     id: new StringField({
       columnName: 'id',
+      cache: false,
     }),
   },
   databaseAdapterFlavor: 'postgres',
@@ -36,7 +37,7 @@ export const testEntityConfiguration = new EntityConfiguration<TestFields>({
 
 export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
   TestFields,
-  string,
+  'id',
   ViewerContext,
   TestEntity,
   TestFieldSelection
@@ -44,7 +45,7 @@ export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
   protected override readonly readRules = [
     new AlwaysAllowPrivacyPolicyRule<
       TestFields,
-      string,
+      'id',
       ViewerContext,
       TestEntity,
       TestFieldSelection
@@ -53,7 +54,7 @@ export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
   protected override readonly createRules = [
     new AlwaysAllowPrivacyPolicyRule<
       TestFields,
-      string,
+      'id',
       ViewerContext,
       TestEntity,
       TestFieldSelection
@@ -62,7 +63,7 @@ export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
   protected override readonly updateRules = [
     new AlwaysAllowPrivacyPolicyRule<
       TestFields,
-      string,
+      'id',
       ViewerContext,
       TestEntity,
       TestFieldSelection
@@ -71,7 +72,7 @@ export class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
   protected override readonly deleteRules = [
     new AlwaysAllowPrivacyPolicyRule<
       TestFields,
-      string,
+      'id',
       ViewerContext,
       TestEntity,
       TestFieldSelection
@@ -84,7 +85,7 @@ const ID_SENTINEL_THROW_ERROR = 'throw_error';
 
 export default class TestEntity extends Entity<
   TestFields,
-  string,
+  'id',
   ViewerContext,
   TestFieldSelection
 > {
@@ -105,7 +106,7 @@ export default class TestEntity extends Entity<
 
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestFields,
-    string,
+    'id',
     ViewerContext,
     TestEntity,
     TestEntityPrivacyPolicy,
@@ -127,7 +128,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
         mock<
           EntityPrivacyPolicyEvaluationContext<
             TestFields,
-            string,
+            'id',
             ViewerContext,
             TestEntity,
             TestFieldSelection
@@ -137,7 +138,7 @@ describe(AuthorizationResultBasedEntityLoader, () => {
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = new StubQueryContextProvider().getQueryContext();
 
-    const databaseAdapter = new StubDatabaseAdapter<TestFields>(
+    const databaseAdapter = new StubDatabaseAdapter<TestFields, 'id'>(
       testEntityConfiguration,
       StubDatabaseAdapter.convertFieldObjectsToDataStore(
         testEntityConfiguration,