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

package/src/driver/testArtifacts.ts

@@ -1,11 +1,17 @@
 import fs from 'fs';
 import strtotime from 'locutus/php/datetime/strtotime';
 
+import type Nymph from '../Nymph';
 import newGUID from '../newGUID';
-import Nymph from '../Nymph';
 import { TestBModel, TestModel, TestModelData } from '../testArtifacts';
 
-export function QueriesTest(it: (name: string, fn: () => void) => void) {
+export function QueriesTest(
+  nymph: Nymph,
+  it: (name: string, fn: () => void) => void
+) {
+  nymph.addEntityClass(TestModel);
+  nymph.addEntityClass(TestBModel);
+
   let testEntity: TestModel & TestModelData;
   let testGuid: string;
   let refGuid: string;
@@ -50,7 +56,7 @@ This one's zip code is 92064.`;
     expect(await entityReferenceTest.$save()).toEqual(true);
 
     // Test synchronous getEntity.
-    testEntity = Nymph.driver.getEntitySync(
+    testEntity = nymph.driver.getEntitySync(
       { class: TestModel },
       testGuid
     ) as TestModel & TestModelData;
@@ -58,7 +64,7 @@ This one's zip code is 92064.`;
     expect(testEntity.guid).toEqual(testGuid);
 
     // Test asynchronous getEntity.
-    testEntity = (await Nymph.getEntity(
+    testEntity = (await nymph.getEntity(
       { class: TestModel },
       testGuid
     )) as TestModel & TestModelData;
@@ -84,13 +90,13 @@ This one's zip code is 92064.`;
   }
 
   it('delete old test data', async () => {
-    let all = await Nymph.getEntities({ class: TestModel });
+    let all = await nymph.getEntities({ class: TestModel });
     expect(Array.isArray(all)).toEqual(true);
     for (const cur of all) {
       expect(await cur.$delete()).toEqual(true);
     }
 
-    all = await Nymph.getEntities({ class: TestModel });
+    all = await nymph.getEntities({ class: TestModel });
     expect(all.length).toEqual(0);
   });
 
@@ -117,7 +123,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by GUID...
-    let resultEntity = await Nymph.getEntity({ class: TestModel }, testGuid);
+    let resultEntity = await nymph.getEntity({ class: TestModel }, testGuid);
     expect(testEntity.$is(resultEntity)).toEqual(true);
 
     // Using class constructor...
@@ -125,7 +131,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$is(resultEntity)).toEqual(true);
 
     // Testing wrong GUID...
-    resultEntity = await Nymph.getEntity({ class: TestModel }, newGUID());
+    resultEntity = await nymph.getEntity({ class: TestModel }, newGUID());
     expect(testEntity.$is(resultEntity)).toEqual(false);
   });
 
@@ -133,54 +139,56 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Verify not in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(false);
+    expect(await nymph.inTransaction()).toEqual(false);
 
-    const transaction = await Nymph.startTransaction('test');
+    let transaction = await nymph.startTransaction('test');
+    testEntity.$nymph = transaction;
 
-    if (!transaction) {
+    if (!(await transaction.inTransaction())) {
       console.log(
         'This Nymph driver or database seems to not support transactions. Skipping transaction tests.'
       );
-      await Nymph.rollback('test');
+      await transaction.rollback('test');
       return;
     }
 
-    // Verify in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(true);
-
     // Change a value in the test entity.
     testEntity.string = 'bad value';
     expect(await testEntity.$save()).toEqual(true);
 
     // Rollback the transaction.
-    await Nymph.rollback('test');
+    await transaction.rollback('test');
 
     // Verify not in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(false);
+    expect(await transaction.inTransaction()).toEqual(false);
 
     // Verify the value is correct.
     await testEntity.$refresh();
     expect(testEntity.string).toEqual('test');
 
     // Start a new transaction.
-    await Nymph.startTransaction('test');
+    transaction = await nymph.startTransaction('test');
+    testEntity.$nymph = transaction;
 
     // Verify in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(true);
+    expect(await transaction.inTransaction()).toEqual(true);
 
     // Delete the entity.
     expect(await testEntity.$delete()).toEqual(true);
-    const resultEntity = await Nymph.getEntity({ class: TestModel }, testGuid);
+    const resultEntity = await transaction.getEntity(
+      { class: TestModel },
+      testGuid
+    );
     expect(resultEntity).toBeNull();
 
     // Rollback the transaction.
-    await Nymph.rollback('test');
+    await transaction.rollback('test');
 
     // Verify not in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(false);
+    expect(await transaction.inTransaction()).toEqual(false);
 
     // Verify it's back.
-    testEntity = (await Nymph.getEntity(
+    testEntity = (await transaction.getEntity(
       { class: TestModel },
       testGuid
     )) as TestModel & TestModelData;
@@ -188,20 +196,22 @@ This one's zip code is 92064.`;
     expect(testEntity.guid).toEqual(testGuid);
 
     // Start a new transaction.
-    await Nymph.startTransaction('test');
+    transaction = await nymph.startTransaction('test');
+    testEntity.$nymph = transaction;
 
     // Verify in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(true);
+    expect(await transaction.inTransaction()).toEqual(true);
 
     // Make a change.
     testEntity.string = 'fish';
     expect(await testEntity.$save()).toEqual(true);
 
     // Commit the transaction.
-    await Nymph.commit('test');
+    await transaction.commit('test');
+    testEntity.$nymph = nymph;
 
     // Verify not in a transaction.
-    expect(await Nymph.inTransaction()).toEqual(false);
+    expect(await transaction.inTransaction()).toEqual(false);
 
     // Verify the value is correct.
     await testEntity.$refresh();
@@ -218,7 +228,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing entity order, offset, limit...
-    const resultEntities = await Nymph.getEntities(
+    const resultEntities = await nymph.getEntities(
       {
         class: TestModel,
         reverse: true,
@@ -236,7 +246,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by GUID and tags...
-    const resultEntity = await Nymph.getEntity(
+    const resultEntity = await nymph.getEntity(
       { class: TestModel },
       { type: '&', guid: testGuid, tag: 'test' }
     );
@@ -247,7 +257,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by GUID and tags...
-    const resultEntity = await Nymph.getEntity(
+    const resultEntity = await nymph.getEntity(
       { class: TestModel },
       { type: '|', guid: [testGuid, newGUID()] }
     );
@@ -258,7 +268,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by GUID and tags...
-    const resultEntity = await Nymph.getEntity(
+    const resultEntity = await nymph.getEntity(
       { class: TestModel },
       { type: '|', guid: [newGUID(), newGUID()] }
     );
@@ -269,7 +279,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !GUID...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', '!guid': newGUID(), tag: 'test' }
     );
@@ -280,7 +290,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', guid: testGuid, '!tag': ['barbecue', 'pickles'] }
     );
@@ -291,7 +301,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing GUID and wrong tags...
-    const resultEntity = await Nymph.getEntity(
+    const resultEntity = await nymph.getEntity(
       { class: TestModel },
       { type: '&', guid: testGuid, tag: ['pickles'] }
     );
@@ -302,7 +312,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' }
     );
@@ -313,7 +323,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickles' }
     );
@@ -324,7 +334,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by tags inclusively...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '|', tag: ['pickles', 'test', 'barbecue'] }
     );
@@ -335,7 +345,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong inclusive tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '|', tag: ['pickles', 'barbecue'] }
     );
@@ -346,7 +356,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by mixed tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '|', tag: ['pickles', 'test', 'barbecue'] }
@@ -358,7 +368,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong inclusive mixed tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '|', tag: ['pickles', 'barbecue'] }
@@ -370,7 +380,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong exclusive mixed tags...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickles' },
       { type: '|', tag: ['test', 'barbecue'] }
@@ -382,7 +392,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by defined...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', defined: 'string' }
     );
