@stamhoofd/structures 2.1.1 → 2.1.4

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compileToInMemoryFilter = exports.memberInMemoryFilterCompilers = exports.baseInMemoryFilterCompilers = void 0;
+exports.compileToInMemoryFilter = exports.baseInMemoryFilterCompilers = exports.createInMemoryFilterCompiler = void 0;
 const utility_1 = require("@stamhoofd/utility");
-function andInMemoryFilterCompiler(filter, filters) {
+function $andInMemoryFilterCompiler(filter, filters) {
     const runners = compileInMemoryFilter(filter, filters);
     return (object) => {
         for (const runner of runners) {
@@ -13,7 +13,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) {
@@ -24,12 +24,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 utility_1.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;
@@ -39,6 +123,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();
@@ -46,70 +148,62 @@ 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 wrapPlainFilter(filter) {
+    if (typeof filter === 'string' || typeof filter === 'number' || typeof filter === 'boolean' || filter === null || filter === undefined || filter instanceof Date) {
+        return {
+            $eq: filter
+        };
+    }
+    return filter;
+}
 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 utility_1.StringCompare.contains(val, f.$contains);
-            }
-            throw new Error('Invalid filter');
+            const value = objectPathValue(object, splitted);
+            return runner(value);
         };
     };
 }
+exports.createInMemoryFilterCompiler = createInMemoryFilterCompiler;
 exports.baseInMemoryFilterCompilers = {
-    '$and': andInMemoryFilterCompiler,
-    '$or': orInMemoryFilterCompiler,
-    '$not': notInMemoryFilterCompiler,
-};
-exports.memberInMemoryFilterCompilers = {
-    ...exports.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);
             }
@@ -118,5 +212,5 @@ function compileInMemoryFilter(filter, definitions) {
     }
     return runners;
 }
-exports.compileToInMemoryFilter = andInMemoryFilterCompiler;
+exports.compileToInMemoryFilter = $andInMemoryFilterCompiler;
 //# sourceMappingURL=InMemoryFilter.js.map

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

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

package/dist/src/filters/new/Sorters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sorters.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/Sorters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAqB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;IACjE,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;AAuDlE,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,OAOlG"}
+{"version":3,"file":"Sorters.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/Sorters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAqB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI;IACjE,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;AAoDlE,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,OAOlG"}

package/dist/src/filters/new/Sorters.js

