@nymphjs/nymph 1.0.0-beta.9 → 1.0.0-beta.91

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nymphjs/nymph",
-  "version": "1.0.0-beta.9",
-  "description": "NymphJS - Nymph ORM",
-  "type": "commonjs",
+  "version": "1.0.0-beta.91",
+  "description": "Nymph.js - Nymph ORM",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
@@ -14,9 +14,9 @@
     "clean": "test -d dist && rm -r dist || true",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepare": "npm run clean && npm run build",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "prepublish": "npm run clean && npm run build",
+    "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "test:watch": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest --watch"
   },
   "publishConfig": {
     "access": "public"
@@ -31,21 +31,24 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/guid": "^1.0.0-beta.9",
-    "joi": "^17.7.0",
-    "locutus": "^2.0.16",
-    "lodash": "^4.17.21",
+    "@nymphjs/guid": "^1.0.0-beta.91",
+    "debug": "^4.4.0",
+    "joi": "^17.13.3",
+    "locutus": "^2.0.32",
+    "lodash-es": "^4.17.21",
     "n-readlines": "^1.0.3"
   },
   "devDependencies": {
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/jest": "^29.2.5",
-    "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.191",
-    "@types/n-readlines": "^1.0.3",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.4"
+    "@tsconfig/recommended": "^1.0.8",
+    "@types/debug": "^4.1.12",
+    "@types/jest": "^29.5.14",
+    "@types/locutus": "^0.0.8",
+    "@types/lodash-es": "^4.17.12",
+    "@types/n-readlines": "^1.0.6",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.2"
   },
-  "gitHead": "dd7ad255610e1028dc232c818b1af0b627847764"
+  "gitHead": "45074e1da0e7879625382a3d35134cde45793f24"
 }

package/src/Entity.test.ts

@@ -1,10 +1,13 @@
-import { MockNymph } from './testMocks';
+import { jest } from '@jest/globals';
+
+import { cloneDeep } from 'lodash-es';
+
+import { MockNymph } from './testMocks.js';
 import {
   TestBModel as TestBModelClass,
   TestModel as TestModelClass,
   TestModelData,
-} from './testArtifacts';
-import { cloneDeep } from 'lodash';
+} from './testArtifacts.js';
 
 const nymph = new MockNymph();
 
@@ -142,7 +145,7 @@ describe('Entity', () => {
     await testEntity.$refresh();
 
     expect(testEntityCopy.mdate ?? Infinity).toBeLessThanOrEqual(
-      testEntity.mdate ?? 0
+      testEntity.mdate ?? 0,
     );
   });
 
@@ -156,13 +159,25 @@ describe('Entity', () => {
     ]);
   });
 
+  it('toReference works even on an unsaved entity', () => {
+    const unsavedEntity = TestModel.factorySync();
+    const reference = unsavedEntity.$toReference();
+
+    expect(unsavedEntity.guid).toBeNull();
+    expect(reference).toEqual([
+      'nymph_entity_reference',
+      unsavedEntity.$getGuaranteedGUID(),
+      'TestModel',
+    ]);
+  });
+
   it('tags work', async () => {
     expect(testEntity.$hasTag('test')).toEqual(true);
     testEntity.$addTag('test', 'test2');
     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);
@@ -183,27 +198,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 TestModelClass & TestModelData;
 
+    await entity.$wake();
     expect(entity.guid).toEqual(testEntity.guid);
     expect(entity.cdate).toEqual(testEntity.cdate);
     expect(entity.mdate).toEqual(testEntity.mdate);
@@ -213,8 +235,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);
   });
 
@@ -239,6 +264,7 @@ describe('Entity', () => {
         array: ['full', 'of', 'values', 500],
         string: 'test',
         null: null,
+        uniques: [],
       },
       class: 'TestModel',
     });
@@ -288,8 +314,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);
@@ -311,7 +340,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);
@@ -403,4 +434,18 @@ describe('Entity', () => {
 
     expect(thrown).toEqual(true);
   });
+
+  it('JSON with new entities works', async () => {
+    testEntity.reference = await TestModel.factory();
+
+    // Test that an old JSON payload causes a conflict.
+    const json = JSON.stringify(testEntity);
+    const data = JSON.parse(json);
+
+    console.log(data.data.reference);
+
+    testEntity.$jsonAcceptData(data);
+
+    expect(testEntity.reference.guid).toBeNull();
+  });
 });