@stamhoofd/structures 1.12.8 → 2.1.1

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

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileToInMemoryFilter = exports.memberInMemoryFilterCompilers = exports.baseInMemoryFilterCompilers = void 0;
+const utility_1 = require("@stamhoofd/utility");
+function andInMemoryFilterCompiler(filter, filters) {
+    const runners = compileInMemoryFilter(filter, filters);
+    return (object) => {
+        for (const runner of runners) {
+            if (!runner(object)) {
+                return false;
+            }
+        }
+        return true;
+    };
+}
+function orInMemoryFilterCompiler(filter, filters) {
+    const runners = compileInMemoryFilter(filter, filters);
+    return (object) => {
+        for (const runner of runners) {
+            if (runner(object)) {
+                return true;
+            }
+        }
+        return false;
+    };
+}
+function notInMemoryFilterCompiler(filter, filters) {
+    const andRunner = andInMemoryFilterCompiler(filter, filters);
+    return (object) => {
+        return !andRunner(object);
+    };
+}
+function objectPathValue(object, path) {
+    if (path.length === 0) {
+        return object;
+    }
+    const nextSearched = path[0];
+    if (nextSearched in object) {
+        return objectPathValue(object[nextSearched], path.slice(1));
+    }
+}
+function normalizeValue(val) {
+    if (val instanceof Date) {
+        return val.getTime();
+    }
+    if (typeof val === 'string') {
+        return val.toLocaleLowerCase();
+    }
+    return val;
+}
+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;
+        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');
+        };
+    };
+}
+exports.baseInMemoryFilterCompilers = {
+    '$and': andInMemoryFilterCompiler,
+    '$or': orInMemoryFilterCompiler,
+    '$not': notInMemoryFilterCompiler,
+};
+exports.memberInMemoryFilterCompilers = {
+    ...exports.baseInMemoryFilterCompilers,
+    id: createInMemoryFilterCompiler('id'),
+    name: createInMemoryFilterCompiler('name'),
+    birthDay: createInMemoryFilterCompiler('birthDay'),
+};
+function compileInMemoryFilter(filter, definitions) {
+    if (filter === undefined) {
+        return [];
+    }
+    const runners = [];
+    for (const f of (Array.isArray(filter) ? filter : [filter])) {
+        if (!f) {
+            continue;
+        }
+        for (const key of Object.keys(f)) {
+            const filter = definitions[key];
+            if (!filter) {
+                throw new Error('Unsupported filter ' + key);
+            }
+            const s = filter(f[key], definitions);
+            if (s === undefined || s === null) {
+                throw new Error('Unsupported filter value for ' + key);
+            }
+            runners.push(s);
+        }
+    }
+    return runners;
+}
+exports.compileToInMemoryFilter = andInMemoryFilterCompiler;
+//# sourceMappingURL=InMemoryFilter.js.map

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

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

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

