@stamhoofd/backend 2.119.0 → 2.120.0

package/src/endpoints/auth/GetOtherUserEndpoint.ts

@@ -1,5 +1,6 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { UserWithMembers } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { UserWithMembers } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../helpers/Context.js';

package/src/endpoints/auth/GetUserEndpoint.ts

@@ -1,5 +1,6 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { UserWithMembers } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { UserWithMembers } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../helpers/Context.js';

package/src/endpoints/auth/OpenIDConnectAuthTokenEndpoint.ts

@@ -1,5 +1,6 @@
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 
 import { Context } from '../../helpers/Context.js';
 import { SSOService } from '../../services/SSOService.js';

package/src/endpoints/auth/OpenIDConnectCallbackEndpoint.ts

@@ -1,5 +1,7 @@
-import { AnyDecoder, Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import { AnyDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint } from '@simonbackx/simple-endpoints';
 
 import { Context } from '../../helpers/Context.js';
 import { SSOServiceWithSession } from '../../services/SSOService.js';

package/src/endpoints/auth/OpenIDConnectStartEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint } from '@simonbackx/simple-endpoints';
 import { StartOpenIDFlowStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';

package/src/endpoints/auth/PatchUserEndpoint.ts

@@ -1,8 +1,11 @@
-import { AutoEncoderPatchType, Decoder, isPatch } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder} from '@simonbackx/simple-encoding';
+import { isPatch } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailVerificationCode, Member, PasswordToken, Platform, Token, User } from '@stamhoofd/models';
-import { LoginMethod, NewUser, PermissionLevel, SignupResponse, UserPermissions, UserWithMembers } from '@stamhoofd/structures';
+import type { UserWithMembers } from '@stamhoofd/structures';
+import { LoginMethod, NewUser, PermissionLevel, SignupResponse, UserPermissions } from '@stamhoofd/structures';
 
 import { Context } from '../../helpers/Context.js';
 import { MemberUserSyncer } from '../../helpers/MemberUserSyncer.js';

package/src/endpoints/auth/PollEmailVerificationEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailVerificationCode } from '@stamhoofd/models';
 import { PollEmailVerificationRequest, PollEmailVerificationResponse } from '@stamhoofd/structures';
 

package/src/endpoints/auth/RetryEmailVerificationEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { EmailVerificationCode } from '@stamhoofd/models';
 import { PollEmailVerificationRequest, PollEmailVerificationResponse } from '@stamhoofd/structures';
 

package/src/endpoints/auth/SignupEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailVerificationCode, PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
 import { EmailTemplateType, LoginMethod, NewUser, Recipient, Replacement, SignupResponse } from '@stamhoofd/structures';

package/src/endpoints/auth/VerifyEmailEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailVerificationCode, Token, User } from '@stamhoofd/models';
 import { Token as TokenStruct, VerifyEmailRequest } from '@stamhoofd/structures';

package/src/endpoints/frontend/FrontendEnvironmentEndpoint.ts

