@legendapp/state 3.0.0-alpha.24 → 3.0.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.24",
+  "version": "3.0.0-alpha.26",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/sync-plugins/crud.js

@@ -61,7 +61,7 @@ function syncedCrud(props) {
       const isObs = state.isObservable(result);
       const value = isObs ? result.peek() : result;
       if (value) {
-        result = !isObs && (result[fieldDeleted] || result.__deleted) ? state.internal.symbolDelete : result;
+        result = !isObs && (result[fieldDeleted] || result[state.symbolDelete]) ? state.internal.symbolDelete : result;
         if (asArray) {
           out.push(result);
         } else if (asMap) {
@@ -73,6 +73,16 @@ function syncedCrud(props) {
     }
     return out;
   };
+  const transformRows = (data) => {
+    return Promise.all(
+      data.map(
+        (value) => (
+          // Skip transforming any children with symbolDelete or fieldDeleted because they'll get deleted by resultsToOutType
+          value[state.symbolDelete] || fieldDeleted && value[fieldDeleted] ? value : transform.load(value, "get")
+        )
+      )
+    );
+  };
   const get = getFn || listFn ? (getParams) => {
     const { updateLastSync, lastSync, value } = getParams;
     if (listFn) {
@@ -89,7 +99,7 @@ function syncedCrud(props) {
           return resultsToOutType(transformed);
         }
       };
-      const processTransformed = (data) => {
+      const processResults = (data) => {
         data || (data = []);
         if (fieldUpdatedAt) {
           const newLastSync = computeLastSync(data, fieldUpdatedAt, fieldCreatedAt);
@@ -99,11 +109,11 @@ function syncedCrud(props) {
         }
         let transformed = data;
         if (transform == null ? void 0 : transform.load) {
-          transformed = Promise.all(data.map((value2) => transform.load(value2, "get")));
+          transformed = transformRows(data);
         }
         return state.isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
       };
-      return state.isPromise(listPromise) ? listPromise.then(processTransformed) : processTransformed(listPromise);
+      return state.isPromise(listPromise) ? listPromise.then(processResults) : processResults(listPromise);
     } else if (getFn) {
       const dataPromise = getFn(getParams);
       const processData = (data) => {
@@ -299,10 +309,7 @@ function syncedCrud(props) {
           } else if (fieldDeleted && updateFn) {
             const valueId = valuePrevious[fieldId];
             if (valueId) {
-              updateFn(
-                { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
-                params
-              );
+              updateFn({ ...{ [fieldId]: valueId }, [fieldDeleted]: true }, params);
             } else {
               console.error("[legend-state]: deleting item without an id");
             }
@@ -327,7 +334,7 @@ function syncedCrud(props) {
       if (newLastSync) {
         paramsForUpdate.lastSync = newLastSync;
       }
-      const rowsTransformed = (transform == null ? void 0 : transform.load) ? await Promise.all(rows.map((row) => transform.load(row, "get"))) : rows;
+      const rowsTransformed = (transform == null ? void 0 : transform.load) ? await transformRows(rows) : rows;
       paramsForUpdate.value = resultsToOutType(rowsTransformed);
       params.update(paramsForUpdate);
     }

package/sync-plugins/crud.mjs

@@ -59,7 +59,7 @@ function syncedCrud(props) {
       const isObs = isObservable(result);
       const value = isObs ? result.peek() : result;
       if (value) {
-        result = !isObs && (result[fieldDeleted] || result.__deleted) ? internal.symbolDelete : result;
+        result = !isObs && (result[fieldDeleted] || result[symbolDelete]) ? internal.symbolDelete : result;
         if (asArray) {
           out.push(result);
         } else if (asMap) {
@@ -71,6 +71,16 @@ function syncedCrud(props) {
     }
     return out;
   };
+  const transformRows = (data) => {
+    return Promise.all(
+      data.map(
+        (value) => (
+          // Skip transforming any children with symbolDelete or fieldDeleted because they'll get deleted by resultsToOutType
+          value[symbolDelete] || fieldDeleted && value[fieldDeleted] ? value : transform.load(value, "get")
+        )
+      )
+    );
+  };
   const get = getFn || listFn ? (getParams) => {
     const { updateLastSync, lastSync, value } = getParams;
     if (listFn) {
@@ -87,7 +97,7 @@ function syncedCrud(props) {
           return resultsToOutType(transformed);
         }
       };
-      const processTransformed = (data) => {
+      const processResults = (data) => {
         data || (data = []);
         if (fieldUpdatedAt) {
           const newLastSync = computeLastSync(data, fieldUpdatedAt, fieldCreatedAt);
@@ -97,11 +107,11 @@ function syncedCrud(props) {
         }
         let transformed = data;
         if (transform == null ? void 0 : transform.load) {
-          transformed = Promise.all(data.map((value2) => transform.load(value2, "get")));
+          transformed = transformRows(data);
         }
         return isPromise(transformed) ? transformed.then(toOut) : toOut(transformed);
       };
-      return isPromise(listPromise) ? listPromise.then(processTransformed) : processTransformed(listPromise);
+      return isPromise(listPromise) ? listPromise.then(processResults) : processResults(listPromise);
     } else if (getFn) {
       const dataPromise = getFn(getParams);
       const processData = (data) => {
@@ -297,10 +307,7 @@ function syncedCrud(props) {
           } else if (fieldDeleted && updateFn) {
             const valueId = valuePrevious[fieldId];
             if (valueId) {
-              updateFn(
-                { ...valueId ? { [fieldId]: valueId } : {}, [fieldDeleted]: true },
-                params
-              );
+              updateFn({ ...{ [fieldId]: valueId }, [fieldDeleted]: true }, params);
             } else {
               console.error("[legend-state]: deleting item without an id");
             }
@@ -325,7 +332,7 @@ function syncedCrud(props) {
       if (newLastSync) {
         paramsForUpdate.lastSync = newLastSync;
       }
-      const rowsTransformed = (transform == null ? void 0 : transform.load) ? await Promise.all(rows.map((row) => transform.load(row, "get"))) : rows;
+      const rowsTransformed = (transform == null ? void 0 : transform.load) ? await transformRows(rows) : rows;
       paramsForUpdate.value = resultsToOutType(rowsTransformed);
       params.update(paramsForUpdate);
     }

package/sync-plugins/firebase.js

@@ -248,8 +248,13 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const key = snap.key;
+        const val = snap.val();
+        if (fieldId && !val[fieldId]) {
+          val[fieldId] = key;
+        }
+        val[state.symbolDelete] = true;
         update2({
-          value: [{ [key]: state.symbolDelete }],
+          value: [val],
           mode: "assign"
         });
       };

package/sync-plugins/firebase.mjs

@@ -246,8 +246,13 @@ function syncedFirebase(props) {
         if (!didList)
           return;
         const key = snap.key;
+        const val = snap.val();
+        if (fieldId && !val[fieldId]) {
+          val[fieldId] = key;
+        }
+        val[symbolDelete] = true;
         update2({
-          value: [{ [key]: symbolDelete }],
+          value: [val],
           mode: "assign"
         });
       };

package/sync-plugins/keel.js

@@ -263,7 +263,7 @@ function syncedKeel(props) {
     onSaved,
     fieldCreatedAt,
     fieldUpdatedAt,
-    fieldDeleted: fieldDeleted || "deleted",
+    fieldDeleted,
     changesSince,
     updatePartial: true,
     subscribe,

package/sync-plugins/keel.mjs

@@ -257,7 +257,7 @@ function syncedKeel(props) {
     onSaved,
     fieldCreatedAt,
     fieldUpdatedAt,
-    fieldDeleted: fieldDeleted || "deleted",
+    fieldDeleted,
     changesSince,
     updatePartial: true,
     subscribe,

package/sync-plugins/supabase.js

@@ -59,8 +59,8 @@ function syncedSupabase(props) {
     }
     return data || [];
   } : void 0;
-  const upsert = async (input) => {
-    const res = await client.from(collection).upsert(input).select();
+  const create = !actions || actions.includes("create") ? async (input) => {
+    const res = await client.from(collection).insert(input).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
@@ -68,9 +68,17 @@ function syncedSupabase(props) {
     } else {
       throw new Error(error == null ? void 0 : error.message);
     }
-  };
-  const create = !actions || actions.includes("create") ? upsert : void 0;
-  const update = !actions || actions.includes("update") ? upsert : void 0;
+  } : void 0;
+  const update = !actions || actions.includes("update") ? async (input) => {
+    const res = await client.from(collection).update(input).eq("id", input.id).select();
+    const { data, error } = res;
+    if (data) {
+      const created = data[0];
+      return created;
+    } else {
+      throw new Error(error == null ? void 0 : error.message);
+    }
+  } : void 0;
   const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? async (input) => {
     const id = input.id;
     const res = await client.from(collection).delete().eq("id", id).select();
@@ -108,9 +116,9 @@ function syncedSupabase(props) {
             });
           }
         } else if (eventType === "DELETE") {
-          const { id } = old;
+          old[state.symbolDelete] = true;
           update2({
-            value: [{ [id]: state.symbolDelete }]
+            value: [old]
           });
         }
       }

package/sync-plugins/supabase.mjs

@@ -57,8 +57,8 @@ function syncedSupabase(props) {
     }
     return data || [];
   } : void 0;
-  const upsert = async (input) => {
-    const res = await client.from(collection).upsert(input).select();
+  const create = !actions || actions.includes("create") ? async (input) => {
+    const res = await client.from(collection).insert(input).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
@@ -66,9 +66,17 @@ function syncedSupabase(props) {
     } else {
       throw new Error(error == null ? void 0 : error.message);
     }
-  };
-  const create = !actions || actions.includes("create") ? upsert : void 0;
-  const update = !actions || actions.includes("update") ? upsert : void 0;
+  } : void 0;
+  const update = !actions || actions.includes("update") ? async (input) => {
+    const res = await client.from(collection).update(input).eq("id", input.id).select();
+    const { data, error } = res;
+    if (data) {
+      const created = data[0];
+      return created;
+    } else {
+      throw new Error(error == null ? void 0 : error.message);
+    }
+  } : void 0;
   const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? async (input) => {
     const id = input.id;
     const res = await client.from(collection).delete().eq("id", id).select();
@@ -106,9 +114,9 @@ function syncedSupabase(props) {
             });
           }
         } else if (eventType === "DELETE") {
-          const { id } = old;
+          old[symbolDelete] = true;
           update2({
-            value: [{ [id]: symbolDelete }]
+            value: [old]
           });
         }
       }