@@ -393,7 +403,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !defined...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', '!defined': 'pickles' }
     );
@@ -404,7 +414,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by defined in not and clause...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '!&', defined: 'pickles' },
       { type: '&', tag: 'test' }
@@ -416,7 +426,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', equal: ['string', 'test'] }
     );
@@ -430,7 +440,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.guid).toEqual(refGuid);
 
     // Retrieving entity by !equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', '!equal': ['string', 'wrong'] }
     );
@@ -442,7 +452,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by like...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', like: ['string', 't_s%'] }
     );
@@ -456,7 +466,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.guid).toEqual(refGuid);
 
     // Retrieving entity by !like...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', '!like': ['string', 'wr_n%'] }
     );
@@ -468,7 +478,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by ilike...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', ilike: ['string', 'T_s%'] }
     );
@@ -482,7 +492,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.guid).toEqual(refGuid);
 
     // Retrieving entity by !ilike...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', '!ilike': ['string', 'wr_n%'] }
     );
@@ -494,7 +504,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by like...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', like: ['string', 'T_s%'] }
     );
@@ -505,7 +515,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by tags and equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', equal: ['string', 'test'] }
     );
@@ -516,7 +526,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong tags and right equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickles', equal: ['string', 'test'] }
     );
@@ -527,7 +537,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing right tags and wrong equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', equal: ['string', 'pickles'] }
     );
