@mgarlik/datastore 0.1.8 → 0.1.10

package/dist/index.cjs

@@ -743,6 +743,17 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
         console.log("Stahuji data z ", buildUri({ dataSource, method: "read" }), " s parametry ", params);
         const axiosResponse = await import_axios.default.get(buildUri({ dataSource, method: "read" }), { params: serializeParams(params) });
         if (schema && !dataSource.readAllFields) {
+          const mapBySchema = (element) => {
+            const mappedRow = {};
+            Object.keys(schema).forEach((key) => {
+              const sourceKey = schema[key].source || key;
+              const value = typeof element === "object" && element !== null ? element[sourceKey] : element;
+              if (value !== void 0) {
+                mappedRow[key] = value;
+              }
+            });
+            return mappedRow;
+          };
           if (Array.isArray(axiosResponse.data.data)) {
             newData = [];
             axiosResponse.data.data.forEach((element) => {
@@ -750,14 +761,7 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
                 newData.push(element);
                 return;
               }
-              var newRow = {};
-              Object.keys(schema).forEach((key) => {
-                if (typeof element === "object") {
-                  newRow[key] = schema[key].source ? element[schema[key].source] : element[key];
-                } else {
-                  newRow[key] = element;
-                }
-              });
+              const newRow = mapBySchema(element);
               if (!newRow.id && ["payments", "deliveries"].includes(id)) {
                 if (element.id) {
                   newRow.id = id + "-" + element.id;
@@ -768,10 +772,7 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
               newData.push(newRow);
             });
           } else {
-            newData = {};
-            Object.keys(schema).forEach((key) => {
-              newData[key] = schema[key].source ? axiosResponse.data.data[schema[key].source] : axiosResponse.data.data[key];
-            });
+            newData = mapBySchema(axiosResponse.data.data);
           }
         } else {
           newData = axiosResponse.data.data;
@@ -801,6 +802,8 @@ var getData = async ({ id, dataSource, isPersisting, schema, SQLite, changeTime
         `getData - Polozky ${id} persisted: ${persistedData.length}, newData: ${newData.length},  vysledek: ${updatedArray.length}`
       );
       console.timeEnd("Maping");
+      console.log("================== NEW DATA");
+      console.log(newData);
       return updatedArray;
     } else {
       return newData || [];
@@ -1222,6 +1225,23 @@ var DataStoreProvider = (0, import_react.forwardRef)(
         actions: [...prev.actions, { action, data, callback }]
       }));
     }, []);
