@nymphjs/nymph 1.0.0-beta.13 → 1.0.0-beta.130

package/src/driver/NymphDriver.ts

@@ -1,20 +1,32 @@
-import fs from 'fs';
-import { difference } from 'lodash';
+import fs from 'node:fs';
+import { difference } from 'lodash-es';
 import ReadLines from 'n-readlines';
-import strtotime from 'locutus/php/datetime/strtotime';
-import { guid } from '@nymphjs/guid';
+import { strtotime } from 'locutus/php/datetime/index';
+import { Tokenizer } from '@sciactive/tokenizer';
 
-import type Nymph from '../Nymph';
-import {
+import type Nymph from '../Nymph.js';
+import type { Selector, Options, FormattedSelector } from '../Nymph.types.js';
+import Entity from '../Entity.js';
+import type { EntityInstanceType, EntityObjectType } from '../Entity.js';
+import type {
   EntityConstructor,
   EntityData,
   EntityInterface,
   EntityReference,
   SerializedEntityData,
-} from '../Entity.types';
-import { InvalidParametersError, UnableToConnectError } from '../errors';
-import { Selector, Options, FormattedSelector } from '../Nymph.types';
-import { xor } from '../utils';
+} from '../Entity.types.js';
+import {
+  ClassNotAvailableError,
+  InvalidParametersError,
+  UnableToConnectError,
+} from '../errors/index.js';
+import {
+  classNamesToEntityConstructors,
+  entitiesToReferences,
+  entityConstructorsToClassNames,
+  referencesToEntities,
+  xor,
+} from '../utils.js';
 
 // from: https://stackoverflow.com/a/6969486/664915
 function escapeRegExp(string: string): string {
@@ -28,11 +40,13 @@ export default abstract class NymphDriver {
   protected nymph: Nymph = new Proxy({} as Nymph, {
     get() {
       throw new Error(
-        'Attempted access of Nymph instance before driver initialization!'
+        'Attempted access of Nymph instance before driver initialization!',
       );
     },
   });
 
+  protected tokenizer = new Tokenizer();
+
   /**
    * A cache to make entity retrieval faster.
    */
@@ -67,13 +81,14 @@ export default abstract class NymphDriver {
   abstract connect(): Promise<boolean>;
 
   abstract isConnected(): boolean;
+  protected abstract internalTransaction(name: string): Promise<any>;
   abstract startTransaction(name: string): Promise<Nymph>;
   abstract commit(name: string): Promise<boolean>;
   abstract rollback(name: string): Promise<boolean>;
   abstract inTransaction(): Promise<boolean>;
   abstract deleteEntityByID(
     guid: string,
-    classConstructor: EntityConstructor
+    classConstructor: EntityConstructor,
   ): Promise<boolean>;
   abstract deleteEntityByID(guid: string, className?: string): Promise<boolean>;
   abstract deleteUID(name: string): Promise<boolean>;
@@ -83,9 +98,42 @@ export default abstract class NymphDriver {
    */
   abstract disconnect(): Promise<boolean>;
 
-  protected abstract exportEntities(
-    writeLine: (line: string) => void
+  abstract needsMigration(): Promise<
+    'json' | 'tokens' | 'tilmeldColumns' | false
+  >;
+  abstract liveMigration(
+    migrationType: 'tokenTables' | 'tilmeldColumns' | 'tilmeldRemoveOldRows',
   ): Promise<void>;
+
+  abstract getEtypes(): Promise<string[]>;
+  abstract getIndexes(etype: string): Promise<
+    {
+      scope: 'data' | 'references' | 'tokens';
+      name: string;
+      property: string;
+    }[]
+  >;
+  abstract addIndex(
+    etype: string,
+    definition: {
+      scope: 'data' | 'references' | 'tokens';
+      name: string;
+      property: string;
+    },
+  ): Promise<boolean>;
+  abstract deleteIndex(
+    etype: string,
+    scope: 'data' | 'references' | 'tokens',
+    name: string,
+  ): Promise<boolean>;
+
+  abstract exportDataIterator(): AsyncGenerator<
+    { type: 'comment' | 'uid' | 'entity'; content: string },
+    void,
+    undefined | false
+  >;
+  abstract exportEntity(etype: string, guid: string): Promise<string>;
+
   abstract getEntities<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> & { return: 'count' },
     ...selectors: Selector[]
@@ -95,44 +143,53 @@ export default abstract class NymphDriver {
     ...selectors: Selector[]
   ): Promise<string[]>;
   abstract getEntities<T extends EntityConstructor = EntityConstructor>(
-    options?: Options<T>,
+    options: Options<T> & { return: 'object' },
     ...selectors: Selector[]
-  ): Promise<ReturnType<T['factorySync']>[]>;
+  ): Promise<EntityObjectType<T>[]>;
   abstract getEntities<T extends EntityConstructor = EntityConstructor>(
     options?: Options<T>,
     ...selectors: Selector[]
-  ): Promise<ReturnType<T['factorySync']>[] | string[] | number>;
-  protected abstract getEntitiesSync<
-    T extends EntityConstructor = EntityConstructor
-  >(
-    options: Options<T> & { return: 'count' },
-    ...selectors: Selector[]
-  ): number;
-  protected abstract getEntitiesSync<
-    T extends EntityConstructor = EntityConstructor
-  >(
-    options: Options<T> & { return: 'guid' },
-    ...selectors: Selector[]
-  ): string[];
-  protected abstract getEntitiesSync<
-    T extends EntityConstructor = EntityConstructor
-  >(
-    options?: Options<T>,
-    ...selectors: Selector[]
-  ): ReturnType<T['factorySync']>[];
-  protected abstract getEntitiesSync<
-    T extends EntityConstructor = EntityConstructor
-  >(
+  ): Promise<EntityInstanceType<T>[]>;
+  abstract getEntities<T extends EntityConstructor = EntityConstructor>(
     options?: Options<T>,
     ...selectors: Selector[]
-  ): ReturnType<T['factorySync']>[] | string[] | number;
+  ): Promise<
+    EntityInstanceType<T>[] | EntityObjectType<T>[] | string[] | number
+  >;
   abstract getUID(name: string): Promise<number | null>;
-  abstract import(filename: string): Promise<boolean>;
+
+  abstract importEntity(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }): Promise<void>;
+  abstract importEntityTokens(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }): Promise<void>;
+  abstract importEntityTilmeldAC(entity: {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    sdata: SerializedEntityData;
+    etype: string;
+  }): Promise<void>;
+  abstract importUID(uid: { name: string; value: number }): Promise<void>;
+
   abstract newUID(name: string): Promise<number | null>;
   abstract renameUID(oldName: string, newName: string): Promise<boolean>;
-  abstract saveEntity(entity: EntityInterface): Promise<boolean>;
   abstract setUID(name: string, value: number): Promise<boolean>;
 
+  abstract saveEntity(entity: EntityInterface): Promise<boolean>;
+
   /**
    * Initialize the Nymph driver.
    *
@@ -147,7 +204,7 @@ export default abstract class NymphDriver {
   protected posixRegexMatch(
     pattern: string,
     subject: string,
-    caseInsensitive = false
+    caseInsensitive = false,
   ) {
     const posixClasses = [
       // '[[:<:]]',
@@ -198,15 +255,23 @@ export default abstract class NymphDriver {
     return re.test(subject);
   }
 
+  public checkIndexName(name: string) {
+    if (name.match(/[^a-z0-9_]/)) {
+      throw new Error(
+        'Index names can only contain lowercase letters, numbers, and underscores.',
+      );
+    }
+  }
+
   public async export(filename: string) {
     try {
       const fhandle = fs.openSync(filename, 'w');
       if (!fhandle) {
         throw new InvalidParametersError('Provided filename is not writeable.');
       }
-      await this.exportEntities((line: string) => {
-        fs.writeSync(fhandle, `${line}\n`);
-      });
+      for await (let entry of this.exportDataIterator()) {
+        fs.writeSync(fhandle, entry.content);
+      }
       fs.closeSync(fhandle);
     } catch (e: any) {
       return false;
@@ -215,23 +280,127 @@ export default abstract class NymphDriver {
   }
 
   public async exportPrint() {
-    await this.exportEntities((line: string) => {
-      console.log(line);
-    });
+    for await (let entry of this.exportDataIterator()) {
+      console.log(entry.content);
+    }
+    return true;
+  }
+
+  public async importDataIterator(
+    lines: Iterable<string>,
+    options?: { ignoreUnknownETypes?: boolean },
+    transaction?: boolean,
+  ) {
+    const first = lines[Symbol.iterator]().next();
+
+    if (first.done || first.value !== '#nex2') {
+      throw new Error('Tried to import a file that is not a NEX v2 file.');
+    }
+
+    if (transaction) {
+      await this.internalTransaction('nymph-import');
+    }
+    try {
+      let guid: string | null = null;
+      let sdata: SerializedEntityData = {};
+      let tags: string[] = [];
+      let etype = '__undefined';
+      for (let line of lines) {
+        if (line.match(/^\s*#/)) {
+          continue;
+        }
+        const entityMatch = line.match(
+          /^\s*{([0-9A-Fa-f]+)}<([-\w_]+)>\[([^\]]*)\]\s*$/,
+        );
+        const propMatch = line.match(/^\s*([^=]+)\s*=\s*(.*\S)\s*$/);
+        const uidMatch = line.match(/^\s*<([^>]+)>\[(\d+)\]\s*$/);
+        if (uidMatch) {
+          // Add the UID.
+          await this.importUID({
+            name: uidMatch[1],
+            value: Number(uidMatch[2]),
+          });
+        } else if (entityMatch) {
+          // Save the current entity.
+          if (guid) {
+            const cdate = Number(JSON.parse(sdata.cdate));
+            delete sdata.cdate;
+            const mdate = Number(JSON.parse(sdata.mdate));
+            delete sdata.mdate;
+            try {
+              await this.importEntity({
+                guid,
+                cdate,
+                mdate,
+                tags,
+                sdata,
+                etype,
+              });
+            } catch (e: any) {
+              if (
+                !(e instanceof ClassNotAvailableError) ||
+                !options?.ignoreUnknownETypes
+              ) {
+                throw e;
+              }
+            }
+            guid = null;
+            tags = [];
+            sdata = {};
+            etype = '__undefined';
+          }
+          // Record the new entity's info.
+          guid = entityMatch[1];
+          etype = entityMatch[2];
+          tags = entityMatch[3].split(',');
+        } else if (propMatch) {
+          // Add the variable to the new entity.
+          if (guid) {
+            sdata[propMatch[1]] = propMatch[2];
+          }
+        }
+        // Clear the entity cache.
+        this.entityCache = {};
+      }
+      // Save the last entity.
+      if (guid) {
+        const cdate = Number(JSON.parse(sdata.cdate));
+        delete sdata.cdate;
+        const mdate = Number(JSON.parse(sdata.mdate));
+        delete sdata.mdate;
+        try {
+          await this.importEntity({ guid, cdate, mdate, tags, sdata, etype });
+        } catch (e: any) {
+          if (
+            !(e instanceof ClassNotAvailableError) ||
+            !options?.ignoreUnknownETypes
+          ) {
+            throw e;
+          }
+        }
+      }
+      if (transaction) {
+        await this.commit('nymph-import');
+      }
+    } catch (e: any) {
+      await this.rollback('nymph-import');
+      throw e;
+    }
     return true;
   }
 
-  protected async importFromFile(
+  public async importData(text: string, transaction?: boolean) {
+    return await this.importDataIterator(
+      text.split('\n'),
+      undefined,
+      transaction,
+    );
+  }
+
+  public async import(
     filename: string,
-    saveEntityCallback: (
-      guid: string,
-      tags: string[],
-      sdata: SerializedEntityData,
-      etype: string
-    ) => Promise<void>,
-    saveUIDCallback: (name: string, value: number) => Promise<void>,
-    startTransactionCallback: (() => Promise<void>) | null = null,
-    commitTransactionCallback: (() => Promise<void>) | null = null
+    options?: { ignoreUnknownETypes?: boolean },
+    transaction?: boolean,
   ) {
     let rl: ReadLines;
     try {
@@ -239,106 +408,63 @@ export default abstract class NymphDriver {
     } catch (e: any) {
       throw new InvalidParametersError('Provided filename is unreadable.');
     }
-    let guid: string | null = null;
-    let line: Buffer | false = false;
-    let sdata: SerializedEntityData = {};
-    let tags: string[] = [];
-    let etype = '__undefined';
-    if (startTransactionCallback) {
-      await startTransactionCallback();
-    }
-    while ((line = rl.next())) {
-      const text = line.toString('utf8');
-      if (text.match(/^\s*#/)) {
-        continue;
-      }
-      const entityMatch = text.match(
-        /^\s*{([0-9A-Fa-f]+)}<([-\w_]+)>\[([^\]]*)\]\s*$/
-      );
-      const propMatch = text.match(/^\s*([^=]+)\s*=\s*(.*\S)\s*$/);
-      const uidMatch = text.match(/^\s*<([^>]+)>\[(\d+)\]\s*$/);
-      if (uidMatch) {
-        // Add the UID.
-        await saveUIDCallback(uidMatch[1], Number(uidMatch[2]));
-      } else if (entityMatch) {
-        // Save the current entity.
-        if (guid) {
-          await saveEntityCallback(guid, tags, sdata, etype);
-          guid = null;
-          tags = [];
-          sdata = {};
-          etype = '__undefined';
-        }
-        // Record the new entity's info.
-        guid = entityMatch[1];
-        etype = entityMatch[2];
-        tags = entityMatch[3].split(',');
-      } else if (propMatch) {
-        // Add the variable to the new entity.
-        if (guid) {
-          sdata[propMatch[1]] = propMatch[2];
+
+    const lines = {
+      *[Symbol.iterator]() {
+        let line: null | Buffer;
+        while ((line = rl.next())) {
+          yield line.toString('utf8');
         }
-      }
-      // Clear the entity cache.
-      this.entityCache = {};
-    }
-    // Save the last entity.
-    if (guid) {
-      await saveEntityCallback(guid, tags, sdata, etype);
-    }
-    if (commitTransactionCallback) {
-      await commitTransactionCallback();
-    }
-    return true;
+      },
+    };
+
+    return await this.importDataIterator(lines, options, transaction);
   }
 
   public checkData(
+    etype: string,
     data: EntityData,
     sdata: SerializedEntityData,
     selectors: Selector[],
     guid: string | null = null,
-    tags: string[] | null = null
+    tags: string[] | null = null,
   ) {
-    const formattedSelectors = this.formatSelectors(selectors).selectors;
+    try {
+      const EntityClass = this.nymph.getEntityClassByEtype(etype);
+      const formattedSelectors = this.formatSelectors(selectors).selectors;
 
-    for (const curSelector of formattedSelectors) {
-      const type = curSelector.type;
-      const typeIsNot = type === '!&' || type === '!|';
-      const typeIsOr = type === '|' || type === '!|';
-      let pass = !typeIsOr;
-      for (const k in curSelector) {
-        const key = k as keyof Selector;
-        const value = curSelector[key];
+      for (const curSelector of formattedSelectors) {
+        const type = curSelector.type;
+        const typeIsNot = type === '!&' || type === '!|';
+        const typeIsOr = type === '|' || type === '!|';
+        let pass = !typeIsOr;
+        for (const k in curSelector) {
+          const key = k as keyof Selector;
+          const value = curSelector[key];
 
-        if (key === 'type' || value == null) {
-          continue;
-        }
+          if (key === 'type' || value == null) {
+            continue;
+          }
 
-        const clauseNot = key.substr(0, 1) === '!';
-        if (key === 'selector' || key === '!selector') {
-          const tmpArr = (Array.isArray(value) ? value : [value]) as Selector[];
-          pass = xor(
-            this.checkData(data, sdata, tmpArr, guid, tags),
-            xor(typeIsNot, clauseNot)
-          );
-        } else {
-          if (key === 'qref' || key === '!qref') {
-            throw new Error("Can't use checkData on qref clauses.");
+          const clauseNot = key.substring(0, 1) === '!';
+          if (key === 'selector' || key === '!selector') {
+            const tmpArr = (
+              Array.isArray(value) ? value : [value]
+            ) as Selector[];
+            pass = xor(
+              this.checkData(etype, data, sdata, tmpArr, guid, tags),
+              xor(typeIsNot, clauseNot),
+            );
           } else {
-            // Check if it doesn't pass any for &, check if it
-            // passes any for |.
-            for (const curValue of value) {
-              if (curValue == null) {
-                continue;
-              }
+            if (key === 'qref' || key === '!qref') {
+              throw new Error("Can't use checkData on qref clauses.");
+            } else {
+              // Check if it doesn't pass any for &, check if it passes any for |.
+              for (const curValue of value) {
+                if (curValue == null) {
+                  continue;
+                }
 
-              if (
-                ((key === 'guid' || key === '!guid') && guid == null) ||
-                ((key === 'tag' || key === '!tag') && tags == null)
-              ) {
-                // Skip because it has already been checked (by the query).
-                pass = true;
-              } else {
                 const propName = (curValue as string[])[0];
 
                 // Unserialize the data for this variable.
@@ -356,7 +482,7 @@ export default abstract class NymphDriver {
                   case '!tag':
                     pass = xor(
                       (tags ?? []).indexOf(propName) !== -1,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'defined':
@@ -367,7 +493,7 @@ export default abstract class NymphDriver {
                   case '!truthy':
                     pass = xor(
                       propName in data && data[propName],
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'ref':
@@ -377,9 +503,9 @@ export default abstract class NymphDriver {
                       propName in data &&
                         this.entityReferenceSearch(
                           data[propName],
-                          testRefValue
+                          testRefValue,
                         ),
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'equal':
@@ -391,7 +517,7 @@ export default abstract class NymphDriver {
                       propName in data &&
                         JSON.stringify(data[propName]) ===
                           JSON.stringify(testEqualValue),
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'contain':
@@ -402,9 +528,9 @@ export default abstract class NymphDriver {
                     pass = xor(
                       propName in data &&
                         JSON.stringify(data[propName]).indexOf(
-                          JSON.stringify(testContainValue)
+                          JSON.stringify(testContainValue),
                         ) !== -1,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'like':
@@ -419,9 +545,27 @@ export default abstract class NymphDriver {
                             escapeRegExp(testLikeValue)
                               .replace('%', () => '.*')
                               .replace('_', () => '.') +
-                            '$'
+                            '$',
                         ).test(data[propName]),
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
+                    );
+                    break;
+                  case 'ilike':
+                  case '!ilike':
+                    const testILikeValue = (
+                      curValue as [string, string]
+                    )[1] as string;
+                    pass = xor(
+                      propName in data &&
+                        new RegExp(
+                          '^' +
+                            escapeRegExp(testILikeValue)
+                              .replace('%', () => '.*')
+                              .replace('_', () => '.') +
+                            '$',
+                          'i',
+                        ).test(data[propName]),
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'match':
@@ -433,7 +577,7 @@ export default abstract class NymphDriver {
                     pass = xor(
                       propName in data &&
                         this.posixRegexMatch(testMatchValue, data[propName]),
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'imatch':
@@ -447,9 +591,28 @@ export default abstract class NymphDriver {
                         this.posixRegexMatch(
                           testIMatchValue,
                           data[propName],
-                          true
+                          true,
                         ),
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
+                    );
+                    break;
+                  case 'search':
+                  case '!search':
+                    const testSearchValue = (
+                      curValue as [string, string]
+                    )[1] as string;
+                    const tokenString =
+                      propName in data
+                        ? (EntityClass.getFTSText(propName, data[propName]) ??
+                          '')
+                        : '';
+                    pass = xor(
+                      propName in data &&
+                        this.tokenizer.searchString(
+                          testSearchValue,
+                          tokenString,
+                        ),
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'gt':
@@ -459,7 +622,7 @@ export default abstract class NymphDriver {
                     )[1] as number;
                     pass = xor(
                       propName in data && data[propName] > testGTValue,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'gte':
@@ -469,7 +632,7 @@ export default abstract class NymphDriver {
                     )[1] as number;
                     pass = xor(
                       propName in data && data[propName] >= testGTEValue,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'lt':
@@ -479,7 +642,7 @@ export default abstract class NymphDriver {
                     )[1] as number;
                     pass = xor(
                       propName in data && data[propName] < testLTValue,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                   case 'lte':
@@ -489,26 +652,33 @@ export default abstract class NymphDriver {
                     )[1] as number;
                     pass = xor(
                       propName in data && data[propName] <= testLTEValue,
-                      xor(typeIsNot, clauseNot)
+                      xor(typeIsNot, clauseNot),
                     );
                     break;
                 }
-              }
-              if (!xor(typeIsOr, pass)) {
-                break;
+
+                if (!xor(typeIsOr, pass)) {
+                  break;
+                }
               }
             }
           }
+          if (!xor(typeIsOr, pass)) {
+            break;
+          }
         }
-        if (!xor(typeIsOr, pass)) {
-          break;
+        if (!pass) {
+          return false;
         }
       }
-      if (!pass) {
-        return false;
-      }
+      return true;
+    } catch (e: any) {
+      this.nymph.config.debugError(
+        'nymph',
+        `Failed to check entity data: ${e}`,
+      );
+      throw e;
     }
-    return true;
   }
 
   /**
@@ -547,7 +717,7 @@ export default abstract class NymphDriver {
       | EntityInterface
       | EntityReference
       | string
-      | (EntityInterface | EntityReference | string)[]
+      | (EntityInterface | EntityReference | string)[],
   ) {
     // Get the GUID, if the passed $entity is an object.
     const guids: string[] = [];
@@ -577,8 +747,19 @@ export default abstract class NymphDriver {
     ) {
       return true;
     }
+    if (
+      value instanceof Entity &&
+      value.guid != null &&
+      guids.indexOf(value.guid) !== -1
+    ) {
+      return true;
+    }
     // Search through arrays and objects looking for the reference.
-    if (Array.isArray(value) || typeof value === 'object') {
+    if (
+      value != null &&
+      (Array.isArray(value) ||
+        (typeof value === 'object' && !(value instanceof Entity)))
+    ) {
       for (const key in value) {
         if (this.entityReferenceSearch(value[key], guids)) {
           return true;
@@ -588,9 +769,222 @@ export default abstract class NymphDriver {
     return false;
   }
 
+  protected removeAndReturnACValues(
+    etype: string,
+    data: EntityData,
+    sdata: SerializedEntityData,
+  ) {
+    let user: string | null = null;
+    let group: string | null = null;
+    let acUser: number | null = null;
+    let acGroup: number | null = null;
+    let acOther: number | null = null;
+    let acRead: string[] | null = null;
+    let acWrite: string[] | null = null;
+    let acFull: string[] | null = null;
+
+    if (this.nymph.tilmeld != null) {
+      // Since Tilmeld is installed, we need to fill the AC vars.
+      const userValue =
+        'user' in sdata
+          ? JSON.parse(sdata.user)
+          : 'user' in data
+            ? data.user
+            : null;
+      if (
+        Array.isArray(userValue) &&
+        userValue[0] === 'nymph_entity_reference' &&
+        userValue[2] === 'User' &&
+        typeof userValue[1] === 'string' &&
+        userValue[1].match(/^[0-9a-f]{24}$/i)
+      ) {
+        user = userValue[1];
+      }
+
+      const groupValue =
+        'group' in sdata
+          ? JSON.parse(sdata.group)
+          : 'group' in data
+            ? data.group
+            : null;
+      if (
+        Array.isArray(groupValue) &&
+        groupValue[0] === 'nymph_entity_reference' &&
+        groupValue[2] === 'Group' &&
+        typeof groupValue[1] === 'string' &&
+        groupValue[1].match(/^[0-9a-f]{24}$/i)
+      ) {
+        group = groupValue[1];
+      }
+
+      if (etype !== 'tilmeld_user' && etype !== 'tilmeld_group') {
+        const acUserValue =
+          'acUser' in sdata
+            ? JSON.parse(sdata.acUser)
+            : 'acUser' in data
+              ? data.acUser
+              : null;
+        if (
+          typeof acUserValue === 'number' &&
+          !isNaN(acUserValue) &&
+          acUserValue >= 0
+        ) {
+          acUser = acUserValue;
+        }
+
+        const acGroupValue =
+          'acGroup' in sdata
+            ? JSON.parse(sdata.acGroup)
+            : 'acGroup' in data
+              ? data.acGroup
+              : null;
+        if (
+          typeof acGroupValue === 'number' &&
+          !isNaN(acGroupValue) &&
+          acGroupValue >= 0
+        ) {
+          acGroup = acGroupValue;
+        }
+
+        const acOtherValue =
+          'acOther' in sdata
+            ? JSON.parse(sdata.acOther)
+            : 'acOther' in data
+              ? data.acOther
+              : null;
+        if (
+          typeof acOtherValue === 'number' &&
+          !isNaN(acOtherValue) &&
+          acOtherValue >= 0
+        ) {
+          acOther = acOtherValue;
+        }
+
+        const acReadValue =
+          'acRead' in sdata
+            ? JSON.parse(sdata.acRead)
+            : 'acRead' in data
+              ? data.acRead
+              : null;
+        if (Array.isArray(acReadValue)) {
+          const acReadArray = [];
+          for (let acReadEntry of acReadValue) {
+            if (
+              typeof acReadEntry === 'string' &&
+              acReadEntry.match(/^[0-9a-f]{24}$/i)
+            ) {
+              acReadArray.push(acReadEntry);
+            } else if (
+              Array.isArray(acReadEntry) &&
+              acReadEntry[0] === 'nymph_entity_reference' &&
+              (acReadEntry[2] === 'User' || acReadEntry[2] === 'Group') &&
+              typeof acReadEntry[1] === 'string' &&
+              acReadEntry[1].match(/^[0-9a-f]{24}$/i)
+            ) {
+              acReadArray.push(acReadEntry[1]);
+            }
+          }
+          if (acReadArray.length) {
+            acRead = acReadArray;
+          }
+        }
+
+        const acWriteValue =
+          'acWrite' in sdata
+            ? JSON.parse(sdata.acWrite)
+            : 'acWrite' in data
+              ? data.acWrite
+              : null;
+        if (Array.isArray(acWriteValue)) {
+          const acWriteArray = [];
+          for (let acWriteEntry of acWriteValue) {
+            if (
+              typeof acWriteEntry === 'string' &&
+              acWriteEntry.match(/^[0-9a-f]{24}$/i)
+            ) {
+              acWriteArray.push(acWriteEntry);
+            } else if (
+              Array.isArray(acWriteEntry) &&
+              acWriteEntry[0] === 'nymph_entity_reference' &&
+              (acWriteEntry[2] === 'User' || acWriteEntry[2] === 'Group') &&
+              typeof acWriteEntry[1] === 'string' &&
+              acWriteEntry[1].match(/^[0-9a-f]{24}$/i)
+            ) {
+              acWriteArray.push(acWriteEntry[1]);
+            }
+          }
+          if (acWriteArray.length) {
+            acWrite = acWriteArray;
+          }
+        }
+
+        const acFullValue =
+          'acFull' in sdata
+            ? JSON.parse(sdata.acFull)
+            : 'acFull' in data
+              ? data.acFull
+              : null;
+        if (Array.isArray(acFullValue)) {
+          const acFullArray = [];
+          for (let acFullEntry of acFullValue) {
+            if (
+              typeof acFullEntry === 'string' &&
+              acFullEntry.match(/^[0-9a-f]{24}$/i)
+            ) {
+              acFullArray.push(acFullEntry);
+            } else if (
+              Array.isArray(acFullEntry) &&
+              acFullEntry[0] === 'nymph_entity_reference' &&
+              (acFullEntry[2] === 'User' || acFullEntry[2] === 'Group') &&
+              typeof acFullEntry[1] === 'string' &&
+              acFullEntry[1].match(/^[0-9a-f]{24}$/i)
+            ) {
+              acFullArray.push(acFullEntry[1]);
+            }
+          }
+          if (acFullArray.length) {
+            acFull = acFullArray;
+          }
+        }
+      }
+
+      // Delete all of the data, so it doesn't go into the database as rows in
+      // the data tables.
+      delete sdata.user;
+      delete data.user;
+      delete sdata.group;
+      delete data.group;
+      delete sdata.acUser;
+      delete data.acUser;
+      delete sdata.acGroup;
+      delete data.acGroup;
+      delete sdata.acOther;
+      delete data.acOther;
+      delete sdata.acRead;
+      delete data.acRead;
+      delete sdata.acWrite;
+      delete data.acWrite;
+      delete sdata.acFull;
+      delete data.acFull;
+    }
+
+    return {
+      data,
+      sdata,
+      user,
+      group,
+      acUser,
+      acGroup,
+      acOther,
+      acRead,
+      acWrite,
+      acFull,
+    };
+  }
+
   public formatSelectors(
     selectors: Selector[],
-    options: Options = {}
+    options: Options = {},
   ): {
     selectors: FormattedSelector[];
     qrefs: [Options, ...FormattedSelector[]][];
@@ -625,10 +1019,9 @@ export default abstract class NymphDriver {
           for (let i = 0; i < tmpArr.length; i++) {
             const name = tmpArr[i][0];
             const [qrefOptions, ...qrefSelectors] = tmpArr[i][1];
-            const QrefEntityClass =
-              typeof qrefOptions.class === 'string'
-                ? this.nymph.getEntityClass(qrefOptions.class)
-                : qrefOptions.class ?? this.nymph.getEntityClass('Entity');
+            const QrefEntityClass = qrefOptions.class
+              ? this.nymph.getEntityClass(qrefOptions.class)
+              : this.nymph.getEntityClass('Entity');
             const newOptions = {
               ...qrefOptions,
               class: QrefEntityClass,
@@ -637,7 +1030,7 @@ export default abstract class NymphDriver {
             const newSelectors = this.formatSelectors(qrefSelectors, options);
             qrefs.push(
               [newOptions, ...newSelectors.selectors],
-              ...newSelectors.qrefs
+              ...newSelectors.qrefs,
             );
             formatArr[i] = [name, [newOptions, ...newSelectors.selectors]];
           }
@@ -670,7 +1063,7 @@ export default abstract class NymphDriver {
               curValue[1] == null &&
               typeof curValue[2] === 'string'
             ) {
-              return [curValue[0], strtotime(curValue[2]) * 1000];
+              return [curValue[0], (strtotime(curValue[2]) || 0) * 1000];
             }
             return curValue;
           });
@@ -685,12 +1078,12 @@ export default abstract class NymphDriver {
 
   protected iterateSelectorsForQuery(
     selectors: FormattedSelector[],
-    callback: (
-      key: string,
-      value: any,
-      typeIsOr: boolean,
-      typeIsNot: boolean
-    ) => string
+    callback: (data: {
+      key: string;
+      value: any;
+      typeIsOr: boolean;
+      typeIsNot: boolean;
+    }) => string,
   ) {
     const queryParts = [];
     for (const curSelector of selectors) {
@@ -703,7 +1096,7 @@ export default abstract class NymphDriver {
         if (key === 'type') {
           continue;
         }
-        let curQuery = callback(key, value, typeIsOr, typeIsNot);
+        let curQuery = callback({ key, value, typeIsOr, typeIsNot });
         if (curQuery) {
           if (curSelectorQuery) {
             curSelectorQuery += typeIsOr ? ' OR ' : ' AND ';
@@ -719,71 +1112,14 @@ export default abstract class NymphDriver {
     return queryParts;
   }
 
-  /**
-   * Get the first entity to match all options/selectors, synchronously.
-   *
-   * This should really only be used internally by the Entity class. It's a bad
-   * idea to get entities synchronously. The Entity class uses this to load
-   * sleeping references.
-   *
-   * @param options The options.
-   * @param selectors Unlimited optional selectors to search for, or a single GUID. If none are given, all entities are searched for the given options.
-   * @returns An entity, or null on failure or nothing found.
-   */
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'count' },
-    ...selectors: Selector[]
-  ): number;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'guid' },
-    ...selectors: Selector[]
-  ): string | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T>,
-    ...selectors: Selector[]
-  ): ReturnType<T['factorySync']> | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'count' },
-    guid: string
-  ): number;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> & { return: 'guid' },
-    guid: string
-  ): string | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T>,
-    guid: string
-  ): ReturnType<T['factorySync']> | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
-    options: Options<T> = {},
-    ...selectors: Selector[] | string[]
-  ): ReturnType<T['factorySync']> | string | number | null {
-    // Set up options and selectors.
-    if (typeof selectors[0] === 'string') {
-      selectors = [{ type: '&', guid: selectors[0] }];
-    }
-    options.limit = 1;
-    const entities = this.getEntitiesSync(
-      options,
-      ...(selectors as Selector[])
-    );
-    if (options.return === 'count') {
-      return entities as unknown as number;
-    }
-    if (!entities || !entities.length) {
-      return null;
-    }
-    return entities[0];
-  }
-
-  protected getEntitesRowLike<T extends EntityConstructor = EntityConstructor>(
+  protected getEntitiesRowLike<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> & { return: 'count' },
     selectors: Selector[],
-    performQueryCallback: (
-      options: Options<T>,
-      formattedSelectors: FormattedSelector[],
-      etype: string
-    ) => {
+    performQueryCallback: (data: {
+      options: Options<T>;
+      selectors: FormattedSelector[];
+      etype: string;
+    }) => {
       result: any;
     },
     rowFetchCallback: () => any,
@@ -798,16 +1134,16 @@ export default abstract class NymphDriver {
     getDataNameAndSValueCallback: (row: any) => {
       name: string;
       svalue: string;
-    }
+    },
   ): { result: any; process: () => number | Error };
-  protected getEntitesRowLike<T extends EntityConstructor = EntityConstructor>(
+  protected getEntitiesRowLike<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> & { return: 'guid' },
     selectors: Selector[],
-    performQueryCallback: (
-      options: Options<T>,
-      formattedSelectors: FormattedSelector[],
-      etype: string
-    ) => {
+    performQueryCallback: (data: {
+      options: Options<T>;
+      selectors: FormattedSelector[];
+      etype: string;
+    }) => {
       result: any;
     },
     rowFetchCallback: () => any,
@@ -822,16 +1158,40 @@ export default abstract class NymphDriver {
     getDataNameAndSValueCallback: (row: any) => {
       name: string;
       svalue: string;
-    }
+    },
   ): { result: any; process: () => string[] | Error };
-  protected getEntitesRowLike<T extends EntityConstructor = EntityConstructor>(
+  protected getEntitiesRowLike<T extends EntityConstructor = EntityConstructor>(
+    options: Options<T> & { return: 'object' },
+    selectors: Selector[],
+    performQueryCallback: (data: {
+      options: Options<T>;
+      selectors: FormattedSelector[];
+      etype: string;
+    }) => {
+      result: any;
+    },
+    rowFetchCallback: () => any,
+    freeResultCallback: () => void,
+    getCountCallback: (row: any) => number,
+    getGUIDCallback: (row: any) => string,
+    getTagsAndDatesCallback: (row: any) => {
+      tags: string[];
+      cdate: number;
+      mdate: number;
+    },
+    getDataNameAndSValueCallback: (row: any) => {
+      name: string;
+      svalue: string;
+    },
+  ): { result: any; process: () => EntityObjectType<T>[] | Error };
+  protected getEntitiesRowLike<T extends EntityConstructor = EntityConstructor>(
     options: Options<T>,
     selectors: Selector[],
-    performQueryCallback: (
-      options: Options<T>,
-      formattedSelectors: FormattedSelector[],
-      etype: string
-    ) => {
+    performQueryCallback: (data: {
+      options: Options<T>;
+      selectors: FormattedSelector[];
+      etype: string;
+    }) => {
       result: any;
     },
     rowFetchCallback: () => any,
@@ -846,16 +1206,19 @@ export default abstract class NymphDriver {
     getDataNameAndSValueCallback: (row: any) => {
       name: string;
       svalue: string;
-    }
-  ): { result: any; process: () => ReturnType<T['factorySync']>[] | Error };
-  protected getEntitesRowLike<T extends EntityConstructor = EntityConstructor>(
+    },
+  ): {
+    result: any;
+    process: () => EntityInstanceType<T>[] | Error;
+  };
+  protected getEntitiesRowLike<T extends EntityConstructor = EntityConstructor>(
     options: Options<T>,
     selectors: Selector[],
-    performQueryCallback: (
-      options: Options<T>,
-      formattedSelectors: FormattedSelector[],
-      etype: string
-    ) => {
+    performQueryCallback: (data: {
+      options: Options<T>;
+      selectors: FormattedSelector[];
+      etype: string;
+    }) => {
       result: any;
     },
     rowFetchCallback: () => any,
@@ -866,14 +1229,27 @@ export default abstract class NymphDriver {
       tags: string[];
       cdate: number;
       mdate: number;
+      user?: string;
+      group?: string;
+      acUser?: number;
+      acGroup?: number;
+      acOther?: number;
+      acRead?: string[];
+      acWrite?: string[];
+      acFull?: string[];
     },
     getDataNameAndSValueCallback: (row: any) => {
       name: string;
       svalue: string;
-    }
+    },
   ): {
     result: any;
-    process: () => ReturnType<T['factorySync']>[] | string[] | number | Error;
+    process: () =>
+      | EntityInstanceType<T>[]
+      | EntityObjectType<T>[]
+      | string[]
+      | number
+      | Error;
   } {
     if (!this.isConnected()) {
       throw new UnableToConnectError('not connected to DB');
@@ -886,21 +1262,29 @@ export default abstract class NymphDriver {
         ['&', '!&', '|', '!|'].indexOf(selector.type) === -1
       ) {
         throw new InvalidParametersError(
-          'Invalid query selector passed: ' + JSON.stringify(selector)
+          'Invalid query selector passed: ' + JSON.stringify(selector),
         );
       }
     }
 
-    let entities: ReturnType<T['factorySync']>[] | string[] = [];
+    let entities: EntityInstanceType<T>[] | EntityObjectType<T>[] | string[] =
+      [];
     let count = 0;
     const EntityClass =
       options.class ?? (this.nymph.getEntityClass('Entity') as T);
     const etype = EntityClass.ETYPE;
 
+    if (options.source === 'client' && options.return === 'object') {
+      throw new InvalidParametersError(
+        'Object return type not allowed from client.',
+      );
+    }
+
     // Check if the requested entity is cached.
     if (
       this.nymph.config.cache &&
       !options.skipCache &&
+      selectors.length &&
       'guid' in selectors[0] &&
       typeof selectors[0].guid === 'number'
     ) {
@@ -912,33 +1296,88 @@ export default abstract class NymphDriver {
         (Object.keys(selectors[0]).length === 2 ||
           (Object.keys(selectors[0]).length === 3 && 'tag' in selectors[0]))
       ) {
-        const entity = this.pullCache<ReturnType<T['factorySync']>>(
-          selectors[0]['guid'],
-          EntityClass.class,
-          !!options.skipAc
-        );
+        const cacheEntity = this.pullCache(selectors[0]['guid']);
+
         if (
-          entity != null &&
-          entity.guid != null &&
+          cacheEntity != null &&
+          cacheEntity.guid != null &&
           (!('tag' in selectors[0]) ||
-            entity.hasTag(
-              ...(Array.isArray(selectors[0].tag)
+            !(
+              Array.isArray(selectors[0].tag)
                 ? selectors[0].tag
-                : [selectors[0].tag])
-            ))
+                : [selectors[0].tag]
+            ).find((tag) => tag == null || !cacheEntity.tags.includes(tag)))
         ) {
-          const guid = entity.guid;
-          return {
-            result: Promise.resolve(null),
-            process: () =>
-              options.return === 'count'
-                ? guid
-                  ? 1
-                  : 0
-                : options.return === 'guid'
-                ? [guid]
-                : [entity],
-          };
+          // Return the value from the cache.
+          const { guid, cdate, mdate, tags, data, sdata } = cacheEntity;
+
+          if (options.return === 'count') {
+            return {
+              result: Promise.resolve(null),
+              process: () => 1,
+            };
+          } else if (options.return === 'guid') {
+            return {
+              result: Promise.resolve(null),
+              process: () => [guid],
+            };
+          } else if (options.return === 'object') {
+            return {
+              result: Promise.resolve(null),
+              process: () => [
+                {
+                  guid,
+                  cdate,
+                  mdate,
+                  tags,
+                  ...data,
+                  ...Object.fromEntries(
+                    Object.entries(sdata).map(([name, value]) => [
+                      name,
+                      JSON.parse(value),
+                    ]),
+                  ),
+                } as EntityObjectType<T>,
+              ],
+            };
+          } else {
+            const entity = this.nymph
+              .getEntityClass(EntityClass.class)
+              .factorySync() as EntityInstanceType<T>;
+            if (entity) {
+              entity.$nymph = this.nymph;
+              if (options.skipAc != null) {
+                entity.$useSkipAc(!!options.skipAc);
+              }
+              entity.guid = guid;
+              entity.cdate = cdate;
+              entity.mdate = mdate;
+              entity.tags = tags;
+              entity.$putData(
+                classNamesToEntityConstructors(
+                  this.nymph,
+                  referencesToEntities(
+                    data,
+                    this.nymph,
+                    !!options.skipAc,
+                    false,
+                  ),
+                  false,
+                ),
+                sdata,
+                'server',
+              );
+              return {
+                result: Promise.resolve(null),
+                process: () => [entity],
+              };
+            }
+
+            return {
+              result: Promise.resolve(null),
+              process: () => [],
+            };
+          }
         }
       }
     }
@@ -946,15 +1385,16 @@ export default abstract class NymphDriver {
     try {
       const formattedSelectors = this.formatSelectors(selectors, options);
       this.nymph.runQueryCallbacks(options, formattedSelectors.selectors);
-      for (let qref of formattedSelectors.qrefs) {
-        const [options, ...selectors] = qref;
+      for (let i = 0; i < formattedSelectors.qrefs.length; i++) {
+        const [options, ...selectors] = formattedSelectors.qrefs[i];
         this.nymph.runQueryCallbacks(options, selectors);
+        formattedSelectors.qrefs[i] = [options, ...selectors];
       }
-      const { result } = performQueryCallback(
+      const { result } = performQueryCallback({
         options,
-        formattedSelectors.selectors,
-        etype
-      );
+        selectors: formattedSelectors.selectors,
+        etype,
+      });
 
       return {
         result,
@@ -994,28 +1434,117 @@ export default abstract class NymphDriver {
                 // Make sure that $row is incremented :)
                 row = rowFetchCallback();
               }
-              const entity = EntityClass.factorySync() as ReturnType<
-                T['factorySync']
-              >;
-              entity.$nymph = this.nymph;
-              if (options.skipAc != null) {
-                entity.$useSkipAc(!!options.skipAc);
+
+              if (this.nymph.tilmeld) {
+                if ('user' in tagsAndDates && tagsAndDates.user != null) {
+                  data.user = [
+                    'nymph_entity_reference',
+                    tagsAndDates.user,
+                    'User',
+                  ];
+                  delete sdata.user;
+                }
+                if ('group' in tagsAndDates && tagsAndDates.group != null) {
+                  data.group = [
+                    'nymph_entity_reference',
+                    tagsAndDates.group,
+                    'Group',
+                  ];
+                  delete sdata.group;
+                }
+                if ('acUser' in tagsAndDates && tagsAndDates.acUser != null) {
+                  data.acUser = tagsAndDates.acUser;
+                  delete sdata.acUser;
+                }
+                if ('acGroup' in tagsAndDates && tagsAndDates.acGroup != null) {
+                  data.acGroup = tagsAndDates.acGroup;
+                  delete sdata.acGroup;
+                }
+                if ('acOther' in tagsAndDates && tagsAndDates.acOther != null) {
+                  data.acOther = tagsAndDates.acOther;
+                  delete sdata.acOther;
+                }
+                if ('acRead' in tagsAndDates && tagsAndDates.acRead != null) {
+                  data.acRead = tagsAndDates.acRead;
+                  delete sdata.acRead;
+                }
+                if ('acWrite' in tagsAndDates && tagsAndDates.acWrite != null) {
+                  data.acWrite = tagsAndDates.acWrite;
+                  delete sdata.acWrite;
+                }
+                if ('acFull' in tagsAndDates && tagsAndDates.acFull != null) {
+                  data.acFull = tagsAndDates.acFull;
+                  delete sdata.acFull;
+                }
               }
-              entity.guid = guid;
-              entity.cdate = cdate;
-              entity.mdate = mdate;
-              entity.tags = tags;
-              this.putDataCounter++;
-              if (this.putDataCounter == 100) {
-                throw new Error('Infinite loop detected in Entity loading.');
+
+              if (options.return === 'object') {
+                (entities as EntityObjectType<T>[]).push({
+                  guid,
+                  cdate,
+                  mdate,
+                  tags,
+                  ...classNamesToEntityConstructors(
+                    this.nymph,
+                    referencesToEntities(
+                      data,
+                      this.nymph,
+                      !!options.skipAc,
+                      false,
+                    ),
+                    false,
+                  ),
+                  ...Object.fromEntries(
+                    Object.entries(sdata).map(([name, value]) => [
+                      name,
+                      classNamesToEntityConstructors(
+                        this.nymph,
+                        referencesToEntities(
+                          JSON.parse(value),
+                          this.nymph,
+                          !!options.skipAc,
+                          false,
+                        ),
+                        false,
+                      ),
+                    ]),
+                  ),
+                } as EntityObjectType<T>);
+              } else {
+                const entity =
+                  EntityClass.factorySync() as EntityInstanceType<T>;
+                entity.$nymph = this.nymph;
+                if (options.skipAc != null) {
+                  entity.$useSkipAc(!!options.skipAc);
+                }
+                entity.guid = guid;
+                entity.cdate = cdate;
+                entity.mdate = mdate;
+                entity.tags = tags;
+                this.putDataCounter++;
+                if (this.putDataCounter == 100) {
+                  throw new Error('Infinite loop detected in Entity loading.');
+                }
+                entity.$putData(
+                  classNamesToEntityConstructors(
+                    this.nymph,
+                    referencesToEntities(
+                      data,
+                      this.nymph,
+                      !!options.skipAc,
+                      false,
+                    ),
+                    false,
+                  ),
+                  sdata,
+                  'server',
+                );
+                this.putDataCounter--;
+                entities.push(entity);
               }
-              entity.$putData(data, sdata);
-              this.putDataCounter--;
               if (this.nymph.config.cache) {
                 this.pushCache(guid, cdate, mdate, tags, data, sdata);
               }
-              // @ts-ignore: ts doesn't know the return type here.
-              entities.push(entity);
             }
           }
 
@@ -1036,125 +1565,166 @@ export default abstract class NymphDriver {
 
   protected async saveEntityRowLike(
     entity: EntityInterface,
-    saveNewEntityCallback: (
-      entity: EntityInterface,
-      guid: string,
-      tags: string[],
-      data: EntityData,
-      sdata: SerializedEntityData,
-      cdate: number,
-      etype: string
-    ) => Promise<boolean>,
-    saveExistingEntityCallback: (
-      entity: EntityInterface,
-      guid: string,
-      tags: string[],
-      data: EntityData,
-      sdata: SerializedEntityData,
-      mdate: number,
-      etype: string
-    ) => Promise<boolean>,
+    saveNewEntityCallback: (data: {
+      entity: EntityInterface;
+      guid: string;
+      tags: string[];
+      data: EntityData;
+      sdata: SerializedEntityData;
+      uniques: string[];
+      cdate: number;
+      etype: string;
+    }) => Promise<boolean>,
+    saveExistingEntityCallback: (data: {
+      entity: EntityInterface;
+      guid: string;
+      tags: string[];
+      data: EntityData;
+      sdata: SerializedEntityData;
+      uniques: string[];
+      mdate: number;
+      etype: string;
+    }) => Promise<boolean>,
     startTransactionCallback: (() => Promise<void>) | null = null,
     commitTransactionCallback:
-      | ((success: boolean) => Promise<boolean>)
-      | null = null
+      ((success: boolean) => Promise<boolean>) | null = null,
   ) {
+    const originalGuid = entity.guid;
+    const originalCdate = entity.cdate;
+    const originalMdate = entity.mdate;
     // Get a modified date.
-    const mdate = Date.now();
+    let mdate = Date.now();
+    if (entity.mdate != null) {
+      if (this.nymph.config.updateMDate === false) {
+        mdate = entity.mdate;
+      } else if (typeof this.nymph.config.updateMDate === 'number') {
+        mdate = entity.mdate + this.nymph.config.updateMDate;
+      } else if (entity.mdate >= mdate) {
+        // If we're saving too fast (within 1 millisecond), increment mdate to
+        // make sure it doesn't conflict in the DB.
+        mdate = entity.mdate + 1;
+      }
+    }
     const tags = difference(entity.tags, ['']);
-    const data = entity.$getData();
+    const data = entityConstructorsToClassNames(
+      // Explicitly save references to entities that aren't saved yet to help
+      // save circular references by saving with a guaranteed GUID.
+      entitiesToReferences(entity.$getData(), false),
+    );
     const sdata = entity.$getSData();
+    const uniques = await entity.$getUniques();
     const EntityClass = entity.constructor as EntityConstructor;
     const etype = EntityClass.ETYPE;
     if (startTransactionCallback) {
       await startTransactionCallback();
     }
     let success = false;
-    if (entity.guid == null) {
-      const cdate = mdate;
-      const newId = guid();
-      success = await saveNewEntityCallback(
-        entity,
-        newId,
-        tags,
-        data,
-        sdata,
-        cdate,
-        etype
-      );
-      if (success) {
-        entity.guid = newId;
-        entity.cdate = cdate;
-        entity.mdate = mdate;
+    try {
+      if (entity.guid == null) {
+        const cdate = mdate;
+        const newId = entity.$getGuaranteedGUID();
+        success = await saveNewEntityCallback({
+          entity,
+          guid: newId,
+          tags,
+          data,
+          sdata,
+          uniques,
+          cdate,
+          etype,
+        });
+        if (success) {
+          entity.guid = newId;
+          entity.cdate = cdate;
+          entity.mdate = mdate;
+        }
+      } else {
+        // Removed any cached versions of this entity.
+        if (this.nymph.config.cache) {
+          this.cleanCache(entity.guid);
+        }
+        success = await saveExistingEntityCallback({
+          entity,
+          guid: entity.guid,
+          tags,
+          data,
+          sdata,
+          uniques,
+          mdate,
+          etype,
+        });
+        if (success) {
+          entity.mdate = mdate;
+        }
       }
-    } else {
-      // Removed any cached versions of this entity.
-      if (this.nymph.config.cache) {
-        this.cleanCache(entity.guid);
+      if (commitTransactionCallback) {
+        success = await commitTransactionCallback(success);
       }
-      success = await saveExistingEntityCallback(
-        entity,
-        entity.guid,
-        tags,
-        data,
-        sdata,
-        mdate,
-        etype
-      );
-      if (success) {
-        entity.mdate = mdate;
+      // Cache the entity.
+      if (success && this.nymph.config.cache) {
+        this.pushCache(
+          entity.guid as string,
+          entity.cdate as number,
+          entity.mdate as number,
+          entity.tags,
+          data,
+          sdata,
+        );
       }
+
+      if (!success) {
+        entity.guid = originalGuid;
+        entity.cdate = originalCdate;
+        entity.mdate = originalMdate;
+      }
+
+      return success;
+    } catch (e: any) {
+      if (commitTransactionCallback) {
+        try {
+          await commitTransactionCallback(false);
+        } catch (e: any) {
+          this.nymph.config.debugError(
+            'nymph',
+            `Rollback of entity save transaction failed, reason: ${e.message}`,
+          );
+        }
+      }
+      entity.guid = originalGuid;
+      entity.cdate = originalCdate;
+      entity.mdate = originalMdate;
+      throw e;
     }
-    if (commitTransactionCallback) {
-      success = await commitTransactionCallback(success);
-    }
-    // Cache the entity.
-    if (success && this.nymph.config.cache) {
-      this.pushCache(
-        entity.guid as string,
-        entity.cdate as number,
-        entity.mdate as number,
-        entity.tags,
-        data,
-        sdata
-      );
-    }
-    return success;
   }
 
   /**
    * Pull an entity from the cache.
    *
    * @param guid The entity's GUID.
-   * @param className The entity's class.
-   * @param useSkipAc Whether to tell the entity to use skip_ac.
-   * @returns The entity or null if it's not cached.
+   * @returns The entity's data or null if it's not cached.
    */
-  protected pullCache<T extends EntityInterface = EntityInterface>(
-    guid: string,
-    className: string,
-    useSkipAc = false
-  ): T | null {
+  protected pullCache(guid: string): {
+    guid: string;
+    cdate: number;
+    mdate: number;
+    tags: string[];
+    data: EntityData;
+    sdata: SerializedEntityData;
+  } | null {
     // Increment the entity access count.
     if (!(guid in this.entityCount)) {
       this.entityCount[guid] = 0;
     }
     this.entityCount[guid]++;
     if (guid in this.entityCache) {
-      const entity = this.nymph.getEntityClass(className).factorySync() as T;
-      if (entity) {
-        entity.$nymph = this.nymph;
-        entity.$useSkipAc(!!useSkipAc);
-        entity.guid = guid;
-        entity.cdate = this.entityCache[guid]['cdate'];
-        entity.mdate = this.entityCache[guid]['mdate'];
-        entity.tags = this.entityCache[guid]['tags'];
-        entity.$putData(
-          this.entityCache[guid]['data'],
-          this.entityCache[guid]['sdata']
-        );
-        return entity;
-      }
+      return {
+        guid,
+        cdate: this.entityCache[guid]['cdate'],
+        mdate: this.entityCache[guid]['mdate'],
+        tags: this.entityCache[guid]['tags'],
+        data: this.entityCache[guid]['data'],
+        sdata: this.entityCache[guid]['sdata'],
+      };
     }
     return null;
   }
@@ -1175,7 +1745,7 @@ export default abstract class NymphDriver {
     mdate: number,
     tags: string[],
     data: EntityData,
-    sdata: SerializedEntityData
+    sdata: SerializedEntityData,
   ) {
     if (guid == null) {
       return;
@@ -1191,11 +1761,11 @@ export default abstract class NymphDriver {
     }
     // Cache the entity.
     this.entityCache[guid] = {
-      cdate: cdate,
-      mdate: mdate,
-      tags: tags,
-      data: data,
-      sdata: sdata,
+      cdate,
+      mdate,
+      tags,
+      data,
+      sdata,
     };
     while (
       this.nymph.config.cacheLimit &&
@@ -1204,7 +1774,7 @@ export default abstract class NymphDriver {
       // Find which entity has been accessed the least.
       const least =
         Object.entries(this.entityCount)
-          .sort(([guidA, countA], [guidB, countB]) => countA - countB)
+          .sort(([_guidA, countA], [_guidB, countB]) => countA - countB)
           .pop()?.[0] ?? null;
       if (least == null) {
         // This should never happen.