@expo/entity 0.40.0 → 0.42.0

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', () => {
@@ -14,26 +14,23 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testOtherEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testOtherEntity.getID())
           .createAsync(),
       );
       const loadedOther = await enforceAsyncResult(
         testEntity
-          .associationLoader()
-          .withAuthorizationResults()
+          .associationLoaderWithAuthorizationResults()
           .loadAssociatedEntityAsync('stringField', TestEntity),
       );
       expect(loadedOther.getID()).toEqual(testOtherEntity.getID());
 
       const loadedOther2 = await enforceAsyncResult(
         testEntity
-          .associationLoader()
-          .withAuthorizationResults()
+          .associationLoaderWithAuthorizationResults()
           .loadAssociatedEntityAsync('nullableField', TestEntity),
       );
       expect(loadedOther2).toBeNull();
@@ -45,24 +42,21 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const testOtherEntity1 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testEntity.getID())
           .createAsync(),
       );
       const testOtherEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testEntity.getID())
           .createAsync(),
       );
       const loaded = await enforceResultsAsync(
         testEntity
-          .associationLoader()
-          .withAuthorizationResults()
+          .associationLoaderWithAuthorizationResults()
           .loadManyAssociatedEntitiesAsync(TestEntity, 'stringField'),
       );
       expect(loaded).toHaveLength(2);
@@ -76,17 +70,15 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testOtherEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testOtherEntity.getID())
           .createAsync(),
       );
       const loadedOtherResult = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityByFieldEqualingAsync('stringField', TestEntity, 'customIdField');
       expect(loadedOtherResult?.enforceValue().getID()).toEqual(testOtherEntity.getID());
     });
@@ -95,14 +87,12 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', uuidv4())
           .createAsync(),
       );
       const loadedOtherResult = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityByFieldEqualingAsync('stringField', TestEntity, 'customIdField');
       expect(loadedOtherResult).toBeNull();
     });
@@ -111,14 +101,12 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', 'blah')
           .createAsync(),
       );
       const loadedOtherResult = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityByFieldEqualingAsync('nullableField', TestEntity, 'customIdField');
       expect(loadedOtherResult).toBeNull();
     });
@@ -129,24 +117,21 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const testOtherEntity1 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testEntity.getID())
           .createAsync(),
       );
       const testOtherEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', testEntity.getID())
           .createAsync(),
       );
       const loaded = await enforceResultsAsync(
         testEntity
-          .associationLoader()
-          .withAuthorizationResults()
+          .associationLoaderWithAuthorizationResults()
           .loadManyAssociatedEntitiesByFieldEqualingAsync(
             'customIdField',
             TestEntity,
@@ -162,12 +147,11 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const loaded = await enforceResultsAsync(
         testEntity
-          .associationLoader()
-          .withAuthorizationResults()
+          .associationLoaderWithAuthorizationResults()
           .loadManyAssociatedEntitiesByFieldEqualingAsync(
             'nullableField',
             TestEntity,
@@ -183,30 +167,26 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
       const testEntity4 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).withAuthorizationResults().createAsync(),
+        TestEntity.creatorWithAuthorizationResults(viewerContext).createAsync(),
       );
       const testEntity3 = await enforceAsyncResult(
-        TestEntity2.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity2.creatorWithAuthorizationResults(viewerContext)
           .setField('foreignKey', testEntity4.getID())
           .createAsync(),
       );
       const testEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('testIndexedField', testEntity3.getID())
           .createAsync(),
       );
       const testEntity = await enforceAsyncResult(
-        TestEntity2.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity2.creatorWithAuthorizationResults(viewerContext)
           .setField('foreignKey', testEntity2.getID())
           .createAsync(),
       );
 
       const loaded2Result = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -216,8 +196,7 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       expect(loaded2Result?.enforceValue().getID()).toEqual(testEntity2.getID());
 
       const loaded3Result = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -231,8 +210,7 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       expect(loaded3Result?.enforceValue().getID()).toEqual(testEntity3.getID());
 
       const loaded4Result = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -255,15 +233,13 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const viewerContext = new TestViewerContext(companionProvider);
 
       const testEntity = await enforceAsyncResult(
-        TestEntity2.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity2.creatorWithAuthorizationResults(viewerContext)
           .setField('foreignKey', uuidv4())
           .createAsync(),
       );
 
       const loadResult = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -279,21 +255,18 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
 
       const fieldValue = uuidv4();
       const testEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('stringField', fieldValue)
           .createAsync(),
       );
       const testEntity = await enforceAsyncResult(
-        TestEntity2.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity2.creatorWithAuthorizationResults(viewerContext)
           .setField('foreignKey', fieldValue)
           .createAsync(),
       );
 
       const loaded2Result = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -309,15 +282,13 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const viewerContext = new TestViewerContext(companionProvider);
 
       const testEntity = await enforceAsyncResult(
-        TestEntity2.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity2.creatorWithAuthorizationResults(viewerContext)
           .setField('foreignKey', uuidv4())
           .createAsync(),
       );
 
       const loaded2Result = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,
@@ -333,15 +304,13 @@ describe(AuthorizationResultBasedEntityAssociationLoader, () => {
       const viewerContext = new TestViewerContext(companionProvider);
 
       const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext)
-          .withAuthorizationResults()
+        TestEntity.creatorWithAuthorizationResults(viewerContext)
           .setField('nullableField', null)
           .createAsync(),
       );
 
       const loadedResult = await testEntity
-        .associationLoader()
-        .withAuthorizationResults()
+        .associationLoaderWithAuthorizationResults()
         .loadAssociatedEntityThroughAsync([
           {
             associatedEntityClass: TestEntity,

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,