chore: remove unnecessary ViewerScopedEntityMutatorFactory

packages/entity/src/EntityCreator.ts

@@ -68,6 +68,6 @@ export class EntityCreator<
     return this.viewerContext
       .getViewerScopedEntityCompanionForClass(this.entityClass)
       .getMutatorFactory()
-      .forCreate(this.queryContext);
+      .forCreate(this.viewerContext, this.queryContext);
   }
 }

packages/entity/src/ViewerScopedEntityCompanion.ts

@@ -1,10 +1,10 @@
 import type { EntityCompanion } from './EntityCompanion.ts';
+import type { EntityMutatorFactory } from './EntityMutatorFactory.ts';
 import type { EntityPrivacyPolicy } from './EntityPrivacyPolicy.ts';
 import type { EntityQueryContextProvider } from './EntityQueryContextProvider.ts';
 import type { ReadonlyEntity } from './ReadonlyEntity.ts';
 import type { ViewerContext } from './ViewerContext.ts';
 import { ViewerScopedEntityLoaderFactory } from './ViewerScopedEntityLoaderFactory.ts';
-import { ViewerScopedEntityMutatorFactory } from './ViewerScopedEntityMutatorFactory.ts';
 import type { IEntityMetricsAdapter } from './metrics/IEntityMetricsAdapter.ts';
 
 /**
@@ -57,18 +57,15 @@ export class ViewerScopedEntityCompanion<
   /**
    * Vend a viewer-scoped entity mutator factory.
    */
-  getMutatorFactory(): ViewerScopedEntityMutatorFactory<
+  getMutatorFactory(): EntityMutatorFactory<
     TFields,
     TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
     TSelectedFields
   > {
-    return new ViewerScopedEntityMutatorFactory(
-      this.entityCompanion.getMutatorFactory(),
-      this.viewerContext,
-    );
+    return this.entityCompanion.getMutatorFactory();
   }
 
   /**

packages/entity/src/__tests__/ViewerScopedEntityCompanion-test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, it } from '@jest/globals';
-import { instance, mock } from 'ts-mockito';
+import { instance, mock, when } from 'ts-mockito';
 
 import type { EntityCompanion } from '../EntityCompanion.ts';
+import { EntityMutatorFactory } from '../EntityMutatorFactory.ts';
 import { ViewerContext } from '../ViewerContext.ts';
 import { ViewerScopedEntityCompanion } from '../ViewerScopedEntityCompanion.ts';
 import { ViewerScopedEntityLoaderFactory } from '../ViewerScopedEntityLoaderFactory.ts';
-import { ViewerScopedEntityMutatorFactory } from '../ViewerScopedEntityMutatorFactory.ts';
 import type {
   TestEntity,
   TestEntityPrivacyPolicy,
@@ -15,7 +15,7 @@ import type {
 describe(ViewerScopedEntityCompanion, () => {
   it('returns viewer scoped loader and mutator factory', () => {
     const vc = instance(mock(ViewerContext));
-    const entityCompanion =
+    const entityCompanionMock =
       mock<
         EntityCompanion<
           TestFields,
@@ -26,13 +26,29 @@ describe(ViewerScopedEntityCompanion, () => {
           keyof TestFields
         >
       >();
-    const viewerScopedEntityCompanion = new ViewerScopedEntityCompanion(entityCompanion, vc);
+    const entityMutatorFactory =
+      instance(
+        mock<
+          EntityMutatorFactory<
+            TestFields,
+            'customIdField',
+            ViewerContext,
+            TestEntity,
+            TestEntityPrivacyPolicy,
+            keyof TestFields
+          >
+        >(),
+      );
+    when(entityCompanionMock.getMutatorFactory()).thenReturn(entityMutatorFactory);
+
+    const viewerScopedEntityCompanion = new ViewerScopedEntityCompanion(
+      instance(entityCompanionMock),
+      vc,
+    );
     expect(viewerScopedEntityCompanion.getLoaderFactory()).toBeInstanceOf(
       ViewerScopedEntityLoaderFactory,
     );
-    expect(viewerScopedEntityCompanion.getMutatorFactory()).toBeInstanceOf(
-      ViewerScopedEntityMutatorFactory,
-    );
+    expect(viewerScopedEntityCompanion.getMutatorFactory()).toBe(entityMutatorFactory);
     expect(viewerScopedEntityCompanion.getMetricsAdapter()).toBeDefined();
   });
 });

packages/entity/src/index.ts

@@ -49,7 +49,6 @@ export * from './ViewerContext.ts';
 export * from './ViewerScopedEntityCompanion.ts';
 export * from './ViewerScopedEntityCompanionProvider.ts';
 export * from './ViewerScopedEntityLoaderFactory.ts';
-export * from './ViewerScopedEntityMutatorFactory.ts';
 export * from './errors/EntityCacheAdapterError.ts';
 export * from './errors/EntityDatabaseAdapterError.ts';
 export * from './errors/EntityError.ts';