Format

Author: atk

packages/db-store/dev/index.tsx

@@ -3,12 +3,12 @@ import { createDbStore, supabaseAdapter, DbRow, DbStoreError } from "../src/inde
 import { AuthResponse, createClient, Session, SupabaseClient } from "@supabase/supabase-js";
 import { reconcile } from "solid-js/store";
 
-const TodoList = (props: { client: SupabaseClient, logout: () => void }) => {
+const TodoList = (props: { client: SupabaseClient; logout: () => void }) => {
   const [error, setError] = createSignal<DbStoreError<DbRow>>();
   (globalThis as any).supabaseClient = props.client;
   const [todos, setTodos] = createDbStore({
     adapter: supabaseAdapter({ client: props.client, table: "todos" }),
-    defaultFields: ['id', 'user_id'],
+    defaultFields: ["id", "user_id"],
     onError: setError,
   });
   const [edit, setEdit] = createSignal<DbRow>();
@@ -79,39 +79,37 @@ const TodoList = (props: { client: SupabaseClient, logout: () => void }) => {
 
 const App: Component = () => {
   // these are public keys that will end up in the client in any case:
-  const client = 
-    createClient(
-      import.meta.env.VITE_SUPABASE_URL,
-      import.meta.env.VITE_SUPABASE_KEY  
-    );
+  const client = createClient(import.meta.env.VITE_SUPABASE_URL, import.meta.env.VITE_SUPABASE_KEY);
   const [session, setSession] = createSignal<Session>();
-  const [error, setError] = createSignal('');
+  const [error, setError] = createSignal("");
   const handleAuthPromise = ({ error, data }: AuthResponse) => {
     if (error) {
-      setError(error.toString())
+      setError(error.toString());
     } else {
       setSession(data.session ?? undefined);
     }
   };
   onMount(() => client.auth.refreshSession().then(handleAuthPromise));
   const login = () => {
     const email = (document.querySelector('[type="email"]') as HTMLInputElement | null)?.value;
-    const password = (document.querySelector('[type="password"]') as HTMLInputElement | null)?.value;
+    const password = (document.querySelector('[type="password"]') as HTMLInputElement | null)
+      ?.value;
     if (!email || !password) {
-      setError('please provide an email and password');
+      setError("please provide an email and password");
       return;
     }
     client.auth.signInWithPassword({ email, password }).then(handleAuthPromise);
   };
   const register = () => {
     const email = (document.querySelector('[type="email"]') as HTMLInputElement | null)?.value;
-    const password = (document.querySelector('[type="password"]') as HTMLInputElement | null)?.value;
+    const password = (document.querySelector('[type="password"]') as HTMLInputElement | null)
+      ?.value;
     if (!email || !password) {
-      setError('please provide an email and password');
+      setError("please provide an email and password");
       return;
     }
     client.auth.signUp({ email, password }).then(handleAuthPromise);
-  }
+  };
 
   return (
     <div class="box-border flex min-h-screen w-full flex-col items-center justify-center space-y-4 bg-gray-800 p-24 text-white">
@@ -121,25 +119,34 @@ const App: Component = () => {
           when={session()}
           fallback={
             <>
-              <Show when={error()}><p>{error()}</p></Show>
+              <Show when={error()}>
+                <p>{error()}</p>
+              </Show>
               <p>
                 <label>
-                  Email <input type="email" onInput={() => setError('')} />
+                  Email <input type="email" onInput={() => setError("")} />
                 </label>
               </p>
               <p>
                 <label>
                   Password <input type="password" />
                 </label>
               </p>
-              <button class="btn" onClick={login}>sign in</button>
-              <button class="btn" onClick={register}>sign up</button>
+              <button class="btn" onClick={login}>
+                sign in
+              </button>
+              <button class="btn" onClick={register}>
+                sign up
+              </button>
             </>
           }
         >
           <TodoList
             client={client}
-            logout={() => { setSession(undefined); client.auth.signOut(); }}
+            logout={() => {
+              setSession(undefined);
+              client.auth.signOut();
+            }}
           />
         </Show>
       </div>

packages/db-store/src/index.ts

@@ -69,7 +69,9 @@ const supabaseHandleError =
         )
       : Promise.resolve();
 
-export const supabaseAdapter = <Row extends DbRow>(opts: DbAdapterOptions<Row, { schema?: string }>): DbAdapter<Row> => {
+export const supabaseAdapter = <Row extends DbRow>(
+  opts: DbAdapterOptions<Row, { schema?: string }>,
+): DbAdapter<Row> => {
   const [insertSignal, setInsertSignal] = createSignal<DbAdapterUpdate<Row>>();
   const [updateSignal, setUpdateSignal] = createSignal<DbAdapterUpdate<Row>>();
   const [deleteSignal, setDeleteSignal] = createSignal<DbAdapterUpdate<Row>>();
@@ -119,7 +121,7 @@ export const supabaseAdapter = <Row extends DbRow>(opts: DbAdapterOptions<Row, {
 export type DbStoreOptions<Row extends DbRow> = {
   adapter: DbAdapter<Row>;
   init?: Row[];
-  defaultFields?: readonly string[]; 
+  defaultFields?: readonly string[];
   equals?: (a: unknown, b: unknown) => boolean;
   onError?: (err: DbStoreError<Row>) => void;
 };
@@ -131,7 +133,7 @@ export const createDbStore = <Row extends DbRow>(
   const [dbStore, setDbStore] = createStore<Row[]>(opts.init || []);
   const [dbInit, { refetch }] = createResource(opts.adapter.init);
   const equals = opts.equals || ((a, b) => a === b);
-  const defaultFields = opts.defaultFields || ['id'];
+  const defaultFields = opts.defaultFields || ["id"];
   const onError = (error: DbStoreError<Row>) => {
     if (typeof opts.onError === "function") {
       opts.onError(error);
@@ -152,11 +154,17 @@ export const createDbStore = <Row extends DbRow>(
     on(opts.adapter.insertSignal, inserted => {
       if (!inserted?.new?.id) return;
       for (const row of insertions.values()) {
-        if (Object.entries(inserted.new).some(([key, value]) => !defaultFields.includes(key) && row[key] !== value))
+        if (
+          Object.entries(inserted.new).some(
+            ([key, value]) => !defaultFields.includes(key) && row[key] !== value,
+          )
+        )
           continue;
         const index = untrack(() =>
           dbStore.findIndex(cand =>
-            Object.entries(cand).every(([key, value]) => defaultFields.includes(key) || row[key] == value),
+            Object.entries(cand).every(
+              ([key, value]) => defaultFields.includes(key) || row[key] == value,
+            ),
           ),
         );
         if (index !== -1) {