@nymphjs/nymph 1.0.0-beta.85 → 1.0.0-beta.87

package/src/driver/NymphDriver.ts

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import { difference } from 'lodash-es';
 import ReadLines from 'n-readlines';
 import strtotime from 'locutus/php/datetime/strtotime.js';
-import { guid } from '@nymphjs/guid';
 
 import type Nymph from '../Nymph.js';
 import type { Selector, Options, FormattedSelector } from '../Nymph.types.js';
@@ -609,7 +608,7 @@ export default abstract class NymphDriver {
       return true;
     }
     // Search through arrays and objects looking for the reference.
-    if (Array.isArray(value) || typeof value === 'object') {
+    if (value != null && (Array.isArray(value) || typeof value === 'object')) {
       for (const key in value) {
         if (this.entityReferenceSearch(value[key], guids)) {
           return true;
@@ -985,7 +984,7 @@ export default abstract class NymphDriver {
               if (this.putDataCounter == 100) {
                 throw new Error('Infinite loop detected in Entity loading.');
               }
-              entity.$putData(data, sdata);
+              entity.$putData(data, sdata, 'server');
               this.putDataCounter--;
               if (this.nymph.config.cache) {
                 this.pushCache(guid, cdate, mdate, tags, data, sdata);
@@ -1037,6 +1036,9 @@ export default abstract class NymphDriver {
       | ((success: boolean) => Promise<boolean>)
       | null = null,
   ) {
+    const originalGuid = entity.guid;
+    const originalCdate = entity.cdate;
+    const originalMdate = entity.mdate;
     // Get a modified date.
     let mdate = Date.now();
     if (entity.mdate != null) {
@@ -1056,56 +1058,68 @@ export default abstract class NymphDriver {
       await startTransactionCallback();
     }
     let success = false;
-    if (entity.guid == null) {
-      const cdate = mdate;
-      const newId = guid();
-      success = await saveNewEntityCallback({
-        entity,
-        guid: newId,
-        tags,
-        data,
-        sdata,
-        uniques,
-        cdate,
-        etype,
-      });
-      if (success) {
-        entity.guid = newId;
-        entity.cdate = cdate;
-        entity.mdate = mdate;
+    try {
+      if (entity.guid == null) {
+        const cdate = mdate;
+        const newId = entity.$getGuaranteedGUID();
+        success = await saveNewEntityCallback({
+          entity,
+          guid: newId,
+          tags,
+          data,
+          sdata,
+          uniques,
+          cdate,
+          etype,
+        });
+        if (success) {
+          entity.guid = newId;
+          entity.cdate = cdate;
+          entity.mdate = mdate;
+        }
+      } else {
+        // Removed any cached versions of this entity.
+        if (this.nymph.config.cache) {
+          this.cleanCache(entity.guid);
+        }
+        success = await saveExistingEntityCallback({
+          entity,
+          guid: entity.guid,
+          tags,
+          data,
+          sdata,
+          uniques,
+          mdate,
+          etype,
+        });
+        if (success) {
+          entity.mdate = mdate;
+        }
       }
-    } else {
-      // Removed any cached versions of this entity.
-      if (this.nymph.config.cache) {
-        this.cleanCache(entity.guid);
+      if (commitTransactionCallback) {
+        success = await commitTransactionCallback(success);
       }
-      success = await saveExistingEntityCallback({
-        entity,
-        guid: entity.guid,
-        tags,
-        data,
-        sdata,
-        uniques,
-        mdate,
-        etype,
-      });
-      if (success) {
-        entity.mdate = mdate;
+      // Cache the entity.
+      if (success && this.nymph.config.cache) {
+        this.pushCache(
+          entity.guid as string,
+          entity.cdate as number,
+          entity.mdate as number,
+          entity.tags,
+          data,
+          sdata,
+        );
       }
+    } catch (e: any) {
+      entity.guid = originalGuid;
+      entity.cdate = originalCdate;
+      entity.mdate = originalMdate;
+      throw e;
     }
-    if (commitTransactionCallback) {
-      success = await commitTransactionCallback(success);
-    }
-    // Cache the entity.
-    if (success && this.nymph.config.cache) {
-      this.pushCache(
-        entity.guid as string,
-        entity.cdate as number,
-        entity.mdate as number,
-        entity.tags,
-        data,
-        sdata,
-      );
+    if (!success) {
+      entity.guid = originalGuid;
+      entity.cdate = originalCdate;
+      entity.mdate = originalMdate;
     }
     return success;
   }
@@ -1140,6 +1154,7 @@ export default abstract class NymphDriver {
         entity.$putData(
           this.entityCache[guid]['data'],
           this.entityCache[guid]['sdata'],
+          'server',
         );
         return entity;
       }

package/src/driver/testArtifacts.ts

@@ -159,6 +159,35 @@ export function EntitiesTest(
     expect(testEntity.$is(resultEntity)).toEqual(false);
   });
 
+  it('guaranteed guid', async () => {
+    // Creating entity...
+    const testEntity = await TestModel.factory();
+
+    // Saving entity...
+    testEntity.name = 'Entity Test ' + new Date().toLocaleString();
+    testEntity.null = null;
+    testEntity.string = 'test';
+    testEntity.array = [];
+    testEntity.match = matchValue;
+    testEntity.number = 30;
+    testEntity.numberString = '30';
+    testEntity.timestamp = Date.now();
+
+    // Get the guaranteed GUID.
+    const testGuid = testEntity.$getGuaranteedGUID();
+
+    expect(await testEntity.$save()).toEqual(true);
+    expect(testEntity.guid).not.toBeNull();
+    expect(testEntity.guid).toEqual(testGuid);
+
+    // Retrieving entity by GUID...
+    let resultEntity = await nymph.getEntity({ class: TestModel }, testGuid);
+    expect(testEntity.$is(resultEntity)).toEqual(true);
+
+    // Delete the entity.
+    expect(await testEntity.$delete()).toEqual(true);
+  });
+
   it('transactions', async () => {
     await createTestEntities();
 

package/src/testMocks.ts

@@ -54,7 +54,7 @@ export class MockNymphDriver {
     entity.cdate = entityJson.cdate;
     entity.mdate = entityJson.mdate;
     entity.tags = entityJson.tags;
-    entity.$putData(entityJson.data, {});
+    entity.$putData(entityJson.data, {}, 'server');
 
     return entity as EntityInstanceType<T>;
   }

package/src/utils.ts

@@ -88,7 +88,12 @@ export function classNamesToEntityConstructors(
 }
 
 export function entitiesToReferences(item: any): any {
-  if (item instanceof Entity && typeof item.$toReference === 'function') {
+  if (item == null) {
+    return item;
+  } else if (
+    item instanceof Entity &&
+    typeof item.$toReference === 'function'
+  ) {
     // Convert entities to references.
     return item.$toReference();
   } else if (Array.isArray(item)) {
@@ -110,7 +115,9 @@ export function referencesToEntities(
   nymph: Nymph,
   useSkipAc = false,
 ): any {
-  if (Array.isArray(item)) {
+  if (item == null) {
+    return item;
+  } else if (Array.isArray(item)) {
     // Check if it's a reference.
     if (item[0] === 'nymph_entity_reference') {
       try {