@@ -5,8 +5,6 @@ function sorterGetNextFilter(lastObject, sortDefinitions, list) {
     if (!lastObject) {
         return null;
     }
-    // Always add id
-    //const sort = [...list, {key: 'id', order: 'ASC'}]
     const first = list[0];
     if (!first) {
         return null;

package/dist/src/filters/new/Sorters.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sorters.js","sourceRoot":"","sources":["../../../../src/filters/new/Sorters.ts"],"names":[],"mappings":";;;AASA,SAAS,mBAAmB,CAAI,UAAa,EAAE,eAAmC,EAAE,IAAc;IAC9F,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gBAAgB;IAChB,mDAAmD;IAEnD,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE/B,MAAM,UAAU,GAAG;QACf,kDAAkD;QAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS;SACrD;KACJ,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IACpF,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IAClE,CAAC;IAED,OAAO;QACH,GAAG,EAAE;YACD,UAAU;YACV;gBACI,2DAA2D;gBAC3D,IAAI,EAAE;oBACF;wBACI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS;qBACzB;oBACD,eAAe;iBAClB;aACJ;SACJ;KACJ,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CAAI,UAAa,EAAE,eAAmC,EAAE,IAAc;IAC/F,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mBAAmB;IACnB,OAAO,mBAAmB,CAAC,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;AACjE,CAAC;AAPD,sCAOC"}
+{"version":3,"file":"Sorters.js","sourceRoot":"","sources":["../../../../src/filters/new/Sorters.ts"],"names":[],"mappings":";;;AASA,SAAS,mBAAmB,CAAI,UAAa,EAAE,eAAmC,EAAE,IAAc;IAC9F,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IACpD,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE/B,MAAM,UAAU,GAAG;QACf,kDAAkD;QAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS;SACrD;KACJ,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IACpF,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IAClE,CAAC;IAED,OAAO;QACH,GAAG,EAAE;YACD,UAAU;YACV;gBACI,2DAA2D;gBAC3D,IAAI,EAAE;oBACF;wBACI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS;qBACzB;oBACD,eAAe;iBAClB;aACJ;SACJ;KACJ,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CAAI,UAAa,EAAE,eAAmC,EAAE,IAAc;IAC/F,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mBAAmB;IACnB,OAAO,mBAAmB,CAAC,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;AACjE,CAAC;AAPD,sCAOC"}

package/dist/src/filters/new/StamhoofdFilter.d.ts

@@ -20,9 +20,12 @@ export type StamhoofdKeyFilterValue = {
     $lt: StamhoofdCompareValue;
 } | {
     $contains: string;
-} | StamhoofdFilter;
+} | {
+    $length: StamhoofdFilter;
+} | StamhoofdCompareValue;
 export type StamhoofdKeyFilter = {
-    [k in string]: StamhoofdKeyFilterValue;
+    [k in string]: StamhoofdFilter;
 };
-export type StamhoofdFilter = StamhoofdAndFilter | StamhoofdOrFilter | StamhoofdNotFilter | StamhoofdKeyFilter | StamhoofdFilter[];
+export type StamhoofdFilter = StamhoofdAndFilter | StamhoofdOrFilter | StamhoofdNotFilter | StamhoofdKeyFilterValue | StamhoofdKeyFilter | StamhoofdFilter[];
+export declare function isEmptyFilter(filter: StamhoofdFilter): boolean;
 //# sourceMappingURL=StamhoofdFilter.d.ts.map

package/dist/src/filters/new/StamhoofdFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StamhoofdFilter.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/StamhoofdFilter.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,eAAe,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,GAAG,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,eAAe,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAC,MAAM,GAAC,IAAI,GAAC,IAAI,GAAC,OAAO,CAAA;AAEnE,MAAM,MAAM,uBAAuB,GAAG;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAAC;IAAC,GAAG,EAAE,qBAAqB,EAAE,CAAA;CAAC,GAAC;IAAC,IAAI,EAAE,qBAAqB,CAAA;CAAC,GAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAAC;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,GAAC,eAAe,CAAC;AAE9N,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,GAAG,uBAAuB;CACzC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,EAAE,CAAA"}
+{"version":3,"file":"StamhoofdFilter.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/StamhoofdFilter.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,eAAe,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,GAAG,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,eAAe,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAC,MAAM,GAAC,IAAI,GAAC,IAAI,GAAC,OAAO,CAAA;AAEnE,MAAM,MAAM,uBAAuB,GAC/B;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAC3B;IAAC,GAAG,EAAE,qBAAqB,EAAE,CAAA;CAAC,GAC9B;IAAC,IAAI,EAAE,qBAAqB,CAAA;CAAC,GAC7B;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAC5B;IAAC,GAAG,EAAE,qBAAqB,CAAA;CAAC,GAC5B;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,GACnB;IAAC,OAAO,EAAE,eAAe,CAAA;CAAC,GAC1B,qBAAqB,CAAC;AAE3B,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,GAAG,eAAe;CACjC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,kBAAkB,GAAG,uBAAuB,GAAG,kBAAkB,GAAG,eAAe,EAAE,CAAA;AAG5J,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,WAUpD"}

package/dist/src/filters/new/StamhoofdFilter.js

@@ -1,3 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmptyFilter = void 0;
+function isEmptyFilter(filter) {
+    if (typeof filter === 'object' && filter !== null) {
+        return Object.keys(filter).length === 0;
+    }
+    if (Array.isArray(filter)) {
+        return filter.length === 0;
+    }
+    return false;
+}
+exports.isEmptyFilter = isEmptyFilter;
 //# sourceMappingURL=StamhoofdFilter.js.map

package/dist/src/filters/new/StamhoofdFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../../src/filters/new/StamhoofdFilter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../../src/filters/new/StamhoofdFilter.ts"],"names":[],"mappings":";;;AA+BA,SAAgB,aAAa,CAAC,MAAuB;IACjD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAVD,sCAUC"}

package/dist/src/grouping/PaginatedResponse.d.ts

@@ -1,17 +1,17 @@
-import { Data, Decoder, Encodeable, EncodeContext } from "@simonbackx/simple-encoding";
-export declare class PaginatedResponse<Result extends Encodeable, Query extends Encodeable> implements Encodeable {
-    results: Result[];
+import { Data, Decoder, EncodableObject, Encodeable, EncodeContext } from "@simonbackx/simple-encoding";
+export declare class PaginatedResponse<Result extends EncodableObject, Query extends Encodeable> implements Encodeable {
+    results: Result;
     next?: Query;
     constructor(data: {
-        results: Result[];
+        results: Result;
         next?: Query;
     });
     encode(context: EncodeContext): {
-        results: import("@simonbackx/simple-encoding").PlainObject[];
+        results: import("@simonbackx/simple-encoding").PlainObject;
         next: import("@simonbackx/simple-encoding").PlainObject;
     };
 }
-export declare class PaginatedResponseDecoder<Result extends Encodeable, Query extends Encodeable> implements Decoder<PaginatedResponse<Result, Query>> {
+export declare class PaginatedResponseDecoder<Result extends EncodableObject, Query extends Encodeable> implements Decoder<PaginatedResponse<Result, Query>> {
     resultDecoder: Decoder<Result>;
     querydecoder: Decoder<Query>;
     constructor(resultDecoder: Decoder<Result>, querydecoder: Decoder<Query>);

package/dist/src/grouping/PaginatedResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PaginatedResponse.d.ts","sourceRoot":"","sources":["../../../src/grouping/PaginatedResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAC,OAAO,EAAC,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAErF,qBAAa,iBAAiB,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,SAAS,UAAU,CAAE,YAAW,UAAU;IACrG,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC;gBAED,IAAI,EAAE;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAA,IAAI,CAAC,EAAE,KAAK,CAAA;KAAC;IAKlD,MAAM,CAAC,OAAO,EAAE,aAAa;;;;CAMhC;AAED,qBAAa,wBAAwB,CAAC,MAAM,SAAS,UAAU,EAAE,KAAK,SAAS,UAAU,CAAE,YAAW,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3I,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9B,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAEhB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC;IAKxE,MAAM,CAAC,IAAI,EAAE,IAAI;CAMpB"}
+{"version":3,"file":"PaginatedResponse.d.ts","sourceRoot":"","sources":["../../../src/grouping/PaginatedResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAC,OAAO,EAAC,eAAe,EAAE,UAAU,EAAE,aAAa,EAAgB,MAAM,6BAA6B,CAAC;AAEpH,qBAAa,iBAAiB,CAAC,MAAM,SAAS,eAAe,EAAE,KAAK,SAAS,UAAU,CAAE,YAAW,UAAU;IAC1G,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;gBAED,IAAI,EAAE;QAAC,OAAO,EAAE,MAAM,CAAC;QAAA,IAAI,CAAC,EAAE,KAAK,CAAA;KAAC;IAKhD,MAAM,CAAC,OAAO,EAAE,aAAa;;;;CAMhC;AAED,qBAAa,wBAAwB,CAAC,MAAM,SAAS,eAAe,EAAE,KAAK,SAAS,UAAU,CAAE,YAAW,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChJ,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9B,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAEhB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC;IAKxE,MAAM,CAAC,IAAI,EAAE,IAAI;CAMpB"}

package/dist/src/grouping/PaginatedResponse.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaginatedResponseDecoder = exports.PaginatedResponse = void 0;
+const simple_encoding_1 = require("@simonbackx/simple-encoding");
 class PaginatedResponse {
     constructor(data) {
         this.results = data.results;
@@ -9,7 +10,7 @@ class PaginatedResponse {
     encode(context) {
         var _a;
         return {
-            results: this.results.map(r => r.encode(context)),
+            results: (0, simple_encoding_1.encodeObject)(this.results, context), //this.results.map(r => r.encode(context)),
             next: (_a = this.next) === null || _a === void 0 ? void 0 : _a.encode(context),
         };
     }
@@ -23,7 +24,7 @@ class PaginatedResponseDecoder {
     decode(data) {
         var _a;
         return new PaginatedResponse({
-            results: data.field('results').array(this.resultDecoder),
+            results: data.field('results').decode(this.resultDecoder),
             next: (_a = data.optionalField('next')) === null || _a === void 0 ? void 0 : _a.decode(this.querydecoder),
         });
     }

package/dist/src/grouping/PaginatedResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaginatedResponse.js","sourceRoot":"","sources":["../../../src/grouping/PaginatedResponse.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAI1B,YAAY,IAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,OAAsB;;QACzB,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,CAAC,OAAO,CAAC;SACnC,CAAC;IACN,CAAC;CACJ;AAfD,8CAeC;AAED,MAAa,wBAAwB;IAIjC,YAAY,aAA8B,EAAE,YAA4B;QACpE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,IAAU;;QACb,OAAO,IAAI,iBAAiB,CAAgB;YACxC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;YACxD,IAAI,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,0CAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SAC9D,CAAC,CAAA;IACN,CAAC;CACJ;AAfD,4DAeC"}
+{"version":3,"file":"PaginatedResponse.js","sourceRoot":"","sources":["../../../src/grouping/PaginatedResponse.ts"],"names":[],"mappings":";;;AAAA,iEAAoH;AAEpH,MAAa,iBAAiB;IAI1B,YAAY,IAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,OAAsB;;QACzB,OAAO;YACH,OAAO,EAAE,IAAA,8BAAY,EAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,2CAA2C;YACzF,IAAI,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,CAAC,OAAO,CAAC;SACnC,CAAC;IACN,CAAC;CACJ;AAfD,8CAeC;AAED,MAAa,wBAAwB;IAIjC,YAAY,aAA8B,EAAE,YAA4B;QACpE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAED,MAAM,CAAC,IAAU;;QACb,OAAO,IAAI,iBAAiB,CAAgB;YACxC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACzD,IAAI,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,0CAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SAC9D,CAAC,CAAA;IACN,CAAC;CACJ;AAfD,4DAeC"}

package/dist/src/members/EmergencyContact.d.ts

@@ -8,5 +8,6 @@ export declare class EmergencyContact extends AutoEncoder {
      * Call this to clean up capitals in all the available data
      */
     cleanData(): void;
+    isEqual(other: EmergencyContact): boolean;
 }
 //# sourceMappingURL=EmergencyContact.d.ts.map

package/dist/src/members/EmergencyContact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmergencyContact.d.ts","sourceRoot":"","sources":["../../../src/members/EmergencyContact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAIhF,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,SAAM;IAGV,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG5B,KAAK,SAAS;IAEd;;OAEG;IACH,SAAS;CAYZ"}
+{"version":3,"file":"EmergencyContact.d.ts","sourceRoot":"","sources":["../../../src/members/EmergencyContact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAIhF,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,SAAM;IAGV,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG5B,KAAK,SAAM;IAEX;;OAEG;IACH,SAAS;IAaT,OAAO,CAAC,KAAK,EAAE,gBAAgB;CAKlC"}

package/dist/src/members/EmergencyContact.js

@@ -10,7 +10,7 @@ class EmergencyContact extends simple_encoding_1.AutoEncoder {
         super(...arguments);
         this.name = "";
         this.phone = null;
-        this.title = "Oma"; // TODO
+        this.title = "";
     }
     /**
      * Call this to clean up capitals in all the available data
@@ -26,6 +26,11 @@ class EmergencyContact extends simple_encoding_1.AutoEncoder {
         this.title = this.title.trim();
         this.title = utility_1.Formatter.capitalizeFirstLetter(this.title);
     }
+    isEqual(other) {
+        this.cleanData();
+        other.cleanData();
+        return this.name === other.name && this.phone === other.phone && this.title === other.title;
+    }
 }
 exports.EmergencyContact = EmergencyContact;
 tslib_1.__decorate([

package/dist/src/members/EmergencyContact.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmergencyContact.js","sourceRoot":"","sources":["../../../src/members/EmergencyContact.ts"],"names":[],"mappings":";;;;AAAA,iEAAgF;AAChF,gDAA6D;AAC7D,+BAAoC;AAEpC,MAAa,gBAAiB,SAAQ,6BAAW;IAAjD;;QAKI,SAAI,GAAG,EAAE,CAAC;QAGV,UAAK,GAAkB,IAAI,CAAC;QAG5B,UAAK,GAAG,KAAK,CAAC,CAAC,OAAO;IAiB1B,CAAC;IAfG;;OAEG;IACH,SAAS;QACL,IAAI,uBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,IAAI,GAAG,mBAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,uBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAA;QACzC,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,mBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QAC9B,IAAI,CAAC,KAAK,GAAG,mBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5D,CAAC;CACJ;AA5BD,4CA4BC;AA1BG;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,SAAM,GAAE,EAAE,CAAC;4CACrD;AAGX;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;8CACxB;AAGV;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;+CACtB;AAG5B;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;+CACpB"}
+{"version":3,"file":"EmergencyContact.js","sourceRoot":"","sources":["../../../src/members/EmergencyContact.ts"],"names":[],"mappings":";;;;AAAA,iEAAgF;AAChF,gDAA6D;AAC7D,+BAAoC;AAEpC,MAAa,gBAAiB,SAAQ,6BAAW;IAAjD;;QAKI,SAAI,GAAG,EAAE,CAAC;QAGV,UAAK,GAAkB,IAAI,CAAC;QAG5B,UAAK,GAAG,EAAE,CAAC;IAuBf,CAAC;IArBG;;OAEG;IACH,SAAS;QACL,IAAI,uBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,IAAI,GAAG,mBAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,uBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAA;QACzC,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,mBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QAC9B,IAAI,CAAC,KAAK,GAAG,mBAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5D,CAAC;IAED,OAAO,CAAC,KAAuB;QAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAA;IAC/F,CAAC;CACJ;AAlCD,4CAkCC;AAhCG;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,SAAM,GAAE,EAAE,CAAC;4CACrD;AAGX;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;8CACxB;AAGV;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;+CACtB;AAG5B;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;+CACvB"}

package/dist/src/members/Member.d.ts

@@ -2,16 +2,6 @@ import { AutoEncoder } from '@simonbackx/simple-encoding';
 import { MemberDetails } from './MemberDetails';
 export declare class Member extends AutoEncoder {
     id: string;
-    /**
-     * @deprecated Marked for removal
-     * Slowly migrate towards a non-encrypted member in the future
-     */
-    _f: string;
-    /**
-     * @deprecated Marked for removal
-     * Slowly migrate towards a non-encrypted member in the future
-     */
-    _ed: never[];
     details: MemberDetails;
     outstandingBalance: number;
     createdAt: Date;

package/dist/src/members/Member.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/members/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAqD,MAAM,6BAA6B,CAAC;AAGvI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,MAAO,SAAQ,WAAW;IAEnC,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IAGH,EAAE,SAAK;IAEP;;;OAGG;IAGH,GAAG,UAAK;IAIR,OAAO,EAAE,aAAa,CAAA;IAGtB,kBAAkB,SAAI;IAGtB,SAAS,EAAE,IAAI,CAAa;IAG5B,SAAS,EAAE,IAAI,CAAa;IAE5B,IAAI,OAAO,YAEV;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,IAAI,WAEP;IAED,MAAM,CAAC,YAAY,CAAC,aAAa,SAAQ,OAC1B,MAAM,KAAK,MAAM;CA6BnC"}
+{"version":3,"file":"Member.d.ts","sourceRoot":"","sources":["../../../src/members/Member.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAqD,MAAM,6BAA6B,CAAC;AAGvI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,MAAO,SAAQ,WAAW;IAEnC,EAAE,EAAE,MAAM,CAAC;IAIX,OAAO,EAAE,aAAa,CAAA;IAGtB,kBAAkB,SAAI;IAGtB,SAAS,EAAE,IAAI,CAAa;IAG5B,SAAS,EAAE,IAAI,CAAa;IAE5B,IAAI,OAAO,YAEV;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,IAAI,WAEP;IAED,MAAM,CAAC,YAAY,CAAC,aAAa,SAAQ,OAC1B,MAAM,KAAK,MAAM;CA6BnC"}

package/dist/src/members/Member.js

@@ -8,16 +8,6 @@ const MemberDetails_1 = require("./MemberDetails");
 class Member extends simple_encoding_1.AutoEncoder {
     constructor() {
         super(...arguments);
-        /**
-         * @deprecated Marked for removal
-         * Slowly migrate towards a non-encrypted member in the future
-         */
-        this._f = "";
-        /**
-         * @deprecated Marked for removal
-         * Slowly migrate towards a non-encrypted member in the future
-         */
-        this._ed = [];
         this.outstandingBalance = 0;
         this.createdAt = new Date();
         this.updatedAt = new Date();
@@ -65,14 +55,6 @@ exports.Member = Member;
 tslib_1.__decorate([
     (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder, defaultValue: () => (0, uuid_1.v4)() })
 ], Member.prototype, "id", void 0);
-tslib_1.__decorate([
-    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder, optional: true, field: 'firstName' }),
-    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder, optional: true, version: 165 })
-], Member.prototype, "_f", void 0);
-tslib_1.__decorate([
-    (0, simple_encoding_1.field)({ decoder: new simple_encoding_1.ArrayDecoder(simple_encoding_1.AnyDecoder), optional: true, field: 'encryptedDetails' }),
-    (0, simple_encoding_1.field)({ decoder: new simple_encoding_1.ArrayDecoder(simple_encoding_1.AnyDecoder), optional: true, version: 165 })
-], Member.prototype, "_ed", void 0);
 tslib_1.__decorate([
     (0, simple_encoding_1.field)({ decoder: MemberDetails_1.MemberDetails, field: 'nonEncryptedDetails' }),
     (0, simple_encoding_1.field)({ decoder: MemberDetails_1.MemberDetails, version: 165 })

package/dist/src/members/Member.js.map

@@ -1 +1 @@
-{"version":3,"file":"Member.js","sourceRoot":"","sources":["../../../src/members/Member.ts"],"names":[],"mappings":";;;;AAAA,iEAAuI;AACvI,+BAAoC;AAEpC,mDAAgD;AAEhD,MAAa,MAAO,SAAQ,6BAAW;IAAvC;;QAII;;;WAGG;QAGH,OAAE,GAAG,EAAE,CAAA;QAEP;;;WAGG;QAGH,QAAG,GAAG,EAAE,CAAA;QAOR,uBAAkB,GAAG,CAAC,CAAA;QAGtB,cAAS,GAAS,IAAI,IAAI,EAAE,CAAA;QAG5B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAA;IA4ChC,CAAC;IA1CG,IAAI,OAAO;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAA;IACjC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,aAAa,GAAG,KAAK;QACrC,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YAC5B,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC3B,OAAO,CAAC,CAAA;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,CAAC,CAAA;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,CAAC,CAAC,CAAA;YACb,CAAC;YAED,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9D,OAAO,CAAC,CAAC;gBACb,CAAC;gBACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9D,OAAO,CAAC,CAAC,CAAC;gBACd,CAAC;gBACD,OAAO,CAAC,CAAC;YACb,CAAC;YACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC9D,OAAO,CAAC,CAAC,CAAC;YACd,CAAC;YACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC9D,OAAO,CAAC,CAAC;YACb,CAAC;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;CACJ;AA3ED,wBA2EC;AAzEG;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,SAAM,GAAE,EAAE,CAAC;kCACrD;AAQX;IAFC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IACrE,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;kCACzD;AAQP;IAFC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,4BAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC3F,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,4BAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;mCACvE;AAIR;IAFC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAa,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC/D,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;uCAC1B;AAGtB;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,gCAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAC7B;AAGtB;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;yCACjB;AAG5B;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;yCACjB"}
+{"version":3,"file":"Member.js","sourceRoot":"","sources":["../../../src/members/Member.ts"],"names":[],"mappings":";;;;AAAA,iEAAuI;AACvI,+BAAoC;AAEpC,mDAAgD;AAEhD,MAAa,MAAO,SAAQ,6BAAW;IAAvC;;QASI,uBAAkB,GAAG,CAAC,CAAA;QAGtB,cAAS,GAAS,IAAI,IAAI,EAAE,CAAA;QAG5B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAA;IA4ChC,CAAC;IA1CG,IAAI,OAAO;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAA;IACjC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,aAAa,GAAG,KAAK;QACrC,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YAC5B,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC3B,OAAO,CAAC,CAAA;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,CAAC,CAAA;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,CAAC,CAAC,CAAA;YACb,CAAC;YAED,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9D,OAAO,CAAC,CAAC;gBACb,CAAC;gBACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9D,OAAO,CAAC,CAAC,CAAC;gBACd,CAAC;gBACD,OAAO,CAAC,CAAC;YACb,CAAC;YACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC9D,OAAO,CAAC,CAAC,CAAC;YACd,CAAC;YACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC9D,OAAO,CAAC,CAAC;YACb,CAAC;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;CACJ;AA3DD,wBA2DC;AAzDG;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAA,SAAM,GAAE,EAAE,CAAC;kCACrD;AAIX;IAFC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAa,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC/D,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;uCAC1B;AAGtB;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,gCAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAC7B;AAGtB;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;yCACjB;AAG5B;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;yCACjB"}