From fa3ac1ee2a6f617b7b987bb7866798b1b4704736 Mon Sep 17 00:00:00 2001 From: Will Schurman Date: Thu, 26 Feb 2026 08:47:52 -0800 Subject: [PATCH] fix: Apply same viewer context subclass type mechanism to knexLoader and related methods --- packages/entity-database-adapter-knex/src/PostgresEntity.ts | 6 ++++-- .../src/internal/getKnexEntityLoaderFactory.ts | 3 ++- packages/entity-database-adapter-knex/src/knexLoader.ts | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/entity-database-adapter-knex/src/PostgresEntity.ts b/packages/entity-database-adapter-knex/src/PostgresEntity.ts index 37a1f66ef..a1b2fa12f 100644 --- a/packages/entity-database-adapter-knex/src/PostgresEntity.ts +++ b/packages/entity-database-adapter-knex/src/PostgresEntity.ts @@ -35,6 +35,7 @@ export abstract class PostgresEntity< TMFields extends object, TMIDField extends keyof NonNullable>, TMViewerContext extends ViewerContext, + TMViewerContext2 extends TMViewerContext, TMEntity extends ReadonlyEntity, TMPrivacyPolicy extends EntityPrivacyPolicy< TMFields, @@ -53,7 +54,7 @@ export abstract class PostgresEntity< TMPrivacyPolicy, TMSelectedFields >, - viewerContext: TMViewerContext, + viewerContext: TMViewerContext2, queryContext: EntityQueryContext = viewerContext .getViewerScopedEntityCompanionForClass(this) .getQueryContextProvider() @@ -80,6 +81,7 @@ export abstract class PostgresEntity< TMFields extends object, TMIDField extends keyof NonNullable>, TMViewerContext extends ViewerContext, + TMViewerContext2 extends TMViewerContext, TMEntity extends ReadonlyEntity, TMPrivacyPolicy extends EntityPrivacyPolicy< TMFields, @@ -98,7 +100,7 @@ export abstract class PostgresEntity< TMPrivacyPolicy, TMSelectedFields >, - viewerContext: TMViewerContext, + viewerContext: TMViewerContext2, queryContext: EntityQueryContext = viewerContext .getViewerScopedEntityCompanionForClass(this) .getQueryContextProvider() diff --git a/packages/entity-database-adapter-knex/src/internal/getKnexEntityLoaderFactory.ts b/packages/entity-database-adapter-knex/src/internal/getKnexEntityLoaderFactory.ts index ba9dc6764..788dd3283 100644 --- a/packages/entity-database-adapter-knex/src/internal/getKnexEntityLoaderFactory.ts +++ b/packages/entity-database-adapter-knex/src/internal/getKnexEntityLoaderFactory.ts @@ -19,6 +19,7 @@ export function getKnexEntityLoaderFactory< TFields extends Record, TIDField extends keyof NonNullable>, TViewerContext extends ViewerContext, + TViewerContext2 extends TViewerContext, TEntity extends ReadonlyEntity, TPrivacyPolicy extends EntityPrivacyPolicy< TFields, @@ -37,7 +38,7 @@ export function getKnexEntityLoaderFactory< TPrivacyPolicy, TSelectedFields >, - viewerContext: TViewerContext, + viewerContext: TViewerContext2, ): KnexEntityLoaderFactory< TFields, TIDField, diff --git a/packages/entity-database-adapter-knex/src/knexLoader.ts b/packages/entity-database-adapter-knex/src/knexLoader.ts index 0a30022fb..6242252bb 100644 --- a/packages/entity-database-adapter-knex/src/knexLoader.ts +++ b/packages/entity-database-adapter-knex/src/knexLoader.ts @@ -20,6 +20,7 @@ export function knexLoader< TMFields extends object, TMIDField extends keyof NonNullable>, TMViewerContext extends ViewerContext, + TMViewerContext2 extends TMViewerContext, TMEntity extends ReadonlyEntity, TMPrivacyPolicy extends EntityPrivacyPolicy< TMFields, @@ -38,7 +39,7 @@ export function knexLoader< TMPrivacyPolicy, TMSelectedFields >, - viewerContext: TMViewerContext, + viewerContext: TMViewerContext2, queryContext: EntityQueryContext = viewerContext .getViewerScopedEntityCompanionForClass(entityClass) .getQueryContextProvider() @@ -69,6 +70,7 @@ export function knexLoaderWithAuthorizationResults< TMFields extends object, TMIDField extends keyof NonNullable>, TMViewerContext extends ViewerContext, + TMViewerContext2 extends TMViewerContext, TMEntity extends ReadonlyEntity, TMPrivacyPolicy extends EntityPrivacyPolicy< TMFields, @@ -87,7 +89,7 @@ export function knexLoaderWithAuthorizationResults< TMPrivacyPolicy, TMSelectedFields >, - viewerContext: TMViewerContext, + viewerContext: TMViewerContext2, queryContext: EntityQueryContext = viewerContext .getViewerScopedEntityCompanionForClass(entityClass) .getQueryContextProvider()