@sumaris-net/ngx-components 18.22.1 → 18.22.2

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

@@ -19,6 +19,10 @@ export class EntityFilter extends Entity {
     constructor(__typename) {
         super(__typename);
     }
+    create() {
+        const Ctor = this.constructor;
+        return new Ctor();
+    }
     /**
      * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)
      */
@@ -35,6 +39,11 @@ export class EntityFilter extends Entity {
     asFilterFn() {
         // Base (this) filter functions
         let filterFns = this.buildFilter() || [];
+        // NOT
+        if (this.__not) {
+            const notFn = this.__not.asFilterFn();
+            filterFns.push((item) => !notFn(item));
+        }
         // AND filters
         if (isNotEmptyArray(this.__and)) {
             filterFns.push(...this.__and.map((f) => f?.asFilterFn()).filter(isNotNil));
@@ -48,11 +57,6 @@ export class EntityFilter extends Entity {
                 ...(this.__or || []).map((f) => f?.asFilterFn())
             ].filter(isNotNil));
         }
-        // NOT
-        if (this.__not && result) {
-            const inner = result;
-            result = (entity) => !inner(entity);
-        }
         return result;
     }
     and(...filters) {
@@ -67,22 +71,22 @@ export class EntityFilter extends Entity {
         }
         return this;
     }
-    not() {
-        this.__not = !(this.__not ?? false);
+    not(filter) {
+        this.__not = filter;
         return this;
     }
     asObject(opts) {
         const target = super.asObject(opts);
         // Serialize composition
+        if (this.__not) {
+            target.not = this.__not.asObject(opts);
+        }
         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;
@@ -94,11 +98,10 @@ export class EntityFilter extends Entity {
         // 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();
+                const f = this.create();
                 f.fromObject(s, opts);
                 return f;
             }).filter(isNotNil);
@@ -108,11 +111,10 @@ export class EntityFilter extends Entity {
         }
         // OR
         if (Array.isArray(source?.or)) {
-            const Ctor = this.constructor;
             this.__or = source.or.map((s) => {
                 if (!s)
                     return undefined;
-                const f = new Ctor();
+                const f = this.create();
                 f.fromObject(s, opts);
                 return f;
             }).filter(isNotNil);
@@ -121,7 +123,11 @@ export class EntityFilter extends Entity {
             this.__or = undefined;
         }
         // NOT
-        this.__not = !!source?.not;
+        if (source?.not) {
+            const f = this.create();
+            f.fromObject(source.not, opts);
+            this.__not = f;
+        }
     }
     /* -- protected functions -- */
     buildFilter() {
@@ -216,4 +222,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, 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"]}
+//# 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(filter: F): 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?: F;\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  create() {\n    const Ctor: new () => F = (this.constructor as any);\n    return new Ctor();\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    // NOT\n    if (this.__not) {\n      const notFn = this.__not.asFilterFn();\n      filterFns.push((item) => !notFn(item));\n    }\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    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(filter: F): F {\n    this.__not = filter;\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 (this.__not) {\n      target.not = this.__not.asObject(opts);\n    }\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\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      this.__and = source.and.map((s) => {\n        if (!s) return undefined;\n        const f = this.create();\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      this.__or = source.or.map((s) => {\n        if (!s) return undefined;\n        const f = this.create();\n        (f as any).fromObject(s, opts);\n        return f;\n      }).filter(isNotNil);\n    } else {\n      this.__or = undefined;\n    }\n\n    // NOT\n    if (source?.not) {\n      const f = this.create();\n      (f as any).fromObject(source.not, opts);\n      this.__not = f;\n    }\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

@@ -17985,6 +17985,10 @@ class EntityFilter extends Entity {
     constructor(__typename) {
         super(__typename);
     }
+    create() {
+        const Ctor = this.constructor;
+        return new Ctor();
+    }
     /**
      * Clean a filter, before sending to the pod (e.g convert dates, remove internal properties, etc.)
      */
@@ -18001,6 +18005,11 @@ class EntityFilter extends Entity {
     asFilterFn() {
         // Base (this) filter functions
         let filterFns = this.buildFilter() || [];
+        // NOT
+        if (this.__not) {
+            const notFn = this.__not.asFilterFn();
+            filterFns.push((item) => !notFn(item));
+        }
         // AND filters
         if (isNotEmptyArray(this.__and)) {
             filterFns.push(...this.__and.map((f) => f?.asFilterFn()).filter(isNotNil));
@@ -18014,11 +18023,6 @@ class EntityFilter extends Entity {
                 ...(this.__or || []).map((f) => f?.asFilterFn())
             ].filter(isNotNil));
         }
-        // NOT
-        if (this.__not && result) {
-            const inner = result;
-            result = (entity) => !inner(entity);
-        }
         return result;
     }
     and(...filters) {
@@ -18033,22 +18037,22 @@ class EntityFilter extends Entity {
         }
         return this;
     }
-    not() {
-        this.__not = !(this.__not ?? false);
+    not(filter) {
+        this.__not = filter;
         return this;
     }
     asObject(opts) {
         const target = super.asObject(opts);
         // Serialize composition
+        if (this.__not) {
+            target.not = this.__not.asObject(opts);
+        }
         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;
@@ -18060,11 +18064,10 @@ class EntityFilter extends Entity {
         // 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();
+                const f = this.create();
                 f.fromObject(s, opts);
                 return f;
             }).filter(isNotNil);
@@ -18074,11 +18077,10 @@ class EntityFilter extends Entity {
         }
         // OR
         if (Array.isArray(source?.or)) {
-            const Ctor = this.constructor;
             this.__or = source.or.map((s) => {
                 if (!s)
                     return undefined;
-                const f = new Ctor();
+                const f = this.create();
                 f.fromObject(s, opts);
                 return f;
             }).filter(isNotNil);
@@ -18087,7 +18089,11 @@ class EntityFilter extends Entity {
             this.__or = undefined;
         }
         // NOT
-        this.__not = !!source?.not;
+        if (source?.not) {
+            const f = this.create();
+            f.fromObject(source.not, opts);
+            this.__not = f;
+        }
     }
     /* -- protected functions -- */
     buildFilter() {