@nymphjs/nymph 1.0.0-beta.5 → 1.0.0-beta.51

package/src/driver/testArtifacts.ts

@@ -3,16 +3,22 @@ import strtotime from 'locutus/php/datetime/strtotime';
 import { guid } from '@nymphjs/guid';
 
 import type Nymph from '../Nymph';
-import { TestBModel, TestModel, TestModelData } from '../testArtifacts';
+import {
+  TestBModel as TestBModelClass,
+  TestModel as TestModelClass,
+  TestModelData,
+  TestEmptyModel as TestEmptyModelClass,
+} from '../testArtifacts';
 
 export function QueriesTest(
   nymph: Nymph,
-  it: (name: string, fn: () => void) => void
+  it: (name: string, fn: () => void) => void,
 ) {
-  nymph.addEntityClass(TestModel);
-  nymph.addEntityClass(TestBModel);
+  const TestModel = nymph.addEntityClass(TestModelClass);
+  const TestBModel = nymph.addEntityClass(TestBModelClass);
+  const TestEmptyModel = nymph.addEntityClass(TestEmptyModelClass);
 
-  let testEntity: TestModel & TestModelData;
+  let testEntity: TestModelClass & TestModelData;
   let testGuid: string;
   let refGuid: string;
   let createdMultiple = false;
@@ -35,7 +41,10 @@ export function QueriesTest(
 
 This one's email address is nice_hat-wednesday+newyork@im-a-hat.hat.
 This one's phone number is (555) 555-1818.
-This one's zip code is 92064.`;
+This one's zip code is 92064.
+This one's favorite emojis are 🔥❤️😊😂⭐🤔
+
+These hats are absolutely fantastic.`;
     testEntity.number = 30;
     testEntity.numberString = '30';
     testEntity.timestamp = Date.now();
@@ -43,7 +52,7 @@ This one's zip code is 92064.`;
     expect(testEntity.guid).not.toBeNull();
     testGuid = testEntity.guid as string;
 
-    const entityReferenceTest: TestModel & TestModelData = new TestModel();
+    const entityReferenceTest: TestModelClass & TestModelData = new TestModel();
     entityReferenceTest.string = 'wrong';
     entityReferenceTest.timestamp = strtotime('-2 days') * 1000;
     expect(await entityReferenceTest.$save()).toEqual(true);
@@ -55,19 +64,11 @@ This one's zip code is 92064.`;
     entityReferenceTest.test = 'good';
     expect(await entityReferenceTest.$save()).toEqual(true);
 
-    // Test synchronous getEntity.
-    testEntity = nymph.driver.getEntitySync(
-      { class: TestModel },
-      testGuid
-    ) as TestModel & TestModelData;
-    expect(testEntity).toBeInstanceOf(TestModel);
-    expect(testEntity.guid).toEqual(testGuid);
-
     // Test asynchronous getEntity.
     testEntity = (await nymph.getEntity(
       { class: TestModel },
-      testGuid
-    )) as TestModel & TestModelData;
+      testGuid,
+    )) as TestModelClass & TestModelData;
     expect(testEntity).toBeInstanceOf(TestModel);
     expect(testEntity.guid).toEqual(testGuid);
   }
@@ -80,6 +81,8 @@ This one's zip code is 92064.`;
       for (let i = 0; i < 100; i++) {
         const testEntity = await TestModel.factory();
         testEntity.name = `Multi Test ${i}`;
+        // Reverse the number for sort testing.
+        testEntity.number = 100 - i;
         testEntity.$removeTag('test');
         testEntity.$addTag('multiTest');
         expect(await testEntity.$save()).toEqual(true);
@@ -104,6 +107,13 @@ This one's zip code is 92064.`;
     await createTestEntities();
   });
 