@@ -0,0 +1,12 @@
+import { PlainObject } from "@simonbackx/simple-encoding";
+import { MemberSummary } from "../../admin/MemberSummary";
+import { SortDefinition } from "./Sorters";
+import { SortList } from "./SortList";
+export type InMemorySorter<T> = (a: T, b: T) => number;
+export type InMemorySortDefinition<T, B extends PlainObject = PlainObject> = SortDefinition<T, B> & {
+    sort: InMemorySorter<T>;
+};
+export type InMemorySortDefinitions<T> = Record<string, InMemorySortDefinition<T>>;
+export declare function compileToInMemorySorter<T>(sortBy: SortList, definitions: InMemorySortDefinitions<T>): InMemorySorter<T>;
+export declare const memberInMemorySorters: InMemorySortDefinitions<MemberSummary>;
+//# sourceMappingURL=InMemorySorter.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InMemorySorter.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/InMemorySorter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC;AACvD,MAAM,MAAM,sBAAsB,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IAChG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;CAC1B,CAAC;AAEF,MAAM,MAAM,uBAAuB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAA;AAGlF,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAwBvH;AAGD,eAAO,MAAM,qBAAqB,EAAE,uBAAuB,CAAC,aAAa,CAyCxE,CAAA"}

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

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memberInMemorySorters = exports.compileToInMemorySorter = void 0;
+const utility_1 = require("@stamhoofd/utility");
+function compileToInMemorySorter(sortBy, definitions) {
+    const sorters = [];
+    for (const s of sortBy) {
+        const d = definitions[s.key];
+        if (!d) {
+            throw new Error('Unknown sort key ' + s.key);
+        }
+        if (s.order === 'DESC') {
+            sorters.push((a, b) => {
+                return -d.sort(a, b);
+            });
+        }
+        else {
+            sorters.push(d.sort);
+        }
+    }
+    if (sorters.length === 0) {
+        throw new Error('No sortBy passed');
+    }
+    return (a, b) => {
+        return utility_1.Sorter.stack(...sorters.map(s => s(a, b)));
+    };
+}
+exports.compileToInMemorySorter = compileToInMemorySorter;
+// EXAMPLE (should move)
+exports.memberInMemorySorters = {
+    'id': {
+        getValue(a) {
+            return a.id;
+        },
+        sort: (a, b) => {
+            return utility_1.Sorter.byStringValue(a.id, b.id);
+        }
+    },
+    'name': {
+        getValue(a) {
+            return a.name;
+        },
+        sort: (a, b) => {
+            return utility_1.Sorter.byStringValue(a.name, b.name);
+        }
+    },
+    'birthDay': {
+        getValue(a) {
+            var _a, _b;
+            return (_b = (_a = a.birthDay) === null || _a === void 0 ? void 0 : _a.getTime()) !== null && _b !== void 0 ? _b : 0;
+        },
+        sort: (a, b) => {
+            var _a, _b, _c, _d;
+            return utility_1.Sorter.byNumberValue((_b = (_a = b.birthDay) === null || _a === void 0 ? void 0 : _a.getTime()) !== null && _b !== void 0 ? _b : 0, (_d = (_c = a.birthDay) === null || _c === void 0 ? void 0 : _c.getTime()) !== null && _d !== void 0 ? _d : 0);
+        }
+    },
+    'organizationName': {
+        getValue(a) {
+            return a.organizationName;
+        },
+        sort: (a, b) => {
+            return utility_1.Sorter.byStringValue(b.organizationName, a.organizationName);
+        }
+    },
+    email: {
+        getValue(a) {
+            return a.email;
+        },
+        sort: (a, b) => {
+            var _a, _b;
+            return utility_1.Sorter.byStringValue((_a = b.email) !== null && _a !== void 0 ? _a : '', (_b = a.email) !== null && _b !== void 0 ? _b : '');
+        },
+    }
+};
+//# sourceMappingURL=InMemorySorter.js.map

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

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

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