@@ -538,7 +548,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong tags and wrong equal...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickles', equal: ['string', 'pickles'] }
     );
@@ -549,14 +559,14 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by contain...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', contain: ['array', 'values'] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by contain with full match...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', contain: ['string', 'test'] }
     );
@@ -567,7 +577,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !contain...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '!&', contain: ['array', 'pickles'] }
@@ -579,14 +589,14 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong contain...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', contain: ['array', 'pickles'] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Testing wrong contain...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', contain: ['string', 'pickles'] }
     );
@@ -597,17 +607,17 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by regex match...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', match: ['match', '.*'] } // anything
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', match: ['match', 'Edward McCheese'] } // a substring
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       {
@@ -619,7 +629,7 @@ This one's zip code is 92064.`;
       } // inclusive test
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -628,7 +638,7 @@ This one's zip code is 92064.`;
       } // a simple email
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -643,7 +653,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by regex match...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', imatch: ['match', 'edward mccheese'] } // a substring
     );
@@ -654,17 +664,17 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong regex match...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', match: ['match', 'Q'] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickle', match: ['match', '.*'] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -681,7 +691,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by regex match...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', match: ['match', 'edward mccheese'] } // a substring
     );
@@ -692,7 +702,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by regex + equal inclusively...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '|', equal: ['string', 'pickles'], match: ['string', 'test'] }
@@ -704,7 +714,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by inequality...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -717,7 +727,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -730,7 +740,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -743,7 +753,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -756,7 +766,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -769,7 +779,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -786,7 +796,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by inequality...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -799,7 +809,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -812,7 +822,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -825,7 +835,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -838,7 +848,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -851,7 +861,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -868,7 +878,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by inequality...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -881,7 +891,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -894,7 +904,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -907,7 +917,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -920,7 +930,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -933,7 +943,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -950,7 +960,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by inequality...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -963,7 +973,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -976,7 +986,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -989,7 +999,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1002,7 +1012,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1015,7 +1025,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by inequality...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1032,7 +1042,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !inequality...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '!&', gte: ['number', 60] }
@@ -1044,7 +1054,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong inequality...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', lte: ['number', 29.99] }
     );
@@ -1055,7 +1065,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by time...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', gt: ['cdate', (testEntity.cdate ?? 0) - 120] }
     );
@@ -1066,7 +1076,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong time...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', gte: ['cdate', (testEntity.cdate ?? 0) + 1] }
     );
