@legendapp/state 2.2.0-next.75 → 2.2.0-next.76

package/sync-plugins/supabase.js

@@ -0,0 +1,134 @@
+'use strict';
+
+var state = require('@legendapp/state');
+var crud = require('@legendapp/state/sync-plugins/crud');
+
+let channelNum = 1;
+const supabaseConfig = {};
+const isEnabled$ = state.observable(true);
+function configureSyncedSupabase(config) {
+    const { enabled, ...rest } = config;
+    if (enabled !== undefined) {
+        isEnabled$.set(enabled);
+    }
+    Object.assign(supabaseConfig, rest);
+}
+function syncedSupabase(props) {
+    state.mergeIntoObservable(props, supabaseConfig);
+    const { supabase: client, collection, filter, actions, fieldUpdatedAt, realtime, changesSince, waitFor, waitForSet, ...rest } = props;
+    const list = !actions || actions.includes('read')
+        ? async (params) => {
+            const { lastSync } = params;
+            let select = client.from(collection).select();
+            if (changesSince === 'last-sync') {
+                select = select.neq('deleted', true);
+                if (lastSync) {
+                    const date = new Date(lastSync).toISOString();
+                    select = select.or(`created_at.gt.${date}${fieldUpdatedAt ? `,${fieldUpdatedAt}.gt.${date}` : ''}`);
+                }
+            }
+            if (filter) {
+                select = filter(select, params);
+            }
+            const { data, error } = await select;
+            if (error) {
+                throw new Error(error === null || error === void 0 ? void 0 : error.message);
+            }
+            return (data || []);
+        }
+        : undefined;
+    const upsert = async (input) => {
+        const res = await client.from(collection).upsert(input).select();
+        const { data, error } = res;
+        if (data) {
+            const created = data[0];
+            return created;
+        }
+        else {
+            throw new Error(error === null || error === void 0 ? void 0 : error.message);
+        }
+    };
+    const create = !actions || actions.includes('create') ? upsert : undefined;
+    const update = !actions || actions.includes('update') ? upsert : undefined;
+    const deleteFn = !actions || actions.includes('delete')
+        ? async (input) => {
+            const id = input.id;
+            const from = client.from(collection);
+            const res = await (changesSince === 'last-sync' ? from.update({ deleted: true }) : from.delete())
+                .eq('id', id)
+                .select();
+            const { data, error } = res;
+            if (data) {
+                const created = data[0];
+                return created;
+            }
+            else {
+                throw new Error(error === null || error === void 0 ? void 0 : error.message);
+            }
+        }
+        : undefined;
+    const subscribe = realtime
+        ? ({ node, update }) => {
+            const { filter, schema } = realtime;
+            const channel = client
+                .channel(`LS_${node.key || ''}${channelNum++}`)
+                .on('postgres_changes', {
+                event: '*',
+                table: collection,
+                schema: schema || 'public',
+                filter: filter || undefined,
+            }, (payload) => {
+                var _a;
+                const { eventType, new: value, old } = payload;
+                if (eventType === 'INSERT' || eventType === 'UPDATE') {
+                    const cur = (_a = state.getNodeValue(node)) === null || _a === void 0 ? void 0 : _a[value.id];
+                    const curDateStr = cur && (cur.updated_at || cur.created_at);
+                    const valueDateStr = value.updated_at || value.created_at;
+                    const valueDate = +new Date(valueDateStr);
+                    // Check if new or newer than last seen locally
+                    if (valueDateStr && (!curDateStr || valueDate > +new Date(curDateStr))) {
+                        // Update local with the new value
+                        update({
+                            value: { [value.id]: value },
+                            lastSync: valueDate,
+                            mode: 'merge',
+                        });
+                    }
+                }
+                else if (eventType === 'DELETE') {
+                    const { id } = old;
+                    update({
+                        value: { [id]: state.symbolDelete },
+                    });
+                }
+            })
+                .subscribe();
+            return channel.unsubscribe;
+        }
+        : undefined;
+    return crud.syncedCrud({
+        ...rest,
+        list,
+        create,
+        update,
+        delete: deleteFn,
+        onSaved: (saved) => {
+            // Update the local timestamps with server response
+            return {
+                id: saved.id,
+                created_at: saved.created_at,
+                updated_at: saved.updated_at,
+            };
+        },
+        subscribe,
+        fieldCreatedAt: 'created_at',
+        fieldUpdatedAt,
+        updatePartial: true,
+        waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
+        waitForSet: () => isEnabled$.get() && (waitForSet ? state.computeSelector(waitForSet) : true),
+    });
+}
+
+exports.configureSyncedSupabase = configureSyncedSupabase;
+exports.syncedSupabase = syncedSupabase;
+//# sourceMappingURL=supabase.js.map