@@ -1,7 +1,8 @@
-import {
+import type {
     DecodedRequest,
+    Request} from '@simonbackx/simple-endpoints';
+import {
     Endpoint,
-    Request,
     Response,
 } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';

package/src/endpoints/global/addresses/SearchRegionsEndpoint.ts

@@ -1,8 +1,11 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { City, Province } from '@stamhoofd/models';
-import { City as CityStruct, Country, Province as ProvinceStruct, SearchRegions } from '@stamhoofd/structures';
+import { City as CityStruct, Province as ProvinceStruct, SearchRegions } from '@stamhoofd/structures';
 import { StringCompare } from '@stamhoofd/utility';
+import { Country } from '@stamhoofd/types/Country';
 
 type Params = Record<string, never>;
 class Query extends AutoEncoder {
@@ -30,14 +33,14 @@ export class SearchRegionsEndpoint extends Endpoint<Params, Query, Body, Respons
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         // Escape query
-        const rawQuery = request.query.query.replace(/([-+><()~*"@\s]+)/g, ' ');
+        const rawQuery = request.query.query.replace(/[-+><()~*"@\s]+/g, ' ');
         const words = rawQuery.split(' ').filter(w => w.length > 0);
 
         // Escape words
         const cleanedWords: string[] = [];
         for (const [index, word] of words.entries()) {
             // If contains special char (non a-zA-Z) - escape with " character
-            if (/^[a-zA-Z0-9]*$/.test(word)) {
+            if (/^[a-z0-9]*$/i.test(word)) {
                 if (index === words.length - 1) {
                     cleanedWords.push('+' + word + '*');
                 }

package/src/endpoints/global/addresses/ValidateAddressEndpoint.ts

@@ -1,6 +1,8 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Address, ValidatedAddress } from '@stamhoofd/structures';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { ValidatedAddress } from '@stamhoofd/structures';
+import { Address } from '@stamhoofd/structures';
 
 import { AddressValidator } from '../../../helpers/AddressValidator.js';
 

package/src/endpoints/global/audit-logs/GetAuditLogsEndpoint.ts

@@ -1,9 +1,12 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog } from '@stamhoofd/models';
-import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { AuditLog as AuditLogStruct, CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { AuditLog as AuditLogStruct, CountFilteredRequest, StamhoofdFilter} from '@stamhoofd/structures';
+import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/billing/ActivatePackagesEndpoint.ts

@@ -1,7 +1,9 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Organization, Platform, STPackage } from '@stamhoofd/models';
+import type { BalanceItem} from '@stamhoofd/models';
+import { Organization, Platform, STPackage } from '@stamhoofd/models';
 import { CheckoutResponse, PackageCheckout, Payment as PaymentStruct, STPackageBundleHelper, STPackageStruct } from '@stamhoofd/structures';
 import { Context } from '../../../helpers/Context.js';
 import { PaymentService } from '../../../services/PaymentService.js';
@@ -16,7 +18,7 @@ export class ActivatePackagesEndpoint extends Endpoint<Params, Query, Body, Resp
     bodyDecoder = PackageCheckout as Decoder<Body>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != 'POST') {
+        if (request.method !== 'POST') {
             return [false];
         }
 

package/src/endpoints/global/billing/DeactivatePackageEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { STPackage } from '@stamhoofd/models';
 

package/src/endpoints/global/caddy/CheckDomainCertEndpoint.ts

@@ -1,5 +1,7 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, Webshop } from '@stamhoofd/models';
 type Params = Record<string, never>;

package/src/endpoints/global/email/CreateEmailEndpoint.ts

@@ -1,7 +1,9 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, Platform, RateLimiter } from '@stamhoofd/models';
-import { EmailPreview, EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
+import type { EmailPreview} from '@stamhoofd/structures';
+import { EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
 import { SimpleError } from '@simonbackx/simple-errors';

package/src/endpoints/global/email/GetAdminEmailsEndpoint.test.ts

@@ -1,5 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { Email, EmailRecipient, MemberFactory, Organization, OrganizationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import { Email, EmailRecipient, MemberFactory, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailStatus, LimitedFilteredRequest, PermissionLevel, Permissions, Replacement } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';

package/src/endpoints/global/email/GetAdminEmailsEndpoint.ts

@@ -1,10 +1,13 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { assertSort, CountFilteredRequest, EmailPreview, EmailStatus, getSortFilter, LimitedFilteredRequest, mergeFilters, PaginatedResponse, PermissionLevel, StamhoofdFilter } from '@stamhoofd/structures';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { CountFilteredRequest, EmailPreview, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, EmailStatus, getSortFilter, LimitedFilteredRequest, mergeFilters, PaginatedResponse, PermissionLevel } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email, Platform } from '@stamhoofd/models';
-import { applySQLSorter, compileToSQLFilter, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { Context } from '../../../helpers/Context.js';
 import { emailFilterCompilers } from '../../../sql-filters/emails.js';
 import { emailSorters } from '../../../sql-sorters/emails.js';
@@ -58,24 +61,24 @@ export class GetAdminEmailsEndpoint extends Endpoint<Params, Query, Body, Respon
                     ids.push(sender.id);
                 }
             }
-            if (ids.length === 0) {
-                throw Context.auth.error();
-            }
 
-            scopeFilter = mergeFilters([scopeFilter, {
-                $or: [
-                    {
-                        senderId: {
-                            $in: ids,
-                        },
-                        status: {
-                            $neq: EmailStatus.Draft,
-                        },
+            const filters: StamhoofdFilter[] = [{
+                userId: user.id,
+            }];
+
+            if (ids.length !== 0) {
+                filters.push({
+                    senderId: {
+                        $in: ids,
                     },
-                    {
-                        userId: user.id,
+                    status: {
+                        $neq: EmailStatus.Draft,
                     },
-                ],
+                });
+            }
+
+            scopeFilter = mergeFilters([scopeFilter, {
+                $or: filters,
             }]);
         }
         else {

package/src/endpoints/global/email/GetEmailAddressEndpoint.ts

@@ -1,5 +1,7 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailAddress } from '@stamhoofd/email';
 import { Organization } from '@stamhoofd/models';

package/src/endpoints/global/email/GetEmailEndpoint.ts

@@ -1,6 +1,7 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email } from '@stamhoofd/models';
-import { EmailPreview } from '@stamhoofd/structures';
+import type { EmailPreview } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/email/GetUserEmailsEndpoint.test.ts

@@ -1,5 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { Email, EmailRecipient, MemberFactory, Organization, OrganizationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import { Email, EmailRecipient, MemberFactory, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { EmailStatus, LimitedFilteredRequest, Replacement } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';

package/src/endpoints/global/email/GetUserEmailsEndpoint.ts

@@ -1,10 +1,13 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { assertSort, CountFilteredRequest, EmailWithRecipients, EmailStatus, getSortFilter, LimitedFilteredRequest, mergeFilters, PaginatedResponse, StamhoofdFilter } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { CountFilteredRequest, EmailWithRecipients, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, EmailStatus, getSortFilter, LimitedFilteredRequest, mergeFilters, PaginatedResponse } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email, Member } from '@stamhoofd/models';
-import { applySQLSorter, compileToSQLFilter, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { Context } from '../../../helpers/Context.js';
 import { emailFilterCompilers, userEmailFilterCompilers } from '../../../sql-filters/emails.js';
 import { emailSorters } from '../../../sql-sorters/emails.js';

package/src/endpoints/global/email/ManageEmailAddressEndpoint.ts

@@ -1,5 +1,7 @@
-import { AutoEncoder, BooleanDecoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, BooleanDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email, EmailAddress } from '@stamhoofd/email';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/email/PatchEmailEndpoint.test.ts

@@ -1,7 +1,7 @@
-/* eslint-disable jest/no-conditional-expect */
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import { Email, EmailRecipient, GroupFactory, MemberFactory, Organization, OrganizationFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import { Email, EmailRecipient, GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailStatus, Email as EmailStruct, OrganizationEmail, Parent, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserPermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
@@ -146,7 +146,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             senderId: 'invalid-sender-id',
         });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('invalid_sender'));
     });
@@ -197,7 +197,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             subject: 'new subject',
         });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('permission_denied'));
     });
@@ -249,7 +249,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             subject: 'new subject',
         });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('permission_denied'));
     });
