@acodeninja/persist 3.0.0-next.19 → 3.0.0-next.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acodeninja/persist",
-  "version": "3.0.0-next.19",
+  "version": "3.0.0-next.20",
   "description": "A JSON based data modelling and persistence module with alternate storage mechanisms.",
   "type": "module",
   "scripts": {

package/src/Connection.js

@@ -185,13 +185,13 @@ export default class Connection {
             modelToProcess.validate();
             const currentModel = await this.get(modelToProcess.id).catch(() => null);
 
-            const modelToProcessHasChanged = JSON.stringify(currentModel?.toData() || {}) !== JSON.stringify(modelToProcess.toData());
+            const modelToProcessHasChanged = !_.isEqual(currentModel?.toData() || {}, modelToProcess.toData());
 
             if (modelToProcessHasChanged) modelsToPut.push(modelToProcess);
 
             if (
                 Boolean(modelToProcess.constructor.indexedProperties().length) &&
-                (!currentModel || JSON.stringify(currentModel.toIndexData()) !== JSON.stringify(modelToProcess.toIndexData()))
+                (!currentModel || !_.isEqual(currentModel.toIndexData(), modelToProcess.toIndexData()))
             ) {
                 const modelToProcessConstructor = this.#getModelConstructorFromId(modelToProcess.id);
                 modelsToReindex[modelToProcessConstructor] = modelsToReindex[modelToProcessConstructor] || [];
@@ -200,7 +200,7 @@ export default class Connection {
 
             if (
                 Boolean(modelToProcess.constructor.searchProperties().length) &&
-                (!currentModel || JSON.stringify(currentModel.toSearchData()) !== JSON.stringify(modelToProcess.toSearchData()))
+                (!currentModel || !_.isEqual(currentModel.toSearchData(), modelToProcess.toSearchData()))
             ) {
                 const modelToProcessConstructor = this.#getModelConstructorFromId(modelToProcess.id);
                 modelsToReindexSearch[modelToProcessConstructor] = modelsToReindexSearch[modelToProcessConstructor] || [];
@@ -343,15 +343,15 @@ export default class Connection {
         await Promise.all([
             Promise.all(Object.entries(indexActions).map(async ([constructorName, actions]) => {
                 const modelConstructor = this.#models[constructorName];
-                indexCache[modelConstructor] = indexCache[modelConstructor] ?? await this.#storage.getIndex(modelConstructor);
+                indexCache[constructorName] = indexCache[constructorName] ?? await this.#storage.getIndex(modelConstructor);
 
                 actions.forEach(([action, actionModel]) => {
                     if (action === 'delete') {
-                        indexCache[modelConstructor] = _.omit(indexCache[modelConstructor], [actionModel.id]);
+                        indexCache[constructorName] = _.omit(indexCache[constructorName], [actionModel.id]);
                     }
                     if (action === 'reindex') {
-                        indexCache[modelConstructor] = {
-                            ...indexCache[modelConstructor],
+                        indexCache[constructorName] = {
+                            ...indexCache[constructorName],
                             [actionModel.id]: actionModel.toIndexData(),
                         };
                     }
@@ -359,15 +359,15 @@ export default class Connection {
             })),
             Promise.all(Object.entries(searchIndexActions).map(async ([constructorName, actions]) => {
                 const modelConstructor = this.#models[constructorName];
-                searchIndexCache[modelConstructor] = searchIndexCache[modelConstructor] ?? await this.#storage.getSearchIndex(modelConstructor);
+                searchIndexCache[constructorName] = searchIndexCache[constructorName] ?? await this.#storage.getSearchIndex(modelConstructor);
 
                 actions.forEach(([action, actionModel]) => {
                     if (action === 'delete') {
-                        searchIndexCache[modelConstructor] = _.omit(searchIndexCache[modelConstructor], [actionModel.id]);
+                        searchIndexCache[constructorName] = _.omit(searchIndexCache[constructorName], [actionModel.id]);
                     }
                     if (action === 'reindex') {
-                        searchIndexCache[modelConstructor] = {
-                            ...searchIndexCache[modelConstructor],
+                        searchIndexCache[constructorName] = {
+                            ...searchIndexCache[constructorName],
                             [actionModel.id]: actionModel.toSearchData(),
                         };
                     }
@@ -377,7 +377,7 @@ export default class Connection {
 
         await Promise.all([
             Promise.all(modelsToDelete.map(m => this.#storage.deleteModel(m))),
-            Promise.all(modelsToPut.map(m => this.#storage.putModel(m))),
+            Promise.all(modelsToPut.map(m => this.#storage.putModel(m.toData()))),
             Promise.all(
                 Object.entries(indexCache)
                     .map(([constructorName, index]) => this.#storage.putIndex(this.#models[constructorName], index)),