@@ -1079,7 +1089,7 @@ This one's zip code is 92064.`;
     const referenceEntity = await TestModel.factory(refGuid);
 
     // Retrieving entity by relative time...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', gt: ['timestamp', null, '-1 day'] }
     );
@@ -1087,7 +1097,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by relative time inclusively...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1101,7 +1111,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by relative time...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', gt: ['timestamp', null, '-3 days'] }
     );
@@ -1109,7 +1119,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by relative time...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', gt: ['cdate', null, '-1 day'] }
     );
@@ -1123,7 +1133,7 @@ This one's zip code is 92064.`;
     const referenceEntity = await TestModel.factory(refGuid);
 
     // Retrieving entity by relative time...
-    let resultEntity = await Nymph.getEntities(
+    let resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', gt: ['timestamp', null, '+1 day'] }
     );
@@ -1131,7 +1141,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by relative time...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', lt: ['timestamp', null, '-3 days'] }
     );
@@ -1139,7 +1149,7 @@ This one's zip code is 92064.`;
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
 
     // Retrieving entity by relative time...
-    resultEntity = await Nymph.getEntities(
+    resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test', gt: ['cdate', null, '+1 day'] }
     );
@@ -1161,7 +1171,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', ref: ['reference', refGuid] }
     );
@@ -1172,7 +1182,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by !reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
       { type: '!&', ref: ['reference', newGUID()] }
@@ -1184,7 +1194,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', ref: ['reference', newGUID()] }
     );
@@ -1195,7 +1205,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing non-existent reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', ref: ['pickle', refGuid] }
     );
@@ -1206,7 +1216,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by inclusive reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1223,7 +1233,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong inclusive reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1240,7 +1250,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Retrieving entity by array reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', ref: ['refArray', refGuid] }
     );
@@ -1251,7 +1261,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing wrong array reference...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -1268,7 +1278,7 @@ This one's zip code is 92064.`;
     await createTestEntities();
 
     // Testing logic operations...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -1309,11 +1319,56 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
 
