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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nymphjs/nymph",
-  "version": "1.0.0-beta.5",
-  "description": "NymphJS - Nymph ORM",
+  "version": "1.0.0-beta.50",
+  "description": "Nymph.js - Nymph ORM",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
     "clean": "test -d dist && rm -r dist || true",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepare": "npm run clean && npm run build",
+    "prepublish": "npm run clean && npm run build",
     "test": "jest",
     "test:watch": "jest --watch"
   },
@@ -31,21 +31,21 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/guid": "^1.0.0-beta.5",
-    "joi": "^17.7.0",
+    "@nymphjs/guid": "^1.0.0-beta.50",
+    "joi": "^17.12.2",
     "locutus": "^2.0.16",
     "lodash": "^4.17.21",
-    "n-readlines": "^1.0.1"
+    "n-readlines": "^1.0.3"
   },
   "devDependencies": {
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/jest": "^29.2.3",
-    "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.189",
-    "@types/n-readlines": "^1.0.3",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "@tsconfig/recommended": "^1.0.3",
+    "@types/jest": "^29.5.12",
+    "@types/locutus": "^0.0.8",
+    "@types/lodash": "^4.14.202",
+    "@types/n-readlines": "^1.0.6",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.3.3"
   },
-  "gitHead": "4e978f5ea940bc801ed93b5e8a7d81f86ca70c8c"
+  "gitHead": "d8fb386f19a1868565dd900e3e48fc586977a3f8"
 }

package/src/Entity.test.ts

@@ -1,5 +1,9 @@
 import { MockNymph } from './testMocks';
-import { TestBModel, TestModel, TestModelData } from './testArtifacts';
+import {
+  TestBModel as TestBModelClass,
+  TestModel as TestModelClass,
+  TestModelData,
+} from './testArtifacts';
 import { cloneDeep } from 'lodash';
 
 const nymph = new MockNymph();
@@ -9,11 +13,11 @@ jest.mock('./Nymph', () => ({
   default: nymph,
 }));
 
-nymph.addEntityClass(TestModel);
-nymph.addEntityClass(TestBModel);
+const TestModel = nymph.addEntityClass(TestModelClass);
+const TestBModel = nymph.addEntityClass(TestBModelClass);
 
 let testEntity = TestModel.factorySync();
-let entityReferenceTest: TestModel & TestModelData;
+let entityReferenceTest: TestModelClass & TestModelData;
 let entityReferenceGuid: string;
 
 describe('Entity', () => {
@@ -71,7 +75,7 @@ describe('Entity', () => {
 
   it('array searching work', async () => {
     const testInArray = await TestModel.factory(testEntity.guid as string);
-    const array: (string | (TestModel & TestModelData))[] = [
+    const array: (string | (TestModelClass & TestModelData))[] = [
       'thing',
       testInArray,
     ];
@@ -125,17 +129,20 @@ describe('Entity', () => {
   });
 
   it('conflict fails to save', async () => {
+    await new Promise((resolve) => setTimeout(resolve, 500));
+
     const testEntityCopy = await TestModel.factory(testEntity.guid as string);
     expect(await testEntityCopy.$save()).toEqual(true);
+    expect(testEntityCopy.mdate ?? 0).toBeGreaterThan(testEntity.mdate ?? 0);
 
-    await new Promise((resolve) => setTimeout(resolve, 250));
+    await new Promise((resolve) => setTimeout(resolve, 500));
 
     expect(await testEntity.$save()).toEqual(false);
 
     await testEntity.$refresh();
 
     expect(testEntityCopy.mdate ?? Infinity).toBeLessThanOrEqual(
-      testEntity.mdate ?? 0
+      testEntity.mdate ?? 0,
     );
   });
 
@@ -155,7 +162,7 @@ describe('Entity', () => {
     expect(testEntity.$hasTag('test', 'test2')).toEqual(true);
     testEntity.$addTag('test', 'test3', 'test4', 'test5', 'test6');
     expect(
-      testEntity.$hasTag('test', 'test3', 'test4', 'test5', 'test6')
+      testEntity.$hasTag('test', 'test3', 'test4', 'test5', 'test6'),
     ).toEqual(true);
     testEntity.$removeTag('test2');
     expect(testEntity.$hasTag('test2')).toEqual(false);
@@ -176,27 +183,34 @@ describe('Entity', () => {
     expect(testEntity.$hasTag('test')).toEqual(true);
   });
 
-  it('references works', async () => {
+  it('references work', async () => {
     await testEntity.$refresh();
 
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await testEntity.refObject?.entity.$wake();
     expect(testEntity.refObject?.entity.guid).toEqual(entityReferenceGuid);
 
     const entity = await TestModel.factory(testEntity.guid as string);
 
+    await entity.reference?.$wake();
     expect(entity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(entity.refArray?.map((e) => e.$wake()) || []);
     expect(entity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await entity.refObject?.entity.$wake();
     expect(entity.refObject?.entity.guid).toEqual(entityReferenceGuid);
   });
 
-  it('sleeping references wake up', () => {
+  it('sleeping references wake up', async () => {
     const entity = TestModel.factoryReference([
       'nymph_entity_reference',
       testEntity.guid as string,
       'TestModel',
-    ]) as TestModel & TestModelData;
+    ]) as TestModelClass & TestModelData;
 
+    await entity.$wake();
     expect(entity.guid).toEqual(testEntity.guid);
     expect(entity.cdate).toEqual(testEntity.cdate);
     expect(entity.mdate).toEqual(testEntity.mdate);
@@ -206,8 +220,11 @@ describe('Entity', () => {
     expect(entity.string).toEqual('test');
     expect(entity.array).toEqual(['full', 'of', 'values', 500]);
     expect(entity.number).toEqual(30);
+    await entity.reference?.$wake();
     expect(entity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(entity.refArray?.map((e) => e.$wake()) || []);
     expect(entity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await entity.refObject?.entity.$wake();
     expect(entity.refObject?.entity.guid).toEqual(entityReferenceGuid);
   });
 
@@ -281,8 +298,11 @@ describe('Entity', () => {
     expect(testEntity.string).toEqual('good');
     expect(testEntity.array).toEqual(['imanarray']);
     expect(testEntity.number).toEqual(30);
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await testEntity.refObject?.entity.$wake();
     expect(testEntity.refObject?.entity.guid).toEqual(entityReferenceGuid);
 
     expect(await testEntity.$refresh()).toEqual(true);
@@ -304,7 +324,9 @@ describe('Entity', () => {
     expect(testEntity.$hasTag('notag')).toEqual(false);
     expect(testEntity.$hasTag('test')).toEqual(true);
     expect(testEntity.$hasTag('newtag')).toEqual(true);
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
 
     expect(await testEntity.$refresh()).toEqual(true);