Exclude triggers with empty arrays

expo · Jun 10, 2024 · c483e0b · c483e0b
1 parent 48f5c56
commit c483e0b
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/packages/entity/src/__tests__/EntityCompanion-test.ts b/packages/entity/src/__tests__/EntityCompanion-test.ts
@@ -74,5 +74,6 @@ describe(EntityCompanion, () => {
     expect(mergedTriggers.afterCreate![1]).toBe(globalMutationTriggers.afterCreate![0]);
     expect(mergedTriggers.afterAll![0]).toBe(localTriggers!.afterAll![0]);
     expect(mergedTriggers.afterAll![1]).toBe(globalMutationTriggers!.afterAll![0]);
+    expect(mergedTriggers.afterCommit![0]).toBe(localTriggers!.afterCommit![0]);
   });
 });
diff --git a/packages/entity/src/testfixtures/TestEntityWithMutationTriggers.ts b/packages/entity/src/testfixtures/TestEntityWithMutationTriggers.ts
@@ -3,7 +3,10 @@ import { EntityCompanionDefinition } from '../EntityCompanionProvider';
 import EntityConfiguration from '../EntityConfiguration';
 import { StringField, UUIDField } from '../EntityFields';
 import { EntityTriggerMutationInfo } from '../EntityMutationInfo';
-import { EntityMutationTrigger } from '../EntityMutationTriggerConfiguration';
+import {
+  EntityMutationTrigger,
+  EntityNonTransactionalMutationTrigger,
+} from '../EntityMutationTriggerConfiguration';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
@@ -97,6 +100,33 @@ export class TestMutationTrigger extends EntityMutationTrigger<
   ): Promise<void> {}
 }
 
+export class NonTransactionalTestMutationTrigger extends EntityNonTransactionalMutationTrigger<
+  TestMTFields,
+  string,
+  ViewerContext,
+  TestEntityWithMutationTriggers,
+  keyof TestMTFields
+> {
+  constructor(
+    // @ts-expect-error key is never used but is helpful for debugging
+    private readonly key: string,
+  ) {
+    super();
+  }
+
+  async executeAsync(
+    _viewerContext: ViewerContext,
+    _entity: TestEntityWithMutationTriggers,
+    _mutationInfo: EntityTriggerMutationInfo<
+      TestMTFields,
+      string,
+      ViewerContext,
+      TestEntityWithMutationTriggers,
+      keyof TestMTFields
+    >,
+  ): Promise<void> {}
+}
+
 /**
  * A test Entity that has one afterCreate and one afterAll trigger
  */
@@ -119,6 +149,7 @@ export default class TestEntityWithMutationTriggers extends Entity<
       mutationTriggers: {
         afterCreate: [new TestMutationTrigger('localAfterCreate')],
         afterAll: [new TestMutationTrigger('localAfterAll')],
+        afterCommit: [new NonTransactionalTestMutationTrigger('localAfterCommit')],
       },
     };
   }

diff --git a/packages/entity/src/utils/mergeMutationTriggers.ts b/packages/entity/src/utils/mergeMutationTriggers.ts
@@ -21,7 +21,7 @@ export function mergeEntityMutationTriggerConfigurations<
     TSelectedFields
   >[]
 ): EntityMutationTriggerConfiguration<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
-  return {
+  const merged = {
     beforeCreate: mutationTriggerConfigurations.flatMap((c) => c.beforeCreate).filter(nonNullish),
     afterCreate: mutationTriggerConfigurations.flatMap((c) => c.afterCreate).filter(nonNullish),
     beforeUpdate: mutationTriggerConfigurations.flatMap((c) => c.beforeUpdate).filter(nonNullish),
@@ -32,4 +32,13 @@ export function mergeEntityMutationTriggerConfigurations<
     afterAll: mutationTriggerConfigurations.flatMap((c) => c.afterAll).filter(nonNullish),
     afterCommit: mutationTriggerConfigurations.flatMap((c) => c.afterCommit).filter(nonNullish),
   };
+
+  /** Remove any trigger that is an empty array */
+  for (const key of Object.keys(merged) as (keyof typeof merged)[]) {
+    if (!merged[key]?.length) {
+      delete merged[key];
+    }
+  }
+
+  return merged;
 }