package/sync-plugins/supabase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase.js","sources":["../src/sync-plugins/supabase.ts"],"sourcesContent":[null],"names":["observable","mergeIntoObservable","getNodeValue","symbolDelete","syncedCrud","computeSelector"],"mappings":"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"}

package/sync-plugins/supabase.mjs

@@ -0,0 +1,131 @@
+import { observable, mergeIntoObservable, computeSelector, getNodeValue, symbolDelete } from '@legendapp/state';
+import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
+
+let channelNum = 1;
+const supabaseConfig = {};
+const isEnabled$ = observable(true);
+function configureSyncedSupabase(config) {
+    const { enabled, ...rest } = config;
+    if (enabled !== undefined) {
+        isEnabled$.set(enabled);
+    }
+    Object.assign(supabaseConfig, rest);
+}
+function syncedSupabase(props) {
+    mergeIntoObservable(props, supabaseConfig);
+    const { supabase: client, collection, filter, actions, fieldUpdatedAt, realtime, changesSince, waitFor, waitForSet, ...rest } = props;
+    const list = !actions || actions.includes('read')
+        ? async (params) => {
+            const { lastSync } = params;
+            let select = client.from(collection).select();
+            if (changesSince === 'last-sync') {
+                select = select.neq('deleted', true);
+                if (lastSync) {
+                    const date = new Date(lastSync).toISOString();
+                    select = select.or(`created_at.gt.${date}${fieldUpdatedAt ? `,${fieldUpdatedAt}.gt.${date}` : ''}`);
+                }
+            }
+            if (filter) {
+                select = filter(select, params);
+            }
+            const { data, error } = await select;
+            if (error) {
+                throw new Error(error === null || error === void 0 ? void 0 : error.message);
+            }
+            return (data || []);
+        }
+        : undefined;
+    const upsert = async (input) => {
+        const res = await client.from(collection).upsert(input).select();
+        const { data, error } = res;
+        if (data) {
+            const created = data[0];
+            return created;
+        }
+        else {
+            throw new Error(error === null || error === void 0 ? void 0 : error.message);
+        }
+    };
+    const create = !actions || actions.includes('create') ? upsert : undefined;
+    const update = !actions || actions.includes('update') ? upsert : undefined;
+    const deleteFn = !actions || actions.includes('delete')
+        ? async (input) => {
+            const id = input.id;
+            const from = client.from(collection);
+            const res = await (changesSince === 'last-sync' ? from.update({ deleted: true }) : from.delete())
+                .eq('id', id)
+                .select();
+            const { data, error } = res;
+            if (data) {
+                const created = data[0];
+                return created;
+            }
+            else {
+                throw new Error(error === null || error === void 0 ? void 0 : error.message);
+            }
+        }
+        : undefined;
+    const subscribe = realtime
+        ? ({ node, update }) => {
+            const { filter, schema } = realtime;
+            const channel = client
+                .channel(`LS_${node.key || ''}${channelNum++}`)
+                .on('postgres_changes', {
+                event: '*',
+                table: collection,
+                schema: schema || 'public',
+                filter: filter || undefined,
+            }, (payload) => {
+                var _a;
+                const { eventType, new: value, old } = payload;
+                if (eventType === 'INSERT' || eventType === 'UPDATE') {
+                    const cur = (_a = getNodeValue(node)) === null || _a === void 0 ? void 0 : _a[value.id];
+                    const curDateStr = cur && (cur.updated_at || cur.created_at);
+                    const valueDateStr = value.updated_at || value.created_at;
+                    const valueDate = +new Date(valueDateStr);
+                    // Check if new or newer than last seen locally
+                    if (valueDateStr && (!curDateStr || valueDate > +new Date(curDateStr))) {
+                        // Update local with the new value
+                        update({
+                            value: { [value.id]: value },
+                            lastSync: valueDate,
+                            mode: 'merge',
+                        });
+                    }
+                }
+                else if (eventType === 'DELETE') {
+                    const { id } = old;
+                    update({
+                        value: { [id]: symbolDelete },
+                    });
+                }
+            })
+                .subscribe();
+            return channel.unsubscribe;
+        }
+        : undefined;
+    return syncedCrud({
+        ...rest,
+        list,
+        create,
+        update,
+        delete: deleteFn,
+        onSaved: (saved) => {
+            // Update the local timestamps with server response
+            return {
+                id: saved.id,
+                created_at: saved.created_at,
+                updated_at: saved.updated_at,
+            };
+        },
+        subscribe,
+        fieldCreatedAt: 'created_at',
+        fieldUpdatedAt,
+        updatePartial: true,
+        waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
+        waitForSet: () => isEnabled$.get() && (waitForSet ? computeSelector(waitForSet) : true),
+    });
+}
+
+export { configureSyncedSupabase, syncedSupabase };
+//# sourceMappingURL=supabase.mjs.map

