@legendapp/state 3.0.0-alpha.25 → 3.0.0-alpha.27

package/index.js

@@ -1908,14 +1908,15 @@ function activateNodeFunction(node, lazyFn) {
       }
       let value = activateFn();
       let didSetToObs = false;
-      if (isObservable(value)) {
-        didSetToObs = true;
+      const isObs = isObservable(value);
+      if (isObs || node.linkedToNode) {
+        didSetToObs = isObs;
         value = setToObservable(node, value);
       }
       if (isFunction(value) && value.length === 0) {
         value = value();
       }
-      const activated = !isObservable(value) ? value == null ? void 0 : value[symbolLinked] : void 0;
+      const activated = !isObs ? value == null ? void 0 : value[symbolLinked] : void 0;
       if (activated) {
         node.activationState = activated;
         value = void 0;
@@ -2081,23 +2082,25 @@ function activateNodeBase(node, value) {
 }
 function setToObservable(node, value) {
   var _a;
-  const linkedNode = getNode(value);
+  const linkedNode = value ? getNode(value) : void 0;
   if (linkedNode !== node && (linkedNode == null ? void 0 : linkedNode.linkedToNode) !== node) {
     node.linkedToNode = linkedNode;
-    linkedNode.linkedFromNodes || (linkedNode.linkedFromNodes = /* @__PURE__ */ new Set());
-    linkedNode.linkedFromNodes.add(node);
     (_a = node.linkedToNodeDispose) == null ? void 0 : _a.call(node);
-    node.linkedToNodeDispose = onChange(
-      linkedNode,
-      () => {
-        value = peekInternal(linkedNode);
-        if (!isFunction(value)) {
-          set(node, value);
-        }
-      },
-      { initial: true },
-      /* @__PURE__ */ new Set([node])
-    );
+    if (linkedNode) {
+      linkedNode.linkedFromNodes || (linkedNode.linkedFromNodes = /* @__PURE__ */ new Set());
+      linkedNode.linkedFromNodes.add(node);
+      node.linkedToNodeDispose = onChange(
+        linkedNode,
+        () => {
+          value = peekInternal(linkedNode);
+          if (!isFunction(value)) {
+            set(node, value);
+          }
+        },
+        { initial: true },
+        /* @__PURE__ */ new Set([node])
+      );
+    }
   }
   return value;
 }

package/index.mjs

@@ -1906,14 +1906,15 @@ function activateNodeFunction(node, lazyFn) {
       }
       let value = activateFn();
       let didSetToObs = false;
-      if (isObservable(value)) {
-        didSetToObs = true;
+      const isObs = isObservable(value);
+      if (isObs || node.linkedToNode) {
+        didSetToObs = isObs;
         value = setToObservable(node, value);
       }
       if (isFunction(value) && value.length === 0) {
         value = value();
       }
-      const activated = !isObservable(value) ? value == null ? void 0 : value[symbolLinked] : void 0;
+      const activated = !isObs ? value == null ? void 0 : value[symbolLinked] : void 0;
       if (activated) {
         node.activationState = activated;
         value = void 0;
@@ -2079,23 +2080,25 @@ function activateNodeBase(node, value) {
 }
 function setToObservable(node, value) {
   var _a;
-  const linkedNode = getNode(value);
+  const linkedNode = value ? getNode(value) : void 0;
   if (linkedNode !== node && (linkedNode == null ? void 0 : linkedNode.linkedToNode) !== node) {
     node.linkedToNode = linkedNode;
-    linkedNode.linkedFromNodes || (linkedNode.linkedFromNodes = /* @__PURE__ */ new Set());
-    linkedNode.linkedFromNodes.add(node);
     (_a = node.linkedToNodeDispose) == null ? void 0 : _a.call(node);
-    node.linkedToNodeDispose = onChange(
-      linkedNode,
-      () => {
-        value = peekInternal(linkedNode);
-        if (!isFunction(value)) {
-          set(node, value);
-        }
-      },
-      { initial: true },
-      /* @__PURE__ */ new Set([node])
-    );
+    if (linkedNode) {
+      linkedNode.linkedFromNodes || (linkedNode.linkedFromNodes = /* @__PURE__ */ new Set());
+      linkedNode.linkedFromNodes.add(node);
+      node.linkedToNodeDispose = onChange(
+        linkedNode,
+        () => {
+          value = peekInternal(linkedNode);
+          if (!isFunction(value)) {
+            set(node, value);
+          }
+        },
+        { initial: true },
+        /* @__PURE__ */ new Set([node])
+      );
+    }
   }
   return value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.27",
   "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.d.mts

@@ -4,10 +4,14 @@ import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudProp
 import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
 import { SupabaseClient } from '@supabase/supabase-js';
 
+type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
+type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
-type SupabaseTableOf<Client extends SupabaseClient> = SupabaseSchemaOf<Client>['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient> = keyof SupabaseTableOf<Client>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>> = SupabaseTableOf<Client>[Collection]['Row'];
+type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -20,10 +24,11 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
     supabase: Client;
     collection: Collection;
-    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    schema?: SchemaName;
+    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
@@ -34,6 +39,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client> & string, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.d.ts

@@ -4,10 +4,14 @@ import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudProp
 import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
 import { SupabaseClient } from '@supabase/supabase-js';
 
+type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
+type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
-type SupabaseTableOf<Client extends SupabaseClient> = SupabaseSchemaOf<Client>['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient> = keyof SupabaseTableOf<Client>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>> = SupabaseTableOf<Client>[Collection]['Row'];
+type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -20,10 +24,11 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
     supabase: Client;
     collection: Collection;
-    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    schema?: SchemaName;
+    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
@@ -34,6 +39,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client> & string, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.js

@@ -24,6 +24,7 @@ function syncedSupabase(props) {
     supabase: client,
     collection,
     select: selectFn,
+    schema,
     filter,
     actions,
     fieldCreatedAt: fieldCreatedAtParam,
@@ -44,7 +45,8 @@ function syncedSupabase(props) {
   const fieldDeleted = fieldDeletedParam || (changesSince === "last-sync" ? "deleted" : void 0);
   const list = !actions || actions.includes("read") ? async (params) => {
     const { lastSync } = params;
-    const from = client.from(collection);
+    const clientSchema = schema ? client.schema(schema) : client;
+    const from = clientSchema.from(collection);
     let select = selectFn ? selectFn(from) : from.select();
     if (changesSince === "last-sync" && lastSync) {
       const date = new Date(lastSync).toISOString();
@@ -91,13 +93,13 @@ function syncedSupabase(props) {
     }
   } : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {
-    const { filter: filter2, schema } = state.isObject(realtime) ? realtime : {};
+    const { filter: filter2, schema: schema2 } = state.isObject(realtime) ? realtime : {};
     const channel = client.channel(`LS_${node.key || ""}${channelNum++}`).on(
       "postgres_changes",
       {
         event: "*",
         table: collection,
-        schema: schema || "public",
+        schema: schema2 || "public",
         filter: filter2 || void 0
       },
       (payload) => {
@@ -116,9 +118,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

@@ -22,6 +22,7 @@ function syncedSupabase(props) {
     supabase: client,
     collection,
     select: selectFn,
+    schema,
     filter,
     actions,
     fieldCreatedAt: fieldCreatedAtParam,
@@ -42,7 +43,8 @@ function syncedSupabase(props) {
   const fieldDeleted = fieldDeletedParam || (changesSince === "last-sync" ? "deleted" : void 0);
   const list = !actions || actions.includes("read") ? async (params) => {
     const { lastSync } = params;
-    const from = client.from(collection);
+    const clientSchema = schema ? client.schema(schema) : client;
+    const from = clientSchema.from(collection);
     let select = selectFn ? selectFn(from) : from.select();
     if (changesSince === "last-sync" && lastSync) {
       const date = new Date(lastSync).toISOString();
@@ -89,13 +91,13 @@ function syncedSupabase(props) {
     }
   } : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {
-    const { filter: filter2, schema } = isObject(realtime) ? realtime : {};
+    const { filter: filter2, schema: schema2 } = isObject(realtime) ? realtime : {};
     const channel = client.channel(`LS_${node.key || ""}${channelNum++}`).on(
       "postgres_changes",
       {
         event: "*",
         table: collection,
-        schema: schema || "public",
+        schema: schema2 || "public",
         filter: filter2 || void 0
       },
       (payload) => {
@@ -114,9 +116,9 @@ function syncedSupabase(props) {
             });
           }
         } else if (eventType === "DELETE") {
-          const { id } = old;
+          old[symbolDelete] = true;
           update2({
-            value: [{ [id]: symbolDelete }]
+            value: [old]
           });
         }
       }

package/sync.js

@@ -241,12 +241,11 @@ function mergeChanges(changes) {
 function mergeQueuedChanges(allChanges) {
   const changesByOptionsRemote = /* @__PURE__ */ new Map();
   const changesByOptionsLocal = /* @__PURE__ */ new Map();
-  const previousByOptions = /* @__PURE__ */ new Map();
   const outRemote = /* @__PURE__ */ new Map();
   const outLocal = /* @__PURE__ */ new Map();
   for (let i = 0; i < allChanges.length; i++) {
     const value = allChanges[i];
-    const { changes, inRemoteChange, getPrevious, syncOptions } = value;
+    const { changes, inRemoteChange, syncOptions } = value;
     const targetMap = inRemoteChange ? outRemote : outLocal;
     const changesMap = inRemoteChange ? changesByOptionsRemote : changesByOptionsLocal;
     const existing = changesMap.get(syncOptions);
@@ -254,9 +253,6 @@ function mergeQueuedChanges(allChanges) {
     const merged = mergeChanges(newChanges);
     changesMap.set(syncOptions, merged);
     value.changes = merged;
-    if (!previousByOptions.has(syncOptions)) {
-      previousByOptions.set(syncOptions, getPrevious());
-    }
     targetMap.set(syncOptions, value);
   }
   return Array.from(outRemote.values()).concat(Array.from(outLocal.values()));

package/sync.mjs

@@ -239,12 +239,11 @@ function mergeChanges(changes) {
 function mergeQueuedChanges(allChanges) {
   const changesByOptionsRemote = /* @__PURE__ */ new Map();
   const changesByOptionsLocal = /* @__PURE__ */ new Map();
-  const previousByOptions = /* @__PURE__ */ new Map();
   const outRemote = /* @__PURE__ */ new Map();
   const outLocal = /* @__PURE__ */ new Map();
   for (let i = 0; i < allChanges.length; i++) {
     const value = allChanges[i];
-    const { changes, inRemoteChange, getPrevious, syncOptions } = value;
+    const { changes, inRemoteChange, syncOptions } = value;
     const targetMap = inRemoteChange ? outRemote : outLocal;
     const changesMap = inRemoteChange ? changesByOptionsRemote : changesByOptionsLocal;
     const existing = changesMap.get(syncOptions);
@@ -252,9 +251,6 @@ function mergeQueuedChanges(allChanges) {
     const merged = mergeChanges(newChanges);
     changesMap.set(syncOptions, merged);
     value.changes = merged;
-    if (!previousByOptions.has(syncOptions)) {
-      previousByOptions.set(syncOptions, getPrevious());
-    }
     targetMap.set(syncOptions, value);
   }
   return Array.from(outRemote.values()).concat(Array.from(outLocal.values()));