Declare list FilterField type lazily (#3242)

SeedCompany · Jun 17, 2024 · 6756446 · 6756446
1 parent bf0f1bb
commit 6756446
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 25 deletions.
diff --git a/src/common/filter-field.ts b/src/common/filter-field.ts
@@ -10,7 +10,7 @@ import { AbstractClassType } from './types';
  * A field that is a filter object probably for input on a list query.
  */
 export const FilterField = <T extends object>(
-  type: HasRequiredKeys<T> extends true ? never : AbstractClassType<T>,
+  type: () => HasRequiredKeys<T> extends true ? never : AbstractClassType<T>,
   options?: {
     /**
      * There are no external fields on the filter, so don't expose to GQL.
@@ -22,12 +22,12 @@ export const FilterField = <T extends object>(
     ...(options?.internal
       ? []
       : [
-          Field(() => type as unknown as Constructor<T>, {
+          Field(type as unknown as () => Constructor<T>, {
             nullable: true,
             defaultValue: {} as unknown as T, // Only for GQL schema & not always applied in TS
           }),
         ]),
-    Type(() => type),
+    Type(type),
     ValidateNested(),
     DefaultValue.Set({}), // Default when omitted
     Transform(({ value }) => value || {}), // null -> {}

diff --git a/src/components/budget/dto/list-budget.dto.ts b/src/components/budget/dto/list-budget.dto.ts
@@ -20,7 +20,7 @@ export abstract class BudgetFilters {
 export class BudgetListInput extends SortablePaginationInput<keyof Budget>({
   defaultSort: 'status',
 }) {
-  @FilterField(BudgetFilters, { internal: true })
+  @FilterField(() => BudgetFilters, { internal: true })
   readonly filter: BudgetFilters;
 }
 

diff --git a/src/components/ceremony/dto/list-ceremony.dto.ts b/src/components/ceremony/dto/list-ceremony.dto.ts
@@ -18,7 +18,7 @@ export class CeremonyListInput extends SortablePaginationInput<
 >({
   defaultSort: 'projectName',
 }) {
-  @FilterField(CeremonyFilters)
+  @FilterField(() => CeremonyFilters)
   readonly filter: CeremonyFilters;
 }
 

diff --git a/src/components/engagement/dto/list-engagements.dto.ts b/src/components/engagement/dto/list-engagements.dto.ts
@@ -34,7 +34,7 @@ export class EngagementListInput extends SortablePaginationInput<
 >({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(EngagementFilters)
+  @FilterField(() => EngagementFilters)
   readonly filter: EngagementFilters;
 }
 

diff --git a/src/components/ethno-art/dto/list-ethno-art.dto.ts b/src/components/ethno-art/dto/list-ethno-art.dto.ts
@@ -9,7 +9,7 @@ export abstract class EthnoArtFilters {}
 export class EthnoArtListInput extends SortablePaginationInput<keyof EthnoArt>({
   defaultSort: 'name',
 }) {
-  @FilterField(EthnoArtFilters, { internal: true })
+  @FilterField(() => EthnoArtFilters, { internal: true })
   readonly filter: EthnoArtFilters;
 }
 

diff --git a/src/components/field-region/dto/list-field-region.dto.ts b/src/components/field-region/dto/list-field-region.dto.ts
@@ -19,7 +19,7 @@ export class FieldRegionListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(FieldRegionFilters, { internal: true })
+  @FilterField(() => FieldRegionFilters, { internal: true })
   readonly filter: FieldRegionFilters;
 }
 

diff --git a/src/components/field-zone/dto/list-field-zone.dto.ts b/src/components/field-zone/dto/list-field-zone.dto.ts
@@ -19,7 +19,7 @@ export class FieldZoneListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(FieldZoneFilters, { internal: true })
+  @FilterField(() => FieldZoneFilters, { internal: true })
   readonly filter: FieldZoneFilters;
 }
 

diff --git a/src/components/file/dto/list.ts b/src/components/file/dto/list.ts
@@ -24,7 +24,7 @@ export class FileListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(FileFilters)
+  @FilterField(() => FileFilters)
   readonly filter?: FileFilters;
 }
 

diff --git a/src/components/film/dto/list-film.dto.ts b/src/components/film/dto/list-film.dto.ts
@@ -9,7 +9,7 @@ export abstract class FilmFilters {}
 export class FilmListInput extends SortablePaginationInput<keyof Film>({
   defaultSort: 'name',
 }) {
-  @FilterField(FilmFilters, { internal: true })
+  @FilterField(() => FilmFilters, { internal: true })
   readonly filter: FilmFilters;
 }
 

diff --git a/src/components/language/dto/list-language.dto.ts b/src/components/language/dto/list-language.dto.ts
@@ -55,7 +55,7 @@ export abstract class LanguageFilters {
 export class LanguageListInput extends SortablePaginationInput<keyof Language>({
   defaultSort: 'name',
 }) {
-  @FilterField(LanguageFilters)
+  @FilterField(() => LanguageFilters)
   readonly filter: LanguageFilters;
 }
 

diff --git a/src/components/location/dto/list-locations.dto.ts b/src/components/location/dto/list-locations.dto.ts
@@ -17,7 +17,7 @@ export abstract class LocationFilters {
 export class LocationListInput extends SortablePaginationInput<keyof Location>({
   defaultSort: 'name',
 }) {
-  @FilterField(LocationFilters, { internal: true })
+  @FilterField(() => LocationFilters, { internal: true })
   readonly filter: LocationFilters;
 }
 

diff --git a/src/components/organization/dto/list-organization.dto.ts b/src/components/organization/dto/list-organization.dto.ts
@@ -19,7 +19,7 @@ export class OrganizationListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(OrganizationFilters, { internal: true })
+  @FilterField(() => OrganizationFilters, { internal: true })
   readonly filter: OrganizationFilters;
 }
 

diff --git a/src/components/partner/dto/list-partner.dto.ts b/src/components/partner/dto/list-partner.dto.ts
@@ -24,7 +24,7 @@ export abstract class PartnerFilters {
 export class PartnerListInput extends SortablePaginationInput<keyof Partner>({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(PartnerFilters)
+  @FilterField(() => PartnerFilters)
   readonly filter: PartnerFilters;
 }
 

diff --git a/src/components/partnership/dto/list-partnership.dto.ts b/src/components/partnership/dto/list-partnership.dto.ts
@@ -19,7 +19,7 @@ export class PartnershipListInput extends SortablePaginationInput<
 >({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(PartnershipFilters, { internal: true })
+  @FilterField(() => PartnershipFilters, { internal: true })
   readonly filter: PartnershipFilters;
 }
 

diff --git a/src/components/post/dto/list-posts.dto.ts b/src/components/post/dto/list-posts.dto.ts
@@ -19,7 +19,7 @@ export class PostListInput extends SortablePaginationInput<keyof Post>({
   defaultSort: 'createdAt',
   defaultOrder: Order.DESC,
 }) {
-  @FilterField(PostFilters, { internal: true })
+  @FilterField(() => PostFilters, { internal: true })
   readonly filter: PostFilters;
 }
 

diff --git a/src/components/product/dto/list-product.dto.ts b/src/components/product/dto/list-product.dto.ts
@@ -41,7 +41,7 @@ export abstract class ProductFilters {
 export class ProductListInput extends SortablePaginationInput<keyof Product>({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(ProductFilters)
+  @FilterField(() => ProductFilters)
   readonly filter: ProductFilters;
 }
 

diff --git a/src/components/project-change-request/dto/project-change-request-list.dto.ts b/src/components/project-change-request/dto/project-change-request-list.dto.ts
@@ -19,7 +19,7 @@ export class ProjectChangeRequestListInput extends SortablePaginationInput<
 >({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(ProjectChangeRequestFilters, { internal: true })
+  @FilterField(() => ProjectChangeRequestFilters, { internal: true })
   readonly filter: ProjectChangeRequestFilters;
 }
 

diff --git a/src/components/project/dto/list-projects.dto.ts b/src/components/project/dto/list-projects.dto.ts
@@ -100,7 +100,7 @@ export abstract class ProjectFilters {
 export class ProjectListInput extends SortablePaginationInput<keyof IProject>({
   defaultSort: 'name',
 }) {
-  @FilterField(ProjectFilters)
+  @FilterField(() => ProjectFilters)
   readonly filter: ProjectFilters;
 }
 

diff --git a/src/components/project/project-member/dto/list-project-members.dto.ts b/src/components/project/project-member/dto/list-project-members.dto.ts
@@ -26,7 +26,7 @@ export class ProjectMemberListInput extends SortablePaginationInput<
 >({
   defaultSort: 'createdAt',
 }) {
-  @FilterField(ProjectMemberFilters)
+  @FilterField(() => ProjectMemberFilters)
   readonly filter: ProjectMemberFilters;
 }
 

diff --git a/src/components/story/dto/list-story.dto.ts b/src/components/story/dto/list-story.dto.ts
@@ -9,7 +9,7 @@ export abstract class StoryFilters {}
 export class StoryListInput extends SortablePaginationInput<keyof Story>({
   defaultSort: 'name',
 }) {
-  @FilterField(StoryFilters, { internal: true })
+  @FilterField(() => StoryFilters, { internal: true })
   readonly filter: StoryFilters;
 }
 

diff --git a/src/components/user/dto/list-users.dto.ts b/src/components/user/dto/list-users.dto.ts
@@ -15,7 +15,7 @@ export abstract class UserFilters {
 export class UserListInput extends SortablePaginationInput<keyof User>({
   defaultSort: 'id', // TODO How to sort on name?
 }) {
-  @FilterField(UserFilters)
+  @FilterField(() => UserFilters)
   readonly filter: UserFilters;
 }
 

diff --git a/src/components/user/education/dto/list-education.dto.ts b/src/components/user/education/dto/list-education.dto.ts
@@ -19,7 +19,7 @@ export class EducationListInput extends SortablePaginationInput<
 >({
   defaultSort: 'institution',
 }) {
-  @FilterField(EducationFilters, { internal: true })
+  @FilterField(() => EducationFilters, { internal: true })
   readonly filter: EducationFilters;
 }
 

diff --git a/src/components/user/unavailability/dto/list-unavailabilities.dto.ts b/src/components/user/unavailability/dto/list-unavailabilities.dto.ts
@@ -21,7 +21,7 @@ export class UnavailabilityListInput extends SortablePaginationInput<
   defaultSort: 'start',
   defaultOrder: Order.DESC,
 }) {
-  @FilterField(UnavailabilityFilters, { internal: true })
+  @FilterField(() => UnavailabilityFilters, { internal: true })
   readonly filter: UnavailabilityFilters;
 }