package/sync-plugins/supabase.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase.mjs","sources":["../src/sync-plugins/supabase.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/sync.js

@@ -675,6 +675,77 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             const get = (_b = localState.pluginSync.get) === null || _b === void 0 ? void 0 : _b.bind(localState.pluginSync);
             if (get) {
                 const runGet = () => {
+                    const onChange = async ({ value, mode, lastSync }) => {
+                        mode = mode || syncOptions.mode || 'set';
+                        if (value !== undefined) {
+                            value = transformLoadData(value, syncOptions, true);
+                            if (state.isPromise(value)) {
+                                value = await value;
+                            }
+                            const pending = localState.pendingChanges;
+                            const currentValue = obs$.peek();
+                            if (pending) {
+                                let didChangeMetadata = false;
+                                Object.keys(pending).forEach((key) => {
+                                    const p = key.split('/').filter((p) => p !== '');
+                                    const { v, t } = pending[key];
+                                    if (t.length === 0 || !value) {
+                                        if (state.isObject(value) && state.isObject(v)) {
+                                            Object.assign(value, v);
+                                        }
+                                        else {
+                                            value = v;
+                                        }
+                                    }
+                                    else if (value[p[0]] !== undefined) {
+                                        const curValue = getValueAtPath(currentValue, p);
+                                        const newValue = getValueAtPath(value, p);
+                                        if (JSON.stringify(curValue) === JSON.stringify(newValue)) {
+                                            delete pending[key];
+                                            didChangeMetadata = true;
+                                        }
+                                        else {
+                                            value = state.setAtPath(value, p, t, v, 'merge', obs$.peek(), (path, value) => {
+                                                delete pending[key];
+                                                pending[path.join('/')] = {
+                                                    p: null,
+                                                    v: value,
+                                                    t: t.slice(0, path.length),
+                                                };
+                                            });
+                                        }
+                                    }
+                                });
+                                if (didChangeMetadata) {
+                                    updateMetadata(obs$, localState, syncState, syncOptions, {
+                                        pending,
+                                    });
+                                }
+                            }
+                            onChangeRemote(() => {
+                                if (mode === 'assign' && state.isObject(value)) {
+                                    obs$.assign(value);
+                                }
+                                else if (mode === 'append' && state.isArray(value)) {
+                                    obs$.push(...value);
+                                }
+                                else if (mode === 'prepend' && state.isArray(value)) {
+                                    obs$.splice(0, 0, ...value);
+                                }
+                                else if (mode === 'merge') {
+                                    state.mergeIntoObservable(obs$, value);
+                                }
+                                else {
+                                    obs$.set(value);
+                                }
+                            });
+                        }
+                        if (lastSync && syncOptions.persist) {
+                            updateMetadata(obs$, localState, syncState, syncOptions, {
+                                lastSync,
+                            });
+                        }
+                    };
                     get({
                         state: syncState,
                         obs: obs$,
@@ -686,82 +757,23 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                             (_a = syncOptions.onGetError) === null || _a === void 0 ? void 0 : _a.call(syncOptions, error);
                         },
                         onGet: () => {
+                            const isFirstLoad = !node.state.isLoaded.peek();
                             node.state.assign({
                                 isLoaded: true,
                                 error: undefined,
                             });
-                        },
-                        onChange: async ({ value, mode, lastSync }) => {
-                            mode = mode || syncOptions.mode || 'set';
-                            if (value !== undefined) {
-                                value = transformLoadData(value, syncOptions, true);
-                                if (state.isPromise(value)) {
-                                    value = await value;
-                                }
-                                const pending = localState.pendingChanges;
-                                const currentValue = obs$.peek();
-                                if (pending) {
-                                    let didChangeMetadata = false;
-                                    Object.keys(pending).forEach((key) => {
-                                        const p = key.split('/').filter((p) => p !== '');
-                                        const { v, t } = pending[key];
-                                        if (t.length === 0 || !value) {
-                                            if (state.isObject(value) && state.isObject(v)) {
-                                                Object.assign(value, v);
-                                            }
-                                            else {
-                                                value = v;
-                                            }
-                                        }
-                                        else if (value[p[0]] !== undefined) {
-                                            const curValue = getValueAtPath(currentValue, p);
-                                            const newValue = getValueAtPath(value, p);
-                                            if (JSON.stringify(curValue) === JSON.stringify(newValue)) {
-                                                delete pending[key];
-                                                didChangeMetadata = true;
-                                            }
-                                            else {
-                                                value = state.setAtPath(value, p, t, v, 'merge', obs$.peek(), (path, value) => {
-                                                    delete pending[key];
-                                                    pending[path.join('/')] = {
-                                                        p: null,
-                                                        v: value,
-                                                        t: t.slice(0, path.length),
-                                                    };
-                                                });
-                                            }
-                                        }
-                                    });
-                                    if (didChangeMetadata) {
-                                        updateMetadata(obs$, localState, syncState, syncOptions, {
-                                            pending,
-                                        });
-                                    }
-                                }
-                                onChangeRemote(() => {
-                                    if (mode === 'assign' && state.isObject(value)) {
-                                        obs$.assign(value);
-                                    }
-                                    else if (mode === 'append' && state.isArray(value)) {
-                                        obs$.push(...value);
-                                    }
-                                    else if (mode === 'prepend' && state.isArray(value)) {
-                                        obs$.splice(0, 0, ...value);
-                                    }
-                                    else if (mode === 'merge') {
-                                        state.mergeIntoObservable(obs$, value);
-                                    }
-                                    else {
-                                        obs$.set(value);
-                                    }
-                                });
-                            }
-                            if (lastSync && syncOptions.persist) {
-                                updateMetadata(obs$, localState, syncState, syncOptions, {
-                                    lastSync,
+                            if (isFirstLoad && syncOptions.subscribe) {
+                                syncOptions.subscribe({
+                                    node,
+                                    update: (params) => {
+                                        params.mode || (params.mode = syncOptions.mode || 'merge');
+                                        onChange(params);
+                                    },
+                                    refresh: sync,
                                 });
                             }
                         },
+                        onChange,
                     });
                 };
                 runGet();
@@ -831,7 +843,7 @@ function enableActivateSyncedNode() {
         const obs$ = getProxy(node);
         if (node.activationState) {
             // If it is a Synced
-            const { get, initial, set, subscribe } = node.activationState;
+            const { get, initial, set } = node.activationState;
             let onChange = undefined;
             const pluginRemote = {};
             let promiseReturn = undefined;
@@ -906,23 +918,6 @@ function enableActivateSyncedNode() {
             setNodeValue(node, promiseReturn ? undefined : newValue);
             // @ts-expect-error TODO fix these types
             syncState = syncObservable(obs$, { ...node.activationState, ...pluginRemote });
-            if (subscribe) {
-                state.when(promiseReturn || true, () => {
-                    subscribe({
-                        node,
-                        update: (params) => {
-                            if (!onChange) {
-                                // TODO: Make this message better
-                                console.log('[legend-state] Cannot update immediately before the first return');
-                            }
-                            else {
-                                onChange(params);
-                            }
-                        },
-                        refresh,
-                    });
-                });
-            }
             return { update: onChange, value: newValue };
         }
         else {