@stamhoofd/structures 2.1.1 → 2.1.3

package/esm/dist/src/billing/STPackageBundle.js

@@ -17,8 +17,8 @@ export class STPackageBundleHelper {
     static getTitle(bundle) {
         switch (bundle) {
             case STPackageBundle.Members: return "Ledenadministratie voor één jaar";
-            case STPackageBundle.Webshops: return "Webshops voor één jaar";
-            case STPackageBundle.SingleWebshop: return "Eén webshop voor twee maanden (Starter)";
+            case STPackageBundle.Webshops: return "Webshops (max. 10) voor één jaar";
+            case STPackageBundle.SingleWebshop: return "Eén webshop voor twee maanden";
         }
         return "?";
     }

package/esm/dist/src/billing/STPackageBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"STPackageBundle.js","sourceRoot":"","sources":["../../../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"STPackageBundle.js","sourceRoot":"","sources":["../../../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEpF;;GAEG;AACH,MAAM,CAAN,IAAY,eAYX;AAZD,WAAY,eAAe;IACvB,uBAAuB;IACvB,sCAAqB,CAAA;IAErB,oCAAoC;IACpC,wCAAuB,CAAA;IAEvB,sCAAsC;IACtC,kDAAiC,CAAA;IAEjC,gDAA+B,CAAA;IAC/B,kDAAiC,CAAA;AACrC,CAAC,EAZW,eAAe,KAAf,eAAe,QAY1B;AAED,MAAM,OAAO,qBAAqB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAuB;QACnC,QAAO,MAAM,EAAE,CAAC;YACZ,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,kCAAkC,CAAA;YACvE,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,kCAAkC,CAAA;YACxE,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,+BAA+B,CAAA;QAC9E,CAAC;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,MAAuB;QACzC,QAAO,MAAM,EAAE,CAAC;YACZ,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,6EAA6E,CAAA;YAClH,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,iDAAiD,CAAA;YACvF,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,iDAAiD,CAAA;QAChG,CAAC;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAuB;QACnC,QAAO,MAAM,EAAE,CAAC;YACZ,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;YAC1C,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,IAAI,CAAC;YAC3C,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,IAAI,CAAC;QACpD,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAuB,EAAE,IAAe;QACvD,QAAO,MAAM,EAAE,CAAC;YACZ,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,uDAAuD;gBACvD,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,wDAAwD;gBACxD,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAuB,EAAE,IAAe;QACzD,QAAO,MAAM,EAAE,CAAC;YACZ,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC3C,iBAAiB;oBACjB,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YACD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC5C,iBAAiB;oBACjB,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC9F,iBAAiB;oBACjB,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YACD,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;oBAC5F,iBAAiB;oBACjB,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;oBAChJ,iBAAiB;oBACjB,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAuB,EAAE,IAAU;QACxD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,eAAe;gBACf,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAA;gBAEpD,wDAAwD;gBACxD,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAA;gBACrC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAA;gBAE1C,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU;oBACV,QAAQ;oBACR,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,OAAO;wBAC3B,SAAS,EAAE,EAAE;wBACb,aAAa,EAAE,EAAE,GAAC,CAAC;wBACnB,UAAU,EAAE,IAAI;wBAChB,WAAW,EAAE,aAAa,CAAC,SAAS;wBACpC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;qBAC5B,CAAC;iBACL,CAAC,CAAA;YACN,CAAC;YAED,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,eAAe;gBACf,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAA;gBAEpD,wDAAwD;gBACxD,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAA;gBACrC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAA;gBAE1C,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU;oBACV,QAAQ;oBACR,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,QAAQ;wBAC5B,SAAS,EAAE,IAAI;wBACf,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,IAAI;wBAChB,WAAW,EAAE,aAAa,CAAC,OAAO;wBAClC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;qBAC5B,CAAC;iBACL,CAAC,CAAA;YACN,CAAC;YAED,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,qCAAqC;gBACrC,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAA;gBAE9C,8BAA8B;gBAC9B,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAA;gBAErC,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU;oBACV,QAAQ;oBACR,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,aAAa;wBACjC,SAAS,EAAE,IAAI;wBACf,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,IAAI;wBAChB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;qBAC5B,CAAC;iBACL,CAAC,CAAA;YACN,CAAC;YAED,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,8DAA8D;gBAC9D,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;gBAE7C,8BAA8B;gBAC9B,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAA;gBAErC,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU;oBACV,QAAQ;oBACR,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,YAAY;wBAChC,SAAS,EAAE,CAAC;wBACZ,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,KAAK;wBACjB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;wBACzB,aAAa,EAAE,IAAI;qBACtB,CAAC;iBACL,CAAC,CAAA;YACN,CAAC;YAED,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBAChC,8DAA8D;gBAC/D,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;gBAE7C,8BAA8B;gBAC9B,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAA;gBAErC,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU;oBACV,QAAQ;oBACR,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,aAAa;wBACjC,SAAS,EAAE,CAAC;wBACZ,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,KAAK;wBACjB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC;wBACzB,aAAa,EAAE,IAAI;qBACtB,CAAC;iBACL,CAAC,CAAA;YACN,CAAC;QACL,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC5C,CAAC;CACJ"}

package/esm/dist/src/endpoints/RegisterResponse.d.ts

@@ -1,11 +1,11 @@
 import { AutoEncoder } from '@simonbackx/simple-encoding';
-import { EncryptedMemberWithRegistrations } from '../members/EncryptedMemberWithRegistrations';
+import { MembersBlob } from '../members/MemberWithRegistrationsBlob';
 import { Payment } from '../members/Payment';
 import { RegistrationWithMember } from '../members/RegistrationWithMember';
 export declare class RegisterResponse extends AutoEncoder {
     payment: Payment | null;
     paymentUrl: string | null;
-    members: EncryptedMemberWithRegistrations[];
+    members: MembersBlob;
     registrations: RegistrationWithMember[];
 }
 //# sourceMappingURL=RegisterResponse.d.ts.map

package/esm/dist/src/endpoints/RegisterResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegisterResponse.d.ts","sourceRoot":"","sources":["../../../../src/endpoints/RegisterResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAE7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,OAAO,EAAE,OAAO,GAAG,IAAI,CAAO;IAG9B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAO;IAGhC,OAAO,EAAE,gCAAgC,EAAE,CAAK;IAGhD,aAAa,EAAE,sBAAsB,EAAE,CAAK;CAC/C"}
+{"version":3,"file":"RegisterResponse.d.ts","sourceRoot":"","sources":["../../../../src/endpoints/RegisterResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAiC,MAAM,6BAA6B,CAAC;AAEtG,OAAO,EAAE,WAAW,EAA+B,MAAM,wCAAwC,CAAC;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,OAAO,EAAE,OAAO,GAAG,IAAI,CAAO;IAG9B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAO;IAGhC,OAAO,EAAE,WAAW,CAAA;IAGpB,aAAa,EAAE,sBAAsB,EAAE,CAAK;CAC/C"}

package/esm/dist/src/endpoints/RegisterResponse.js

@@ -1,6 +1,6 @@
 import { __decorate } from "tslib";
 import { ArrayDecoder, AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { EncryptedMemberWithRegistrations } from '../members/EncryptedMemberWithRegistrations';
+import { MembersBlob } from '../members/MemberWithRegistrationsBlob';
 import { Payment } from '../members/Payment';
 import { RegistrationWithMember } from '../members/RegistrationWithMember';
 export class RegisterResponse extends AutoEncoder {
@@ -8,7 +8,6 @@ export class RegisterResponse extends AutoEncoder {
         super(...arguments);
         this.payment = null;
         this.paymentUrl = null;
-        this.members = [];
         this.registrations = [];
     }
 }
@@ -19,7 +18,7 @@ __decorate([
     field({ decoder: StringDecoder, nullable: true, version: 28 })
 ], RegisterResponse.prototype, "paymentUrl", void 0);
 __decorate([
-    field({ decoder: new ArrayDecoder(EncryptedMemberWithRegistrations) })
+    field({ decoder: MembersBlob })
 ], RegisterResponse.prototype, "members", void 0);
 __decorate([
     field({ decoder: new ArrayDecoder(RegistrationWithMember), version: 19 })

package/esm/dist/src/endpoints/RegisterResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"RegisterResponse.js","sourceRoot":"","sources":["../../../../src/endpoints/RegisterResponse.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAC,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,6CAA6C,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAAjD;;QAEI,YAAO,GAAmB,IAAI,CAAA;QAG9B,eAAU,GAAkB,IAAI,CAAA;QAGhC,YAAO,GAAuC,EAAE,CAAA;QAGhD,kBAAa,GAA6B,EAAE,CAAA;IAChD,CAAC;CAAA;AAVG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iDACd;AAG9B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;oDAC/B;AAGhC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,gCAAgC,CAAC,EAAE,CAAC;iDACvB;AAGhD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;uDAC9B"}
+{"version":3,"file":"RegisterResponse.js","sourceRoot":"","sources":["../../../../src/endpoints/RegisterResponse.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAC,WAAW,EAAW,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEtG,OAAO,EAAE,WAAW,EAA+B,MAAM,wCAAwC,CAAC;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAAjD;;QAEI,YAAO,GAAmB,IAAI,CAAA;QAG9B,eAAU,GAAkB,IAAI,CAAA;QAMhC,kBAAa,GAA6B,EAAE,CAAA;IAChD,CAAC;CAAA;AAVG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iDACd;AAG9B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;oDAC/B;AAGhC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAmC,EAAE,CAAC;iDACpC;AAGpB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;uDAC9B"}

package/esm/dist/src/filters/PropertyFilter.d.ts

@@ -1,20 +1,23 @@
 import { Data, Encodeable, EncodeContext, PlainObject } from "@simonbackx/simple-encoding";
-import { FilterDefinition } from "./FilterDefinition";
-import { FilterGroupEncoded } from "./FilterGroup";
-export declare class PropertyFilter<T> implements Encodeable {
-    constructor(enabledWhen: FilterGroupEncoded<T>, requiredWhen: FilterGroupEncoded<T> | null);
-    static createDefault<T>(): PropertyFilter<T>;
+import { StamhoofdFilter } from "./new/StamhoofdFilter";
+import { Filterable } from "../members/records/RecordCategory";
+export declare class PropertyFilter implements Encodeable {
+    constructor(enabledWhen: StamhoofdFilter | null, requiredWhen: StamhoofdFilter | null);
+    static createDefault(): PropertyFilter;
     /**
      * Enabled when...
-     * cannot be null (always should be enabled)
+     * null = always enabled
      */
-    enabledWhen: FilterGroupEncoded<T>;
+    enabledWhen: StamhoofdFilter | null;
     /**
      * If enabled, whether it is required
+     * null = always skippable
+     * empty filter = always required
      */
-    requiredWhen: FilterGroupEncoded<T> | null;
-    getString(definitions: FilterDefinition<T>[]): string;
+    requiredWhen: StamhoofdFilter | null;
+    isEnabled(object: Filterable): boolean;
+    isRequired(object: Filterable): boolean;
     encode(context: EncodeContext): PlainObject;
-    static decode<T>(data: Data): PropertyFilter<T>;
+    static decode<T>(data: Data): PropertyFilter;
 }
 //# sourceMappingURL=PropertyFilter.d.ts.map

package/esm/dist/src/filters/PropertyFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyFilter.d.ts","sourceRoot":"","sources":["../../../../src/filters/PropertyFilter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAE1F,OAAO,EAAU,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAe,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAE/D,qBAAa,cAAc,CAAC,CAAC,CAAE,YAAW,UAAU;gBACpC,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,IAAI;IAK1F,MAAM,CAAC,aAAa,CAAC,CAAC;IAItB;;;OAGG;IACH,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;IAElC;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAO;IAEjD,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM;IA4BrD,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;IAO3C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC;CAMlD"}
+{"version":3,"file":"PropertyFilter.d.ts","sourceRoot":"","sources":["../../../../src/filters/PropertyFilter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAI1F,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAE9D,qBAAa,cAAe,YAAW,UAAU;gBACjC,WAAW,EAAE,eAAe,GAAG,IAAI,EAAE,YAAY,EAAE,eAAe,GAAG,IAAI;IAKrF,MAAM,CAAC,aAAa;IAIpB;;;OAGG;IACH,WAAW,EAAE,eAAe,GAAG,IAAI,CAAO;IAE1C;;;;OAIG;IACH,YAAY,EAAE,eAAe,GAAG,IAAI,CAAO;IAE3C,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO;IAOtC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO;IAOvC,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;IAO3C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,cAAc;CAmB/C"}

package/esm/dist/src/filters/PropertyFilter.js

@@ -1,45 +1,58 @@
-import { FilterGroup, FilterGroupEncoded } from "./FilterGroup";
+import { FilterGroupEncoded } from "./FilterGroup";
+import { StamhoofdFilterDecoder } from "./new/FilteredRequest";
 export class PropertyFilter {
     constructor(enabledWhen, requiredWhen) {
+        /**
+         * Enabled when...
+         * null = always enabled
+         */
+        this.enabledWhen = null;
         /**
          * If enabled, whether it is required
+         * null = always skippable
+         * empty filter = always required
          */
         this.requiredWhen = null;
         this.enabledWhen = enabledWhen;
         this.requiredWhen = requiredWhen;
     }
     static createDefault() {
-        return new PropertyFilter(new FilterGroup([]).encoded, new FilterGroup([]).encoded);
+        return new PropertyFilter(null, {});
     }
-    getString(definitions) {
-        const decodedEnabledWhen = this.enabledWhen.decode(definitions);
-        const decodedRequiredWhen = this.requiredWhen === null ? null : this.requiredWhen.decode(definitions);
-        if (decodedEnabledWhen.filters.length == 0) {
-            // Always enabled
-            if (decodedRequiredWhen === null) {
-                return "Stap kan worden overgeslagen";
-            }
-            if (decodedRequiredWhen.filters.length == 0) {
-                return "Stap kan niet worden overgeslagen";
-            }
-            return "Stap kan niet worden overgeslagen als: " + decodedRequiredWhen.toString();
+    isEnabled(object) {
+        if (this.enabledWhen === null) {
+            return true;
         }
-        if (decodedRequiredWhen === null) {
-            return "Ingeschakeld (kan altijd worden overgeslagen) als: " + decodedEnabledWhen.toString();
-        }
-        if (decodedRequiredWhen.filters.length == 0) {
-            return "Ingeschakeld als: " + decodedEnabledWhen.toString();
+        return object.doesMatchFilter(this.enabledWhen);
+    }
+    isRequired(object) {
+        if (this.requiredWhen === null) {
+            return false;
         }
-        return "Ingeschakeld als: " + decodedEnabledWhen + ", enkel verplicht invullen als: " + decodedRequiredWhen.toString();
+        return object.doesMatchFilter(this.requiredWhen);
     }
     encode(context) {
         return {
-            enabledWhen: this.enabledWhen.encode(context),
-            requiredWhen: this.requiredWhen === null ? null : this.requiredWhen.encode(context)
+            enabledWhen: this.enabledWhen,
+            requiredWhen: this.requiredWhen
         };
     }
     static decode(data) {
-        return new PropertyFilter(data.field("enabledWhen").decode(FilterGroupEncoded), data.field("requiredWhen").nullable(FilterGroupEncoded));
+        if (data.context.version < 251) {
+            // Legacy filters: convert to StamhoofdFilter
+            const oldData = {
+                enabledWhen: data.field("enabledWhen").decode(FilterGroupEncoded),
+                requiredWhen: data.field("requiredWhen").nullable(FilterGroupEncoded)
+            };
+            return new PropertyFilter(oldData.enabledWhen ? convertFilterGroupEncoded(oldData.enabledWhen) : null, oldData.requiredWhen ? convertFilterGroupEncoded(oldData.requiredWhen) : null);
+        }
+        return new PropertyFilter(data.field("enabledWhen").nullable(StamhoofdFilterDecoder), data.field("requiredWhen").nullable(StamhoofdFilterDecoder));
+    }
+}
+function convertFilterGroupEncoded(obj) {
+    if (obj === null) {
+        return null;
     }
+    return {};
 }
 //# sourceMappingURL=PropertyFilter.js.map

package/esm/dist/src/filters/PropertyFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyFilter.js","sourceRoot":"","sources":["../../../../src/filters/PropertyFilter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAE/D,MAAM,OAAO,cAAc;IACvB,YAAY,WAAkC,EAAE,YAA0C;QAe1F;;WAEG;QACH,iBAAY,GAAiC,IAAI,CAAA;QAjB7C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,aAAa;QAChB,OAAO,IAAI,cAAc,CAAI,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;IAC1F,CAAC;IAaD,SAAS,CAAC,WAAkC;QACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC/D,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAErG,IAAI,kBAAkB,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzC,iBAAiB;YAEjB,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;gBAC/B,OAAO,8BAA8B,CAAA;YACzC,CAAC;YACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC1C,OAAO,mCAAmC,CAAA;YAC9C,CAAC;YAED,OAAO,yCAAyC,GAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;QACnF,CAAC;QAED,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;YAC/B,OAAO,qDAAqD,GAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAA;QAC9F,CAAC;QAED,IAAI,mBAAmB,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC1C,OAAO,oBAAoB,GAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAA;QAC7D,CAAC;QAED,OAAO,oBAAoB,GAAC,kBAAkB,GAAC,kCAAkC,GAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;IACpH,CAAC;IAED,MAAM,CAAC,OAAsB;QACzB,OAAO;YACH,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;YAC7C,YAAY,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC;SACtF,CAAA;IACL,CAAC;IAED,MAAM,CAAC,MAAM,CAAI,IAAU;QACvB,OAAO,IAAI,cAAc,CACrB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,EACpD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAC1D,CAAA;IACL,CAAC;CACJ"}
+{"version":3,"file":"PropertyFilter.js","sourceRoot":"","sources":["../../../../src/filters/PropertyFilter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAI9D,MAAM,OAAO,cAAc;IACvB,YAAY,WAAmC,EAAE,YAAoC;QASrF;;;WAGG;QACH,gBAAW,GAA2B,IAAI,CAAA;QAE1C;;;;WAIG;QACH,iBAAY,GAA2B,IAAI,CAAA;QAnBvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,aAAa;QAChB,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACvC,CAAC;IAeD,SAAS,CAAC,MAAkB;QACxB,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACnD,CAAC;IAED,UAAU,CAAC,MAAkB;QACzB,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACpD,CAAC;IAED,MAAM,CAAC,OAAsB;QACzB,OAAO;YACH,WAAW,EAAE,IAAI,CAAC,WAA0B;YAC5C,YAAY,EAAE,IAAI,CAAC,YAA2B;SACjD,CAAA;IACL,CAAC;IAED,MAAM,CAAC,MAAM,CAAI,IAAU;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC;YAC7B,6CAA6C;YAC7C,MAAM,OAAO,GAAG;gBACZ,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBACjE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;aACxE,CAAC;YAEF,OAAO,IAAI,cAAc,CACrB,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAC3E,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAChF,CAAA;QACL,CAAC;QAED,OAAO,IAAI,cAAc,CACrB,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAC9D,CAAA;IACL,CAAC;CACJ;AAGD,SAAS,yBAAyB,CAAC,GAA4B;IAC3D,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,CAAA;AACb,CAAC"}

package/esm/dist/src/filters/new/FilteredRequest.d.ts

@@ -1,6 +1,9 @@
-import { AutoEncoder, Data, EncodeContext, Encodeable, PlainObject } from "@simonbackx/simple-encoding";
+import { AutoEncoder, Data, Encodeable, EncodeContext, PlainObject } from "@simonbackx/simple-encoding";
 import { SortList } from "./SortList";
 import { StamhoofdFilter } from "./StamhoofdFilter";
+export declare class StamhoofdFilterJSONDecoder {
+    static decode(data: Data): StamhoofdFilter;
+}
 export declare class StamhoofdFilterDecoder {
     static decode(data: Data): StamhoofdFilter;
 }

package/esm/dist/src/filters/new/FilteredRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilteredRequest.d.ts","sourceRoot":"","sources":["../../../../../src/filters/new/FilteredRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAW,aAAa,EAAE,UAAU,EAAkB,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAEvJ,OAAO,EAAE,QAAQ,EAAmC,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,sBAAsB;IAC/B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe;CAa7C;AAED,qBAAa,aAAc,SAAQ,WAAW;IAE1C,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACnD,MAAM,EAAE,eAAe,GAAC,IAAI,CAAA;IAC5B,MAAM,EAAE,MAAM,GAAC,IAAI,CAAA;gBAEP,IAAI,EAAE;QAAC,MAAM,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;KAAC;IAKvE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,oBAAoB;IAO/C,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;CAM9C;AAED,qBAAa,sBAAuB,YAAW,UAAU;IACrD;;OAEG;IACH,MAAM,EAAE,eAAe,GAAC,IAAI,CAAA;IAE5B;;OAEG;IACH,UAAU,EAAE,eAAe,GAAC,IAAI,CAAA;IAEhC,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,GAAC,IAAI,CAAA;gBAEP,IAAI,EAAE;QAAC,MAAM,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;KAAC;IAQzI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,sBAAsB;IAUjD,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;CAS9C"}
+{"version":3,"file":"FilteredRequest.d.ts","sourceRoot":"","sources":["../../../../../src/filters/new/FilteredRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAW,UAAU,EAAE,aAAa,EAAwB,WAAW,EAAiB,MAAM,6BAA6B,CAAC;AAGtJ,OAAO,EAAiB,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,0BAA0B;IACnC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe;CAa7C;AAED,qBAAa,sBAAsB;IAC/B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe;CAW7C;AAED,qBAAa,aAAc,SAAQ,WAAW;IAE1C,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,oBAAqB,YAAW,UAAU;IACnD,MAAM,EAAE,eAAe,GAAC,IAAI,CAAA;IAC5B,MAAM,EAAE,MAAM,GAAC,IAAI,CAAA;gBAEP,IAAI,EAAE;QAAC,MAAM,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;KAAC;IAKvE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,oBAAoB;IAO/C,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;CAM9C;AAED,qBAAa,sBAAuB,YAAW,UAAU;IACrD;;OAEG;IACH,MAAM,EAAE,eAAe,GAAC,IAAI,CAAA;IAE5B;;OAEG;IACH,UAAU,EAAE,eAAe,GAAC,IAAI,CAAA;IAEhC,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,GAAC,IAAI,CAAA;gBAEP,IAAI,EAAE;QAAC,MAAM,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,eAAe,GAAC,IAAI,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;KAAC;IAQzI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,sBAAsB;IAUjD,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW;CAS9C"}

package/esm/dist/src/filters/new/FilteredRequest.js

@@ -1,8 +1,8 @@
 import { __decorate } from "tslib";
-import { AutoEncoder, IntegerDecoder, StringDecoder, field } from "@simonbackx/simple-encoding";
+import { AutoEncoder, field, IntegerDecoder, StringDecoder } from "@simonbackx/simple-encoding";
 import { SimpleError } from "@simonbackx/simple-errors";
-import { SortListDecoder, encodeSortList } from "./SortList";
-export class StamhoofdFilterDecoder {
+import { encodeSortList, SortListDecoder } from "./SortList";
+export class StamhoofdFilterJSONDecoder {
     static decode(data) {
         const str = data.string;
         try {
@@ -18,6 +18,18 @@ export class StamhoofdFilterDecoder {
         }
     }
 }
+export class StamhoofdFilterDecoder {
+    static decode(data) {
+        if (typeof data.value === 'object' && data.value !== null) {
+            return data.value;
+        }
+        throw new SimpleError({
+            code: "invalid_field",
+            message: `Expected filter object at ${data.currentField}`,
+            field: data.currentField,
+        });
+    }
+}
 export class CountResponse extends AutoEncoder {
 }
 __decorate([
@@ -32,7 +44,7 @@ export class CountFilteredRequest {
     static decode(data) {
         var _a, _b;
         return new CountFilteredRequest({
-            filter: (_a = data.optionalField('filter')) === null || _a === void 0 ? void 0 : _a.nullable(StamhoofdFilterDecoder),
+            filter: (_a = data.optionalField('filter')) === null || _a === void 0 ? void 0 : _a.nullable(StamhoofdFilterJSONDecoder),
             search: (_b = data.optionalField('search')) === null || _b === void 0 ? void 0 : _b.nullable(StringDecoder)
         });
     }
@@ -56,8 +68,8 @@ export class LimitedFilteredRequest {
     static decode(data) {
         var _a, _b, _c;
         return new LimitedFilteredRequest({
-            filter: (_a = data.optionalField('filter')) === null || _a === void 0 ? void 0 : _a.nullable(StamhoofdFilterDecoder),
-            pageFilter: (_b = data.optionalField('pageFilter')) === null || _b === void 0 ? void 0 : _b.nullable(StamhoofdFilterDecoder),
+            filter: (_a = data.optionalField('filter')) === null || _a === void 0 ? void 0 : _a.nullable(StamhoofdFilterJSONDecoder),
+            pageFilter: (_b = data.optionalField('pageFilter')) === null || _b === void 0 ? void 0 : _b.nullable(StamhoofdFilterJSONDecoder),
             sort: data.field('sort').decode(SortListDecoder),
             limit: data.field('limit').integer,
             search: (_c = data.optionalField('search')) === null || _c === void 0 ? void 0 : _c.nullable(StringDecoder)

package/esm/dist/src/filters/new/FilteredRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilteredRequest.js","sourceRoot":"","sources":["../../../../../src/filters/new/FilteredRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilteredRequest.js","sourceRoot":"","sources":["../../../../../src/filters/new/FilteredRequest.ts"],"names":[],"mappings":"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"}

package/esm/dist/src/filters/new/InMemoryFilter.d.ts

@@ -1,10 +1,10 @@
-import { PlainObject } from "@simonbackx/simple-encoding";
-type InMemoryFilterRunner = (object: any) => boolean;
-type InMemoryFilterCompiler = (filter: PlainObject, filters: InMemoryFilterDefinitions) => InMemoryFilterRunner | null;
-type InMemoryFilterDefinitions = Record<string, InMemoryFilterCompiler>;
-declare function andInMemoryFilterCompiler(filter: PlainObject, filters: InMemoryFilterDefinitions): InMemoryFilterRunner;
+import { StamhoofdFilter } from "./StamhoofdFilter";
+export type InMemoryFilterRunner = (object: any) => boolean;
+export type InMemoryFilterCompiler = (filter: StamhoofdFilter, filters: InMemoryFilterDefinitions) => InMemoryFilterRunner;
+export type InMemoryFilterDefinitions = Record<string, InMemoryFilterCompiler>;
+declare function $andInMemoryFilterCompiler(filter: StamhoofdFilter, filters: InMemoryFilterDefinitions): InMemoryFilterRunner;
+export declare function createInMemoryFilterCompiler(path: string): InMemoryFilterCompiler;
 export declare const baseInMemoryFilterCompilers: InMemoryFilterDefinitions;
-export declare const memberInMemoryFilterCompilers: InMemoryFilterDefinitions;
-export declare const compileToInMemoryFilter: typeof andInMemoryFilterCompiler;
+export declare const compileToInMemoryFilter: typeof $andInMemoryFilterCompiler;
 export {};
 //# sourceMappingURL=InMemoryFilter.d.ts.map

package/esm/dist/src/filters/new/InMemoryFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InMemoryFilter.d.ts","sourceRoot":"","sources":["../../../../../src/filters/new/InMemoryFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D,KAAK,oBAAoB,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC;AAErD,KAAK,sBAAsB,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,yBAAyB,KAAK,oBAAoB,GAAC,IAAI,CAAC;AACrH,KAAK,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;AAGvE,iBAAS,yBAAyB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,yBAAyB,GAAG,oBAAoB,CAUhH;AA2FD,eAAO,MAAM,2BAA2B,EAAE,yBAIzC,CAAA;AAED,eAAO,MAAM,6BAA6B,EAAE,yBAK3C,CAAA;AA8BD,eAAO,MAAM,uBAAuB,kCAA4B,CAAA"}
+{"version":3,"file":"InMemoryFilter.d.ts","sourceRoot":"","sources":["../../../../../src/filters/new/InMemoryFilter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAA+C,MAAM,mBAAmB,CAAC;AAExH,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,KAAK,oBAAoB,CAAC;AAC3H,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;AAG9E,iBAAS,0BAA0B,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,GAAG,oBAAoB,CAUrH;AA6LD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAWjF;AAED,eAAO,MAAM,2BAA2B,EAAE,yBAWzC,CAAA;AAgCD,eAAO,MAAM,uBAAuB,mCAA6B,CAAA"}

package/esm/dist/src/filters/new/InMemoryFilter.js

@@ -1,5 +1,5 @@
 import { StringCompare } from "@stamhoofd/utility";
-function andInMemoryFilterCompiler(filter, filters) {
+function $andInMemoryFilterCompiler(filter, filters) {
     const runners = compileInMemoryFilter(filter, filters);
     return (object) => {
         for (const runner of runners) {
@@ -10,7 +10,7 @@ function andInMemoryFilterCompiler(filter, filters) {
         return true;
     };
 }
-function orInMemoryFilterCompiler(filter, filters) {
+function $orInMemoryFilterCompiler(filter, filters) {
     const runners = compileInMemoryFilter(filter, filters);
     return (object) => {
         for (const runner of runners) {
@@ -21,12 +21,96 @@ function orInMemoryFilterCompiler(filter, filters) {
         return false;
     };
 }
-function notInMemoryFilterCompiler(filter, filters) {
-    const andRunner = andInMemoryFilterCompiler(filter, filters);
+function $notInMemoryFilterCompiler(filter, filters) {
+    const andRunner = $andInMemoryFilterCompiler(filter, filters);
     return (object) => {
         return !andRunner(object);
     };
 }
+function $lessThanInMemoryFilterCompiler(filter) {
+    return (val) => {
+        const a = normalizeValue(guardFilterCompareValue(val));
+        const b = normalizeValue(guardFilterCompareValue(filter));
+        if (a === null || b === null) {
+            return a !== null && b === null;
+        }
+        return a < b;
+    };
+}
+function $equalsInMemoryFilterCompiler(filter) {
+    return (val) => {
+        const b = normalizeValue(guardFilterCompareValue(filter));
+        if (Array.isArray(val)) {
+            // To match backend logic where these things are required for optimizations
+            // + also match MongoDB behavior
+            for (const v of val) {
+                const a = normalizeValue(guardFilterCompareValue(v));
+                if (a === b) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        const a = normalizeValue(guardFilterCompareValue(val));
+        return a === b;
+    };
+}
+function invertFilterCompiler(compiler) {
+    return (filter, filters) => {
+        const runner = compiler(filter, filters);
+        return (val) => {
+            return !runner(val);
+        };
+    };
+}
+function $containsInMemoryFilterCompiler(filter) {
+    return (val) => {
+        const a = normalizeValue(guardFilterCompareValue(val));
+        const needle = normalizeValue(guardFilterCompareValue(filter));
+        if (typeof a !== 'string' || typeof needle !== 'string') {
+            return false;
+        }
+        return StringCompare.contains(a, needle);
+    };
+}
+function $inInMemoryFilterCompiler(filter) {
+    return (val) => {
+        if (!Array.isArray(filter)) {
+            throw new Error('Invalid filter: expected array as value for $in filter');
+        }
+        if (Array.isArray(val)) {
+            // To match backend logic (JSON_OVERLAPS in MySQL) where these things are required for optimizations
+            // + also match MongoDB behavior 
+            for (const v of val) {
+                const a = normalizeValue(guardFilterCompareValue(v));
+                for (const element of filter) {
+                    const b = normalizeValue(guardFilterCompareValue(element));
+                    if (a === b) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        const a = normalizeValue(guardFilterCompareValue(val));
+        for (const element of filter) {
+            const b = normalizeValue(guardFilterCompareValue(element));
+            if (a === b) {
+                return true;
+            }
+        }
+        return false;
+    };
+}
+function $lengthInMemoryFilterCompiler(filter, filters) {
+    const runner = $andInMemoryFilterCompiler(filter, filters);
+    return (val) => {
+        if (typeof val === 'string' || Array.isArray(val)) {
+            return runner(val.length);
+        }
+        throw new Error('Invalid filter: expected string or array as value for $length filter');
+    };
+}
 function objectPathValue(object, path) {
     if (path.length === 0) {
         return object;
@@ -36,6 +120,24 @@ function objectPathValue(object, path) {
         return objectPathValue(object[nextSearched], path.slice(1));
     }
 }
+function guardFilterCompareValue(val) {
+    if (val instanceof Date) {
+        return val;
+    }
+    if (typeof val === 'string') {
+        return val;
+    }
+    if (typeof val === 'number') {
+        return val;
+    }
+    if (typeof val === 'boolean') {
+        return val;
+    }
+    if (val === null) {
+        return null;
+    }
+    throw new Error('Invalid compare value. Expected a string, number, boolean, date or null.');
+}
 function normalizeValue(val) {
     if (val instanceof Date) {
         return val.getTime();
@@ -43,70 +145,61 @@ function normalizeValue(val) {
     if (typeof val === 'string') {
         return val.toLocaleLowerCase();
     }
+    if (typeof val === 'boolean') {
+        return val === true ? 1 : 0;
+    }
+    if (val === null) {
+        return null;
+    }
     return val;
 }
-function createInMemoryFilterCompiler(path) {
+function wrapPlainFilter(filter) {
+    if (typeof filter === 'string' || typeof filter === 'number' || typeof filter === 'boolean' || filter === null || filter === undefined || filter instanceof Date) {
+        return {
+            $eq: filter
+        };
+    }
+    return filter;
+}
+export function createInMemoryFilterCompiler(path) {
     const splitted = path.split('.');
     return (filter, filters) => {
-        if (typeof filter === 'string' || typeof filter === 'number' || typeof filter === 'boolean' || filter === null || filter === undefined) {
-            filter = {
-                $eq: filter
-            };
-        }
-        if (Array.isArray(filter)) {
-            throw new Error('Unexpected array in filter');
-        }
-        const f = filter;
+        const runner = $andInMemoryFilterCompiler(filter, filters);
         return (object) => {
-            const val = normalizeValue(objectPathValue(object, splitted));
-            if ("$eq" in f) {
-                return val === normalizeValue(f.$eq);
-            }
-            if ("$neq" in f) {
-                return val !== normalizeValue(f.$neq);
-            }
-            if ("$gt" in f) {
-                return val > normalizeValue(f.$gt);
-            }
-            if ("$lt" in f) {
-                return val < normalizeValue(f.$lt);
-            }
-            if ("$contains" in f) {
-                if (typeof val !== 'string' || typeof f.$contains !== 'string') {
-                    return false;
-                }
-                return StringCompare.contains(val, f.$contains);
-            }
-            throw new Error('Invalid filter');
+            const value = objectPathValue(object, splitted);
+            return runner(value);
         };
     };
 }
 export const baseInMemoryFilterCompilers = {
-    '$and': andInMemoryFilterCompiler,
-    '$or': orInMemoryFilterCompiler,
-    '$not': notInMemoryFilterCompiler,
-};
-export const memberInMemoryFilterCompilers = {
-    ...baseInMemoryFilterCompilers,
-    id: createInMemoryFilterCompiler('id'),
-    name: createInMemoryFilterCompiler('name'),
-    birthDay: createInMemoryFilterCompiler('birthDay'),
+    '$and': $andInMemoryFilterCompiler,
+    '$or': $orInMemoryFilterCompiler,
+    '$not': $notInMemoryFilterCompiler,
+    '$eq': $equalsInMemoryFilterCompiler,
+    '$neq': invertFilterCompiler($equalsInMemoryFilterCompiler),
+    '$lt': $lessThanInMemoryFilterCompiler,
+    '$gt': invertFilterCompiler($lessThanInMemoryFilterCompiler),
+    '$in': $inInMemoryFilterCompiler,
+    '$contains': $containsInMemoryFilterCompiler,
+    '$length': $lengthInMemoryFilterCompiler,
 };
 function compileInMemoryFilter(filter, definitions) {
     if (filter === undefined) {
         return [];
     }
     const runners = [];
-    for (const f of (Array.isArray(filter) ? filter : [filter])) {
-        if (!f) {
+    for (const f2 of (Array.isArray(filter) ? filter : [filter])) {
+        if (!f2) {
             continue;
         }
+        const f = wrapPlainFilter(f2);
         for (const key of Object.keys(f)) {
-            const filter = definitions[key];
-            if (!filter) {
+            if (!(key in definitions)) {
                 throw new Error('Unsupported filter ' + key);
             }
-            const s = filter(f[key], definitions);
+            const filterCompiler = definitions[key];
+            const subFilter = f[key];
+            const s = filterCompiler(subFilter, definitions);
             if (s === undefined || s === null) {
                 throw new Error('Unsupported filter value for ' + key);
             }
@@ -115,5 +208,5 @@ function compileInMemoryFilter(filter, definitions) {
     }
     return runners;
 }
-export const compileToInMemoryFilter = andInMemoryFilterCompiler;
+export const compileToInMemoryFilter = $andInMemoryFilterCompiler;
 //# sourceMappingURL=InMemoryFilter.js.map