Skip to content

fix: Apply same viewer context subclass type mechanism to knexLoader and related methods #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wschurman merged 1 commit into from
Feb 27, 2026
Merged

fix: Apply same viewer context subclass type mechanism to knexLoader and related methods #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/entity-database-adapter-knex/src/PostgresEntity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export abstract class PostgresEntity<
TMFields extends object,
TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>,
TMViewerContext extends ViewerContext,
TMViewerContext2 extends TMViewerContext,
TMEntity extends ReadonlyEntity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>,
TMPrivacyPolicy extends EntityPrivacyPolicy<
TMFields,
Expand All @@ -53,7 +54,7 @@ export abstract class PostgresEntity<
TMPrivacyPolicy,
TMSelectedFields
>,
viewerContext: TMViewerContext,
viewerContext: TMViewerContext2,
queryContext: EntityQueryContext = viewerContext
.getViewerScopedEntityCompanionForClass(this)
.getQueryContextProvider()
Expand All @@ -80,6 +81,7 @@ export abstract class PostgresEntity<
TMFields extends object,
TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>,
TMViewerContext extends ViewerContext,
TMViewerContext2 extends TMViewerContext,
TMEntity extends ReadonlyEntity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>,
TMPrivacyPolicy extends EntityPrivacyPolicy<
TMFields,
Expand All @@ -98,7 +100,7 @@ export abstract class PostgresEntity<
TMPrivacyPolicy,
TMSelectedFields
>,
viewerContext: TMViewerContext,
viewerContext: TMViewerContext2,
queryContext: EntityQueryContext = viewerContext
.getViewerScopedEntityCompanionForClass(this)
.getQueryContextProvider()
Expand Down
3 changes: 2 additions & 1 deletion packages/entity-database-adapter-knex/src/internal/getKnexEntityLoaderFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export function getKnexEntityLoaderFactory<
TFields extends Record<string, any>,
TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
TViewerContext extends ViewerContext,
TViewerContext2 extends TViewerContext,
TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
TPrivacyPolicy extends EntityPrivacyPolicy<
TFields,
Expand All @@ -37,7 +38,7 @@ export function getKnexEntityLoaderFactory<
TPrivacyPolicy,
TSelectedFields
>,
viewerContext: TViewerContext,
viewerContext: TViewerContext2,
): KnexEntityLoaderFactory<
TFields,
TIDField,
Expand Down
6 changes: 4 additions & 2 deletions packages/entity-database-adapter-knex/src/knexLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export function knexLoader<
TMFields extends object,
TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>,
TMViewerContext extends ViewerContext,
TMViewerContext2 extends TMViewerContext,
TMEntity extends ReadonlyEntity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>,
TMPrivacyPolicy extends EntityPrivacyPolicy<
TMFields,
Expand All @@ -38,7 +39,7 @@ export function knexLoader<
TMPrivacyPolicy,
TMSelectedFields
>,
viewerContext: TMViewerContext,
viewerContext: TMViewerContext2,
queryContext: EntityQueryContext = viewerContext
.getViewerScopedEntityCompanionForClass(entityClass)
.getQueryContextProvider()
Expand Down Expand Up @@ -69,6 +70,7 @@ export function knexLoaderWithAuthorizationResults<
TMFields extends object,
TMIDField extends keyof NonNullable<Pick<TMFields, TMSelectedFields>>,
TMViewerContext extends ViewerContext,
TMViewerContext2 extends TMViewerContext,
TMEntity extends ReadonlyEntity<TMFields, TMIDField, TMViewerContext, TMSelectedFields>,
TMPrivacyPolicy extends EntityPrivacyPolicy<
TMFields,
Expand All @@ -87,7 +89,7 @@ export function knexLoaderWithAuthorizationResults<
TMPrivacyPolicy,
TMSelectedFields
>,
viewerContext: TMViewerContext,
viewerContext: TMViewerContext2,
queryContext: EntityQueryContext = viewerContext
.getViewerScopedEntityCompanionForClass(entityClass)
.getQueryContextProvider()
Expand Down