@nymphjs/tilmeld 1.0.0-beta.131 → 1.0.0-beta.133

package/src/conf/defaults.ts

@@ -7,8 +7,8 @@ import { nanoid } from '@nymphjs/guid';
 import { nymphJoiProps } from '@nymphjs/nymph';
 
 import type { Config } from './index.js';
-import User from '../User.js';
-import Group from '../Group.js';
+import { User } from '../User.js';
+import { Group } from '../Group.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 

package/src/conf/index.ts

@@ -1,10 +1,8 @@
 import type { EmailOptions, EmailConfig } from 'email-templates';
 
 import type Tilmeld from '../Tilmeld.js';
-import type Group from '../Group.js';
-import type { GroupData } from '../Group.js';
-import type User from '../User.js';
-import type { UserData } from '../User.js';
+import type { Group } from '../Group.js';
+import type { User } from '../User.js';
 
 /**
  * Tilmeld Config
@@ -267,11 +265,7 @@ export interface Config {
   /**
    * Function to build the JWT for user sessions.
    */
-  jwtBuilder: (
-    config: Config,
-    user: User & UserData,
-    switchToken?: boolean,
-  ) => string;
+  jwtBuilder: (config: Config, user: User, switchToken?: boolean) => string;
   /**
    * Function to verify that a JWT was signed with the secret key, validate its
    * data, validate the XSRF token, and extract the GUID and dates.
@@ -301,7 +295,7 @@ export interface Config {
   configEmail: (
     tilmeld: Tilmeld,
     options: EmailOptions,
-    user: User & UserData,
+    user: User,
   ) => Promise<EmailConfig>;
   /**
    * Send an email to a user. Uses `email-templates` by default.
@@ -331,7 +325,7 @@ export interface Config {
   sendEmail: (
     tilmeld: Tilmeld,
     options: EmailOptions,
-    user: User & UserData,
+    user: User,
   ) => Promise<boolean>;
   /**
    * The address you'd like to receive a notification of registered users, if
@@ -350,7 +344,7 @@ export interface Config {
    * verified. For example, username might be an array or a number.
    */
   failedLoginAttempt: (
-    user: (User & UserData) | null,
+    user: User | null,
     data: {
       username: string;
       password: string;
@@ -361,11 +355,11 @@ export interface Config {
   /**
    * The validator used to check groups before saving.
    */
-  validatorGroup: (tilmeld: Tilmeld, group: Group & GroupData) => void;
+  validatorGroup: (tilmeld: Tilmeld, group: Group) => void;
   /**
    * The validator used to check users before saving.
    */
-  validatorUser: (tilmeld: Tilmeld, user: User & UserData) => void;
+  validatorUser: (tilmeld: Tilmeld, user: User) => void;
 }
 
 import defaults from './defaults.js';

package/src/index.ts

@@ -5,21 +5,15 @@ export * from './enforceTilmeld.js';
 export * from './decorators/index.js';
 export * from './errors/index.js';
 
-import AbleObject from './AbleObject.js';
-export { AbleObject };
+export * from './AbleObject.js';
 
 export * from './Group.js';
-import Group from './Group.js';
-export { Group };
 
 import Tilmeld from './Tilmeld.js';
 export { Tilmeld };
 
 export * from './Tilmeld.types.js';
 
-import tilmeldJoiProps from './tilmeldJoiProps.js';
-export { tilmeldJoiProps };
+export * from './tilmeldJoiProps.js';
 
 export * from './User.js';
-import User from './User.js';
-export { User };

package/src/testArtifacts.ts

@@ -10,14 +10,16 @@ import Tilmeld from './Tilmeld.js';
 import { requireAbility, requireAuthentication } from './decorators/index.js';
 import { AccessControlError } from './errors/index.js';
 import type { AccessControlData } from './Tilmeld.types.js';
-import type UserClass from './User.js';
+import type { User as UserClass } from './User.js';
 import { UserTest } from './User.testArtifacts.js';
-import type GroupClass from './Group.js';
+import type { Group as GroupClass } from './Group.js';
 import { GroupTest } from './Group.testArtifacts.js';
 
-export type TestModelData = {
+export interface TestModelData extends AccessControlData {
   name?: string;
-} & AccessControlData;
+}
+
+export interface TestModel extends TestModelData {}
 
 /**
  * This class is a test class that extends the Entity class.

package/src/tilmeldJoiProps.ts

@@ -1,10 +1,10 @@
 import { TilmeldAccessLevels } from '@nymphjs/nymph';
 import Joi from 'joi';
 
-import User from './User.js';
-import Group from './Group.js';
+import { User } from './User.js';
+import { Group } from './Group.js';
 
-export default {
+export const tilmeldJoiProps = {
   user: Joi.object().instance(User),
   group: Joi.object().instance(Group),
   acUser: Joi.number().valid(