@nymphjs/nymph 1.0.0-beta.40 → 1.0.0-beta.41

package/src/driver/testArtifacts.ts

@@ -64,14 +64,6 @@ These hats are absolutely fantastic.`;
     entityReferenceTest.test = 'good';
     expect(await entityReferenceTest.$save()).toEqual(true);
 
-    // Test synchronous getEntity.
-    testEntity = nymph.driver.getEntitySync(
-      { class: TestModel },
-      testGuid
-    ) as TestModelClass & TestModelData;
-    expect(testEntity).toBeInstanceOf(TestModel);
-    expect(testEntity.guid).toEqual(testGuid);
-
     // Test asynchronous getEntity.
     testEntity = (await nymph.getEntity(
       { class: TestModel },
@@ -1179,9 +1171,11 @@ These hats are absolutely fantastic.`;
     await createTestEntities();
 
     // Testing referenced entities...
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.test).toEqual('good');
 
     // Testing referenced entity arrays...
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].test).toEqual('good');
   });
 
@@ -1790,7 +1784,9 @@ These hats are absolutely fantastic.`;
     await createTestEntities();
 
     // Deleting referenced entities...
+    await testEntity.reference?.$wake();
     expect(await testEntity.reference?.$delete()).toEqual(true);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.reference?.guid).toBeNull();
   });
 
@@ -1900,9 +1896,11 @@ export function ExportImportTest(
         expect(model.number).toEqual(30);
         expect(model.timestamp).toBeGreaterThanOrEqual(strtotime('-2 minutes'));
 
+        await model.reference?.$wake();
         expect(model.reference?.guid).not.toBeNull();
         expect(model.reference?.string).toEqual('another');
         expect(model.reference?.index?.match(/^\d+b$/)).toBeTruthy();
+        await Promise.all(model.refArray?.map((e) => e.$wake()) || []);
         expect(model.refArray?.[0].guid).not.toBeNull();
         expect(model.refArray?.[0].guid).toEqual(model.reference?.guid);
       }

package/src/errors/InvalidStateError.ts

@@ -0,0 +1,6 @@
+export class InvalidStateError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'InvalidStateError';
+  }
+}

package/src/errors/index.ts

@@ -8,6 +8,8 @@ export * from './EntityIsSleepingReferenceError';
 
 export * from './InvalidParametersError';
 
+export * from './InvalidStateError';
+
 export * from './NotConfiguredError';
 
 export * from './QueryFailedError';

package/src/testArtifacts.ts

@@ -38,17 +38,15 @@ export class TestModel extends Entity<TestModelData> {
     return (await super.factory(guid)) as TestModel & TestModelData;
   }
 
-  static factorySync(guid?: string): TestModel & TestModelData {
-    return super.factorySync(guid) as TestModel & TestModelData;
+  static factorySync(): TestModel & TestModelData {
+    return super.factorySync() as TestModel & TestModelData;
   }
 
-  constructor(guid?: string) {
-    super(guid);
+  constructor() {
+    super();
 
-    if (this.guid == null) {
-      this.$addTag('test');
-      this.$data.boolean = true;
-    }
+    this.$addTag('test');
+    this.$data.boolean = true;
   }
 
   public $useProtectedData() {
@@ -82,8 +80,8 @@ export class TestBModel extends TestModel {
     return (await super.factory(guid)) as TestBModel & TestModelData;
   }
 
-  static factorySync(guid?: string): TestBModel & TestModelData {
-    return super.factorySync(guid) as TestBModel & TestModelData;
+  static factorySync(): TestBModel & TestModelData {
+    return super.factorySync() as TestBModel & TestModelData;
   }
 }
 
@@ -102,7 +100,7 @@ export class TestEmptyModel extends Entity<TestEmptyModelData> {
     return (await super.factory(guid)) as TestEmptyModel & TestEmptyModelData;
   }
 
-  static factorySync(guid?: string): TestEmptyModel & TestEmptyModelData {
-    return super.factorySync(guid) as TestEmptyModel & TestEmptyModelData;
+  static factorySync(): TestEmptyModel & TestEmptyModelData {
+    return super.factorySync() as TestEmptyModel & TestEmptyModelData;
   }
 }

package/src/testMocks.ts

@@ -15,26 +15,26 @@ export class MockNymphDriver {
     this.nymph = nymph;
   }
 
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
+  public async getEntity<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> & { return: 'guid' },
     ...selectors: Selector[]
-  ): string | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
+  ): Promise<string | null>;
+  public async getEntity<T extends EntityConstructor = EntityConstructor>(
     options: Options<T>,
     ...selectors: Selector[]
-  ): ReturnType<T['factorySync']> | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
+  ): Promise<ReturnType<T['factorySync']> | null>;
+  public async getEntity<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> & { return: 'guid' },
     guid: string
-  ): string | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
+  ): Promise<string | null>;
+  public async getEntity<T extends EntityConstructor = EntityConstructor>(
     options: Options<T>,
     guid: string
-  ): ReturnType<T['factorySync']> | null;
-  public getEntitySync<T extends EntityConstructor = EntityConstructor>(
+  ): Promise<ReturnType<T['factorySync']> | null>;
+  public async getEntity<T extends EntityConstructor = EntityConstructor>(
     options: Options<T> = {},
     ...selectors: Selector[] | string[]
-  ): ReturnType<T['factorySync']> | string | null {
+  ): Promise<ReturnType<T['factorySync']> | string | null> {
     const guid =
       typeof selectors[0] === 'string' ? selectors[0] : selectors[0].guid;
     if (!options || !guid || typeof guid !== 'string' || !(guid in entities)) {
@@ -119,7 +119,7 @@ export class MockNymph {
     ...selectors: Selector[] | string[]
   ): Promise<ReturnType<T['factorySync']> | string | null> {
     // @ts-ignore: The selector type is correct here.
-    return this.driver.getEntitySync(options, ...selectors);
+    return await this.driver.getEntity(options, ...selectors);
   }
 
   public async saveEntity(entity: EntityInterface): Promise<boolean> {