@@ -0,0 +1,15 @@
+import { Data } from "@simonbackx/simple-encoding";
+export declare enum SortItemDirection {
+    ASC = "ASC",
+    DESC = "DESC"
+}
+export type SortItem = {
+    key: string;
+    order: SortItemDirection;
+};
+export type SortList = SortItem[];
+export declare function encodeSortList(sort: SortList): string;
+export declare class SortListDecoder {
+    static decode(data: Data): SortList;
+}
+//# sourceMappingURL=SortList.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SortList.d.ts","sourceRoot":"","sources":["../../../../src/filters/new/SortList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAGnD,oBAAY,iBAAiB;IACzB,GAAG,QAAQ;IACX,IAAI,SAAS;CAChB;AACD,MAAM,MAAM,QAAQ,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,iBAAiB,CAAC;CAAE,CAAA;AACjE,MAAM,MAAM,QAAQ,GAAG,QAAQ,EAAE,CAAA;AAEjC,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAErD;AAED,qBAAa,eAAe;IACxB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,QAAQ;CA8BtC"}

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SortListDecoder = exports.encodeSortList = exports.SortItemDirection = void 0;
+const simple_errors_1 = require("@simonbackx/simple-errors");
+var SortItemDirection;
+(function (SortItemDirection) {
+    SortItemDirection["ASC"] = "ASC";
+    SortItemDirection["DESC"] = "DESC";
+})(SortItemDirection || (exports.SortItemDirection = SortItemDirection = {}));
+function encodeSortList(sort) {
+    return sort.map(s => `${s.key} ${s.order}`).join(',');
+}
+exports.encodeSortList = encodeSortList;
+class SortListDecoder {
+    static decode(data) {
+        const str = data.string;
+        const splitted = str.split(',');
+        const list = [];
+        for (const [index, part] of splitted.entries()) {
+            const sub = part.trim().split(' ');
+            if (sub.length > 2 || sub.length === 0) {
+                throw new simple_errors_1.SimpleError({
+                    code: "invalid_field",
+                    message: `Invalid sort list at ${data.currentField}`,
+                    field: data.currentField
+                });
+            }
+            const direction = sub.length === 1 ? SortItemDirection.ASC : data.clone({
+                data: sub[1],
+                context: data.context,
+                field: data.addToCurrentField(index)
+            }).enum(SortItemDirection);
+            const key = sub[0].trim();
+            list.push({
+                key,
+                order: direction
+            });
+        }
+        return list;
+    }
+}
+exports.SortListDecoder = SortListDecoder;
+//# sourceMappingURL=SortList.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SortList.js","sourceRoot":"","sources":["../../../../src/filters/new/SortList.ts"],"names":[],"mappings":";;;AACA,6DAAwD;AAExD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,gCAAW,CAAA;IACX,kCAAa,CAAA;AACjB,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B;AAID,SAAgB,cAAc,CAAC,IAAc;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAI,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3D,CAAC;AAFD,wCAEC;AAED,MAAa,eAAe;IACxB,MAAM,CAAC,MAAM,CAAC,IAAU;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;QACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,IAAI,GAAa,EAAE,CAAA;QAEzB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,eAAe;oBACrB,OAAO,EAAE,wBAAwB,IAAI,CAAC,YAAY,EAAE;oBACpD,KAAK,EAAE,IAAI,CAAC,YAAY;iBAC3B,CAAC,CAAC;YACP,CAAC;YAED,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;gBACpE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;gBACZ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;aACvC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAE1B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC;gBACN,GAAG;gBACH,KAAK,EAAE,SAAS;aACnB,CAAC,CAAA;QACN,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA/BD,0CA+BC"}

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

@@ -0,0 +1,8 @@
+import { PlainObject } from "@simonbackx/simple-encoding";
+import { SortList } from "./SortList";
+export type SortDefinition<T, B extends PlainObject = PlainObject> = {
+    getValue(a: T): B;
+};
+export type SortDefinitions<T> = Record<string, SortDefinition<T>>;
+export declare function getSortFilter<O>(lastObject: O, sortDefinitions: SortDefinitions<O>, list: SortList): any;
+//# sourceMappingURL=Sorters.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSortFilter = void 0;
+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;
+    }
+    const definition = sortDefinitions[first.key];
+    if (!definition) {
+        throw new Error('Unknown sort key ' + first.key);
+    }
+    const lastValue = definition.getValue(lastObject);
+    const remaining = list.slice(1);
+    const baseFilter = {
+        // Either the object is plainly larger than this. 
+        [first.key]: {
+            [first.order === 'ASC' ? '$gt' : '$lt']: lastValue
+        }
+    };
+    if (remaining.length === 0) {
+        return baseFilter;
+    }
+    const remainingFilter = sorterGetNextFilter(lastObject, sortDefinitions, remaining);
+    if (!remainingFilter) {
+        throw new Error('Unexpected remaining filter at ' + first.key);
+    }
+    return {
+        $or: [
+            baseFilter,
+            {
+                // OR, it is the same, but the following sorters are larger
+                $and: [
+                    {
+                        [first.key]: lastValue
+                    },
+                    remainingFilter
+                ]
+            }
+        ]
+    };
+}
+function getSortFilter(lastObject, sortDefinitions, list) {
+    if (!lastObject) {
+        return null;
+    }
+    // We always add id
+    return sorterGetNextFilter(lastObject, sortDefinitions, list);
+}
+exports.getSortFilter = getSortFilter;
+//# sourceMappingURL=Sorters.js.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,28 @@
+export type StamhoofdAndFilter = {
+    $and: StamhoofdFilter;
+};
+export type StamhoofdOrFilter = {
+    $or: StamhoofdFilter;
+};
+export type StamhoofdNotFilter = {
+    $not: StamhoofdFilter;
+};
+export type StamhoofdCompareValue = string | number | Date | null | boolean;
+export type StamhoofdKeyFilterValue = {
+    $eq: StamhoofdCompareValue;
+} | {
+    $in: StamhoofdCompareValue[];
+} | {
+    $neq: StamhoofdCompareValue;
+} | {
+    $gt: StamhoofdCompareValue;
+} | {
+    $lt: StamhoofdCompareValue;
+} | {
+    $contains: string;
+} | StamhoofdFilter;
+export type StamhoofdKeyFilter = {
+    [k in string]: StamhoofdKeyFilterValue;
+};
+export type StamhoofdFilter = StamhoofdAndFilter | StamhoofdOrFilter | StamhoofdNotFilter | StamhoofdKeyFilter | StamhoofdFilter[];
+//# sourceMappingURL=StamhoofdFilter.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=StamhoofdFilter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../../src/filters/new/StamhoofdFilter.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,14 @@
+import { AutoEncoder } from '@simonbackx/simple-encoding';
+import { Member } from '../members/Member';
+/**
+ * Equivalent of KeychainedResponse, but this one is patchable and used by the patchusermembers endpoint
+ */
+export declare class KeychainedMembers extends AutoEncoder {
+    members: Member[];
+    /**
+     * @deprecated
+     * Can get dropped after a few months
+     */
+    keychainItems: never[];
+}
+//# sourceMappingURL=KeychainedMembers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KeychainedMembers.d.ts","sourceRoot":"","sources":["../../../src/grouping/KeychainedMembers.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAS,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAE9C,OAAO,EAAE,MAAM,EAAE,CAAA;IAEjB;;;OAGG;IAEH,aAAa,EAAE,KAAK,EAAE,CAAK;CAC9B"}

