@nymphjs/nymph 1.0.0-beta.125 → 1.0.0-beta.126

package/src/driver/NymphDriver.ts

@@ -20,7 +20,13 @@ import {
   InvalidParametersError,
   UnableToConnectError,
 } from '../errors/index.js';
-import { xor } from '../utils.js';
+import {
+  classNamesToEntityConstructors,
+  entitiesToReferences,
+  entityConstructorsToClassNames,
+  referencesToEntities,
+  xor,
+} from '../utils.js';
 
 // from: https://stackoverflow.com/a/6969486/664915
 function escapeRegExp(string: string): string {
@@ -1340,7 +1346,20 @@ export default abstract class NymphDriver {
               entity.cdate = cdate;
               entity.mdate = mdate;
               entity.tags = tags;
-              entity.$putData(data, sdata, 'server');
+              entity.$putData(
+                classNamesToEntityConstructors(
+                  this.nymph,
+                  referencesToEntities(
+                    data,
+                    this.nymph,
+                    !!options.skipAc,
+                    false,
+                  ),
+                  false,
+                ),
+                sdata,
+                'server',
+              );
               return {
                 result: Promise.resolve(null),
                 process: () => [entity],
@@ -1458,11 +1477,29 @@ export default abstract class NymphDriver {
                   cdate,
                   mdate,
                   tags,
-                  ...data,
+                  ...classNamesToEntityConstructors(
+                    this.nymph,
+                    referencesToEntities(
+                      data,
+                      this.nymph,
+                      !!options.skipAc,
+                      false,
+                    ),
+                    false,
+                  ),
                   ...Object.fromEntries(
                     Object.entries(sdata).map(([name, value]) => [
                       name,
-                      JSON.parse(value),
+                      classNamesToEntityConstructors(
+                        this.nymph,
+                        referencesToEntities(
+                          JSON.parse(value),
+                          this.nymph,
+                          !!options.skipAc,
+                          false,
+                        ),
+                        false,
+                      ),
                     ]),
                   ),
                 } as EntityObjectType<T>);
@@ -1481,7 +1518,20 @@ export default abstract class NymphDriver {
                 if (this.putDataCounter == 100) {
                   throw new Error('Infinite loop detected in Entity loading.');
                 }
-                entity.$putData(data, sdata, 'server');
+                entity.$putData(
+                  classNamesToEntityConstructors(
+                    this.nymph,
+                    referencesToEntities(
+                      data,
+                      this.nymph,
+                      !!options.skipAc,
+                      false,
+                    ),
+                    false,
+                  ),
+                  sdata,
+                  'server',
+                );
                 this.putDataCounter--;
                 entities.push(entity);
               }
@@ -1549,7 +1599,11 @@ export default abstract class NymphDriver {
       }
     }
     const tags = difference(entity.tags, ['']);
-    const data = entity.$getData();
+    const data = entityConstructorsToClassNames(
+      // Explicitly save references to entities that aren't saved yet to help
+      // save circular references by saving with a guaranteed GUID.
+      entitiesToReferences(entity.$getData(), false),
+    );
     const sdata = entity.$getSData();
     const uniques = await entity.$getUniques();
     const EntityClass = entity.constructor as EntityConstructor;

package/src/driver/testArtifacts.ts

@@ -15,6 +15,10 @@ import {
   TestModelData,
   TestEmptyModel as TestEmptyModelClass,
 } from '../testArtifacts.js';
+import {
+  entitiesToReferences,
+  entityConstructorsToClassNames,
+} from '../utils.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -2706,7 +2710,9 @@ export function ExportImportTest(
       expect(model).not.toBeNull();
 
       if (model != null) {
-        const data = model.$getData(true);
+        const data = entityConstructorsToClassNames(
+          entitiesToReferences(model.$getData(true), true),
+        );
         // These should not actually be saved in the DB.
         data.number = 424242424242;
         // But this should become searchable.

package/src/testMocks.ts

@@ -10,6 +10,12 @@ import type {
 import { Options, Selector } from './Nymph.types.js';
 import { ClassNotAvailableError, EntityConflictError } from './errors/index.js';
 import Entity from './Entity.js';
+import {
+  classNamesToEntityConstructors,
+  entitiesToReferences,
+  entityConstructorsToClassNames,
+  referencesToEntities,
+} from './utils.js';
 
 const entities: { [k: string]: EntityJson } = {};
 
@@ -62,7 +68,20 @@ export class MockNymphDriver {
     entity.cdate = entityJson.cdate;
     entity.mdate = entityJson.mdate;
     entity.tags = entityJson.tags;
-    entity.$putData(entityJson.data, {}, 'server');
+    entity.$putData(
+      classNamesToEntityConstructors(
+        this.nymph as unknown as Nymph,
+        referencesToEntities(
+          entityJson.data,
+          this.nymph as unknown as Nymph,
+          !!options.skipAc,
+          false,
+        ),
+        false,
+      ),
+      {},
+      'server',
+    );
 
     return entity as EntityInstanceType<T>;
   }
@@ -174,7 +193,13 @@ export class MockNymph {
       cdate: entity.cdate,
       mdate: entity.mdate,
       tags: [...entity.tags],
-      data: JSON.parse(JSON.stringify(entity.$getData(true))),
+      data: JSON.parse(
+        JSON.stringify(
+          entityConstructorsToClassNames(
+            entitiesToReferences(entity.$getData(true), true),
+          ),
+        ),
+      ),
     };
 
     entities[entity.guid] = entityJson;