fixes

Author: ryanrasti

README.md

@@ -19,7 +19,8 @@ npm install typegres pg
 ```
 
 ```typescript
-import { typegres, Int8, Text, expose } from "typegres";
+import { typegres, expose } from "typegres";
+import { Int8, Text } from "typegres/postgres";
 
 const { db, conn } = await typegres({
   type: "pg",

examples/basic/src/tables/collars.ts

@@ -1,4 +1,4 @@
-import { Int8, Text } from "typegres";
+import { Int8, Text } from "typegres/postgres";
 import { db } from "../db";
 import { Dogs } from "./dogs";
 

examples/basic/src/tables/dogs.ts

@@ -1,4 +1,5 @@
-import { Int8, Text, Timestamptz, sql } from "typegres";
+import { sql } from "typegres";
+import { Int8, Text, Timestamptz } from "typegres/postgres";
 import { db } from "../db";
 import { Teams } from "./teams";
 import { Collars } from "./collars";

examples/basic/src/tables/microchips.ts

@@ -1,4 +1,4 @@
-import { Int8, Text } from "typegres";
+import { Int8, Text } from "typegres/postgres";
 import { db } from "../db";
 import { Dogs } from "./dogs";
 

examples/basic/src/tables/teams.ts

@@ -1,4 +1,4 @@
-import { Int8, Text } from "typegres";
+import { Int8, Text } from "typegres/postgres";
 import { db } from "../db";
 import { Dogs } from "./dogs";
 

examples/basic/src/tables/toys.ts

@@ -1,4 +1,4 @@
-import { Int8, Text } from "typegres";
+import { Int8, Text } from "typegres/postgres";
 import { db } from "../db";
 import { Dogs } from "./dogs";
 

package.json

@@ -13,14 +13,18 @@
       "import": "./dist/config.mjs",
       "types": "./dist/config.d.mts"
     },
-    "./types": {
-      "import": "./dist/types/index.mjs",
-      "types": "./dist/types/index.d.mts"
-    },
     "./sql-builder": {
       "import": "./dist/builder/sql.mjs",
       "types": "./dist/builder/sql.d.mts"
     },
+    "./postgres": {
+      "import": "./dist/types/postgres/index.mjs",
+      "types": "./dist/types/postgres/index.d.mts"
+    },
+    "./sqlite": {
+      "import": "./dist/types/sqlite/index.mjs",
+      "types": "./dist/types/sqlite/index.d.mts"
+    },
     "./exoeval": {
       "import": "./dist/exoeval/index.mjs",
       "types": "./dist/exoeval/index.d.mts"

site/package-lock.json

@@ -20,7 +20,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       const user = await api.currentUser();
       return user.orders()
         .select(({ orders }) => ({ id: orders.id, org: orders.organization_id }))
-        .execute(api.db);
+        .execute(api.conn);
     });
     expect(alice.length).toBeGreaterThan(0);
     expect(new Set(alice.map((r) => r.org))).toEqual(new Set(["1"]));
@@ -30,7 +30,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       const user = await api.currentUser();
       return user.orders()
         .select(({ orders }) => ({ id: orders.id, org: orders.organization_id }))
-        .execute(api.db);
+        .execute(api.conn);
     });
     expect(dave.length).toBeGreaterThan(0);
     expect(new Set(dave.map((r) => r.org))).toEqual(new Set(["2"]));
@@ -42,7 +42,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       return user.orders()
         .where(({ orders }) => orders.status.in("packed", "shipped"))
         .select(({ orders }) => ({ id: orders.id, status: orders.status }))
-        .execute(api.db);
+        .execute(api.conn);
     });
     for (const row of result) {
       expect(["packed", "shipped"]).toContain(row.status);
@@ -57,7 +57,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
           id: orders.id,
           customer: orders.customer().select(({ customers }) => ({ name: customers.name })).scalar(),
         }))
-        .execute(api.db);
+        .execute(api.conn);
     });
     expect(result.length).toBeGreaterThan(0);
     for (const row of result) {
@@ -74,7 +74,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
           status: orders.status,
           count: orders.id.count(),
         }))
-        .execute(api.db);
+        .execute(api.conn);
     });
     expect(result.length).toBeGreaterThan(0);
     for (const row of result) {
@@ -90,7 +90,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       return user.orders()
         .where(({ orders }) => orders.status["="]("draft"))
         .select(({ orders }) => ({ id: orders.id }))
-        .live(api.db);
+        .live(api.conn);
     });
     const it = (iter as AsyncIterable<{ id: string }[]>)[Symbol.asyncIterator]();
 
@@ -104,7 +104,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
     // iterator yields again with the new row included.
     const inserted = await rpc(async (api) => {
       const user = await api.currentUser();
-      return (await user.insertDraftOrder(api.db)).id;
+      return (await user.insertDraftOrder(api.conn)).id;
     });
 
     const second = await it.next();
@@ -120,7 +120,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       const user = await api.currentUser();
       return user.orders()
         .select(({ orders }) => ({ id: orders.id, status: orders.status }))
-        .live(api.db);
+        .live(api.conn);
     });
     const it = (iter as AsyncIterable<{ id: string; status: string }[]>)[Symbol.asyncIterator]();
     const first = await it.next();
@@ -135,7 +135,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
       const user = await api.currentUser();
       return user.orders()
         .select(({ orders }) => ({ id: orders.id }))
-        .live(api.db);
+        .live(api.conn);
     });
     const it = (iter as AsyncIterable<{ id: string }[]>)[Symbol.asyncIterator]();
 
@@ -169,7 +169,7 @@ describe("playground demo: cap-rooted API over exoeval RPC", () => {
         return u.orders()
           .select(({ orders }) => ({ id: orders.id }))
           .debug()
-          .execute(api.db);
+          .execute(api.conn);
       });
       expect(Array.isArray(result)).toBe(true);
     } finally {

site/src/demo/demo.test.ts

@@ -6,14 +6,14 @@ import { typegres } from "typegres";
 import { runMigrations, runSeed } from "./seed";
 import type { UserRoot } from "./server/api";
 
-export const db = await typegres<UserRoot>({ type: "pglite" });
+export const { db, conn } = await typegres<UserRoot>({ type: "pglite" });
 
-await runMigrations(db);
-await runSeed(db);
+await runMigrations(conn);
+await runSeed(conn);
 
 // `installLiveEvents` is a one-time DDL — production callers run it as
 // part of their migrations. The demo's storage doesn't survive page
 // reloads, so we run it on every boot. `startLive` then assumes the
 // events table exists and only spins up the polling bus.
-await db.installLiveEvents();
-await db.startLive();
+await conn.installLiveEvents();
+await conn.startLive();