@sumaris-net/ngx-components 18.22.0 → 18.22.1

package/esm2022/src/app/admin/users/person.filter.mjs

@@ -131,7 +131,7 @@ export class AdditionalFields {
             return;
         return (Object.keys(source)
             // Exclude common fields, from PersonFilter
-            .filter((key) => !PersonFilter.FIELDS.includes(key))
+            .filter((key) => !PersonFilter.FIELDS.includes(key) && key !== 'and' && key !== 'or' && key !== 'not')
             .reduce((target, key) => {
             if (isNil(source[key]))
                 return target;
@@ -154,4 +154,4 @@ export class AdditionalFields {
         return target;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.filter.js","sourceRoot":"","sources":["../../../../../../src/app/admin/users/person.filter.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAyB,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAG7F,WAAW;AAEJ,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,YAAkC;;IAClE,MAAM,CAAC,MAAM,GAA2B;QACtC,YAAY;QACZ,IAAI;QACJ,YAAY;QACZ,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,WAAW;QACX,cAAc;QACd,aAAa;QACb,iBAAiB;QACjB,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;IAEF,MAAM,CAAC,UAAU,CAAuC;IAExD,MAAM,CAAC,UAAU,CAAC,MAAW;QAC3B,OAAO,cAAY,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,YAAY,GAAG,cAAY,CAAC,UAAU,CAAC;IAE9C,KAAK,CAAS;IACd,MAAM,CAAS;IACf,UAAU,CAAS;IACnB,SAAS,CAAW;IACpB,YAAY,CAAW;IACvB,WAAW,CAAW;IACtB,WAAW,CAAW;IACtB,eAAe,CAAS;IACxB,gBAAgB,CAAW;IAC3B,gBAAgB,CAAmB;IAEnC;QACE,KAAK,CAAC,cAAY,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,MAAW,EAAE,IAA4B;QAClD,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACjG,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAEhD,4BAA4B;QAC5B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC;IAED,QAAQ,CAAC,IAA4B;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACxC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACtC,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC9C,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAChD,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC,gBAAgB,CAAC;QAE/B,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3H,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,WAAW;QACnB,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAEtC,mBAAmB;QACnB,IAAI,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,sBAAsB;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;QAED,sBAAsB;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,cAAc;QACd,MAAM,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CACnD,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAC7F,IAAI,CAAC,UAAU,CAChB,CAAC;QACF,IAAI,gBAAgB;YAAE,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAEvD,8BAA8B;QAC9B,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACtD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBACnD,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACzB,SAAS,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE;wBAChC,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;wBACxD,qEAAqE;wBACrE,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;4BAC9B,wEAAwE;4BACxE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE;gCACvC,MAAM,UAAU,GAAG,aAAa,EAAE,EAAE,IAAI,aAAa,CAAC;gCACtD,MAAM,QAAQ,GAAG,WAAW,EAAE,EAAE,IAAI,WAAW,CAAC;gCAChD,OAAO,UAAU,KAAK,QAAQ,CAAC;4BACjC,CAAC,CAAC,CAAC;wBACL,CAAC;6BAAM,CAAC;4BACN,mCAAmC;4BACnC,MAAM,UAAU,GAAG,UAAU,EAAE,EAAE,IAAI,UAAU,CAAC;4BAChD,MAAM,QAAQ,GAAG,WAAW,EAAE,EAAE,IAAI,WAAW,CAAC;4BAChD,OAAO,UAAU,KAAK,QAAQ,CAAC;wBACjC,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;;AAlIU,YAAY;IADxB,WAAW,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;GAC/B,YAAY,CAmIxB;;AAED,MAAM,OAAO,gBAAgB;IAG3B,MAAM,CAAC,UAAU,CAAC,MAAW,EAAE,IAAU;QACvC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,MAAM,IAAI,QAAQ,CAAC;YAAE,OAAO;QACpD,OAAO,CACL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACjB,2CAA2C;aAC1C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAyB,CAAC,CAAC;aACzE,MAAM,CACL,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACd,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAAE,OAAO,MAAM,CAAC;YACtC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,SAAmC,CACpC,CACJ,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAW,EAAE,SAAc,EAAE,EAAE,IAA4B;QACzE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,MAAM,IAAI,QAAQ,CAAC;YAAE,OAAO;QACpD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACzC,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;YACtD,IAAI,KAAK,CAAC,KAAK,CAAC;gBAAE,OAAO,MAAM,CAAC;YAChC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC,EAAE,MAAM,CAAC,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","sourcesContent":["import { EntityClass } from '../../core/services/model/entity.decorators';\nimport { EntityFilter } from '../../core/services/model/filter.model';\nimport { Person } from '../../core/services/model/person.model';\nimport { EntityAsObjectOptions, EntityUtils } from '../../core/services/model/entity.model';\nimport { StoreObject } from '@apollo/client/core';\nimport { getPropertyByPath, isNil, isNotEmptyArray, isNotNil } from '../../shared/functions';\nimport { FilterFn } from '../../shared/types';\n\n// @dynamic\n@EntityClass({ typename: 'PersonFilterVO' })\nexport class PersonFilter extends EntityFilter<PersonFilter, Person> {\n  static FIELDS: (keyof PersonFilter)[] = [\n    '__typename',\n    'id',\n    'updateDate',\n    'email',\n    'pubkey',\n    'searchText',\n    'statusIds',\n    'userProfiles',\n    'excludedIds',\n    'searchAttribute',\n    'searchAttributes',\n    'additionalFields',\n  ];\n\n  static fromObject: (source, opts?: any) => PersonFilter;\n\n  static asFilterFn(source: any): FilterFn<Person> {\n    return PersonFilter.fromObject(source)?.asFilterFn();\n  }\n\n  /**\n   * @deprecated Use `PersonFilter.asFilterFn` instead\n   */\n  static searchFilter = PersonFilter.asFilterFn;\n\n  email: string;\n  pubkey: string;\n  searchText: string;\n  statusIds: number[];\n  userProfiles: string[];\n  includedIds: number[];\n  excludedIds: number[];\n  searchAttribute: string;\n  searchAttributes: string[];\n  additionalFields: AdditionalFields;\n\n  constructor() {\n    super(PersonFilter.TYPENAME);\n  }\n\n  fromObject(source: any, opts?: EntityAsObjectOptions) {\n    super.fromObject(source, opts);\n    this.email = source.email;\n    this.pubkey = source.pubkey;\n    this.searchText = source.searchText;\n    this.statusIds = source.statusIds || (isNotNil(source.statusId) ? [source.statusId] : undefined);\n    this.userProfiles = source.userProfiles;\n    this.excludedIds = source.excludedIds;\n    this.searchAttribute = source.searchAttribute;\n    this.searchAttributes = source.searchAttributes;\n\n    // Extract additional fields\n    this.additionalFields = AdditionalFields.fromObject(source, opts);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): StoreObject {\n    const target = super.asObject(opts);\n    target.email = this.email;\n    target.pubkey = this.pubkey;\n    target.searchText = this.searchText;\n    target.statusIds = this.statusIds;\n    target.userProfiles = this.userProfiles;\n    target.excludedIds = this.excludedIds;\n    target.searchAttribute = this.searchAttribute;\n    target.searchAttributes = this.searchAttributes;\n    AdditionalFields.asObject(this.additionalFields, target, opts);\n    delete target.additionalFields;\n\n    if (opts?.minify) {\n      target.userProfiles = Array.isArray(target.userProfiles) ? target.userProfiles?.map((up) => up?.label ?? up) : undefined;\n    }\n    return target;\n  }\n\n  protected buildFilter(): FilterFn<Person>[] {\n    const filterFns = super.buildFilter();\n\n    // Filter by status\n    if (isNotEmptyArray(this.statusIds)) {\n      filterFns.push((e) => this.statusIds.includes(e.statusId));\n    }\n\n    // Filter included ids\n    const includedIds = this.includedIds;\n    if (isNotEmptyArray(includedIds)) {\n      filterFns.push((e) => isNotNil(e.id) && includedIds.includes(e.id));\n    }\n\n    // Filter excluded ids\n    const excludedIds = this.excludedIds;\n    if (isNotEmptyArray(excludedIds)) {\n      filterFns.push((e) => isNil(e.id) || !excludedIds.includes(e.id));\n    }\n\n    // Search text\n    const searchTextFilter = EntityUtils.searchTextFilter(\n      this.searchAttribute || this.searchAttributes || ['lastName', 'firstName', 'department.name'],\n      this.searchText\n    );\n    if (searchTextFilter) filterFns.push(searchTextFilter);\n\n    // Filter by additional fields\n    if (this.additionalFields) {\n      Object.keys(this.additionalFields).forEach((fieldKey) => {\n        const fieldValue = this.additionalFields[fieldKey];\n        if (isNotNil(fieldValue)) {\n          filterFns.push((person: Person) => {\n            const personValue = getPropertyByPath(person, fieldKey);\n            // Handle different value types (string, object with id, array, etc.)\n            if (Array.isArray(fieldValue)) {\n              // Multiple selection - check if person value matches any selected value\n              return fieldValue.some((selectedValue) => {\n                const selectedId = selectedValue?.id ?? selectedValue;\n                const personId = personValue?.id ?? personValue;\n                return selectedId === personId;\n              });\n            } else {\n              // Single value - direct comparison\n              const selectedId = fieldValue?.id ?? fieldValue;\n              const personId = personValue?.id ?? personValue;\n              return selectedId === personId;\n            }\n          });\n        }\n      });\n    }\n\n    return filterFns;\n  }\n}\n\nexport class AdditionalFields {\n  [key: string]: any;\n\n  static fromObject(source: any, opts?: any): { [key: string]: any } {\n    if (!source || !(typeof source == 'object')) return;\n    return (\n      Object.keys(source)\n        // Exclude common fields, from PersonFilter\n        .filter((key) => !PersonFilter.FIELDS.includes(key as keyof PersonFilter))\n        .reduce(\n          (target, key) => {\n            if (isNil(source[key])) return target;\n            target = target || {};\n            target[key] = source[key];\n            return target;\n          },\n          undefined as { [key: string]: any }\n        )\n    );\n  }\n\n  static asObject(source: any, target: any = {}, opts?: EntityAsObjectOptions): { [key: string]: any } {\n    if (!source || !(typeof source == 'object')) return;\n    Object.keys(source).reduce((target, key) => {\n      const value = EntityUtils.asObject(source[key], opts);\n      if (isNil(value)) return target;\n      target = target || {};\n      target[key] = value;\n      return target;\n    }, target);\n    return target;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.filter.js","sourceRoot":"","sources":["../../../../../../src/app/admin/users/person.filter.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityClass } from '../../core/services/model/entity.decorators';\nimport { EntityFilter } from '../../core/services/model/filter.model';\nimport { Person } from '../../core/services/model/person.model';\nimport { EntityAsObjectOptions, EntityUtils } from '../../core/services/model/entity.model';\nimport { StoreObject } from '@apollo/client/core';\nimport { getPropertyByPath, isNil, isNotEmptyArray, isNotNil } from '../../shared/functions';\nimport { FilterFn } from '../../shared/types';\n\n// @dynamic\n@EntityClass({ typename: 'PersonFilterVO' })\nexport class PersonFilter extends EntityFilter<PersonFilter, Person> {\n  static FIELDS: (keyof PersonFilter)[] = [\n    '__typename',\n    'id',\n    'updateDate',\n    'email',\n    'pubkey',\n    'searchText',\n    'statusIds',\n    'userProfiles',\n    'excludedIds',\n    'searchAttribute',\n    'searchAttributes',\n    'additionalFields',\n  ];\n\n  static fromObject: (source, opts?: any) => PersonFilter;\n\n  static asFilterFn(source: any): FilterFn<Person> {\n    return PersonFilter.fromObject(source)?.asFilterFn();\n  }\n\n  /**\n   * @deprecated Use `PersonFilter.asFilterFn` instead\n   */\n  static searchFilter = PersonFilter.asFilterFn;\n\n  email: string;\n  pubkey: string;\n  searchText: string;\n  statusIds: number[];\n  userProfiles: string[];\n  includedIds: number[];\n  excludedIds: number[];\n  searchAttribute: string;\n  searchAttributes: string[];\n  additionalFields: AdditionalFields;\n\n  constructor() {\n    super(PersonFilter.TYPENAME);\n  }\n\n  fromObject(source: any, opts?: EntityAsObjectOptions) {\n    super.fromObject(source, opts);\n    this.email = source.email;\n    this.pubkey = source.pubkey;\n    this.searchText = source.searchText;\n    this.statusIds = source.statusIds || (isNotNil(source.statusId) ? [source.statusId] : undefined);\n    this.userProfiles = source.userProfiles;\n    this.excludedIds = source.excludedIds;\n    this.searchAttribute = source.searchAttribute;\n    this.searchAttributes = source.searchAttributes;\n\n    // Extract additional fields\n    this.additionalFields = AdditionalFields.fromObject(source, opts);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): StoreObject {\n    const target = super.asObject(opts);\n    target.email = this.email;\n    target.pubkey = this.pubkey;\n    target.searchText = this.searchText;\n    target.statusIds = this.statusIds;\n    target.userProfiles = this.userProfiles;\n    target.excludedIds = this.excludedIds;\n    target.searchAttribute = this.searchAttribute;\n    target.searchAttributes = this.searchAttributes;\n    AdditionalFields.asObject(this.additionalFields, target, opts);\n    delete target.additionalFields;\n\n    if (opts?.minify) {\n      target.userProfiles = Array.isArray(target.userProfiles) ? target.userProfiles?.map((up) => up?.label ?? up) : undefined;\n    }\n    return target;\n  }\n\n  protected buildFilter(): FilterFn<Person>[] {\n    const filterFns = super.buildFilter();\n\n    // Filter by status\n    if (isNotEmptyArray(this.statusIds)) {\n      filterFns.push((e) => this.statusIds.includes(e.statusId));\n    }\n\n    // Filter included ids\n    const includedIds = this.includedIds;\n    if (isNotEmptyArray(includedIds)) {\n      filterFns.push((e) => isNotNil(e.id) && includedIds.includes(e.id));\n    }\n\n    // Filter excluded ids\n    const excludedIds = this.excludedIds;\n    if (isNotEmptyArray(excludedIds)) {\n      filterFns.push((e) => isNil(e.id) || !excludedIds.includes(e.id));\n    }\n\n    // Search text\n    const searchTextFilter = EntityUtils.searchTextFilter(\n      this.searchAttribute || this.searchAttributes || ['lastName', 'firstName', 'department.name'],\n      this.searchText\n    );\n    if (searchTextFilter) filterFns.push(searchTextFilter);\n\n    // Filter by additional fields\n    if (this.additionalFields) {\n      Object.keys(this.additionalFields).forEach((fieldKey) => {\n        const fieldValue = this.additionalFields[fieldKey];\n        if (isNotNil(fieldValue)) {\n          filterFns.push((person: Person) => {\n            const personValue = getPropertyByPath(person, fieldKey);\n            // Handle different value types (string, object with id, array, etc.)\n            if (Array.isArray(fieldValue)) {\n              // Multiple selection - check if person value matches any selected value\n              return fieldValue.some((selectedValue) => {\n                const selectedId = selectedValue?.id ?? selectedValue;\n                const personId = personValue?.id ?? personValue;\n                return selectedId === personId;\n              });\n            } else {\n              // Single value - direct comparison\n              const selectedId = fieldValue?.id ?? fieldValue;\n              const personId = personValue?.id ?? personValue;\n              return selectedId === personId;\n            }\n          });\n        }\n      });\n    }\n\n    return filterFns;\n  }\n}\n\nexport class AdditionalFields {\n  [key: string]: any;\n\n  static fromObject(source: any, opts?: any): { [key: string]: any } {\n    if (!source || !(typeof source == 'object')) return;\n    return (\n      Object.keys(source)\n        // Exclude common fields, from PersonFilter\n        .filter((key) => !PersonFilter.FIELDS.includes(key as keyof PersonFilter) && key !== 'and' && key !== 'or' && key !== 'not')\n        .reduce(\n          (target, key) => {\n            if (isNil(source[key])) return target;\n            target = target || {};\n            target[key] = source[key];\n            return target;\n          },\n          undefined as { [key: string]: any }\n        )\n    );\n  }\n\n  static asObject(source: any, target: any = {}, opts?: EntityAsObjectOptions): { [key: string]: any } {\n    if (!source || !(typeof source == 'object')) return;\n    Object.keys(source).reduce((target, key) => {\n      const value = EntityUtils.asObject(source[key], opts);\n      if (isNil(value)) return target;\n      target = target || {};\n      target[key] = value;\n      return target;\n    }, target);\n    return target;\n  }\n}\n"]}

package/esm2022/src/app/core/services/model/filter.model.mjs

@@ -1,48 +1,20 @@
-import { isEmptyArray, isNotNil } from '../../../shared/functions';
+import { isEmptyArray, isNotEmptyArray, isNotNil } from '../../../shared/functions';
 import { MINIFY_ENTITY_FOR_POD, ReferentialUtils } from './referential.model';
 import { Entity, isInstanceOf } from './entity.model';
 export class EntityFilter extends Entity {
-    /**
-     * @deprecated Use `EntityFilterUtils.composeFns()`
-     * Compose some filter functions: all should return true
-     *
-     * @param filterFns
-     */
-    static composeFilters(filterFns) {
+    // Internal composition state (fluent API)
+    __and;
+    __or;
+    __not;
+    static andFns(filterFns) {
         if (isEmptyArray(filterFns))
             return undefined;
         return (entity) => (filterFns || []).every((fn) => fn(entity));
     }
-    /**
-     * Compose some filter functions: all should return true
-     *
-     * @param filterFns
-     */
-    static composeFns(filterFns) {
+    static orFns(filterFns) {
         if (isEmptyArray(filterFns))
             return undefined;
-        return (entity) => (filterFns || []).every((fn) => fn(entity));
-    }
-    /**
-     * @deprecated Use `EntityFilter.and()`
-     */
-    static compose(filters) {
-        const filterFns = (filters || []).reduce((res, f) => {
-            const fns = f.buildFilter();
-            if (!fns)
-                return res;
-            return res.concat(fns);
-        }, []);
-        return this.composeFns(filterFns);
-    }
-    static or(...filters) {
-        return new OrFilter(...(filters || []));
-    }
-    static and(...filters) {
-        return new AndFilter(...(filters || []));
-    }
-    static not(filter) {
-        return new NotFilter(filter);
+        return (entity) => (filterFns || []).some((fn) => fn(entity));
     }
     constructor(__typename) {
         super(__typename);
@@ -61,17 +33,95 @@ export class EntityFilter extends Entity {
         return Object.keys(json).filter((key) => this.isCriteriaNotEmpty(key, json[key])).length;
     }
     asFilterFn() {
-        const filterFns = this.buildFilter();
-        return EntityFilter.composeFns(filterFns);
+        // Base (this) filter functions
+        let filterFns = this.buildFilter() || [];
+        // AND filters
+        if (isNotEmptyArray(this.__and)) {
+            filterFns.push(...this.__and.map((f) => f?.asFilterFn()).filter(isNotNil));
+        }
+        // As filter function
+        let result = EntityFilter.andFns(filterFns);
+        // OR filters
+        if (isNotEmptyArray(this.__or)) {
+            result = EntityFilter.orFns([
+                result,
+                ...(this.__or || []).map((f) => f?.asFilterFn())
+            ].filter(isNotNil));
+        }
+        // NOT
+        if (this.__not && result) {
+            const inner = result;
+            result = (entity) => !inner(entity);
+        }
+        return result;
     }
     and(...filters) {
-        return new AndFilter(this, ...filters);
+        if (!isEmptyArray(filters)) {
+            this.__and = (this.__and || []).concat(filters.filter(isNotNil));
+        }
+        return this;
     }
     or(...filters) {
-        return new OrFilter(this, ...filters);
+        if (!isEmptyArray(filters)) {
+            this.__or = (this.__or || []).concat(filters.filter(isNotNil));
+        }
+        return this;
     }
     not() {
-        return new NotFilter(this);
+        this.__not = !(this.__not ?? false);
+        return this;
+    }
+    asObject(opts) {
+        const target = super.asObject(opts);
+        // Serialize composition
+        if (isNotEmptyArray(this.__and)) {
+            target.and = this.__and.map((f) => f.asObject(opts));
+        }
+        if (isNotEmptyArray(this.__or)) {
+            target.or = this.__or.map((f) => f.asObject(opts));
+        }
+        if (this.__not) {
+            target.not = true;
+        }
+        // Sanitize
+        delete target.__and;
+        delete target.__or;
+        delete target.__not;
+        return target;
+    }
+    fromObject(source, opts) {
+        super.fromObject(source, opts);
+        // Deserialize composition using the same concrete filter type
+        // AND
+        if (Array.isArray(source?.and)) {
+            const Ctor = this.constructor;
+            this.__and = source.and.map((s) => {
+                if (!s)
+                    return undefined;
+                const f = new Ctor();
+                f.fromObject(s, opts);
+                return f;
+            }).filter(isNotNil);
+        }
+        else {
+            this.__and = undefined;
+        }
+        // OR
+        if (Array.isArray(source?.or)) {
+            const Ctor = this.constructor;
+            this.__or = source.or.map((s) => {
+                if (!s)
+                    return undefined;
+                const f = new Ctor();
+                f.fromObject(s, opts);
+                return f;
+            }).filter(isNotNil);
+        }
+        else {
+            this.__or = undefined;
+        }
+        // NOT
+        this.__not = !!source?.not;
     }
     /* -- protected functions -- */
     buildFilter() {
@@ -166,4 +216,4 @@ export class EntityFilterUtils {
         return target;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"filter.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/filter.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { isEmptyArray, isNotNil } from '../../../shared/functions';\nimport { MINIFY_ENTITY_FOR_POD, ReferentialUtils } from './referential.model';\nimport { Entity, EntityAsObjectOptions, IEntity, isInstanceOf } from './entity.model';\n\nimport { FilterFn } from '../../../shared/types';\n\nexport interface IEntityFilter<\n  F extends IEntityFilter<F, T, ID, AO, FO>,\n  T extends IEntity<T, any>,\n  ID = number,\n  AO extends EntityAsObjectOptions = EntityAsObjectOptions,\n  FO = any,\n> extends IEntity<F, ID, AO, FO> {\n  asPodObject(): any;\n\n  asFilterFn(): FilterFn<T>;\n\n  isEmpty(): boolean;\n\n  countNotEmptyCriteria(): number;\n\n  // Logical combinators\n  and(...filters: EntityFilter<any, T>[]): AndFilter<T>;\n  or(...filters: EntityFilter<any, T>[]): OrFilter<T>;\n  not(): NotFilter<T>;\n}\n\nexport abstract class EntityFilter<\n    F extends IEntityFilter<F, T, ID, AO, FO>,\n    T extends IEntity<T, any>,\n    ID = number,\n    AO extends EntityAsObjectOptions = EntityAsObjectOptions,\n    FO = any,\n  >\n  extends Entity<F, ID, AO, FO>\n  implements IEntityFilter<F, T, ID, AO, FO>\n{\n  /**\n   * @deprecated Use `EntityFilterUtils.composeFns()`\n   * Compose some filter functions: all should return true\n   *\n   * @param filterFns\n   */\n  static composeFilters<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T> {\n    if (isEmptyArray(filterFns)) return undefined;\n    return (entity) => (filterFns || []).every((fn) => fn(entity));\n  }\n\n  /**\n   * Compose some filter functions: all should return true\n   *\n   * @param filterFns\n   */\n  static composeFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T> {\n    if (isEmptyArray(filterFns)) return undefined;\n    return (entity) => (filterFns || []).every((fn) => fn(entity));\n  }\n\n  /**\n   * @deprecated Use `EntityFilter.and()`\n   */\n  static compose<F extends EntityFilter<F, T>, T extends IEntity<T, any>>(filters: F[]): FilterFn<T> {\n    const filterFns = (filters || []).reduce((res, f) => {\n      const fns = f.buildFilter();\n      if (!fns) return res;\n      return res.concat(fns);\n    }, []);\n    return this.composeFns(filterFns);\n  }\n\n  static or<T extends IEntity<T, any>>(...filters: EntityFilter<any, T>[]): OrFilter<T> {\n    return new OrFilter<T>(...(filters || []));\n  }\n\n  static and<T extends IEntity<T, any>>(...filters: EntityFilter<any, T>[]): AndFilter<T> {\n    return new AndFilter<T>(...(filters || []));\n  }\n\n  static not<T extends IEntity<T, any>>(filter: EntityFilter<any, T>): NotFilter<T> {\n    return new NotFilter<T>(filter);\n  }\n\n  constructor(__typename?: string) {\n    super(__typename);\n  }\n\n  /**\n   * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)\n   */\n  asPodObject(): any {\n    return this.asObject(MINIFY_ENTITY_FOR_POD as AO);\n  }\n\n  isEmpty(): boolean {\n    return this.countNotEmptyCriteria() === 0;\n  }\n\n  countNotEmptyCriteria(): number {\n    const json = this.asPodObject();\n    return Object.keys(json).filter((key) => this.isCriteriaNotEmpty(key, json[key])).length;\n  }\n\n  asFilterFn(): FilterFn<T> {\n    const filterFns = this.buildFilter();\n    return EntityFilter.composeFns(filterFns);\n  }\n\n  and(...filters: EntityFilter<any, T>[]): AndFilter<T> {\n    return new AndFilter<T>(this as EntityFilter<any, T>, ...filters);\n  }\n\n  or(...filters: EntityFilter<any, T>[]): OrFilter<T> {\n    return new OrFilter<T>(this as EntityFilter<any, T>, ...filters);\n  }\n\n  not(): NotFilter<T> {\n    return new NotFilter<T>(this as EntityFilter<any, T>);\n  }\n\n  /* -- protected functions -- */\n\n  protected buildFilter(): FilterFn<T>[] {\n    // Can be completed by subclasses\n    return [];\n  }\n\n  protected isCriteriaNotEmpty(key: string, value: any): boolean {\n    // Can be overridden by subclasses\n    return (\n      value !== undefined &&\n      value !== null &&\n      // not empty string\n      ((typeof value === 'string' && value.trim() !== '') ||\n        // valid number\n        (typeof value === 'number' && !isNaN(value)) ||\n        // valid boolean\n        typeof value === 'boolean' ||\n        // not empty array\n        (Array.isArray(value) && value.length > 0) ||\n        // entity with an id\n        ReferentialUtils.isNotEmpty(value))\n    );\n  }\n}\n\nexport class OrFilter<T extends IEntity<T, any>> extends EntityFilter<OrFilter<T>, T> {\n  protected filters: EntityFilter<any, T>[];\n\n  constructor(...filters: EntityFilter<any, T>[]) {\n    super('OrFilter');\n    this.filters = (filters || []).filter(isNotNil);\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fns = (this.filters || [])\n      .map((f) => (f ? f.asFilterFn() : undefined))\n      .filter(isNotNil);\n\n    if (isEmptyArray(fns)) return [];\n\n    return [\n      (entity: T) => fns.some((fn) => fn(entity))\n    ];\n  }\n}\n\nexport class NotFilter<T extends IEntity<T, any>> extends EntityFilter<NotFilter<T>, T> {\n  protected filter: EntityFilter<any, T>;\n\n  constructor(filter: EntityFilter<any, T>) {\n    super('NotFilter');\n    this.filter = filter;\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fn = this.filter?.asFilterFn();\n    if (!fn) return [];\n    return [\n      (entity: T) => !fn(entity)\n    ];\n  }\n}\n\n\nexport class AndFilter<T extends IEntity<T, any>> extends EntityFilter<AndFilter<T>, T> {\n  protected filters: EntityFilter<any, T>[];\n\n  constructor(...filters: EntityFilter<any, T>[]) {\n    super('AndFilter');\n    this.filters = (filters || []).filter(isNotNil);\n  }\n\n  and(...filters: EntityFilter<any, T>[]): AndFilter<T> {\n    this.filters = this.filters.concat(...(filters || []).filter(isNotNil));\n    return this;\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fns = (this.filters || [])\n      .map((f) => (f ? f.asFilterFn() : undefined))\n      .filter(isNotNil);\n\n    if (isEmptyArray(fns)) return [];\n\n    return [\n      (entity: T) => fns.every((fn) => fn(entity))\n    ];\n  }\n}\n\nexport abstract class EntityFilterUtils {\n  static isEntityFilter<F extends EntityFilter<F, any>>(obj: Partial<F>): obj is F {\n    return (obj && obj.asPodObject && obj.asFilterFn && true) || false;\n  }\n\n  static fromObject<F>(source: any, filterType: new () => F): F {\n    if (!source) return source;\n    if (isInstanceOf(source, filterType)) return source as F;\n    const target = new filterType();\n    if (EntityFilterUtils.isEntityFilter(target)) {\n      target.fromObject(source);\n    } else {\n      Object.assign(target, source);\n    }\n    return target;\n  }\n\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"filter.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/filter.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { isEmptyArray, isNotEmptyArray, isNotNil } from '../../../shared/functions';\nimport { MINIFY_ENTITY_FOR_POD, ReferentialUtils } from './referential.model';\nimport { Entity, EntityAsObjectOptions, IEntity, isInstanceOf } from './entity.model';\n\nimport { FilterFn } from '../../../shared/types';\n\nexport interface IEntityFilter<\n  F extends IEntityFilter<F, T, ID, AO, FO>,\n  T extends IEntity<T, any>,\n  ID = number,\n  AO extends EntityAsObjectOptions = EntityAsObjectOptions,\n  FO = any,\n> extends IEntity<F, ID, AO, FO> {\n  asPodObject(): any;\n\n  asFilterFn(): FilterFn<T>;\n\n  isEmpty(): boolean;\n\n  countNotEmptyCriteria(): number;\n\n  // Logical combinators (fluent, return same filter type F)\n  and(...filters: F[]): F;\n  or(...filters: F[]): F;\n  not(): F;\n}\n\nexport abstract class EntityFilter<\n    F extends IEntityFilter<F, T, ID, AO, FO>,\n    T extends IEntity<T, any>,\n    ID = number,\n    AO extends EntityAsObjectOptions = EntityAsObjectOptions,\n    FO = any,\n  >\n  extends Entity<F, ID, AO, FO>\n  implements IEntityFilter<F, T, ID, AO, FO>\n{\n  // Internal composition state (fluent API)\n  protected __and?: F[];\n  protected __or?: F[];\n  protected __not?: boolean;\n\n  static andFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T> {\n    if (isEmptyArray(filterFns)) return undefined;\n    return (entity) => (filterFns || []).every((fn) => fn(entity));\n  }\n\n  static orFns<T extends IEntity<T, any>>(filterFns: FilterFn<T>[]): FilterFn<T> {\n    if (isEmptyArray(filterFns)) return undefined;\n    return (entity) => (filterFns || []).some((fn) => fn(entity));\n  }\n\n\n  constructor(__typename?: string) {\n    super(__typename);\n  }\n\n  /**\n   * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)\n   */\n  asPodObject(): any {\n    return this.asObject(MINIFY_ENTITY_FOR_POD as AO);\n  }\n\n  isEmpty(): boolean {\n    return this.countNotEmptyCriteria() === 0;\n  }\n\n  countNotEmptyCriteria(): number {\n    const json = this.asPodObject();\n    return Object.keys(json).filter((key) => this.isCriteriaNotEmpty(key, json[key])).length;\n  }\n\n  asFilterFn(): FilterFn<T> {\n    // Base (this) filter functions\n    let filterFns = this.buildFilter() || [];\n\n    // AND filters\n    if (isNotEmptyArray(this.__and)) {\n      filterFns.push(...this.__and.map((f) => f?.asFilterFn()).filter(isNotNil));\n    }\n\n    // As filter function\n    let result = EntityFilter.andFns<T>(filterFns);\n\n    // OR filters\n    if (isNotEmptyArray(this.__or)) {\n      result = EntityFilter.orFns(\n        [\n          result,\n          ...(this.__or || []).map((f) => f?.asFilterFn())\n        ].filter(isNotNil)\n      );\n    }\n\n    // NOT\n    if (this.__not && result) {\n      const inner = result;\n      result = (entity: T) => !inner(entity);\n    }\n\n    return result;\n  }\n\n  and(...filters: F[]): F {\n    if (!isEmptyArray(filters)) {\n      this.__and = (this.__and || []).concat(filters.filter(isNotNil));\n    }\n    return this as unknown as F;\n  }\n\n  or(...filters: F[]): F {\n    if (!isEmptyArray(filters)) {\n      this.__or = (this.__or || []).concat(filters.filter(isNotNil));\n    }\n    return this as unknown as F;\n  }\n\n  not(): F {\n    this.__not = !(this.__not ?? false);\n    return this as unknown as F;\n  }\n\n  asObject(opts?: AO): any {\n    const target: any = super.asObject(opts);\n\n    // Serialize composition\n    if (isNotEmptyArray(this.__and)) {\n      target.and = this.__and.map((f) => f.asObject(opts));\n    }\n    if (isNotEmptyArray(this.__or)) {\n      target.or = this.__or.map((f) => f.asObject(opts));\n    }\n    if (this.__not) {\n      target.not = true;\n    }\n\n    // Sanitize\n    delete target.__and;\n    delete target.__or;\n    delete target.__not;\n\n    return target;\n  }\n\n  fromObject(source: any, opts?: FO) {\n    super.fromObject(source, opts as any);\n    // Deserialize composition using the same concrete filter type\n\n    // AND\n    if (Array.isArray(source?.and)) {\n      const Ctor: new () => F = (this.constructor as any);\n      this.__and = source.and.map((s) => {\n        if (!s) return undefined;\n        const f = new Ctor();\n        (f as any).fromObject(s, opts);\n        return f;\n      }).filter(isNotNil);\n    } else {\n      this.__and = undefined;\n    }\n\n    // OR\n    if (Array.isArray(source?.or)) {\n      const Ctor: new () => F = (this.constructor as any);\n      this.__or = source.or.map((s) => {\n        if (!s) return undefined;\n        const f = new Ctor();\n        (f as any).fromObject(s, opts);\n        return f;\n      }).filter(isNotNil);\n    } else {\n      this.__or = undefined;\n    }\n\n    // NOT\n    this.__not = !!source?.not;\n  }\n\n  /* -- protected functions -- */\n\n  protected buildFilter(): FilterFn<T>[] {\n    // Can be completed by subclasses\n    return [];\n  }\n\n  protected isCriteriaNotEmpty(key: string, value: any): boolean {\n    // Can be overridden by subclasses\n    return (\n      value !== undefined &&\n      value !== null &&\n      // not empty string\n      ((typeof value === 'string' && value.trim() !== '') ||\n        // valid number\n        (typeof value === 'number' && !isNaN(value)) ||\n        // valid boolean\n        typeof value === 'boolean' ||\n        // not empty array\n        (Array.isArray(value) && value.length > 0) ||\n        // entity with an id\n        ReferentialUtils.isNotEmpty(value))\n    );\n  }\n}\n\nexport class OrFilter<T extends IEntity<T, any>> extends EntityFilter<OrFilter<T>, T> {\n  protected filters: EntityFilter<any, T>[];\n\n  constructor(...filters: EntityFilter<any, T>[]) {\n    super('OrFilter');\n    this.filters = (filters || []).filter(isNotNil);\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fns = (this.filters || [])\n      .map((f) => (f ? f.asFilterFn() : undefined))\n      .filter(isNotNil);\n\n    if (isEmptyArray(fns)) return [];\n\n    return [\n      (entity: T) => fns.some((fn) => fn(entity))\n    ];\n  }\n}\n\nexport class NotFilter<T extends IEntity<T, any>> extends EntityFilter<NotFilter<T>, T> {\n  protected filter: EntityFilter<any, T>;\n\n  constructor(filter: EntityFilter<any, T>) {\n    super('NotFilter');\n    this.filter = filter;\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fn = this.filter?.asFilterFn();\n    if (!fn) return [];\n    return [\n      (entity: T) => !fn(entity)\n    ];\n  }\n}\n\n\nexport class AndFilter<T extends IEntity<T, any>> extends EntityFilter<AndFilter<T>, T> {\n  protected filters: EntityFilter<any, T>[];\n\n  constructor(...filters: EntityFilter<any, T>[]) {\n    super('AndFilter');\n    this.filters = (filters || []).filter(isNotNil);\n  }\n\n  and(...filters: EntityFilter<any, T>[]): AndFilter<T> {\n    this.filters = this.filters.concat(...(filters || []).filter(isNotNil));\n    return this;\n  }\n\n  protected buildFilter(): FilterFn<T>[] {\n    const fns = (this.filters || [])\n      .map((f) => (f ? f.asFilterFn() : undefined))\n      .filter(isNotNil);\n\n    if (isEmptyArray(fns)) return [];\n\n    return [\n      (entity: T) => fns.every((fn) => fn(entity))\n    ];\n  }\n}\n\nexport abstract class EntityFilterUtils {\n  static isEntityFilter<F extends EntityFilter<F, any>>(obj: Partial<F>): obj is F {\n    return (obj && obj.asPodObject && obj.asFilterFn && true) || false;\n  }\n\n  static fromObject<F>(source: any, filterType: new () => F): F {\n    if (!source) return source;\n    if (isInstanceOf(source, filterType)) return source as F;\n    const target = new filterType();\n    if (EntityFilterUtils.isEntityFilter(target)) {\n      target.fromObject(source);\n    } else {\n      Object.assign(target, source);\n    }\n    return target;\n  }\n\n}\n"]}

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -17968,47 +17968,19 @@ ReferentialRef = ReferentialRef_1 = __decorate([
 ], ReferentialRef);
 
 class EntityFilter extends Entity {
-    /**
-     * @deprecated Use `EntityFilterUtils.composeFns()`
-     * Compose some filter functions: all should return true
-     *
-     * @param filterFns
-     */
-    static composeFilters(filterFns) {
+    // Internal composition state (fluent API)
+    __and;
+    __or;
+    __not;
+    static andFns(filterFns) {
         if (isEmptyArray(filterFns))
             return undefined;
         return (entity) => (filterFns || []).every((fn) => fn(entity));
     }
-    /**
-     * Compose some filter functions: all should return true
-     *
-     * @param filterFns
-     */
-    static composeFns(filterFns) {
+    static orFns(filterFns) {
         if (isEmptyArray(filterFns))
             return undefined;
-        return (entity) => (filterFns || []).every((fn) => fn(entity));
-    }
-    /**
-     * @deprecated Use `EntityFilter.and()`
-     */
-    static compose(filters) {
-        const filterFns = (filters || []).reduce((res, f) => {
-            const fns = f.buildFilter();
-            if (!fns)
-                return res;
-            return res.concat(fns);
-        }, []);
-        return this.composeFns(filterFns);
-    }
-    static or(...filters) {
-        return new OrFilter(...(filters || []));
-    }
-    static and(...filters) {
-        return new AndFilter(...(filters || []));
-    }
-    static not(filter) {
-        return new NotFilter(filter);
+        return (entity) => (filterFns || []).some((fn) => fn(entity));
     }
     constructor(__typename) {
         super(__typename);
@@ -18027,17 +17999,95 @@ class EntityFilter extends Entity {
         return Object.keys(json).filter((key) => this.isCriteriaNotEmpty(key, json[key])).length;
     }
     asFilterFn() {
-        const filterFns = this.buildFilter();
-        return EntityFilter.composeFns(filterFns);
+        // Base (this) filter functions
+        let filterFns = this.buildFilter() || [];
+        // AND filters
+        if (isNotEmptyArray(this.__and)) {
+            filterFns.push(...this.__and.map((f) => f?.asFilterFn()).filter(isNotNil));
+        }
+        // As filter function
+        let result = EntityFilter.andFns(filterFns);
+        // OR filters
+        if (isNotEmptyArray(this.__or)) {
+            result = EntityFilter.orFns([
+                result,
+                ...(this.__or || []).map((f) => f?.asFilterFn())
+            ].filter(isNotNil));
+        }
+        // NOT
+        if (this.__not && result) {
+            const inner = result;
+            result = (entity) => !inner(entity);
+        }
+        return result;
     }
     and(...filters) {
-        return new AndFilter(this, ...filters);
+        if (!isEmptyArray(filters)) {
+            this.__and = (this.__and || []).concat(filters.filter(isNotNil));
+        }
+        return this;
     }
     or(...filters) {
-        return new OrFilter(this, ...filters);
+        if (!isEmptyArray(filters)) {
+            this.__or = (this.__or || []).concat(filters.filter(isNotNil));
+        }
+        return this;
     }
     not() {
-        return new NotFilter(this);
+        this.__not = !(this.__not ?? false);
+        return this;
+    }
+    asObject(opts) {
+        const target = super.asObject(opts);
+        // Serialize composition
+        if (isNotEmptyArray(this.__and)) {
+            target.and = this.__and.map((f) => f.asObject(opts));
+        }
+        if (isNotEmptyArray(this.__or)) {
+            target.or = this.__or.map((f) => f.asObject(opts));
+        }
+        if (this.__not) {
+            target.not = true;
+        }
+        // Sanitize
+        delete target.__and;
+        delete target.__or;
+        delete target.__not;
+        return target;
+    }
+    fromObject(source, opts) {
+        super.fromObject(source, opts);
+        // Deserialize composition using the same concrete filter type
+        // AND
+        if (Array.isArray(source?.and)) {
+            const Ctor = this.constructor;
+            this.__and = source.and.map((s) => {
+                if (!s)
+                    return undefined;
+                const f = new Ctor();
+                f.fromObject(s, opts);
+                return f;
+            }).filter(isNotNil);
+        }
+        else {
+            this.__and = undefined;
+        }
+        // OR
+        if (Array.isArray(source?.or)) {
+            const Ctor = this.constructor;
+            this.__or = source.or.map((s) => {
+                if (!s)
+                    return undefined;
+                const f = new Ctor();
+                f.fromObject(s, opts);
+                return f;
+            }).filter(isNotNil);
+        }
+        else {
+            this.__or = undefined;
+        }
+        // NOT
+        this.__not = !!source?.not;
     }
     /* -- protected functions -- */
     buildFilter() {
@@ -34203,7 +34253,7 @@ class AdditionalFields {
             return;
         return (Object.keys(source)
             // Exclude common fields, from PersonFilter
-            .filter((key) => !PersonFilter.FIELDS.includes(key))
+            .filter((key) => !PersonFilter.FIELDS.includes(key) && key !== 'and' && key !== 'or' && key !== 'not')
             .reduce((target, key) => {
             if (isNil(source[key]))
                 return target;