@nymphjs/nymph 1.0.0-alpha.1 → 1.0.0-alpha.13

package/src/Entity.ts

@@ -1,5 +1,6 @@
 import { difference, intersection, isEqual } from 'lodash';
 
+import type Nymph from './Nymph';
 import {
   ACProperties,
   EntityConstructor,
@@ -11,7 +12,6 @@ import {
   SerializedEntityData,
 } from './Entity.types';
 import { EntityConflictError, InvalidParametersError } from './errors';
-import Nymph from './Nymph';
 import {
   entitiesToReferences,
   referencesToEntities,
@@ -91,6 +91,10 @@ import {
 export default class Entity<T extends EntityData = EntityData>
   implements EntityInterface
 {
+  /**
+   * The instance of Nymph to use for queries.
+   */
+  public static nymph = {} as Nymph;
   /**
    * A unique name for this type of entity used to separate its data from other
    * types of entities in the database.
@@ -104,6 +108,7 @@ export default class Entity<T extends EntityData = EntityData>
    */
   public static class = 'Entity';
 
+  public $nymph: Nymph;
   public guid: string | null = null;
   public cdate: number | null = null;
   public mdate: number | null = null;
@@ -198,6 +203,7 @@ export default class Entity<T extends EntityData = EntityData>
    * @param guid The ID of the entity to load, undefined for a new entity.
    */
   public constructor(guid?: string) {
+    this.$nymph = (this.constructor as EntityConstructor).nymph;
     this.$dataHandler = {
       has: (data: EntityData, name: string) => {
         this.$referenceWake();
@@ -211,6 +217,7 @@ export default class Entity<T extends EntityData = EntityData>
         if (this.$sdata.hasOwnProperty(name)) {
           data[name] = referencesToEntities(
             JSON.parse(this.$sdata[name]),
+            this.$nymph,
             this.$skipAc
           );
           delete this.$sdata[name];
@@ -249,7 +256,7 @@ export default class Entity<T extends EntityData = EntityData>
     this.$data = new Proxy(this.$dataStore, this.$dataHandler);
 
     if (guid != null) {
-      const entity = Nymph.driver.getEntitySync(
+      const entity = this.$nymph.driver.getEntitySync(
         { class: this.constructor as EntityConstructor },
         { type: '&', guid }
       );
@@ -331,7 +338,7 @@ export default class Entity<T extends EntityData = EntityData>
   public static async factory(guid?: string) {
     const entity = new this();
     if (guid != null) {
-      const entity = await Nymph.getEntity(
+      const entity = await this.nymph.getEntity(
         {
           class: this as any as EntityConstructor,
         },
@@ -412,7 +419,7 @@ export default class Entity<T extends EntityData = EntityData>
   public async $delete(): Promise<boolean> {
     this.$referenceWake();
 
-    return await Nymph.deleteEntity(this);
+    return await this.$nymph.deleteEntity(this);
   }
 
   public $equals(object: any) {
@@ -487,7 +494,7 @@ export default class Entity<T extends EntityData = EntityData>
       cdate: this.cdate,
       mdate: this.mdate,
       tags: this.tags,
-      ...referencesToEntities(this.$dataStore, this.$skipAc),
+      ...referencesToEntities(this.$dataStore, this.$nymph, this.$skipAc),
     };
   }
 
@@ -578,7 +585,10 @@ export default class Entity<T extends EntityData = EntityData>
 
     const protectedData: EntityData = {};
     const protectedProps = [...this.$protectedData];
-    if (Nymph.Tilmeld && !Nymph.Tilmeld.gatekeeper('tilmeld/admin')) {
+    if (
+      this.$nymph.tilmeld &&
+      !this.$nymph.tilmeld.gatekeeper('tilmeld/admin')
+    ) {
       protectedProps.push('user');
       protectedProps.push('group');
     }
@@ -640,6 +650,7 @@ export default class Entity<T extends EntityData = EntityData>
       }
       (this.$data as any)[name] = referencesToEntities(
         patch.set[name],
+        this.$nymph,
         this.$skipAc
       );
     }
@@ -692,6 +703,7 @@ export default class Entity<T extends EntityData = EntityData>
     for (const name in data) {
       (this.$dataStore as any)[name] = referencesToEntities(
         data[name],
+        this.$nymph,
         this.$skipAc
       );
     }
@@ -739,8 +751,8 @@ export default class Entity<T extends EntityData = EntityData>
     if (!this.$isASleepingReference || this.$sleepingReference == null) {
       return true;
     }
-    const EntityClass = Nymph.getEntityClass(this.$sleepingReference[2]);
-    const entity = Nymph.driver.getEntitySync(
+    const EntityClass = this.$nymph.getEntityClass(this.$sleepingReference[2]);
+    const entity = this.$nymph.driver.getEntitySync(
       {
         class: EntityClass,
         skipAc: this.$skipAc,
@@ -766,7 +778,7 @@ export default class Entity<T extends EntityData = EntityData>
     if (this.guid == null) {
       return false;
     }
-    const refresh = await Nymph.getEntity(
+    const refresh = await this.$nymph.getEntity(
       {
         class: this.constructor as EntityConstructor,
         skipCache: true,
@@ -793,7 +805,7 @@ export default class Entity<T extends EntityData = EntityData>
   public async $save(): Promise<boolean> {
     this.$referenceWake();
 
-    return await Nymph.saveEntity(this);
+    return await this.$nymph.saveEntity(this);
   }
 
   public $toReference() {
@@ -814,5 +826,3 @@ export default class Entity<T extends EntityData = EntityData>
     this.$skipAc = !!skipAc;
   }
 }
-
-Nymph.setEntityClass(Entity.class, Entity);

package/src/Entity.types.ts

@@ -1,4 +1,5 @@
-import { Options } from './Nymph.types';
+import type Nymph from './Nymph';
+import type { Options } from './Nymph.types';
 
 export type ACProperties = {
   user: any;
@@ -113,6 +114,10 @@ export interface DataObjectInterface {
  * Entity interface.
  */
 export interface EntityInterface extends DataObjectInterface {
+  /**
+   * The instance of Nymph to use for queries.
+   */
+  $nymph: Nymph;
   /**
    * The entity's Globally Unique ID.
    *
@@ -267,6 +272,10 @@ export interface EntityInterface extends DataObjectInterface {
 }
 
 export type EntityConstructor = (new (guid?: string) => EntityInterface) & {
+  /**
+   * The instance of Nymph to use for queries.
+   */
+  nymph: Nymph;
   /**
    * A unique name for this type of entity used to separate its data from other
    * types of entities in the database.