@@ -350,7 +350,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             senderId: sender2.id,
         });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('permission_denied'));
     });
@@ -402,7 +402,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
             status: EmailStatus.Sending,
         });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('permission_denied'));
     });
@@ -448,7 +448,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
 
         const body = EmailStruct.patch({ id: email.id, senderId: sender.id, status: EmailStatus.Sending });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('missing_unsubscribe_button'));
     });
@@ -494,7 +494,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
 
         const body = EmailStruct.patch({ id: email.id, senderId: sender.id, status: EmailStatus.Sending });
 
-        await expect(async () => await patchEmail(body, token, organization))
+        await expect(patchEmail(body, token, organization))
             .rejects
             .toThrow(STExpect.errorWithCode('missing_unsubscribe_button'));
     });
@@ -707,7 +707,7 @@ describe('Endpoint.PatchEmailEndpoint', () => {
 
             const balanceTable = recipient.replacements.find(r => r.token === 'balanceTable');
             expect(balanceTable).toBeDefined();
-            expect(balanceTable?.html).toInclude($t('%hX'));
+            expect(balanceTable?.html).toMatch($t('%hX'));
 
             // Outstanding balance
             const outstandingBalance = recipient.replacements.find(r => r.token === 'outstandingBalance');

package/src/endpoints/global/email/PatchEmailEndpoint.ts

@@ -1,8 +1,11 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, Platform } from '@stamhoofd/models';
-import { EmailPreview, EmailRecipientsStatus, EmailStatus, Email as EmailStruct, PermissionLevel } from '@stamhoofd/structures';
+import type { EmailPreview} from '@stamhoofd/structures';
+import { EmailRecipientsStatus, EmailStatus, Email as EmailStruct, PermissionLevel } from '@stamhoofd/structures';
 
-import { AutoEncoderPatchType, Decoder, patchObject } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder} from '@simonbackx/simple-encoding';
+import { patchObject } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';
 