+  it("doesn't create empty entity", async () => {
+    const testEntity = await TestEmptyModel.factory();
+
+    expect(await testEntity.$save()).toBeFalsy();
+    expect(testEntity.guid).toBeNull();
+  });
+
   it('update mdate on save', async () => {
     await createTestEntities();
 
@@ -146,7 +156,7 @@ This one's zip code is 92064.`;
 
     if (!(await transaction.inTransaction())) {
       console.log(
-        'This Nymph driver or database seems to not support transactions. Skipping transaction tests.'
+        'This Nymph driver or database seems to not support transactions. Skipping transaction tests.',
       );
       await transaction.rollback('test');
       return;
@@ -177,7 +187,7 @@ This one's zip code is 92064.`;
     expect(await testEntity.$delete()).toEqual(true);
     const resultEntity = await transaction.getEntity(
       { class: TestModel },
-      testGuid
+      testGuid,
     );
     expect(resultEntity).toBeNull();
 
@@ -190,13 +200,13 @@ This one's zip code is 92064.`;
     // Verify it's back.
     testEntity = (await transaction.getEntity(
       { class: TestModel },
-      testGuid
-    )) as TestModel & TestModelData;
+      testGuid,
+    )) as TestModelClass & TestModelData;
 
     expect(testEntity.guid).toEqual(testGuid);
 
-    // Start a new transaction.
-    transaction = await nymph.startTransaction('test');
+    // Start a new transaction with a dot in the name.
+    transaction = await nymph.startTransaction('test.1');
     testEntity.$nymph = transaction;
 
     // Verify in a transaction.
@@ -207,7 +217,7 @@ This one's zip code is 92064.`;
     expect(await testEntity.$save()).toEqual(true);
 
     // Commit the transaction.
-    await transaction.commit('test');
+    await transaction.commit('test.1');
     testEntity.$nymph = nymph;
 
     // Verify not in a transaction.
@@ -236,7 +246,7 @@ This one's zip code is 92064.`;
         limit: 1,
         sort: 'cdate',
       },
-      { type: '&', tag: 'test' }
+      { type: '&', tag: 'test' },
     );
     expect(resultEntities.length).toEqual(1);
     expect(testEntity.$is(resultEntities[0])).toEqual(true);
@@ -248,7 +258,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by GUID and tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '&', guid: testGuid, tag: 'test' }
+      { type: '&', guid: testGuid, tag: 'test' },
     );
     expect(testEntity.$is(resultEntity)).toEqual(true);
   });
@@ -259,7 +269,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by GUID and tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '|', guid: [testGuid, guid()] }
+      { type: '|', guid: [testGuid, guid()] },
     );
     expect(testEntity.$is(resultEntity)).toEqual(true);
   });
@@ -270,7 +280,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by GUID and tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '|', guid: [guid(), guid()] }
+      { type: '|', guid: [guid(), guid()] },
     );
     expect(testEntity.$is(resultEntity)).toEqual(false);
   });
@@ -281,7 +291,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !GUID...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', '!guid': guid(), tag: 'test' }
+      { type: '&', '!guid': guid(), tag: 'test' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -292,7 +302,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !tags...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', guid: testGuid, '!tag': ['barbecue', 'pickles'] }
+      { type: '&', guid: testGuid, '!tag': ['barbecue', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -303,7 +313,7 @@ This one's zip code is 92064.`;
     // Testing GUID and wrong tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '&', guid: testGuid, tag: ['pickles'] }
+      { type: '&', guid: testGuid, tag: ['pickles'] },
     );
     expect(resultEntity).toBeNull();
   });