+    const mergeWithNullDeletion = (0, import_react.useCallback)((base, patch) => {
+      const isObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+      if (!isObject(patch)) return patch;
+      const result = isObject(base) ? { ...base } : {};
+      Object.entries(patch).forEach(([key, value]) => {
+        if (value === null) {
+          delete result[key];
+          return;
+        }
+        if (isObject(value)) {
+          result[key] = mergeWithNullDeletion(result[key], value);
+          return;
+        }
+        result[key] = value;
+      });
+      return result;
+    }, []);
     (0, import_react.useEffect)(() => {
       async function processDispatcher() {
         if (dispatcher.actions.length > 0) {
@@ -1315,7 +1335,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                   if (!newDocs[id]) {
                     systemLog("dsp", "updateDocuments - vytvarim", id);
                     data.push(id);
-                    newDocs[id] = doc;
+                    newDocs[id] = mergeWithNullDeletion(void 0, doc);
                     documentsToPersist.push({ id, data: newDocs[id] });
                   } else if (doc._deleted) {
                     systemLog("dsp", "updateDocuments - mazu", id);
@@ -1324,7 +1344,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                     delete newDocs[id];
                   } else {
                     systemLog("dsp", "updateDocuments - updatuji", id);
-                    newDocs[id] = { ...newDocs[id], ...doc };
+                    newDocs[id] = mergeWithNullDeletion(newDocs[id], doc);
                     documentsToPersist.push({ id, data: newDocs[id] });
                   }
                   break;
@@ -1352,7 +1372,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                 default:
                   if (!newDocs[key]) {
                     data.push(key);
-                    newDocs[key] = uDocuments[key];
+                    newDocs[key] = mergeWithNullDeletion(void 0, uDocuments[key]);
                     documentsToPersist.push({ id: key, data: newDocs[key] });
                     break;
                   }
@@ -1361,7 +1381,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                     documentIdsToDelete.push(key);
                     delete newDocs[key];
                   } else {
-                    newDocs[key] = { ...newDocs[key], ...uDocuments[key] };
+                    newDocs[key] = mergeWithNullDeletion(newDocs[key], uDocuments[key]);
                     documentsToPersist.push({ id: key, data: newDocs[key] });
                   }
                   break;
@@ -1386,7 +1406,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
           await Promise.all(documentIdsToDelete.map((documentId) => removePersistedDocument(documentId)));
         }
       },
-      [providers, setDocuments, setProviders, persistDocument, removePersistedDocument, persistenceStorage]
+      [providers, setDocuments, setProviders, persistDocument, removePersistedDocument, persistenceStorage, mergeWithNullDeletion]
     );
     const updateDocument = (0, import_react.useCallback)(
       async ({ documentId, model, fields, data: pData }) => {
@@ -1414,6 +1434,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
         }
         if (data) {
           console.log("[updateDocument]:", documentId, ", model:", model);
+          const documentForFilter = mergeWithNullDeletion(documents[documentId], dataWithDocumentId);
           var listeningProviders = 0;
           var isProvidersUpdated = false;
           const rand = uuid();
@@ -1430,7 +1451,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
               var socketListeners = providerNext.dataSource?.socketListeners || [];
               if (socketListeners.length === 0) {
                 if (providerNext.data.includes(documentId)) {
-                  if (!providerNext.dataSource?.filter || filterDocuments(dataWithDocumentId, providerNext.dataSource?.filter)) {
+                  if (!providerNext.dataSource?.filter || filterDocuments(documentForFilter, providerNext.dataSource?.filter)) {
                     systemLog("dsp", "[updateDocument] - zustava v Provider bez Listeners:", key);
                     listeningProviders++;
                     providerNext.lastUpdate = {
@@ -1450,7 +1471,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                 }
               } else if (socketListeners.includes(model) || // socketListeners.includes(documentId) ||
               key === model) {
-                if (!providerNext.dataSource.filter || filterDocuments(dataWithDocumentId, providerNext.dataSource.filter)) {
+                if (!providerNext.dataSource.filter || filterDocuments(documentForFilter, providerNext.dataSource.filter)) {
                   listeningProviders++;
                   providerNext.lastUpdate = {
                     id: uuid(),
@@ -1490,12 +1511,12 @@ var DataStoreProvider = (0, import_react.forwardRef)(
                   console.timeEnd("[DSP UPDATE DOCUMENTS INSIDE]");
                   return {
                     ...prev2,
-                    [documentId]: { ...prev2[documentId], ...dataWithDocumentId }
+                    [documentId]: mergeWithNullDeletion(prev2[documentId], dataWithDocumentId)
                   };
                 }
               } else if (listeningProviders > 0) {
                 console.timeEnd("[DSP UPDATE DOCUMENTS INSIDE]");
-                return { ...prev2, [documentId]: dataWithDocumentId };
+                return { ...prev2, [documentId]: mergeWithNullDeletion(void 0, dataWithDocumentId) };
               }
               console.timeEnd("[DSP UPDATE DOCUMENTS INSIDE]");
               return prev2;
@@ -1524,7 +1545,7 @@ var DataStoreProvider = (0, import_react.forwardRef)(
               await persistDocument({
                 documentId,
                 model,
-                data: { ...documents[documentId], ...dataWithDocumentId }
+                data: documentForFilter
               });
             } else {
               await removePersistedDocument(documentId);
@@ -1532,7 +1553,17 @@ var DataStoreProvider = (0, import_react.forwardRef)(
           }
         }
       },
-      [documents, providers, setDocuments, setProviders, setCounterDocuments, persistDocument, removePersistedDocument, persistenceStorage]
+      [
+        documents,
+        providers,
+        setDocuments,
+        setProviders,
+        setCounterDocuments,
+        persistDocument,
+        removePersistedDocument,
+        persistenceStorage,
+        mergeWithNullDeletion
+      ]
     );
     const updateDataStore = (0, import_react.useCallback)(
       async ({ id, documentId, params, variant, data }) => {
@@ -2115,7 +2146,13 @@ var useDataProvider = (id, params, dataFilter, settings) => {
     dispatch("deleteProviderItem", { providerId, data, params: params2 }, callback);
   };
   const createItem = (data, callback) => {
-    dispatch("createProviderItem", { id, data }, callback);
+    return new Promise((resolve, reject) => {
+      const wrappedCallback = (result) => {
+        callback?.(result);
+        resolve(result);
+      };
+      dispatch("createProviderItem", { id, data }, wrappedCallback);
+    });
   };
   const provider = (0, import_react2.useMemo)(() => {
     systemLog("usedp", "Vytvoreni dat: ", filter);
@@ -2244,7 +2281,13 @@ var useProviderActions = (providerId, data) => {
   };
   const createItem = (data2, callback) => {
     systemLog("usedp", "createItem Prov. id:", providerId);
-    dispatch("createProviderItem", { id: providerId, data: data2 }, callback);
+    return new Promise((resolve, reject) => {
+      const wrappedCallback = (result) => {
+        callback?.(result);
+        resolve(result);
+      };
+      dispatch("createProviderItem", { id: providerId, data: data2 }, wrappedCallback);
+    });
   };
   return {
     schema: providers[providerId]?.schema,