feat: upgrade drizzle-zero

.env.example

@@ -12,3 +12,9 @@ ZERO_GET_QUERIES_FORWARD_COOKIES="true"
 
 ZERO_MUTATE_URL="http://localhost:3000/api/zero/mutate"
 ZERO_MUTATE_FORWARD_COOKIES="true"
+
+PLAID_CLIENT_ID=
+PLAID_SECRET=
+PLAID_ENV=sandbox
+
+EXPO_PUBLIC_TAILSCALE_MACHINE=laptop

.gitignore

@@ -31,7 +31,8 @@ yarn-error.*
 *.pem
 
 # local env files
-.env
+.env*
+!.env.example
 
 # typescript
 *.tsbuildinfo
@@ -45,4 +46,3 @@ app-example
 .direnv/
 .db/
 .logs
-.env

README.md

@@ -1,50 +1,20 @@
-# Welcome to your Expo app 👋
+# Money
 
-This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).
+Personal finance application by [Max Koon](https://max.koon.us). Writen with Typescript, Expo/React Native, Zero Sync Engine, Better Auth, and Drizzle.
 
-## Get started
+## Development
 
-1. Install dependencies
-
-   ```bash
-   npm install
-   ```
-
-2. Start the app
-
-   ```bash
-   npx expo start
-   ```
-
-In the output, you'll find options to open the app in a
-
-- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
-- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
-- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
-- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo
-
-You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).
-
-## Get a fresh project
-
-When you're ready, run:
-
-```bash
-npm run reset-project
+```sh
+git clone https://git.koon.us/max/money.git
+direnv allow
+cp .env.example .env.dev
+ln -s .env.dev .env
+vim .env.dev # Update with Plaid credentials
+pnpm install
+pnpm dev
 ```
 
-This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.
+## Deployment
 
-## Learn more
+An example deployment of this application can be found [here](https://git.koon.us/max/os/src/branch/main/host/ark/service/money.nix).
 
-To learn more about developing your project with Expo, look at the following resources:
-
-- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
-- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.
-
-## Join the community
-
-Join our community of developers creating universal apps.
-
-- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
-- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.

api/package.json

@@ -11,7 +11,8 @@
     "@money/shared": "link:../shared",
     "better-auth": "^1.3.27",
     "hono": "^4.9.12",
-    "plaid": "^39.0.0"
+    "plaid": "^39.0.0",
+    "tsx": "^4.20.6"
   },
   "devDependencies": {
     "@types/node": "^24.7.2"

api/src/auth.ts

@@ -4,6 +4,7 @@ import { genericOAuth } from "better-auth/plugins";
 import { expo } from "@better-auth/expo";
 import { drizzleSchema } from "@money/shared/db";
 import { db } from "./db";
+import { BASE_URL, HOST } from "@money/shared";
 
 export const auth = betterAuth({
   database: drizzleAdapter(db, {
@@ -11,7 +12,19 @@ export const auth = betterAuth({
     provider: "pg",
     usePlural: true,
   }),
-  trustedOrigins: ["money://", "http://localhost:8081"],
+  trustedOrigins: [
+    "http://localhost:8081",
+    `exp://${HOST}:8081`,
+    `${BASE_URL}:8081`,
+    "https://money.koon.us",
+    "money://",
+  ],
+  advanced: {
+      crossSubDomainCookies: {
+          enabled: process.env.NODE_ENV == 'production',
+          domain: "koon.us",
+      },
+  },
   plugins: [
     expo(),
     genericOAuth({

api/src/index.ts

@@ -1,5 +1,6 @@
 import { serve } from "@hono/node-server";
 import { authDataSchema } from "@money/shared/auth";
+import { BASE_URL } from "@money/shared";
 import { cors } from "hono/cors";
 import { auth } from "./auth";
 import { getHono } from "./hono";
@@ -10,7 +11,7 @@ const app = getHono();
 app.use(
   "/api/*",
   cors({
-    origin: (origin) => origin ?? "",
+    origin: ['https://money.koon.us', `${BASE_URL}:8081`],
     allowMethods: ["POST", "GET", "OPTIONS"],
     allowHeaders: ["Content-Type", "Authorization"],
     credentials: true,
@@ -47,7 +48,7 @@ app.get("/", (c) => c.text("OK"));
 serve(
   {
     fetch: app.fetch,
-    port: 3000,
+    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
   },
   (info) => {
     console.log(`Server is running on ${info.address}:${info.port}`);

api/src/zero.ts

@@ -24,11 +24,11 @@ import { Configuration, CountryCode, PlaidApi, PlaidEnvironments, Products } fro
 import { randomUUID } from "crypto";
 import { db } from "./db";
 import { balance, plaidAccessTokens, plaidLink, transaction } from "@money/shared/db";
-import { asc, desc, eq, inArray, sql, type InferInsertModel } from "drizzle-orm";
+import { eq, inArray, sql, type InferInsertModel } from "drizzle-orm";
 
 
 const configuration = new Configuration({
-  basePath: PlaidEnvironments.production,
+  basePath: process.env.PLAID_ENV == 'production' ? PlaidEnvironments.production : PlaidEnvironments.sandbox,
   baseOptions: {
     headers: {
       'PLAID-CLIENT-ID': process.env.PLAID_CLIENT_ID,
@@ -116,7 +116,7 @@ const createMutators = (authData: AuthData | null) => {
           const { data } = await plaidClient.transactionsGet({
             access_token: account.token,
             start_date: "2025-10-01",
-            end_date: "2025-10-15",
+            end_date: new Date().toISOString().split("T")[0],
           });
 
           const transactions = data.transactions.map(tx => ({

app/_layout.tsx

@@ -7,7 +7,7 @@ import { useMemo } from 'react';
 import { authDataSchema } from '@/shared/src/auth';
 import { Platform } from 'react-native';
 import type { ZeroOptions } from '@rocicorp/zero';
-import { schema, type Schema, createMutators, type Mutators } from '@/shared/src';
+import { schema, type Schema, createMutators, type Mutators, BASE_URL } from '@/shared/src';
 import { expoSQLiteStoreProvider } from "@rocicorp/zero/react-native";
 
 export const unstable_settings = {
@@ -32,7 +32,7 @@ export default function RootLayout() {
     return {
       storageKey: 'money',
       kvStore,
-      server: process.env.NODE_ENV == 'production' ? 'https://zero.koon.us' : 'http://localhost:4848',
+      server: process.env.NODE_ENV == 'production' ? 'https://zero.koon.us' : `${BASE_URL}:4848`,
       userID: authData?.user.id ?? "anon",
       schema,
       mutators: createMutators(authData),

app/auth.tsx

@@ -1,11 +1,12 @@
 import { Button, View } from "react-native";
 import { authClient } from "@/lib/auth-client";
+import { BASE_URL } from "@money/shared";
 
 export default function Auth() {
   const onLogin = () => {
     authClient.signIn.oauth2({
       providerId: "koon-family",
-      callbackURL: "http://localhost:8081"
+      callbackURL: process.env.NODE_ENV == 'production' ? 'https://money.koon.us' : `${BASE_URL}:8081`,
     });
   };
 

app/index.tsx

@@ -1,83 +1,35 @@
 import { authClient } from '@/lib/auth-client';
-import { Pressable, ScrollView, Text, View } from 'react-native';
+import {  RefreshControl, ScrollView, StatusBar, Text, View } from 'react-native';
 import { useQuery, useZero } from "@rocicorp/zero/react";
 import { queries, type Mutators, type Schema } from '@money/shared';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 export default function HomeScreen() {
   const { data: session } = authClient.useSession();
 
-  const z = useZero<Schema, Mutators>();
-  const [transactions] = useQuery(queries.allTransactions(session));
   const [balances] = useQuery(queries.getBalances(session));
+  const [refreshing, setRefreshing] = useState(false);
 
-  const [idx, setIdx] = useState(0);
-  const [accountIdx, setAccountIdx] = useState(0);
-
-  const account = balances.at(accountIdx)!;
-
-  const filteredTransactions = transactions
-    .filter(t => t.account_id == account.plaid_id)
-
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "j") {
-        setIdx((prevIdx) => {
-          if (prevIdx + 1 == filteredTransactions.length) return prevIdx;
-          return prevIdx + 1
-        });
-      } else if (event.key === "k") {
-        setIdx((prevIdx) => prevIdx == 0 ? 0 : prevIdx - 1);
-      } else if (event.key == 'g') {
-        setIdx(0);
-      } else if (event.key == "G") {
-        setIdx(transactions.length - 1);
-      } else if (event.key == 'R') {
-        z.mutate.link.updateTransactions();
-        z.mutate.link.updateBalences();
-      } else if (event.key == 'h') {
-        setAccountIdx((prevIdx) => prevIdx == 0 ? 0 : prevIdx - 1);
-      } else if (event.key == 'l') {
-        setAccountIdx((prevIdx) => {
-          if (prevIdx + 1 == balances.length) return prevIdx;
-          return prevIdx + 1
-        });
-      }
+  const onRefresh = async () => {
+    setRefreshing(true);
+    // simulate async work
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    setRefreshing(false);
   };
 
-    window.addEventListener("keydown", handleKeyDown);
-
-    return () => {
-      window.removeEventListener("keydown", handleKeyDown);
-    };
-  }, [filteredTransactions, balances]);
-
-  function lpad(n: number): string {
-    const LEN = 9;
-    const nstr = n.toFixed(2).toLocaleString();
-    return Array.from({ length: LEN - nstr.length }).join(" ") + nstr;
-  }
-
   return (
-    <View>
-      <View style={{ flexDirection: "row" }}>
-        <View style={{ backgroundColor: '' }}>
-          {balances.map((bal, i) => <View key={bal.id} style={{ backgroundColor: i == accountIdx ? 'black' : undefined}}>
-            <Text style={{ fontFamily: 'mono', color: i == accountIdx ? 'white' : undefined  }}>{bal.name}: {bal.current} ({bal.avaliable})</Text>
-          </View>)}
-        </View>
-
-        <View>
-          {filteredTransactions.map((t, i) => <Pressable onHoverIn={() => {
-            setIdx(i);
-          }} style={{ backgroundColor: i == idx ? 'black' : undefined, cursor: 'default' as 'auto' }} key={t.id}>
-            <Text style={{ fontFamily: 'mono', color: i == idx ? 'white' : undefined }}>{new Date(t.datetime!).toDateString()} <Text style={{ color: t.amount > 0 ? 'red' : 'green' }}>{lpad(t.amount)}</Text> {t.name.substring(0, 50)}</Text>
-          </Pressable>)}
-        </View>
-        <ScrollView>
-          <Text style={{ fontFamily: 'mono' }}>{JSON.stringify(JSON.parse(filteredTransactions.at(idx)?.json || "null"), null, 4)}</Text>
+    <>
+      <StatusBar barStyle="dark-content" />
+      <ScrollView contentContainerStyle={{ paddingTop: StatusBar.currentHeight, flexGrow: 1 }} refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />} style={{ paddingHorizontal: 10 }}>
+        {balances.map(balance => <Balance key={balance.id} balance={balance} />)}
       </ScrollView>
-      </View>
-    </View>
+    </>
   );
 }
+
+function Balance({ balance }: { balance: { name: string, current: number, avaliable: number } }) {
+  return <View style={{ backgroundColor: "#eee", borderColor: "#ddd", borderWidth: 1, marginBottom: 10, borderRadius: 10 }}>
+    <Text style={{ fontSize: 15, textAlign: "center" }}>{balance.name}</Text>
+    <Text style={{ fontSize: 30, textAlign: "center" }}>{balance.current}</Text>
+  </View>
+}

app/index.web.tsx

@@ -0,0 +1,99 @@
+import { authClient } from '@/lib/auth-client';
+import { Button, Image, Platform, Pressable, ScrollView, Text, View } from 'react-native';
+import { useQuery, useZero } from "@rocicorp/zero/react";
+import { queries, type Mutators, type Schema } from '@money/shared';
+import { useEffect, useState } from 'react';
+import { Link } from 'expo-router';
+
+export default function HomeScreen() {
+  const { data: session } = authClient.useSession();
+
+  const z = useZero<Schema, Mutators>();
+  const [transactions] = useQuery(queries.allTransactions(session));
+  const [balances] = useQuery(queries.getBalances(session));
+
+  const [idx, setIdx] = useState(0);
+  const [accountIdx, setAccountIdx] = useState(0);
+
+  const account = balances.at(accountIdx)!;
+
+  const filteredTransactions = transactions
+    .filter(t => t.account_id == account.plaid_id)
+
+  useEffect(() => {
+    if (Platform.OS != 'web') return;
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "j") {
+        setIdx((prevIdx) => {
+          if (prevIdx + 1 == filteredTransactions.length) return prevIdx;
+          return prevIdx + 1
+        });
+      } else if (event.key === "k") {
+        setIdx((prevIdx) => prevIdx == 0 ? 0 : prevIdx - 1);
+      } else if (event.key == 'g') {
+        setIdx(0);
+      } else if (event.key == "G") {
+        setIdx(transactions.length - 1);
+      } else if (event.key == 'R') {
+        z.mutate.link.updateTransactions();
+        z.mutate.link.updateBalences();
+      } else if (event.key == 'h') {
+        setAccountIdx((prevIdx) => prevIdx == 0 ? 0 : prevIdx - 1);
+      } else if (event.key == 'l') {
+        setAccountIdx((prevIdx) => {
+          if (prevIdx + 1 == balances.length) return prevIdx;
+          return prevIdx + 1
+        });
+      }
+    };
+
+    window.addEventListener("keydown", handleKeyDown);
+
+    return () => {
+      window.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [filteredTransactions, balances]);
+
+  function lpad(n: number): string {
+    const LEN = 9;
+    const nstr = n.toFixed(2).toLocaleString();
+    return Array.from({ length: LEN - nstr.length }).join(" ") + nstr;
+  }
+
+  function uuu(t: typeof filteredTransactions[number]): string | undefined {
+    if (!t.json) return;
+    const j = JSON.parse(t.json);
+    return j.counterparties.filter((c: any) => !!c.logo_url).at(0)?.logo_url || j.personal_finance_category_icon_url;
+  }
+
+  return (
+    <View>
+      <Link prefetch href="/settings">
+        <Button title="Settings" />
+      </Link>
+      <View style={{ flexDirection: "row" }}>
+        <View style={{ backgroundColor: '' }}>
+          {balances.map((bal, i) => <View key={bal.id} style={{ backgroundColor: i == accountIdx ? 'black' : undefined}}>
+            <Text style={{ fontFamily: 'mono', color: i == accountIdx ? 'white' : undefined  }}>{bal.name}: {bal.current} ({bal.avaliable})</Text>
+          </View>)}
+        </View>
+
+        <View>
+          {filteredTransactions.map((t, i) => <Pressable onHoverIn={() => {
+            setIdx(i);
+          }} style={{ backgroundColor: i == idx ? 'black' : undefined, cursor: 'default' as 'auto' }} key={t.id}>
+            <Text style={{ fontFamily: 'mono', color: i == idx ? 'white' : undefined }}>
+              {new Date(t.datetime!).toDateString()}
+              <Text style={{ color: t.amount > 0 ? 'red' : 'green' }}> {lpad(t.amount)}</Text>
+              <Image style={{ width: 15, height: 15, marginHorizontal: 10 }} source={{ uri: uuu(t) || "" }} />
+              {t.name.substring(0, 50)}
+            </Text>
+          </Pressable>)}
+        </View>
+        <ScrollView>
+          <Text style={{ fontFamily: 'mono' }}>{JSON.stringify(JSON.parse(filteredTransactions.at(idx)?.json || "null"), null, 4)}</Text>
+        </ScrollView>
+      </View>
+    </View>
+  );
+}

lib/auth-client.ts

@@ -2,9 +2,10 @@ import { createAuthClient } from "better-auth/react";
 import { genericOAuthClient } from "better-auth/client/plugins";
 import { expoClient } from "@better-auth/expo/client";
 import * as SecureStore from "expo-secure-store";
+import { BASE_URL } from "@money/shared";
 
 export const authClient = createAuthClient({
-  baseURL: process.env.NODE_ENV == 'production' ? 'https://money-api.koon.us' : "http://localhost:3000",
+  baseURL: process.env.NODE_ENV == 'production' ? 'https://money-api.koon.us' : `${BASE_URL}:3000`,
   plugins: [
     expoClient({
       scheme: "money",

package.json

@@ -21,7 +21,7 @@
     "@react-navigation/bottom-tabs": "^7.4.0",
     "@react-navigation/elements": "^2.6.3",
     "@react-navigation/native": "^7.1.8",
-    "@rocicorp/zero": "^0.23.2025090100",
+    "@rocicorp/zero": "^0.24.2025101500",
     "better-auth": "^1.3.27",
     "drizzle-orm": "^0.44.6",
     "expo": "~54.0.13",

process-compose.yaml

@@ -25,10 +25,14 @@ processes:
       initial_delay_seconds: 2
       period_seconds: 1
 
+  tailscale_machine_name:
+    command: "pnpm tsx ./scripts/set-machine-name.ts"
+
   expo:
     command: "pnpm start"
-    environment:
-      - "DATABASE_URL=postgresql://postgres@localhost:5432/money"
+    depends_on:
+      tailscale_machine_name:
+        condition: process_completed_successfully
 
   api:
     command: "pnpm run dev"

scripts/set-machine-name.ts

@@ -0,0 +1,36 @@
+import { execSync } from "child_process";
+import fs from "fs";
+
+const ENV_FILE = ".env.dev";
+const VARIABLE_NAME = "EXPO_PUBLIC_TAILSCALE_MACHINE";
+
+try {
+  const json = execSync("tailscale status --self --json", { encoding: "utf8" });
+  const data = JSON.parse(json);
+  const machine = data?.Self?.DNSName.split(".")[0];
+
+  if (!machine) {
+    console.error("Error: could not retrieve Tailscale machine name");
+    process.exit(1);
+  }
+
+  let content = "";
+  if (fs.existsSync(ENV_FILE)) {
+    content = fs.readFileSync(ENV_FILE, "utf8");
+  }
+
+  const pattern = new RegExp(`^${VARIABLE_NAME}=.*`, "m");
+  if (pattern.test(content)) {
+    content = content.replace(pattern, `${VARIABLE_NAME}=${machine}`);
+  } else {
+    if (content && !content.endsWith("\n")) content += "\n";
+    content += `${VARIABLE_NAME}=${machine}\n`;
+  }
+
+  fs.writeFileSync(ENV_FILE, content, "utf8");
+  console.log(`Updated ${ENV_FILE} with ${VARIABLE_NAME}=${machine}`);
+} catch (err) {
+  console.error("Failed to update .env.dev:", err);
+  process.exit(1);
+}
+

shared/package.json

@@ -9,10 +9,10 @@
     "./db": "./src/db/index.ts"
   },
   "dependencies": {
-    "drizzle-zero": "^0.14.3"
+    "drizzle-zero": "^0.15.1"
   },
   "scripts": {
-    "generate:zero": "drizzle-zero generate -s ./src/db/schema/public.ts -o ./src/zero-schema.gen.ts -f && sed -i 's/enableLegacyQueries: true,/enableLegacyQueries: false,/g' src/zero-schema.gen.ts && sed -i 's/enableLegacyMutators: true,/enableLegacyMutators: false,/g' src/zero-schema.gen.ts",
+    "generate:zero": "drizzle-zero generate -s ./src/db/schema/public.ts -o ./src/zero-schema.gen.ts -f --disable-legacy-queries --disable-legacy-mutators",
     "db:migrate": "drizzle-kit push"
   }
 }

shared/src/const.ts

@@ -0,0 +1,3 @@
+export const HOST = process.env.EXPO_PUBLIC_TAILSCALE_MACHINE || "localhost";
+export const BASE_URL = `http://${HOST}`;
+

shared/src/index.ts

@@ -2,3 +2,4 @@ export * from "./queries";
 export * from "./mutators";
 export * from "./zero-schema.gen";
 export * from "./zql";
+export * from "./const";

shared/src/queries.ts

@@ -1,23 +1,22 @@
 import { syncedQueryWithContext } from "@rocicorp/zero";
 import { z } from "zod";
-import { builder } from "@money/shared";
+import { builder } from ".";
 import { type AuthData } from "./auth";
 import { isLoggedIn } from "./zql";
 
 export const queries = {
+  me: syncedQueryWithContext('me', z.tuple([]), (authData: AuthData | null) => {
+    isLoggedIn(authData);
+    return builder.users
+      .where('id', '=', authData.user.id)
+      .one();
+  }),
   allTransactions: syncedQueryWithContext('allTransactions', z.tuple([]), (authData: AuthData | null) => {
     isLoggedIn(authData);
     return builder.transaction
       .where('user_id', '=', authData.user.id)
       .orderBy('datetime', 'desc')
       .limit(50)
-  }
-  ),
-  me: syncedQueryWithContext('me', z.tuple([]), (authData: AuthData | null) => {
-    isLoggedIn(authData);
-    return builder.users
-      .where('id', '=', authData.user.id)
-      .one();
   }),
   getPlaidLink: syncedQueryWithContext('getPlaidLink', z.tuple([]), (authData: AuthData | null) => {
     isLoggedIn(authData);
@@ -29,6 +28,7 @@ export const queries = {
   getBalances: syncedQueryWithContext('getBalances', z.tuple([]), (authData: AuthData | null) => {
     isLoggedIn(authData);
     return builder.balance
-      .where('user_id', '=', authData.user.id);
+      .where('user_id', '=', authData.user.id)
+      .orderBy('name', 'asc');
   })
 };

shared/src/zero-schema.gen.ts

@@ -10,11 +10,9 @@
 
 import type { Row } from "@rocicorp/zero";
 import { createBuilder } from "@rocicorp/zero";
-import type { DrizzleToZeroSchema, ZeroCustomType } from "drizzle-zero";
+import type { CustomType } from "drizzle-zero";
 import type * as drizzleSchema from "./db/schema/public";
 
-type ZeroSchema = DrizzleToZeroSchema<typeof drizzleSchema>;
-
 /**
  * The Zero schema object.
  * This type is auto-generated from your Drizzle schema definition.
@@ -27,8 +25,8 @@ export const schema = {
         id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "id"
           >,
@@ -36,8 +34,8 @@ export const schema = {
         user_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "user_id"
           >,
@@ -46,8 +44,8 @@ export const schema = {
         plaid_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "plaid_id"
           >,
@@ -56,8 +54,8 @@ export const schema = {
         avaliable: {
           type: "number",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "avaliable"
           >,
@@ -65,8 +63,8 @@ export const schema = {
         current: {
           type: "number",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "current"
           >,
@@ -74,8 +72,8 @@ export const schema = {
         name: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "name"
           >,
@@ -83,8 +81,8 @@ export const schema = {
         createdAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "createdAt"
           >,
@@ -93,8 +91,8 @@ export const schema = {
         updatedAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "balance",
             "updatedAt"
           >,
@@ -109,8 +107,8 @@ export const schema = {
         id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "plaidLink",
             "id"
           >,
@@ -118,8 +116,8 @@ export const schema = {
         user_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "plaidLink",
             "user_id"
           >,
@@ -127,8 +125,8 @@ export const schema = {
         link: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "plaidLink",
             "link"
           >,
@@ -136,8 +134,8 @@ export const schema = {
         token: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "plaidLink",
             "token"
           >,
@@ -145,8 +143,8 @@ export const schema = {
         createdAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "plaidLink",
             "createdAt"
           >,
@@ -161,8 +159,8 @@ export const schema = {
         id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "id"
           >,
@@ -170,8 +168,8 @@ export const schema = {
         user_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "user_id"
           >,
@@ -179,8 +177,8 @@ export const schema = {
         plaid_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "plaid_id"
           >,
@@ -188,8 +186,8 @@ export const schema = {
         account_id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "account_id"
           >,
@@ -197,8 +195,8 @@ export const schema = {
         name: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "name"
           >,
@@ -206,8 +204,8 @@ export const schema = {
         amount: {
           type: "number",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "amount"
           >,
@@ -215,8 +213,8 @@ export const schema = {
         datetime: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "datetime"
           >,
@@ -224,8 +222,8 @@ export const schema = {
         authorized_datetime: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "authorized_datetime"
           >,
@@ -233,8 +231,8 @@ export const schema = {
         json: {
           type: "string",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "json"
           >,
@@ -242,8 +240,8 @@ export const schema = {
         createdAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "createdAt"
           >,
@@ -252,8 +250,8 @@ export const schema = {
         updatedAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "transaction",
             "updatedAt"
           >,
@@ -268,8 +266,8 @@ export const schema = {
         id: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "id"
           >,
@@ -277,8 +275,8 @@ export const schema = {
         name: {
           type: "string",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "name"
           >,
@@ -286,8 +284,8 @@ export const schema = {
         email: {
           type: "string",
           optional: false,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "email"
           >,
@@ -295,8 +293,8 @@ export const schema = {
         emailVerified: {
           type: "boolean",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "emailVerified"
           >,
@@ -305,8 +303,8 @@ export const schema = {
         image: {
           type: "string",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "image"
           >,
@@ -314,8 +312,8 @@ export const schema = {
         createdAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "createdAt"
           >,
@@ -324,8 +322,8 @@ export const schema = {
         updatedAt: {
           type: "number",
           optional: true,
-          customType: null as unknown as ZeroCustomType<
-            ZeroSchema,
+          customType: null as unknown as CustomType<
+            typeof drizzleSchema,
             "users",
             "updatedAt"
           >,

shared/src/zql.ts

@@ -3,6 +3,7 @@ import type { AuthData } from "./auth";
 export function isLoggedIn(
   authData: AuthData | null,
 ): asserts authData is AuthData {
+  console.log("AUTHDATA", authData);
   if (!authData?.user.id) {
     throw new Error("User is not logged in");
   }

shared/tsconfig.json

@@ -3,7 +3,7 @@
     "target": "ES2022",
     "module": "ESNext",
     "moduleResolution": "Bundler",
-    "declaration": true,
+    "declaration": false,
     "outDir": "./dist",
     "strict": true,
     "verbatimModuleSyntax": true,