+  it('guid return', async () => {
+    await createTestEntities();
+
+    // Testing guid return using logic operations...
+    const resultGuid = await nymph.getEntities(
+      { class: TestModel, return: 'guid' },
+      {
+        type: '&',
+        '!ref': [
+          ['refArray', newGUID()],
+          ['refArray', newGUID()],
+        ],
+        '!lte': ['number', 29.99],
+      },
+      {
+        type: '|',
+        '!lte': [
+          ['number', 29.99],
+          ['number', 30],
+        ],
+      },
+      {
+        type: '!&',
+        '!equal': ['string', 'test'],
+        '!contain': [
+          ['array', 'full'],
+          ['array', 'of'],
+          ['array', 'values'],
+          ['array', 500],
+        ],
+      },
+      {
+        type: '!|',
+        '!equal': ['string', 'test'],
+        contain: [
+          ['array', 'full'],
+          ['array', 'of'],
+          ['array', 'values'],
+          ['array', 500],
+        ],
+      }
+    );
+    expect(resultGuid.indexOf(testEntity.guid ?? '')).toBeGreaterThan(-1);
+  });
+
   it('deep selector', async () => {
     await createTestEntities();
 
     // Testing deep selectors...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -1358,7 +1413,7 @@ This one's zip code is 92064.`;
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
-    const resultEntity2 = await Nymph.getEntities(
+    const resultEntity2 = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -1403,7 +1458,7 @@ This one's zip code is 92064.`;
     );
     expect(testEntity.$inArray(resultEntity2)).toEqual(true);
 
-    const resultEntity3 = await Nymph.getEntities(
+    const resultEntity3 = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1419,7 +1474,7 @@ This one's zip code is 92064.`;
     );
     expect(testEntity.$inArray(resultEntity3)).toEqual(true);
 
-    const resultEntity4 = await Nymph.getEntities(
+    const resultEntity4 = await nymph.getEntities(
       { class: TestModel },
       {
         type: '|',
@@ -1444,7 +1499,7 @@ This one's zip code is 92064.`;
 
   it('wrong deep selector', async () => {
     // Testing wrong deep selectors...
-    const resultEntity = await Nymph.getEntities(
+    const resultEntity = await nymph.getEntities(
       { class: TestModel },
       {
         type: '&',
@@ -1461,12 +1516,80 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
 
+  it('qref', async () => {
+    await createTestEntities();
+
+    // Retrieving entity by qref...
+    const resultEntity = await nymph.getEntities(
+      { class: TestModel },
+      {
+        type: '&',
+        qref: [
+          'reference',
+          [{ class: TestModel }, { type: '&', equal: ['test', 'good'] }],
+        ],
+      }
+    );
+    expect(testEntity.$inArray(resultEntity)).toEqual(true);
+  });
+
+  it('not qref', async () => {
+    await createTestEntities();
+
+    // Retrieving entity by !qref...
+    const resultEntity = await nymph.getEntities(
+      { class: TestModel },
+      {
+        type: '&',
+        '!qref': [
+          'reference',
+          [{ class: TestModel }, { type: '&', equal: ['test', 'pickles'] }],
+        ],
+      }
+    );
+    expect(testEntity.$inArray(resultEntity)).toEqual(true);
+  });
+
+  it('wrong qref class', async () => {
+    await createTestEntities();
+
+    // Testing wrong qref...
+    const resultEntity = await nymph.getEntities(
+      { class: TestModel },
+      {
+        type: '&',
+        qref: [
+          'reference',
+          [{ class: TestBModel }, { type: '&', equal: ['test', 'good'] }],
+        ],
+      }
+    );
+    expect(testEntity.$inArray(resultEntity)).toEqual(false);
+  });
+
+  it('wrong qref data', async () => {
+    await createTestEntities();
+
+    // Testing wrong qref...
+    const resultEntity = await nymph.getEntities(
+      { class: TestModel },
+      {
+        type: '&',
+        qref: [
+          'reference',
+          [{ class: TestModel }, { type: '&', equal: ['test', 'pickles'] }],
+        ],
+      }
+    );
+    expect(testEntity.$inArray(resultEntity)).toEqual(false);
+  });
+
   it('sort option', async () => {
     await createMultipleTestEntities();
 
     for (const sort of ['cdate', 'mdate']) {
       // Retrieving entities sorted...
-      let resultEntities = await Nymph.getEntities({
+      let resultEntities = await nymph.getEntities({
         class: TestModel,
         sort: sort as 'cdate' | 'mdate',
       });
@@ -1477,8 +1600,19 @@ This one's zip code is 92064.`;
         ).toBeGreaterThan(resultEntities[i][sort as 'cdate' | 'mdate'] ?? 0);
       }
 
+      // And test the same with guid return...
+      let resultGuids = await nymph.getEntities({
+        class: TestModel,
+        sort: sort as 'cdate' | 'mdate',
+        return: 'guid',
+      });
+      expect(resultGuids.length).toBeGreaterThan(100);
+      for (let i = 0; i < resultGuids.length - 1; i++) {
+        expect(resultGuids[i]).toEqual(resultEntities[i].guid);
+      }
+
       // Retrieving entities reverse sorted...
-      resultEntities = await Nymph.getEntities({
+      resultEntities = await nymph.getEntities({
         class: TestModel,
         sort: sort as 'cdate' | 'mdate',
         reverse: true,
@@ -1492,7 +1626,7 @@ This one's zip code is 92064.`;
 
       // And again with other selectors.
       // Retrieving entities sorted...
-      resultEntities = await Nymph.getEntities(
+      resultEntities = await nymph.getEntities(
         { class: TestModel, sort: sort as 'cdate' | 'mdate' },
         { type: '&', match: ['name', '^Multi Test '] }
       );
@@ -1504,7 +1638,7 @@ This one's zip code is 92064.`;
       }
 
       // Retrieving entities reverse sorted...
-      resultEntities = await Nymph.getEntities(
+      resultEntities = await nymph.getEntities(
         { class: TestModel, sort: sort as 'cdate' | 'mdate', reverse: true },
         { type: '&', match: ['name', '^Multi Test '] }
       );
@@ -1532,7 +1666,7 @@ This one's zip code is 92064.`;
     expect(await testEntity.$delete()).toEqual(true);
     expect(testEntity.guid).toBeNull();
 
-    const entity = await Nymph.getEntity(
+    const entity = await nymph.getEntity(
       { class: TestModel },
       { type: '&', guid: testGuid }
     );
@@ -1541,74 +1675,86 @@ This one's zip code is 92064.`;
   });
 }
 
-export function UIDTest(it: (name: string, fn: () => void) => void) {
+export function UIDTest(
+  nymph: Nymph,
+  it: (name: string, fn: () => void) => void
+) {
+  nymph.addEntityClass(TestModel);
+  nymph.addEntityClass(TestBModel);
+
   it('delete old test data', async () => {
-    expect(await Nymph.deleteUID('TestUID')).toEqual(true);
-    expect(await Nymph.deleteUID('NewUID')).toEqual(true);
+    expect(await nymph.deleteUID('TestUID')).toEqual(true);
+    expect(await nymph.deleteUID('NewUID')).toEqual(true);
   });
 
   it('new UID', async () => {
-    expect(await Nymph.newUID('TestUID')).toEqual(1);
+    expect(await nymph.newUID('TestUID')).toEqual(1);
   });
 
   it('increment UID', async () => {
-    expect(await Nymph.newUID('TestUID')).toEqual(2);
+    expect(await nymph.newUID('TestUID')).toEqual(2);
   });
 
   it('retrieve UID', async () => {
-    expect(await Nymph.getUID('TestUID')).toEqual(2);
+    expect(await nymph.getUID('TestUID')).toEqual(2);
   });
 
   it('rename UID', async () => {
-    expect(await Nymph.renameUID('TestUID', 'NewUID')).toEqual(true);
-    expect(await Nymph.getUID('TestUID')).toBeNull();
-    expect(await Nymph.getUID('NewUID')).toEqual(2);
-    expect(await Nymph.renameUID('NewUID', 'TestUID')).toEqual(true);
-    expect(await Nymph.getUID('NewUID')).toBeNull();
-    expect(await Nymph.getUID('TestUID')).toEqual(2);
+    expect(await nymph.renameUID('TestUID', 'NewUID')).toEqual(true);
+    expect(await nymph.getUID('TestUID')).toBeNull();
+    expect(await nymph.getUID('NewUID')).toEqual(2);
+    expect(await nymph.renameUID('NewUID', 'TestUID')).toEqual(true);
+    expect(await nymph.getUID('NewUID')).toBeNull();
+    expect(await nymph.getUID('TestUID')).toEqual(2);
   });
 
   it('set UID', async () => {
-    expect(await Nymph.setUID('TestUID', 5)).toEqual(true);
-    expect(await Nymph.getUID('TestUID')).toEqual(5);
+    expect(await nymph.setUID('TestUID', 5)).toEqual(true);
+    expect(await nymph.getUID('TestUID')).toEqual(5);
   });
 
   it('delete UID', async () => {
-    expect(await Nymph.deleteUID('TestUID')).toEqual(true);
-    expect(await Nymph.getUID('TestUID')).toBeNull();
+    expect(await nymph.deleteUID('TestUID')).toEqual(true);
+    expect(await nymph.getUID('TestUID')).toBeNull();
   });
 }
 
-export function ExportImportTest(it: (name: string, fn: () => void) => void) {
+export function ExportImportTest(
+  nymph: Nymph,
+  it: (name: string, fn: () => void) => void
+) {
+  nymph.addEntityClass(TestModel);
+  nymph.addEntityClass(TestBModel);
+
   async function deleteTestData() {
-    let all = await Nymph.getEntities({ class: TestModel });
+    let all = await nymph.getEntities({ class: TestModel });
     expect(Array.isArray(all)).toEqual(true);
     for (const cur of all) {
       expect(await cur.$delete()).toEqual(true);
     }
 
-    all = await Nymph.getEntities({ class: TestModel });
+    all = await nymph.getEntities({ class: TestModel });
     expect(all.length).toEqual(0);
 
-    all = await Nymph.getEntities({ class: TestBModel });
+    all = await nymph.getEntities({ class: TestBModel });
     expect(Array.isArray(all)).toEqual(true);
     for (const cur of all) {
       expect(await cur.$delete()).toEqual(true);
     }
 
-    all = await Nymph.getEntities({ class: TestBModel });
+    all = await nymph.getEntities({ class: TestBModel });
     expect(all.length).toEqual(0);
 
-    expect(await Nymph.deleteUID('TestUID')).toEqual(true);
-    expect(await Nymph.deleteUID('TestUID2')).toEqual(true);
+    expect(await nymph.deleteUID('TestUID')).toEqual(true);
+    expect(await nymph.deleteUID('TestUID2')).toEqual(true);
   }
 
   async function checkEntityDataAndCount() {
-    expect(await Nymph.getUID('TestUID')).toEqual(2);
-    expect(await Nymph.getUID('TestUID2')).toEqual(1);
+    expect(await nymph.getUID('TestUID')).toEqual(2);
+    expect(await nymph.getUID('TestUID2')).toEqual(1);
 
-    const models = await Nymph.getEntities({ class: TestModel });
-    const bmodels = await Nymph.getEntities({ class: TestBModel });
+    const models = await nymph.getEntities({ class: TestModel });
+    const bmodels = await nymph.getEntities({ class: TestBModel });
 
     expect(models.length).toEqual(30);
     expect(bmodels.length).toEqual(10);
@@ -1636,9 +1782,9 @@ export function ExportImportTest(it: (name: string, fn: () => void) => void) {
   });
 
   it('setup data', async () => {
-    expect(await Nymph.newUID('TestUID')).toEqual(1);
-    expect(await Nymph.newUID('TestUID')).toEqual(2);
-    expect(await Nymph.newUID('TestUID2')).toEqual(1);
+    expect(await nymph.newUID('TestUID')).toEqual(1);
+    expect(await nymph.newUID('TestUID')).toEqual(2);
+    expect(await nymph.newUID('TestUID2')).toEqual(1);
 
     for (let i = 0; i < 20; i++) {
       const EntityClass = i < 15 ? TestModel : TestBModel;
@@ -1670,7 +1816,7 @@ export function ExportImportTest(it: (name: string, fn: () => void) => void) {
   });
 
   it('export data', async () => {
-    expect(await Nymph.export(__dirname + '/testentityexport.nex')).toEqual(
+    expect(await nymph.export(__dirname + '/testentityexport.nex')).toEqual(
       true
     );
   });
@@ -1680,14 +1826,14 @@ export function ExportImportTest(it: (name: string, fn: () => void) => void) {
   });
 
   it('import data', async () => {
-    expect(await Nymph.getUID('TestUID')).toBeNull();
-    expect(await Nymph.getUID('TestUID2')).toBeNull();
-    const models = await Nymph.getEntities({ class: TestModel });
-    const bmodels = await Nymph.getEntities({ class: TestBModel });
+    expect(await nymph.getUID('TestUID')).toBeNull();
+    expect(await nymph.getUID('TestUID2')).toBeNull();
+    const models = await nymph.getEntities({ class: TestModel });
+    const bmodels = await nymph.getEntities({ class: TestBModel });
     expect(models.length).toEqual(0);
     expect(bmodels.length).toEqual(0);
 
-    expect(await Nymph.import(__dirname + '/testentityexport.nex')).toEqual(
+    expect(await nymph.import(__dirname + '/testentityexport.nex')).toEqual(
       true
     );