Declare list FilterField type lazily (#3242)

Author: CarsonF

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 -> {}

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;
 }
 

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;
 }
 

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;
 }
 

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;
 }
 

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;
 }
 

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;
 }
 

src/components/file/dto/list.ts

@@ -24,7 +24,7 @@ export class FileListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(FileFilters)
+  @FilterField(() => FileFilters)
   readonly filter?: FileFilters;
 }
 

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;
 }
 

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;
 }