package/dist/src/grouping/KeychainedMembers.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeychainedMembers = void 0;
+const tslib_1 = require("tslib");
+const simple_encoding_1 = require("@simonbackx/simple-encoding");
+const Member_1 = require("../members/Member");
+/**
+ * Equivalent of KeychainedResponse, but this one is patchable and used by the patchusermembers endpoint
+ */
+class KeychainedMembers extends simple_encoding_1.AutoEncoder {
+    constructor() {
+        super(...arguments);
+        /**
+         * @deprecated
+         * Can get dropped after a few months
+         */
+        this.keychainItems = [];
+    }
+}
+exports.KeychainedMembers = KeychainedMembers;
+tslib_1.__decorate([
+    (0, simple_encoding_1.field)({ decoder: new simple_encoding_1.ArrayDecoder(Member_1.Member) })
+], KeychainedMembers.prototype, "members", void 0);
+tslib_1.__decorate([
+    (0, simple_encoding_1.field)({ decoder: new simple_encoding_1.ArrayDecoder(simple_encoding_1.AnyDecoder), optional: true })
+], KeychainedMembers.prototype, "keychainItems", void 0);
+//# sourceMappingURL=KeychainedMembers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KeychainedMembers.js","sourceRoot":"","sources":["../../../src/grouping/KeychainedMembers.ts"],"names":[],"mappings":";;;;AAAA,iEAA2F;AAE3F,8CAA2C;AAE3C;;GAEG;AACH,MAAa,iBAAkB,SAAQ,6BAAW;IAAlD;;QAII;;;WAGG;QAEH,kBAAa,GAAY,EAAE,CAAA;IAC/B,CAAC;CAAA;AAVD,8CAUC;AARG;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,eAAM,CAAC,EAAE,CAAC;kDAC5B;AAOjB;IADC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,IAAI,8BAAY,CAAC,4BAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;wDACtC"}

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

@@ -1,21 +1,20 @@
 import { Data, Decoder, Encodeable, EncodeContext } from "@simonbackx/simple-encoding";