@@ -314,7 +324,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by tags...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test' }
+      { type: '&', tag: 'test' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -325,7 +335,7 @@ This one's zip code is 92064.`;
     // Testing wrong tags...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'pickles' }
+      { type: '&', tag: 'pickles' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -336,7 +346,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by tags inclusively...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '|', tag: ['pickles', 'test', 'barbecue'] }
+      { type: '|', tag: ['pickles', 'test', 'barbecue'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -347,7 +357,7 @@ This one's zip code is 92064.`;
     // Testing wrong inclusive tags...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '|', tag: ['pickles', 'barbecue'] }
+      { type: '|', tag: ['pickles', 'barbecue'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -359,7 +369,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '|', tag: ['pickles', 'test', 'barbecue'] }
+      { type: '|', tag: ['pickles', 'test', 'barbecue'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -371,7 +381,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '|', tag: ['pickles', 'barbecue'] }
+      { type: '|', tag: ['pickles', 'barbecue'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -383,7 +393,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'pickles' },
-      { type: '|', tag: ['test', 'barbecue'] }
+      { type: '|', tag: ['test', 'barbecue'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -394,7 +404,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by defined...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', defined: 'string' }
+      { type: '&', defined: 'string' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -405,7 +415,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !defined...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', '!defined': 'pickles' }
+      { type: '&', tag: 'test', '!defined': 'pickles' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -417,7 +427,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '!&', defined: 'pickles' },
-      { type: '&', tag: 'test' }
+      { type: '&', tag: 'test' },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -428,7 +438,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', equal: ['string', 'test'] }
+      { type: '&', equal: ['string', 'test'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -442,7 +452,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', '!equal': ['string', 'wrong'] }
+      { type: '&', tag: 'test', '!equal': ['string', 'wrong'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -454,7 +464,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by like...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', like: ['string', 't_s%'] }
+      { type: '&', like: ['string', 't_s%'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -468,7 +478,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !like...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', '!like': ['string', 'wr_n%'] }
+      { type: '&', tag: 'test', '!like': ['string', 'wr_n%'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -480,7 +490,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by ilike...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ilike: ['string', 'T_s%'] }
+      { type: '&', ilike: ['string', 'T_s%'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -494,7 +504,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !ilike...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', '!ilike': ['string', 'wr_n%'] }
+      { type: '&', tag: 'test', '!ilike': ['string', 'wr_n%'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -506,7 +516,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by like...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', like: ['string', 'T_s%'] }
+      { type: '&', like: ['string', 'T_s%'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -517,7 +527,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by tags and equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', equal: ['string', 'test'] }
+      { type: '&', tag: 'test', equal: ['string', 'test'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -528,7 +538,7 @@ This one's zip code is 92064.`;
     // Testing wrong tags and right equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'pickles', equal: ['string', 'test'] }
+      { type: '&', tag: 'pickles', equal: ['string', 'test'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -539,7 +549,7 @@ This one's zip code is 92064.`;
     // Testing right tags and wrong equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', equal: ['string', 'pickles'] }
+      { type: '&', tag: 'test', equal: ['string', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -550,7 +560,7 @@ This one's zip code is 92064.`;
     // Testing wrong tags and wrong equal...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'pickles', equal: ['string', 'pickles'] }
+      { type: '&', tag: 'pickles', equal: ['string', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -561,14 +571,14 @@ This one's zip code is 92064.`;
     // Retrieving entity by contain...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', contain: ['array', 'values'] }
+      { type: '&', contain: ['array', 'values'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
     // Retrieving entity by contain with full match...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', contain: ['string', 'test'] }
+      { type: '&', contain: ['string', 'test'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -580,7 +590,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '!&', contain: ['array', 'pickles'] }
+      { type: '!&', contain: ['array', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -591,14 +601,14 @@ This one's zip code is 92064.`;
     // Testing wrong contain...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', contain: ['array', 'pickles'] }
+      { type: '&', contain: ['array', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
     // Testing wrong contain...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', contain: ['string', 'pickles'] }
+      { type: '&', contain: ['string', 'pickles'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -609,12 +619,12 @@ This one's zip code is 92064.`;
     // Retrieving entity by regex match...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', match: ['match', '.*'] } // anything
+      { type: '&', match: ['match', '.*'] }, // anything
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', match: ['match', 'Edward McCheese'] } // a substring
+      { type: '&', tag: 'test', match: ['match', 'Edward McCheese'] }, // a substring
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     resultEntity = await nymph.getEntities(
@@ -626,7 +636,7 @@ This one's zip code is 92064.`;
           ['string', '[0-9]'],
           ['match', 'Edward McCheese'],
         ],
-      } // inclusive test
+      }, // inclusive test
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     resultEntity = await nymph.getEntities(
@@ -635,7 +645,7 @@ This one's zip code is 92064.`;
         type: '&',
         tag: 'test',
         match: ['match', '[-a-zA-Z0-9+_]+@[-a-zA-Z0-9_]+.[-a-zA-Z0-9_]{2,4}'],
-      } // a simple email
+      }, // a simple email
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     resultEntity = await nymph.getEntities(
@@ -644,7 +654,7 @@ This one's zip code is 92064.`;
         type: '&',
         tag: 'test',
         match: ['match', '\\([0-9]{3}\\) [0-9]{3}-[0-9]{4}'],
-      } // a phone number
+      }, // a phone number
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -655,7 +665,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by regex match...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', imatch: ['match', 'edward mccheese'] } // a substring
+      { type: '&', tag: 'test', imatch: ['match', 'edward mccheese'] }, // a substring
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -666,12 +676,12 @@ This one's zip code is 92064.`;
     // Testing wrong regex match...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', match: ['match', 'Q'] }
+      { type: '&', match: ['match', 'Q'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'pickle', match: ['match', '.*'] }
+      { type: '&', tag: 'pickle', match: ['match', '.*'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
     resultEntity = await nymph.getEntities(
@@ -682,7 +692,7 @@ This one's zip code is 92064.`;
           ['string', '[0-9]'],
           ['match', ',,'],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -693,7 +703,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by regex match...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', match: ['match', 'edward mccheese'] } // a substring
+      { type: '&', tag: 'test', match: ['match', 'edward mccheese'] }, // a substring
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -705,7 +715,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '|', equal: ['string', 'pickles'], match: ['string', 'test'] }
+      { type: '|', equal: ['string', 'pickles'], match: ['string', 'test'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -722,7 +732,7 @@ This one's zip code is 92064.`;
           ['number', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -735,7 +745,7 @@ This one's zip code is 92064.`;
           ['number', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -748,7 +758,7 @@ This one's zip code is 92064.`;
           ['number', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -761,7 +771,7 @@ This one's zip code is 92064.`;
           ['numberString', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -774,7 +784,7 @@ This one's zip code is 92064.`;
           ['numberString', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -787,7 +797,7 @@ This one's zip code is 92064.`;
           ['numberString', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -804,7 +814,7 @@ This one's zip code is 92064.`;
           ['number', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -817,7 +827,7 @@ This one's zip code is 92064.`;
           ['number', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -830,7 +840,7 @@ This one's zip code is 92064.`;
           ['number', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -843,7 +853,7 @@ This one's zip code is 92064.`;
           ['numberString', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -856,7 +866,7 @@ This one's zip code is 92064.`;
           ['numberString', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -869,7 +879,7 @@ This one's zip code is 92064.`;
           ['numberString', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -886,7 +896,7 @@ This one's zip code is 92064.`;
           ['number', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -899,7 +909,7 @@ This one's zip code is 92064.`;
           ['number', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -912,7 +922,7 @@ This one's zip code is 92064.`;
           ['number', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -925,7 +935,7 @@ This one's zip code is 92064.`;
           ['numberString', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -938,7 +948,7 @@ This one's zip code is 92064.`;
           ['numberString', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -951,7 +961,7 @@ This one's zip code is 92064.`;
           ['numberString', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -968,7 +978,7 @@ This one's zip code is 92064.`;
           ['number', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -981,7 +991,7 @@ This one's zip code is 92064.`;
           ['number', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -994,7 +1004,7 @@ This one's zip code is 92064.`;
           ['number', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
 
@@ -1007,7 +1017,7 @@ This one's zip code is 92064.`;
           ['numberString', 30],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -1020,7 +1030,7 @@ This one's zip code is 92064.`;
           ['numberString', 31],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -1033,7 +1043,7 @@ This one's zip code is 92064.`;
           ['numberString', 29],
           ['pickles', 100],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1045,7 +1055,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '!&', gte: ['number', 60] }
+      { type: '!&', gte: ['number', 60] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1056,7 +1066,7 @@ This one's zip code is 92064.`;
     // Testing wrong inequality...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', lte: ['number', 29.99] }
+      { type: '&', lte: ['number', 29.99] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1067,7 +1077,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by time...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', gt: ['cdate', (testEntity.cdate ?? 0) - 120] }
+      { type: '&', tag: 'test', gt: ['cdate', (testEntity.cdate ?? 0) - 120] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1078,7 +1088,7 @@ This one's zip code is 92064.`;
     // Testing wrong time...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', gte: ['cdate', (testEntity.cdate ?? 0) + 1] }
+      { type: '&', tag: 'test', gte: ['cdate', (testEntity.cdate ?? 0) + 1] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1091,7 +1101,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', gt: ['timestamp', null, '-1 day'] }
+      { type: '&', gt: ['timestamp', null, '-1 day'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -1105,7 +1115,7 @@ This one's zip code is 92064.`;
           ['timestamp', null, '-1 day'],
           ['timestamp', null, '+5 days'],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -1113,7 +1123,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', gt: ['timestamp', null, '-3 days'] }
+      { type: '&', gt: ['timestamp', null, '-3 days'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(true);
@@ -1121,7 +1131,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', gt: ['cdate', null, '-1 day'] }
+      { type: '&', gt: ['cdate', null, '-1 day'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(true);
@@ -1135,7 +1145,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     let resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', gt: ['timestamp', null, '+1 day'] }
+      { type: '&', tag: 'test', gt: ['timestamp', null, '+1 day'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -1143,7 +1153,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', lt: ['timestamp', null, '-3 days'] }
+      { type: '&', tag: 'test', lt: ['timestamp', null, '-3 days'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -1151,7 +1161,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by relative time...
     resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', tag: 'test', gt: ['cdate', null, '+1 day'] }
+      { type: '&', tag: 'test', gt: ['cdate', null, '+1 day'] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
     expect(referenceEntity.$inArray(resultEntity)).toEqual(false);
@@ -1161,9 +1171,11 @@ This one's zip code is 92064.`;
     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');
   });
 
@@ -1173,7 +1185,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by reference...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['reference', refGuid] }
+      { type: '&', ref: ['reference', refGuid] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1185,7 +1197,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '!&', ref: ['reference', guid()] }
+      { type: '!&', ref: ['reference', guid()] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1196,7 +1208,7 @@ This one's zip code is 92064.`;
     // Testing wrong reference...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['reference', guid()] }
+      { type: '&', ref: ['reference', guid()] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1207,7 +1219,7 @@ This one's zip code is 92064.`;
     // Testing non-existent reference...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['pickle', refGuid] }
+      { type: '&', ref: ['pickle', refGuid] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1224,7 +1236,7 @@ This one's zip code is 92064.`;
           ['reference', refGuid],
           ['reference', guid()],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1241,7 +1253,7 @@ This one's zip code is 92064.`;
           ['reference', guid()],
           ['reference', guid()],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1252,7 +1264,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by array reference...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['refArray', refGuid] }
+      { type: '&', ref: ['refArray', refGuid] },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1269,7 +1281,7 @@ This one's zip code is 92064.`;
           ['refArray', refGuid],
           ['refArray', guid()],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1314,7 +1326,7 @@ This one's zip code is 92064.`;
           ['array', 'values'],
           ['array', 500],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1334,13 +1346,13 @@ This one's zip code is 92064.`;
 
     const resultSelectors = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['reference', refGuid] }
+      { type: '&', ref: ['reference', refGuid] },
     );
 
     // Testing count return with selectors...
     const resultSelectorsCount = await nymph.getEntities(
       { class: TestModel, return: 'count' },
-      { type: '&', ref: ['reference', refGuid] }
+      { type: '&', ref: ['reference', refGuid] },
     );
     expect(resultSelectorsCount).toBeGreaterThanOrEqual(1);
     expect(resultSelectorsCount).toEqual(resultSelectors.length);
@@ -1363,7 +1375,7 @@ This one's zip code is 92064.`;
     // Testing empty count...
     const resultSelectorsEmpty = await nymph.getEntities(
       { class: TestModel, return: 'count' },
-      { type: '&', ref: ['reference', guid()] }
+      { type: '&', ref: ['reference', guid()] },
     );
     expect(resultSelectorsEmpty).toEqual(0);
   });
@@ -1408,7 +1420,7 @@ This one's zip code is 92064.`;
           ['array', 'values'],
           ['array', 500],
         ],
-      }
+      },
     );
     expect(resultGuid.indexOf(testEntity.guid ?? '')).toBeGreaterThan(-1);
   });
@@ -1458,7 +1470,7 @@ This one's zip code is 92064.`;
             ],
           },
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
 
@@ -1503,7 +1515,7 @@ This one's zip code is 92064.`;
             ],
           },
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity2)).toEqual(true);
 
@@ -1519,7 +1531,7 @@ This one's zip code is 92064.`;
           },
           { type: '&', gte: ['number', 16000] },
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity3)).toEqual(true);
 
@@ -1541,7 +1553,7 @@ This one's zip code is 92064.`;
             },
           },
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity4)).toEqual(true);
   });
@@ -1560,7 +1572,7 @@ This one's zip code is 92064.`;
           },
           { type: '&', gte: ['number', 16000] },
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1577,7 +1589,7 @@ This one's zip code is 92064.`;
           'reference',
           [{ class: TestModel }, { type: '&', equal: ['test', 'good'] }],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1594,7 +1606,7 @@ This one's zip code is 92064.`;
           'reference',
           [{ class: TestModel }, { type: '&', equal: ['test', 'pickles'] }],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1611,7 +1623,7 @@ This one's zip code is 92064.`;
           'reference',
           [{ class: TestBModel }, { type: '&', equal: ['test', 'good'] }],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1628,31 +1640,28 @@ This one's zip code is 92064.`;
           'reference',
           [{ class: TestModel }, { type: '&', equal: ['test', 'pickles'] }],
         ],
-      }
+      },
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
 
-  it('sort option', async () => {
+  it('cdate and mdate sort option', async () => {
     await createMultipleTestEntities();
 
-    for (const sort of ['cdate', 'mdate']) {
+    for (const sort of ['cdate', 'mdate'] as ('cdate' | 'mdate')[]) {
       // Retrieving entities sorted...
-      let resultEntities = await nymph.getEntities({
-        class: TestModel,
-        sort: sort as 'cdate' | 'mdate',
-      });
+      let resultEntities = await nymph.getEntities({ class: TestModel, sort });
       expect(resultEntities.length).toBeGreaterThan(100);
       for (let i = 0; i < resultEntities.length - 1; i++) {
-        expect(
-          resultEntities[i + 1][sort as 'cdate' | 'mdate']
-        ).toBeGreaterThan(resultEntities[i][sort as 'cdate' | 'mdate'] ?? 0);
+        expect(resultEntities[i + 1][sort]).toBeGreaterThan(
+          resultEntities[i][sort] ?? 0,
+        );
       }
 
       // And test the same with guid return...
       let resultGuids = await nymph.getEntities({
         class: TestModel,
-        sort: sort as 'cdate' | 'mdate',
+        sort,
         return: 'guid',
       });
       expect(resultGuids.length).toBeGreaterThan(100);
@@ -1663,48 +1672,121 @@ This one's zip code is 92064.`;
       // Retrieving entities reverse sorted...
       resultEntities = await nymph.getEntities({
         class: TestModel,
-        sort: sort as 'cdate' | 'mdate',
+        sort,
         reverse: true,
       });
       expect(resultEntities.length).toBeGreaterThan(100);
       for (let i = 0; i < resultEntities.length - 1; i++) {
-        expect(resultEntities[i + 1][sort as 'cdate' | 'mdate']).toBeLessThan(
-          resultEntities[i][sort as 'cdate' | 'mdate'] ?? 0
+        expect(resultEntities[i + 1][sort]).toBeLessThan(
+          resultEntities[i][sort] ?? 0,
         );
       }
 
       // And again with other selectors.
       // Retrieving entities sorted...
       resultEntities = await nymph.getEntities(
-        { class: TestModel, sort: sort as 'cdate' | 'mdate' },
-        { type: '&', match: ['name', '^Multi Test '] }
+        { class: TestModel, sort },
+        { type: '&', match: ['name', '^Multi Test '] },
       );
       expect(resultEntities.length).toEqual(100);
       for (let i = 0; i < resultEntities.length - 1; i++) {
-        expect(
-          resultEntities[i + 1][sort as 'cdate' | 'mdate']
-        ).toBeGreaterThan(resultEntities[i][sort as 'cdate' | 'mdate'] ?? 0);
+        expect(resultEntities[i + 1][sort]).toBeGreaterThan(
+          resultEntities[i][sort] ?? 0,
+        );
       }
 
       // Retrieving entities reverse sorted...
       resultEntities = await nymph.getEntities(
-        { class: TestModel, sort: sort as 'cdate' | 'mdate', reverse: true },
-        { type: '&', match: ['name', '^Multi Test '] }
+        { class: TestModel, sort, reverse: true },
+        { type: '&', match: ['name', '^Multi Test '] },
       );
       expect(resultEntities.length).toEqual(100);
       for (let i = 0; i < resultEntities.length - 1; i++) {
-        expect(resultEntities[i + 1][sort as 'cdate' | 'mdate']).toBeLessThan(
-          resultEntities[i][sort as 'cdate' | 'mdate'] ?? 0
+        expect(resultEntities[i + 1][sort]).toBeLessThan(
+          resultEntities[i][sort] ?? 0,
         );
       }
     }
   });
 
+  it('property sort option', async () => {
+    await createMultipleTestEntities();
+
+    // Retrieving entities sorted...
+    let resultEntities = await nymph.getEntities({
+      class: TestModel,
+      sort: 'number',
+    });
+    expect(resultEntities.length).toBeGreaterThan(100);
+    for (let i = 0; i < resultEntities.length - 1; i++) {
+      expect(resultEntities[i + 1].number ?? Infinity).toBeGreaterThanOrEqual(
+        resultEntities[i].number ?? 0,
+      );
+    }
+
+    // And test the same with guid return...
+    let resultGuids = await nymph.getEntities({
+      class: TestModel,
+      sort: 'number',
+      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({
+      class: TestModel,
+      sort: 'number',
+      reverse: true,
+    });
+    expect(resultEntities.length).toBeGreaterThan(100);
+    for (let i = 0; i < resultEntities.length - 1; i++) {
+      expect(resultEntities[i + 1].number ?? 0).toBeLessThanOrEqual(
+        resultEntities[i].number ?? Infinity,
+      );
+    }
+
+    // And again with other selectors.
+    // Retrieving entities sorted...
+    resultEntities = await nymph.getEntities(
+      { class: TestModel, sort: 'number' },
+      { type: '&', match: ['name', '^Multi Test '] },
+    );
+    expect(resultEntities.length).toEqual(100);
+    for (let i = 0; i < resultEntities.length - 1; i++) {
+      expect(resultEntities[i + 1].number ?? Infinity).toBeGreaterThan(
+        resultEntities[i].number ?? 0,
+      );
+      expect(resultEntities[i].name).toEqual(
+        `Multi Test ${100 - (resultEntities[i].number ?? 0)}`,
+      );
+    }
+
+    // Retrieving entities reverse sorted...
+    resultEntities = await nymph.getEntities(
+      { class: TestModel, sort: 'number', reverse: true },
+      { type: '&', match: ['name', '^Multi Test '] },
+    );
+    expect(resultEntities.length).toEqual(100);
+    for (let i = 0; i < resultEntities.length - 1; i++) {
+      expect(resultEntities[i + 1].number ?? 0).toBeLessThan(
+        resultEntities[i].number ?? Infinity,
+      );
+      expect(resultEntities[i].name).toEqual(
+        `Multi Test ${100 - (resultEntities[i].number ?? 0)}`,
+      );
+    }
+  });
+
   it('delete reference', async () => {
     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();
   });
 
@@ -1717,7 +1799,7 @@ This one's zip code is 92064.`;
 
     const entity = await nymph.getEntity(
       { class: TestModel },
-      { type: '&', guid: testGuid }
+      { type: '&', guid: testGuid },
     );
 
     expect(entity).toBeNull();
@@ -1726,11 +1808,8 @@ This one's zip code is 92064.`;
 
 export function UIDTest(
   nymph: Nymph,
-  it: (name: string, fn: () => void) => void
+  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);
@@ -1770,10 +1849,10 @@ export function UIDTest(
 
 export function ExportImportTest(
   nymph: Nymph,
-  it: (name: string, fn: () => void) => void
+  it: (name: string, fn: () => void) => void,
 ) {
-  nymph.addEntityClass(TestModel);
-  nymph.addEntityClass(TestBModel);
+  const TestModel = nymph.addEntityClass(TestModelClass);
+  const TestBModel = nymph.addEntityClass(TestBModelClass);
 
   async function deleteTestData() {
     let all = await nymph.getEntities({ class: TestModel });
@@ -1817,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);
       }
@@ -1866,7 +1947,7 @@ export function ExportImportTest(
 
   it('export data', async () => {
     expect(await nymph.export(__dirname + '/testentityexport.nex')).toEqual(
-      true
+      true,
     );
   });
 
@@ -1883,7 +1964,7 @@ export function ExportImportTest(
     expect(bmodels.length).toEqual(0);
 
     expect(await nymph.import(__dirname + '/testentityexport.nex')).toEqual(
-      true
+      true,
     );
 
     await checkEntityDataAndCount();