package/src/endpoints/global/email-recipients/GetEmailRecipientsCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.test.ts

@@ -1,7 +1,8 @@
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint.js';
 import { AccessRight, EmailStatus, LimitedFilteredRequest, OrganizationEmail, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
-import { Email, EmailRecipient, Organization, OrganizationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod, User} from '@stamhoofd/models';
+import { Email, EmailRecipient, OrganizationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { Request } from '@simonbackx/simple-endpoints';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.ts

@@ -1,10 +1,13 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { assertSort, CountFilteredRequest, EmailRecipient as EmailRecipientStruct, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PermissionLevel, StamhoofdFilter } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { CountFilteredRequest, EmailRecipient as EmailRecipientStruct, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PermissionLevel } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailRecipient, fillRecipientReplacements } from '@stamhoofd/models';
-import { applySQLSorter, compileToSQLFilter, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { Context } from '../../../helpers/Context.js';
 import { emailRecipientsFilterCompilers } from '../../../sql-filters/email-recipients.js';
 import { emailRecipientSorters } from '../../../sql-sorters/email-recipients.js';

package/src/endpoints/global/email-recipients/RetryEmailRecipientEndpoint.ts

@@ -1,6 +1,8 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Email, EmailRecipient } from '@stamhoofd/models';
-import { EmailRecipient as EmailRecipientStruct, EmailStatus, PermissionLevel } from '@stamhoofd/structures';
+import type { EmailRecipient as EmailRecipientStruct} from '@stamhoofd/structures';
+import { EmailStatus, PermissionLevel } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/email-recipients/helpers/validateEmailRecipientFilter.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/models';
-import { FilterWrapperMarker, PermissionLevel, StamhoofdFilter, unwrapFilter, WrapperFilter } from '@stamhoofd/structures';
+import type { PermissionLevel, StamhoofdFilter, WrapperFilter } from '@stamhoofd/structures';
+import { FilterWrapperMarker, unwrapFilter } from '@stamhoofd/structures';
 import { Context } from '../../../../helpers/Context.js';
 
 export async function validateEmailRecipientFilter({ filter, permissionLevel }: { filter: StamhoofdFilter; permissionLevel: PermissionLevel }) {

package/src/endpoints/global/events/GetEventNotificationsCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/events/GetEventNotificationsEndpoint.ts

@@ -1,11 +1,14 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EventNotification } from '@stamhoofd/models';
-import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { AccessRight, CountFilteredRequest, EventNotification as EventNotificationStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, EventNotification as EventNotificationStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import { AccessRight, LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
 import { eventNotificationsFilterCompilers } from '../../../sql-filters/event-notifications.js';

package/src/endpoints/global/events/GetEventsEndpoint.ts

@@ -1,9 +1,12 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Event } from '@stamhoofd/models';
-import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { CountFilteredRequest, Event as EventStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, Event as EventStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/events/PatchEventNotificationsEndpoint.test.ts

@@ -1,7 +1,9 @@
 import { PatchableArray, PatchMap, patchObject } from '@simonbackx/simple-encoding';
-import { Endpoint, Request } from '@simonbackx/simple-endpoints';
+import type { Endpoint} from '@simonbackx/simple-endpoints';
+import { Request } from '@simonbackx/simple-endpoints';
 import { EmailMocker } from '@stamhoofd/email';
-import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { User} from '@stamhoofd/models';
+import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, BaseOrganization, EmailTemplateType, Event, EventNotificationStatus, EventNotification as EventNotificationStruct, Permissions, PermissionsResourceType, RecordType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';