@legendapp/state 3.0.0-alpha.8 → 3.0.0-alpha.9

package/index.d.mts

@@ -96,7 +96,7 @@ type RecursiveValueOrFunction<T> = T extends Function ? T : T extends object ? (
 
 declare const symbolOpaque: unique symbol;
 declare function getPathType(value: any): TypeAtPath;
-declare function safeStringify(value: any): string;
+declare function safeStringify(value: any): any;
 declare function safeParse(value: any): any;
 declare function clone<T>(value: T): any;
 declare function isObservable(value$: any): value$ is Observable;

package/index.d.ts

@@ -96,7 +96,7 @@ type RecursiveValueOrFunction<T> = T extends Function ? T : T extends object ? (
 
 declare const symbolOpaque: unique symbol;
 declare function getPathType(value: any): TypeAtPath;
-declare function safeStringify(value: any): string;
+declare function safeStringify(value: any): any;
 declare function safeParse(value: any): any;
 declare function clone<T>(value: T): any;
 declare function isObservable(value$: any): value$ is Observable;

package/index.js

@@ -118,10 +118,10 @@ function reviver(key, value) {
   return value;
 }
 function safeStringify(value) {
-  return JSON.stringify(value, replacer);
+  return value ? JSON.stringify(value, replacer) : value;
 }
 function safeParse(value) {
-  return JSON.parse(value, reviver);
+  return value ? JSON.parse(value, reviver) : value;
 }
 function clone(value) {
   return safeParse(safeStringify(value));

package/index.mjs

@@ -116,10 +116,10 @@ function reviver(key, value) {
   return value;
 }
 function safeStringify(value) {
-  return JSON.stringify(value, replacer);
+  return value ? JSON.stringify(value, replacer) : value;
 }
 function safeParse(value) {
-  return JSON.parse(value, reviver);
+  return value ? JSON.parse(value, reviver) : value;
 }
 function clone(value) {
   return safeParse(safeStringify(value));

package/package.json

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

package/sync-plugins/crud.d.mts

@@ -30,7 +30,6 @@ interface SyncedCrudPropsBase<TRemote extends {
         id: TRemote['id'];
     }, params: SyncedSetParams<TRemote>): Promise<CrudResult<any>>;
     onSaved?(params: SyncedCrudOnSavedParams<TRemote, TLocal>): Partial<TLocal> | void;
-    onSavedUpdate?: 'createdUpdatedAt';
     fieldUpdatedAt?: string;
     fieldCreatedAt?: string;
     fieldDeleted?: string;

package/sync-plugins/crud.d.ts

@@ -30,7 +30,6 @@ interface SyncedCrudPropsBase<TRemote extends {
         id: TRemote['id'];
     }, params: SyncedSetParams<TRemote>): Promise<CrudResult<any>>;
     onSaved?(params: SyncedCrudOnSavedParams<TRemote, TLocal>): Partial<TLocal> | void;
-    onSavedUpdate?: 'createdUpdatedAt';
     fieldUpdatedAt?: string;
     fieldCreatedAt?: string;
     fieldDeleted?: string;

package/sync-plugins/crud.js

@@ -14,25 +14,6 @@ function ensureId(obj, generateId) {
   }
   return obj.id;
 }
-function onSavedCreatedUpdatedAt(mode, { saved, currentValue, isCreate, props }) {
-  const savedOut = {};
-  if (isCreate) {
-    Object.keys(saved).forEach((key) => {
-      if (state.isNullOrUndefined(currentValue[key])) {
-        savedOut[key] = saved[key];
-      }
-    });
-  } else if (mode === "createdUpdatedAt") {
-    Object.keys(saved).forEach((key) => {
-      const k = key;
-      const keyLower = key.toLowerCase();
-      if ((key === props.fieldCreatedAt || key === props.fieldUpdatedAt || keyLower.endsWith("createdat") || keyLower.endsWith("updatedat") || keyLower.endsWith("created_at") || keyLower.endsWith("updated_at")) && saved[k] instanceof Date) {
-        savedOut[k] = saved[k];
-      }
-    });
-  }
-  return savedOut;
-}
 function syncedCrud(props) {
   const {
     get: getFn,
@@ -46,7 +27,6 @@ function syncedCrud(props) {
     fieldDeleted,
     updatePartial,
     onSaved,
-    onSavedUpdate,
     mode: modeParam,
     changesSince,
     generateId,
@@ -198,7 +178,7 @@ function syncedCrud(props) {
       }
     });
     const saveResult = async (itemKey, input, data, isCreate) => {
-      if (data && (onSaved || onSavedUpdate)) {
+      if (data) {
         const saved = (transform == null ? void 0 : transform.load) ? transform.load(data, "set") : data;
         const isChild = itemKey !== "undefined" && asType !== "value";
         const currentPeeked = state.getNodeValue(node);
@@ -210,17 +190,26 @@ function syncedCrud(props) {
           isCreate,
           props
         };
-        let savedOut = void 0;
-        if (onSavedUpdate) {
-          savedOut = onSavedCreatedUpdatedAt(onSavedUpdate, dataOnSaved);
-        }
-        if (onSaved) {
-          const ret = onSaved(dataOnSaved);
-          if (ret) {
-            savedOut = ret;
-          }
-        }
+        let savedOut = saved;
         if (savedOut) {
+          savedOut = clone(savedOut);
+          Object.keys(savedOut).forEach((key) => {
+            const i = input[key];
+            const c = currentValue[key];
+            if (
+              // value is already the new value, can ignore
+              savedOut[key] === c || // user has changed local value
+              key !== "id" && i !== c
+            ) {
+              delete savedOut[key];
+            }
+          });
+          if (onSaved) {
+            const ret = onSaved(dataOnSaved);
+            if (ret) {
+              savedOut = ret;
+            }
+          }
           const createdAt = fieldCreatedAt ? savedOut[fieldCreatedAt] : void 0;
           const updatedAt = fieldUpdatedAt ? savedOut[fieldUpdatedAt] : void 0;
           const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: savedOut } : savedOut;

package/sync-plugins/crud.mjs

@@ -12,25 +12,6 @@ function ensureId(obj, generateId) {
   }
   return obj.id;
 }
-function onSavedCreatedUpdatedAt(mode, { saved, currentValue, isCreate, props }) {
-  const savedOut = {};
-  if (isCreate) {
-    Object.keys(saved).forEach((key) => {
-      if (isNullOrUndefined(currentValue[key])) {
-        savedOut[key] = saved[key];
-      }
-    });
-  } else if (mode === "createdUpdatedAt") {
-    Object.keys(saved).forEach((key) => {
-      const k = key;
-      const keyLower = key.toLowerCase();
-      if ((key === props.fieldCreatedAt || key === props.fieldUpdatedAt || keyLower.endsWith("createdat") || keyLower.endsWith("updatedat") || keyLower.endsWith("created_at") || keyLower.endsWith("updated_at")) && saved[k] instanceof Date) {
-        savedOut[k] = saved[k];
-      }
-    });
-  }
-  return savedOut;
-}
 function syncedCrud(props) {
   const {
     get: getFn,
@@ -44,7 +25,6 @@ function syncedCrud(props) {
     fieldDeleted,
     updatePartial,
     onSaved,
-    onSavedUpdate,
     mode: modeParam,
     changesSince,
     generateId,
@@ -196,7 +176,7 @@ function syncedCrud(props) {
       }
     });
     const saveResult = async (itemKey, input, data, isCreate) => {
-      if (data && (onSaved || onSavedUpdate)) {
+      if (data) {
         const saved = (transform == null ? void 0 : transform.load) ? transform.load(data, "set") : data;
         const isChild = itemKey !== "undefined" && asType !== "value";
         const currentPeeked = getNodeValue(node);
@@ -208,17 +188,26 @@ function syncedCrud(props) {
           isCreate,
           props
         };
-        let savedOut = void 0;
-        if (onSavedUpdate) {
-          savedOut = onSavedCreatedUpdatedAt(onSavedUpdate, dataOnSaved);
-        }
-        if (onSaved) {
-          const ret = onSaved(dataOnSaved);
-          if (ret) {
-            savedOut = ret;
-          }
-        }
+        let savedOut = saved;
         if (savedOut) {
+          savedOut = clone(savedOut);
+          Object.keys(savedOut).forEach((key) => {
+            const i = input[key];
+            const c = currentValue[key];
+            if (
+              // value is already the new value, can ignore
+              savedOut[key] === c || // user has changed local value
+              key !== "id" && i !== c
+            ) {
+              delete savedOut[key];
+            }
+          });
+          if (onSaved) {
+            const ret = onSaved(dataOnSaved);
+            if (ret) {
+              savedOut = ret;
+            }
+          }
           const createdAt = fieldCreatedAt ? savedOut[fieldCreatedAt] : void 0;
           const updatedAt = fieldUpdatedAt ? savedOut[fieldUpdatedAt] : void 0;
           const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: savedOut } : savedOut;

package/sync-plugins/keel.js

@@ -244,7 +244,6 @@ function syncedKeel(props) {
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
     onSaved,
-    onSavedUpdate: "createdUpdatedAt",
     fieldCreatedAt,
     fieldUpdatedAt,
     fieldDeleted: fieldDeleted || "deleted",

package/sync-plugins/keel.mjs

@@ -238,7 +238,6 @@ function syncedKeel(props) {
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
     onSaved,
-    onSavedUpdate: "createdUpdatedAt",
     fieldCreatedAt,
     fieldUpdatedAt,
     fieldDeleted: fieldDeleted || "deleted",

package/sync-plugins/supabase.js

@@ -132,7 +132,6 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
-    onSavedUpdate: "createdUpdatedAt",
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),

package/sync-plugins/supabase.mjs

@@ -130,7 +130,6 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
-    onSavedUpdate: "createdUpdatedAt",
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),

package/sync.js

@@ -525,13 +525,12 @@ async function doChangeRemote(changeInfo) {
         await state.when(waitFor);
       }
     }
-    let value = obs.peek();
+    let value = clone(obs.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
-      value = transformSave(clone(value));
+      value = transformSave(value);
     }
     onBeforeSet == null ? void 0 : onBeforeSet();
-    localState.numSavesOutstanding = (localState.numSavesOutstanding || 0) + 1;
     let savedPromise = pluginSync.set({
       value$: obs,
       syncState,
@@ -544,7 +543,6 @@ async function doChangeRemote(changeInfo) {
       savedPromise = savedPromise.catch((err) => onSetError == null ? void 0 : onSetError(err));
     }
     const saved = await savedPromise;
-    localState.numSavesOutstanding--;
     if (saved !== void 0) {
       const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
       const { changes, lastSync } = saved;
@@ -571,29 +569,16 @@ async function doChangeRemote(changeInfo) {
         if (changes && !state.isEmpty(changes)) {
           transformedChanges = transformLoadData(changes, syncOptions, false, "set");
         }
-        if (localState.numSavesOutstanding > 0) {
-          if (transformedChanges) {
-            if (!localState.pendingSaveResults) {
-              localState.pendingSaveResults = [];
-            }
-            localState.pendingSaveResults.push(transformedChanges);
-          }
-        } else {
-          let allChanges = [...localState.pendingSaveResults || [], transformedChanges].filter(
-            (v) => v !== void 0
-          );
-          if (allChanges.length > 0) {
-            if (allChanges.some((change) => state.isPromise(change))) {
-              allChanges = await Promise.all(allChanges);
-            }
-            onChangeRemote(() => state.mergeIntoObservable(obs, ...allChanges));
+        if (transformedChanges !== void 0) {
+          if (state.isPromise(transformedChanges)) {
+            transformedChanges = await transformedChanges;
           }
-          if (saveLocal) {
-            if (shouldSaveMetadata && !state.isEmpty(metadata)) {
-              updateMetadata(obs, localState, syncState, syncOptions, metadata);
-            }
+          onChangeRemote(() => state.mergeIntoObservable(obs, transformedChanges));
+        }
+        if (saveLocal) {
+          if (shouldSaveMetadata && !state.isEmpty(metadata)) {
+            updateMetadata(obs, localState, syncState, syncOptions, metadata);
           }
-          localState.pendingSaveResults = [];
         }
         onAfterSet == null ? void 0 : onAfterSet();
       }

package/sync.mjs

@@ -523,13 +523,12 @@ async function doChangeRemote(changeInfo) {
         await when(waitFor);
       }
     }
-    let value = obs.peek();
+    let value = clone(obs.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
-      value = transformSave(clone(value));
+      value = transformSave(value);
     }
     onBeforeSet == null ? void 0 : onBeforeSet();
-    localState.numSavesOutstanding = (localState.numSavesOutstanding || 0) + 1;
     let savedPromise = pluginSync.set({
       value$: obs,
       syncState,
@@ -542,7 +541,6 @@ async function doChangeRemote(changeInfo) {
       savedPromise = savedPromise.catch((err) => onSetError == null ? void 0 : onSetError(err));
     }
     const saved = await savedPromise;
-    localState.numSavesOutstanding--;
     if (saved !== void 0) {
       const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
       const { changes, lastSync } = saved;
@@ -569,29 +567,16 @@ async function doChangeRemote(changeInfo) {
         if (changes && !isEmpty(changes)) {
           transformedChanges = transformLoadData(changes, syncOptions, false, "set");
         }
-        if (localState.numSavesOutstanding > 0) {
-          if (transformedChanges) {
-            if (!localState.pendingSaveResults) {
-              localState.pendingSaveResults = [];
-            }
-            localState.pendingSaveResults.push(transformedChanges);
-          }
-        } else {
-          let allChanges = [...localState.pendingSaveResults || [], transformedChanges].filter(
-            (v) => v !== void 0
-          );
-          if (allChanges.length > 0) {
-            if (allChanges.some((change) => isPromise(change))) {
-              allChanges = await Promise.all(allChanges);
-            }
-            onChangeRemote(() => mergeIntoObservable(obs, ...allChanges));
+        if (transformedChanges !== void 0) {
+          if (isPromise(transformedChanges)) {
+            transformedChanges = await transformedChanges;
           }
-          if (saveLocal) {
-            if (shouldSaveMetadata && !isEmpty(metadata)) {
-              updateMetadata(obs, localState, syncState, syncOptions, metadata);
-            }
+          onChangeRemote(() => mergeIntoObservable(obs, transformedChanges));
+        }
+        if (saveLocal) {
+          if (shouldSaveMetadata && !isEmpty(metadata)) {
+            updateMetadata(obs, localState, syncState, syncOptions, metadata);
           }
-          localState.pendingSaveResults = [];
         }
         onAfterSet == null ? void 0 : onAfterSet();
       }