-import { KeychainItem } from '../KeychainItem';
 /**
  * Returns the response data, along with related keychain items that might be needed to decrypt the data
  */
 export declare class KeychainedResponse<T extends Encodeable | (Encodeable[])> implements Encodeable {
     data: T;
-    keychainItems: KeychainItem[];
+    /**
+     * @deprecated
+     */
+    keychainItems: never[];
     constructor(data: {
         data: T;
-        keychainItems: KeychainItem[];
+        keychainItems?: never[];
     });
     encode(context: EncodeContext): {
-        data: any[];
-        keychainItems: import("@simonbackx/simple-encoding").PlainObject[];
-    } | {
         data: import("@simonbackx/simple-encoding").PlainObject;
-        keychainItems: import("@simonbackx/simple-encoding").PlainObject[];
+        keychainItems: never[];
     };
 }
 export declare class KeychainedResponseDecoder<T extends Encodeable | Encodeable[]> implements Decoder<KeychainedResponse<T>> {

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

@@ -1 +1 @@
-{"version":3,"file":"KeychainedResponse.d.ts","sourceRoot":"","sources":["../../../src/grouping/KeychainedResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEvF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;GAEG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,UAAU,GAAG,CAAC,UAAU,EAAE,CAAC,CAAE,YAAW,UAAU;IACxF,IAAI,EAAE,CAAC,CAAC;IACR,aAAa,EAAE,YAAY,EAAE,CAAC;gBAElB,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,aAAa,EAAE,YAAY,EAAE,CAAA;KAAE;IAK5D,MAAM,CAAC,OAAO,EAAE,aAAa;;;;;;;CAYhC;AAED,qBAAa,yBAAyB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAE,YAAW,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACjH,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;gBAEX,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAInC,MAAM,CAAC,IAAI,EAAE,IAAI;CAMpB"}
+{"version":3,"file":"KeychainedResponse.d.ts","sourceRoot":"","sources":["../../../src/grouping/KeychainedResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEvF;;GAEG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,UAAU,GAAG,CAAC,UAAU,EAAE,CAAC,CAAE,YAAW,UAAU;IACxF,IAAI,EAAE,CAAC,CAAC;IAER;;OAEG;IACH,aAAa,EAAE,KAAK,EAAE,CAAC;gBAEX,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAA;KAAE;IAKtD,MAAM,CAAC,OAAO,EAAE,aAAa;;;;CAYhC;AAED,qBAAa,yBAAyB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAE,YAAW,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACjH,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;gBAEX,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAInC,MAAM,CAAC,IAAI,EAAE,IAAI;CAMpB"}

package/dist/src/grouping/KeychainedResponse.js

@@ -1,25 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeychainedResponseDecoder = exports.KeychainedResponse = void 0;
-const KeychainItem_1 = require("../KeychainItem");
 /**
  * Returns the response data, along with related keychain items that might be needed to decrypt the data
  */
 class KeychainedResponse {
     constructor(data) {
         this.data = data.data;
-        this.keychainItems = data.keychainItems;
+        this.keychainItems = [];
     }
     encode(context) {
         if (Array.isArray(this.data)) {
             return {
                 data: this.data.map(r => r.encode(context)),
-                keychainItems: this.keychainItems.map(r => r.encode(context)),
+                keychainItems: [],
             };
         }
         return {
             data: this.data.encode(context),
-            keychainItems: this.keychainItems.map(r => r.encode(context)),
+            keychainItems: [],
         };
     }
 }
@@ -31,7 +30,7 @@ class KeychainedResponseDecoder {
     decode(data) {
         return new KeychainedResponse({
             data: data.field('data').decode(this.dataDecoder),
-            keychainItems: data.field('keychainItems').array(KeychainItem_1.KeychainItem),
+            keychainItems: [],
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"KeychainedResponse.js","sourceRoot":"","sources":["../../../src/grouping/KeychainedResponse.ts"],"names":[],"mappings":";;;AAEA,kDAA+C;AAE/C;;GAEG;AACH,MAAa,kBAAkB;IAI3B,YAAY,IAAgD;QACxD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,OAAsB;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3C,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAChE,CAAC;SACL;QACD,OAAO;YACH,IAAI,EAAG,IAAI,CAAC,IAAmB,CAAC,MAAM,CAAC,OAAO,CAAC;YAC/C,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAChE,CAAC;IACN,CAAC;CACJ;AArBD,gDAqBC;AAED,MAAa,yBAAyB;IAGlC,YAAY,WAAuB;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,IAAU;QACb,OAAO,IAAI,kBAAkB,CAAI;YAC7B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;YACjD,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,2BAAqC,CAAC;SAC1F,CAAC,CAAA;IACN,CAAC;CACJ;AAbD,8DAaC"}
+{"version":3,"file":"KeychainedResponse.js","sourceRoot":"","sources":["../../../src/grouping/KeychainedResponse.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,kBAAkB;IAQ3B,YAAY,IAA0C;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACrB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,CAAC,OAAsB;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3C,aAAa,EAAE,EAAE;aACpB,CAAC;QACN,CAAC;QACD,OAAO;YACH,IAAI,EAAG,IAAI,CAAC,IAAmB,CAAC,MAAM,CAAC,OAAO,CAAC;YAC/C,aAAa,EAAE,EAAE;SACpB,CAAC;IACN,CAAC;CACJ;AAzBD,gDAyBC;AAED,MAAa,yBAAyB;IAGlC,YAAY,WAAuB;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,IAAU;QACb,OAAO,IAAI,kBAAkB,CAAI;YAC7B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;YACjD,aAAa,EAAE,EAAE;SACpB,CAAC,CAAA;IACN,CAAC;CACJ;AAbD,8DAaC"}

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,QAAE,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,QAAE,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":";;;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"}

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

@@ -4,5 +4,9 @@ export declare class EmergencyContact extends AutoEncoder {
     name: string;
     phone: string | null;
     title: string;
+    /**
+     * Call this to clean up capitals in all the available data
+     */
+    cleanData(): void;
 }
 //# 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;AAGhF,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,SAAM;IAGV,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG5B,KAAK,SAAS;CACjB"}
+{"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"}

package/dist/src/members/EmergencyContact.js

@@ -3,26 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmergencyContact = void 0;
 const tslib_1 = require("tslib");
 const simple_encoding_1 = require("@simonbackx/simple-encoding");
+const utility_1 = require("@stamhoofd/utility");
 const uuid_1 = require("uuid");
 class EmergencyContact extends simple_encoding_1.AutoEncoder {
     constructor() {
         super(...arguments);
         this.name = "";
         this.phone = null;
-        this.title = "Oma"; // Todo
+        this.title = "Oma"; // TODO
+    }
+    /**
+     * Call this to clean up capitals in all the available data
+     */
+    cleanData() {
+        if (utility_1.StringCompare.isFullCaps(this.name)) {
+            this.name = utility_1.Formatter.capitalizeWords(this.name.toLowerCase());
+        }
+        if (utility_1.StringCompare.isFullCaps(this.title)) {
+            this.title = this.title.toLowerCase();
+        }
+        this.name = utility_1.Formatter.capitalizeFirstLetter(this.name.trim());
+        this.title = this.title.trim();
+        this.title = utility_1.Formatter.capitalizeFirstLetter(this.title);
     }
 }
+exports.EmergencyContact = EmergencyContact;
 tslib_1.__decorate([
-    simple_encoding_1.field({ decoder: simple_encoding_1.StringDecoder, defaultValue: () => uuid_1.v4() })
+    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder, defaultValue: () => (0, uuid_1.v4)() })
 ], EmergencyContact.prototype, "id", void 0);
 tslib_1.__decorate([
-    simple_encoding_1.field({ decoder: simple_encoding_1.StringDecoder })
+    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder })
 ], EmergencyContact.prototype, "name", void 0);
 tslib_1.__decorate([
-    simple_encoding_1.field({ decoder: simple_encoding_1.StringDecoder, nullable: true })
+    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder, nullable: true })
 ], EmergencyContact.prototype, "phone", void 0);
 tslib_1.__decorate([
-    simple_encoding_1.field({ decoder: simple_encoding_1.StringDecoder })
+    (0, simple_encoding_1.field)({ decoder: simple_encoding_1.StringDecoder })
 ], EmergencyContact.prototype, "title", void 0);
-exports.EmergencyContact = EmergencyContact;
 //# sourceMappingURL=EmergencyContact.js.map

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,+BAAoC;AAEpC,MAAa,gBAAiB,SAAQ,6BAAW;IAAjD;;QAKI,SAAI,GAAG,EAAE,CAAC;QAGV,UAAK,GAAkB,IAAI,CAAC;QAG5B,UAAK,GAAG,KAAK,CAAC,CAAC,OAAO;IAC1B,CAAC;CAAA;AAVG;IADC,uBAAK,CAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,SAAM,EAAE,EAAE,CAAC;4CACrD;AAGX;IADC,uBAAK,CAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;8CACxB;AAGV;IADC,uBAAK,CAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;+CACtB;AAG5B;IADC,uBAAK,CAAC,EAAE,OAAO,EAAE,+BAAa,EAAE,CAAC;+CACpB;AAXlB,4CAYC"}
+{"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"}