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

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.133](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.132...v1.0.0-beta.133) (2026-10-28)
+
+### Features
+
+- remove necessity for data prop inside entities ([34e13f5](https://forge.sciactive.com/sciactive/nymphjs/commits/34e13f57375e82ab9677c6fd42ecc433333e0d22))
+
 # [1.0.0-beta.132](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.131...v1.0.0-beta.132) (2026-10-26)
 
 ### Bug Fixes

package/dist/AbleObject.d.ts

@@ -1,12 +1,15 @@
 import { Entity } from '@nymphjs/nymph';
+export interface AbleObjectData {
+    abilities?: string[];
+}
+export interface AbleObject<T extends {}> extends AbleObjectData {
+}
 /**
  * AbleObject abstract class.
  *
  * Used in entities which support abilities, such as users and groups.
  */
-export default abstract class AbleObject<T extends {
-    abilities?: string[];
-}> extends Entity<T> {
+export declare abstract class AbleObject<T extends {}> extends Entity<T & AbleObjectData> {
     /**
      * Grant an ability.
      *

package/dist/AbleObject.js

@@ -4,18 +4,18 @@ import { Entity } from '@nymphjs/nymph';
  *
  * Used in entities which support abilities, such as users and groups.
  */
-export default class AbleObject extends Entity {
+export class AbleObject extends Entity {
     /**
      * Grant an ability.
      *
      * @param ability The ability.
      */
     $grant(ability) {
-        if (!Array.isArray(this.$data.abilities)) {
-            this.$data.abilities = [];
+        if (!Array.isArray(this.abilities)) {
+            this.abilities = [];
         }
-        if (!this.$data.abilities.includes(ability)) {
-            this.$data.abilities.push(ability);
+        if (!this.abilities.includes(ability)) {
+            this.abilities.push(ability);
         }
     }
     /**
@@ -24,14 +24,14 @@ export default class AbleObject extends Entity {
      * @param ability The ability.
      */
     $revoke(ability) {
-        if (!Array.isArray(this.$data.abilities)) {
-            this.$data.abilities = [];
+        if (!Array.isArray(this.abilities)) {
+            this.abilities = [];
         }
         let idx;
         do {
-            idx = this.$data.abilities.indexOf(ability);
+            idx = this.abilities.indexOf(ability);
             if (idx !== -1) {
-                this.$data.abilities.splice(idx, 1);
+                this.abilities.splice(idx, 1);
             }
         } while (idx !== -1);
     }

package/dist/AbleObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbleObject.js","sourceRoot":"","sources":["../src/AbleObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAgB,UAE5B,SAAQ,MAAS;IACjB;;;;OAIG;IACI,MAAM,CAAC,OAAe;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,OAAO,CAAC,OAAe;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,GAAW,CAAC;QAChB,GAAG,CAAC;YACF,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,EAAE;IACvB,CAAC;CACF"}
+{"version":3,"file":"AbleObject.js","sourceRoot":"","sources":["../src/AbleObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAQxC;;;;GAIG;AACH,MAAM,OAAgB,UAAyB,SAAQ,MAEtD;IACC;;;;OAIG;IACI,MAAM,CAAC,OAAe;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,OAAO,CAAC,OAAe;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,GAAW,CAAC;QAChB,GAAG,CAAC;YACF,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACtC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,EAAE;IACvB,CAAC;CACF"}

package/dist/Group.d.ts

@@ -1,14 +1,13 @@
-import { type EntityData, type EntityJson, type EntityPatch, type Options, type Selector, type SerializedEntityData } from '@nymphjs/nymph';
-import AbleObject from './AbleObject.js';
-import UserClass from './User.js';
-import type { UserData } from './User.js';
+import { type EntityJson, type EntityPatch, type Options, type Selector, type SerializedEntityData } from '@nymphjs/nymph';
+import { AbleObject } from './AbleObject.js';
+import { User as UserClass } from './User.js';
 export type GroupEventType = 'checkGroupname' | 'beforeSave' | 'afterSave' | 'beforeDelete' | 'afterDelete';
 /**
  * This is run when the user has entered an otherwise valid groupname into the
  * signup form. It should return a result, which when false will stop the
  * process and return the included message, disallowing the groupname.
  */
-export type TilmeldCheckGroupnameCallback = (group: Group & GroupData, data: {
+export type TilmeldCheckGroupnameCallback = (group: Group, data: {
     groupname: string;
 }) => Promise<{
     result: boolean;
@@ -19,24 +18,24 @@ export type TilmeldCheckGroupnameCallback = (group: Group & GroupData, data: {
  *
  * The transaction is available in `group.$nymph`.
  */
-export type TilmeldBeforeGroupSaveCallback = (group: Group & GroupData) => Promise<void>;
+export type TilmeldBeforeGroupSaveCallback = (group: Group) => Promise<void>;
 /**
  * This is run before the transaction is committed, and you can perform
  * additional functions on the transaction, which is available in
  * `group.$nymph`.
  */
-export type TilmeldAfterGroupSaveCallback = (group: Group & GroupData) => Promise<void>;
+export type TilmeldAfterGroupSaveCallback = (group: Group) => Promise<void>;
 /**
  * The transaction is available in `group.$nymph`.
  */
-export type TilmeldBeforeGroupDeleteCallback = (group: Group & GroupData) => Promise<void>;
+export type TilmeldBeforeGroupDeleteCallback = (group: Group) => Promise<void>;
 /**
  * This is run before the transaction is committed, and you can perform
  * additional functions on the transaction, which is available in
  * `group.$nymph`.
  */
-export type TilmeldAfterGroupDeleteCallback = (group: Group & GroupData) => Promise<void>;
-export type GroupData = {
+export type TilmeldAfterGroupDeleteCallback = (group: Group) => Promise<void>;
+export interface GroupData {
     /**
      * The abilities granted to the group.
      */
@@ -64,11 +63,11 @@ export type GroupData = {
     /**
      * The group's parent.
      */
-    parent?: Group & GroupData;
+    parent?: Group;
     /**
      * If generatePrimary is on, this will be the user who generated this group.
      */
-    user?: (UserClass & UserData) | null;
+    user?: UserClass | null;
     /**
      * Whether the group can be used.
      */
@@ -85,7 +84,9 @@ export type GroupData = {
      * Whether this group is a default secondary group for unverified users.
      */
     unverifiedSecondary?: boolean;
-};
+}
+export interface Group extends GroupData {
+}
 /**
  * A user group data model.
  *
@@ -95,7 +96,7 @@ export type GroupData = {
  * @copyright SciActive Inc
  * @see http://nymph.io/
  */
-export default class Group extends AbleObject<GroupData> {
+export declare class Group extends AbleObject<GroupData> {
     static ETYPE: string;
     static class: string;
     private static checkGroupnameCallbacks;
@@ -125,7 +126,7 @@ export default class Group extends AbleObject<GroupData> {
      */
     $originalGroupname?: string;
     static getFTSText(name: string, value: any): string | null;
-    static factoryGroupname(groupname?: string): Promise<Group & GroupData>;
+    static factoryGroupname(groupname?: string): Promise<Group>;
     /**
      * Get all the groups that can be assigned as primary groups.
      *
@@ -133,7 +134,7 @@ export default class Group extends AbleObject<GroupData> {
      * @param selectors The selectors for an optional search query.
      * @returns An array of the assignable primary groups.
      */
-    static getPrimaryGroups(options?: Options, selectors?: Selector[]): Promise<(Group & GroupData)[]>;
+    static getPrimaryGroups(options?: Options, selectors?: Selector[]): Promise<Group[]>;
     /**
      * Get all the groups that can be assigned as secondary groups.
      *
@@ -141,7 +142,7 @@ export default class Group extends AbleObject<GroupData> {
      * @param selectors The selectors for an optional search query.
      * @returns An array of the assignable secondary groups.
      */
-    static getSecondaryGroups(options?: Options, selectors?: Selector[]): Promise<(Group & GroupData)[]>;
+    static getSecondaryGroups(options?: Options, selectors?: Selector[]): Promise<Group[]>;
     private static getAssignableGroups;
     constructor();
     $getUniques(): Promise<string[]>;
@@ -149,26 +150,26 @@ export default class Group extends AbleObject<GroupData> {
     $jsonAcceptData(input: EntityJson, allowConflict?: boolean): void;
     $jsonAcceptPatch(patch: EntityPatch, allowConflict?: boolean): void;
     private $checkIncomingAbilities;
-    $putData(data: EntityData, sdata?: SerializedEntityData, source?: 'server'): void;
+    $putData(data: GroupData, sdata?: SerializedEntityData, source?: 'server'): void;
     /**
      * Update the data protection arrays for a user.
      *
      * @param givenUser User to update protection for. If undefined, will use the currently logged in user.
      */
-    $updateDataProtection(givenUser?: UserClass & UserData): void;
+    $updateDataProtection(givenUser?: UserClass): void;
     /**
      * Check whether the group is a descendant of the given group.
      *
      * @param group The group, or the group's GUID.
      * @returns True or false.
      */
-    $isDescendant(givenGroup: (Group & GroupData) | string): Promise<boolean>;
+    $isDescendant(givenGroup: Group | string): Promise<boolean>;
     /**
      * Gets an array of the group's child groups.
      *
      * @returns An array of groups.
      */
-    $getChildren(): Promise<(Group & GroupData)[]>;
+    $getChildren(): Promise<Group[]>;
     /**
      * Gets an array of the group's descendant groups.
      *
@@ -176,7 +177,7 @@ export default class Group extends AbleObject<GroupData> {
      * @param andDisabled Include disabled groups.
      * @returns An array of groups.
      */
-    $getDescendants(andSelf?: boolean, andDisabled?: boolean): Promise<(Group & GroupData)[]>;
+    $getDescendants(andSelf?: boolean, andDisabled?: boolean): Promise<Group[]>;
     /**
      * Get the number of parents the group has.
      *
@@ -197,7 +198,7 @@ export default class Group extends AbleObject<GroupData> {
      * @param offset The offset for the query.
      * @returns An array of users.
      */
-    $getUsers(descendants?: boolean, limit?: number, offset?: number): Promise<(UserClass & UserData)[]>;
+    $getUsers(descendants?: boolean, limit?: number, offset?: number): Promise<UserClass[]>;
     /**
      * Check that a groupname is valid.
      *

package/dist/Group.js

@@ -38,9 +38,18 @@ import { nanoid } from '@nymphjs/guid';
 import { difference, xor } from 'lodash-es';
 import { splitn } from '@sciactive/splitn';
 import { enforceTilmeld } from './enforceTilmeld.js';
-import AbleObject from './AbleObject.js';
+import { AbleObject } from './AbleObject.js';
 import { AccessControlError, BadDataError, BadEmailError, BadUsernameError, CouldNotChangeDefaultPrimaryGroupError, } from './errors/index.js';
-import UserClass from './User.js';
+import { User as UserClass } from './User.js';
+/**
+ * A user group data model.
+ *
+ * Written by Hunter Perrin for SciActive.
+ *
+ * @author Hunter Perrin <hperrin@port87.com>
+ * @copyright SciActive Inc
+ * @see http://nymph.io/
+ */
 let Group = (() => {
     let _classSuper = AbleObject;
     let _instanceExtraInitializers = [];
@@ -176,33 +185,33 @@ let Group = (() => {
         constructor() {
             super();
             // Defaults.
-            this.$data.enabled = true;
-            this.$data.abilities = [];
+            this.enabled = true;
+            this.abilities = [];
             this.$updateDataProtection();
         }
         async $getUniques() {
             const tilmeld = enforceTilmeld(this);
-            const uniques = [`u:${this.$data.groupname}`];
+            const uniques = [`u:${this.groupname}`];
             if (!tilmeld.config.emailUsernames &&
                 tilmeld.config.userFields.includes('email')) {
-                uniques.push(`e:${this.$data.email}`);
+                uniques.push(`e:${this.email}`);
             }
-            if (this.$data.defaultPrimary) {
+            if (this.defaultPrimary) {
                 uniques.push(`o:default-primary`);
             }
             return uniques;
         }
         $getAvatar() {
-            if (this.$data.avatar != null && this.$data.avatar !== '') {
-                return this.$data.avatar;
+            if (this.avatar != null && this.avatar !== '') {
+                return this.avatar;
             }
-            if (this.$data.email == null || !this.$data.email.length) {
+            if (this.email == null || !this.email.length) {
                 return 'https://secure.gravatar.com/avatar/?d=mm&s=40';
             }
             return ('https://secure.gravatar.com/avatar/' +
                 crypto
                     .createHash('sha256')
-                    .update(this.$data.email.trim().toLowerCase())
+                    .update(this.email.trim().toLowerCase())
                     .digest('hex')
                     .toLowerCase() +
                 '?d=identicon&s=40');
@@ -228,24 +237,24 @@ let Group = (() => {
                 throw new BadDataError('Abilities must be an array of strings.');
             }
             if (incoming.includes('system/admin') !==
-                this.$data.abilities?.includes('system/admin') &&
+                this.abilities?.includes('system/admin') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke system/admin.");
             }
             if (incoming.includes('tilmeld/admin') !==
-                this.$data.abilities?.includes('tilmeld/admin') &&
+                this.abilities?.includes('tilmeld/admin') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke tilmeld/admin.");
             }
             if (incoming.includes('tilmeld/switch') !==
-                this.$data.abilities?.includes('tilmeld/switch') &&
+                this.abilities?.includes('tilmeld/switch') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke tilmeld/switch.");
             }
-            if (xor(incoming.filter((ability) => ability.startsWith('tilmeld/')), this.$data.abilities?.filter((ability) => ability.startsWith('tilmeld/')) ?? []).length &&
+            if (xor(incoming.filter((ability) => ability.startsWith('tilmeld/')), this.abilities?.filter((ability) => ability.startsWith('tilmeld/')) ?? []).length &&
                 (!tilmeld.currentUser ||
                     (!tilmeld.currentUser.abilities?.includes('system/admin') &&
                         !tilmeld.currentUser.abilities?.includes('tilmeld/admin')))) {
@@ -256,13 +265,13 @@ let Group = (() => {
             super.$putData(data, sdata, source);
             // TODO: Fix these being added by the drivers.
             // @ts-ignore
-            delete this.$data.acRead;
+            delete this.acRead;
             // @ts-ignore
-            delete this.$data.acWrite;
+            delete this.acWrite;
             // @ts-ignore
-            delete this.$data.acFull;
+            delete this.acFull;
             if (source === 'server') {
-                this.$originalGroupname = this.$data.groupname;
+                this.$originalGroupname = this.groupname;
             }
             this.$updateDataProtection();
         }
@@ -275,8 +284,8 @@ let Group = (() => {
             const tilmeld = enforceTilmeld(this);
             let user = givenUser ?? tilmeld.User.current();
             let [_groupname, domain] = tilmeld.config.domainSupport
-                ? splitn(this.$data.groupname ?? '', '@', 2)
-                : [this.$data.groupname, null];
+                ? splitn(this.groupname ?? '', '@', 2)
+                : [this.groupname, null];
             // Lowercase the domain part.
             if (domain) {
                 domain = domain.toLowerCase();
@@ -293,9 +302,9 @@ let Group = (() => {
                 this.$privateData = [];
                 this.$allowlistData = undefined;
             }
-            else if (this.$data.user != null &&
+            else if (this.user != null &&
                 user != null &&
-                this.$data.user.guid === user.guid) {
+                this.user.guid === user.guid) {
                 // Users can see their group's data.
                 this.$privateData = [];
             }
@@ -326,7 +335,7 @@ let Group = (() => {
                 return false;
             }
             // Check to see if the group is a descendant of the given group.
-            const parent = this.$data.parent;
+            const parent = this.parent;
             await parent?.$wake();
             if (parent == null) {
                 return false;
@@ -423,14 +432,8 @@ let Group = (() => {
                 ref: [
                     ['group', this],
                     ['groups', this],
-                    ...groups.map((group) => [
-                        'group',
-                        group,
-                    ]),
-                    ...groups.map((group) => [
-                        'groups',
-                        group,
-                    ]),
+                    ...groups.map((group) => ['group', group]),
+                    ...groups.map((group) => ['groups', group]),
                 ],
             });
         }
@@ -443,15 +446,15 @@ let Group = (() => {
             const tilmeld = enforceTilmeld(this);
             if (!tilmeld.config.emailUsernames) {
                 let [groupname, domain] = tilmeld.config.domainSupport
-                    ? splitn(this.$data.groupname ?? '', '@', 2)
-                    : [this.$data.groupname, null];
+                    ? splitn(this.groupname ?? '', '@', 2)
+                    : [this.groupname, null];
                 // Lowercase the domain part.
                 if (domain) {
                     domain = domain.toLowerCase();
-                    this.$data.groupname = `${groupname}@${domain}`;
+                    this.groupname = `${groupname}@${domain}`;
                 }
-                if (this.$data.groupname == null ||
-                    !this.$data.groupname.length ||
+                if (this.groupname == null ||
+                    !this.groupname.length ||
                     groupname == null ||
                     !groupname.length) {
                     return { result: false, message: 'Please specify a groupname.' };
@@ -504,7 +507,7 @@ let Group = (() => {
                     type: '&',
                     ilike: [
                         'groupname',
-                        this.$data.groupname.replace(/([\\%_])/g, (s) => `\\${s}`),
+                        this.groupname.replace(/([\\%_])/g, (s) => `\\${s}`),
                     ],
                 };
                 if (this.guid != null) {
@@ -518,7 +521,7 @@ let Group = (() => {
                     .checkGroupnameCallbacks) {
                     if (callback) {
                         const result = await callback(this, {
-                            groupname: this.$data.groupname,
+                            groupname: this.groupname,
                         });
                         if (!result.result) {
                             return { message: 'Groupname is not available.', ...result };
@@ -531,11 +534,11 @@ let Group = (() => {
                 };
             }
             else {
-                this.$data.email = this.$data.groupname;
-                if (this.$data.groupname == null || !this.$data.groupname.length) {
+                this.email = this.groupname;
+                if (this.groupname == null || !this.groupname.length) {
                     return { result: false, message: 'Please specify an email.' };
                 }
-                if (this.$data.groupname.length < tilmeld.config.minUsernameLength) {
+                if (this.groupname.length < tilmeld.config.minUsernameLength) {
                     return {
                         result: false,
                         message: 'Emails must be at least ' +
@@ -543,7 +546,7 @@ let Group = (() => {
                             ' characters.',
                     };
                 }
-                if (this.$data.groupname.length > tilmeld.config.maxUsernameLength) {
+                if (this.groupname.length > tilmeld.config.maxUsernameLength) {
                     return {
                         result: false,
                         message: 'Emails must not exceed ' +
@@ -561,13 +564,13 @@ let Group = (() => {
          */
         async $checkEmail() {
             const tilmeld = enforceTilmeld(this);
-            if (this.$data.email === '') {
+            if (this.email === '') {
                 return { result: true, message: '' };
             }
-            if (this.$data.email == null) {
+            if (this.email == null) {
                 return { result: false, message: 'Please specify a valid email.' };
             }
-            if (!tilmeld.config.validEmailRegex.test(this.$data.email)) {
+            if (!tilmeld.config.validEmailRegex.test(this.email)) {
                 return {
                     result: false,
                     message: tilmeld.config.validEmailRegexNotice,
@@ -575,7 +578,7 @@ let Group = (() => {
             }
             const selector = {
                 type: '&',
-                ilike: ['email', this.$data.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
+                ilike: ['email', this.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
             };
             if (this.guid != null) {
                 selector['!guid'] = this.guid;
@@ -594,18 +597,18 @@ let Group = (() => {
         }
         async $save() {
             let tilmeld = enforceTilmeld(this);
-            if (this.$data.groupname == null || !this.$data.groupname.trim().length) {
+            if (this.groupname == null || !this.groupname.trim().length) {
                 throw new BadUsernameError('Groupname must not be empty.');
             }
             // Lowercase the domain part.
             if (tilmeld.config.domainSupport) {
-                const [groupname, domain] = splitn(this.$data.groupname ?? '', '@', 2);
+                const [groupname, domain] = splitn(this.groupname ?? '', '@', 2);
                 if (domain) {
-                    this.$data.groupname = `${groupname}@${domain.toLowerCase()}`;
+                    this.groupname = `${groupname}@${domain.toLowerCase()}`;
                 }
             }
             if (tilmeld.config.domainSupport) {
-                const [_groupname, domain] = splitn(this.$data.groupname ?? '', '@', 2);
+                const [_groupname, domain] = splitn(this.groupname ?? '', '@', 2);
                 const [_originalGroupname, originalDomain] = splitn(this.$originalGroupname ?? '', '@', 2);
                 if (this.guid != null &&
                     ((originalDomain == null && domain != null) ||
@@ -629,47 +632,45 @@ let Group = (() => {
                 }
             }
             // Formatting.
-            this.$data.groupname = this.$data.groupname.trim();
+            this.groupname = this.groupname.trim();
             if (tilmeld.config.emailUsernames) {
-                this.$data.email = this.$data.groupname;
+                this.email = this.groupname;
             }
-            this.$data.email = (this.$data.email ?? '').trim();
-            this.$data.name = (this.$data.name ?? '').trim();
-            this.$data.phone = (this.$data.phone ?? '').trim();
-            this.$data.enabled = !!this.$data.enabled;
+            this.email = (this.email ?? '').trim();
+            this.name = (this.name ?? '').trim();
+            this.phone = (this.phone ?? '').trim();
+            this.enabled = !!this.enabled;
             // Clear empty values.
-            if (this.$data.name === '' || !tilmeld.config.userFields.includes('name')) {
-                delete this.$data.name;
+            if (this.name === '' || !tilmeld.config.userFields.includes('name')) {
+                delete this.name;
             }
-            if (this.$data.email === '' ||
-                !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.email;
+            if (this.email === '' || !tilmeld.config.userFields.includes('email')) {
+                delete this.email;
             }
-            if (this.$data.avatar === '') {
-                delete this.$data.avatar;
+            if (this.avatar === '') {
+                delete this.avatar;
             }
-            if (this.$data.phone === '' ||
-                !tilmeld.config.userFields.includes('phone')) {
-                delete this.$data.phone;
+            if (this.phone === '' || !tilmeld.config.userFields.includes('phone')) {
+                delete this.phone;
             }
-            if (this.$data.parent == null) {
-                delete this.$data.parent;
+            if (this.parent == null) {
+                delete this.parent;
             }
-            if (this.$data.user == null) {
-                delete this.$data.user;
+            if (this.user == null) {
+                delete this.user;
             }
-            if (!this.$data.defaultPrimary) {
-                delete this.$data.defaultPrimary;
+            if (!this.defaultPrimary) {
+                delete this.defaultPrimary;
             }
-            if (!this.$data.defaultSecondary) {
-                delete this.$data.defaultSecondary;
+            if (!this.defaultSecondary) {
+                delete this.defaultSecondary;
             }
-            if (!this.$data.unverifiedSecondary) {
-                delete this.$data.unverifiedSecondary;
+            if (!this.unverifiedSecondary) {
+                delete this.unverifiedSecondary;
             }
             // Groups should never have 'system/admin', 'tilmeld/admin',
             // 'tilmeld/switch', or domain admin abilities.
-            this.$data.abilities = (this.$data.abilities ?? []).filter((ability) => {
+            this.abilities = (this.abilities ?? []).filter((ability) => {
                 if (['system/admin', 'tilmeld/admin', 'tilmeld/switch'].indexOf(ability) !==
                     -1) {
                     return false;
@@ -695,7 +696,7 @@ let Group = (() => {
                 }
             }
             // Validate group parent. Make sure it's not a descendant of this group.
-            const parent = this.$data.parent;
+            const parent = this.parent;
             await parent?.$wake();
             if (parent &&
                 (parent.cdate == null ||
@@ -710,7 +711,7 @@ let Group = (() => {
                 throw new BadDataError(e?.message);
             }
             // Only one default primary group is allowed.
-            if (this.$data.defaultPrimary) {
+            if (this.defaultPrimary) {
                 const currentPrimary = await this.$nymph.getEntity({ class: tilmeld.Group }, { type: '&', truthy: 'defaultPrimary' });
                 if (currentPrimary != null && !this.$is(currentPrimary)) {
                     currentPrimary.defaultPrimary = false;
@@ -749,7 +750,7 @@ let Group = (() => {
             }, async (nymph, committed) => {
                 this.$setNymph(nymph);
                 if (committed) {
-                    this.$originalGroupname = this.$data.groupname;
+                    this.$originalGroupname = this.groupname;
                 }
                 else {
                     this.guid = preGuid;
@@ -778,7 +779,7 @@ let Group = (() => {
             if (!this.$skipAcWhenDeleting && !tilmeld.gatekeeper('tilmeld/admin')) {
                 throw new AccessControlError("You don't have the authority to delete groups.");
             }
-            if (this.$data.groupname !== this.$originalGroupname) {
+            if (this.groupname !== this.$originalGroupname) {
                 throw new AccessControlError("You can't delete a group while switching its groupname.");
             }
             for (let callback of this.constructor
@@ -868,14 +869,5 @@ let Group = (() => {
         }
     };
 })();
-/**
- * A user group data model.
- *
- * Written by Hunter Perrin for SciActive.
- *
- * @author Hunter Perrin <hperrin@port87.com>
- * @copyright SciActive Inc
- * @see http://nymph.io/
- */
-export default Group;
+export { Group };
 //# sourceMappingURL=Group.js.map