@typesql/drizzle 0.1.5 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @typesql/drizzle
 
+## 0.2.1
+
+### Patch Changes
+
+- The README is shorter: install, one example and links to the docs site, which now has the details it used to repeat.
+
+- Updated dependencies:
+  - @typesql/core@0.6.0
+
+## 0.2.0
+
+### Minor Changes
+
+- `NoResultError`, `Executor` and `TransactionalSql` are no longer re-exported (from `@typesql/drizzle` also `Sql`, `Query`, `RowType`, `ParamsType`, `DefaultTypeMap` and `TypeMap`); import them from `@typesql/core`.
+
+### Patch Changes
+
+- Updated dependencies:
+  - @typesql/core@0.5.0
+
 ## 0.1.5
 
 ### Patch Changes

package/README.md

@@ -1,41 +1,32 @@
 # @typesql/drizzle
 
-Use your Drizzle ORM schema as a TypeSQL schema. `FromDrizzle<typeof schema>` turns
-`pgTable`, `pgView`, `pgMaterializedView`, `pgEnum` and `pgSchema` definitions into the
-`DB` type that `createSql` expects, entirely at the type level: no code generation, and the
-SQL you write is checked against the same tables Drizzle manages.
+Write [TypeSQL](https://www.npmjs.com/package/@typesql/core) queries against your [Drizzle](https://orm.drizzle.team) schema, and run them on your Drizzle database. The schema is converted in the type checker: nothing is generated.
+
+## Install
 
 ```sh
-npm install @typesql/drizzle @typesql/core
+npm install @typesql/core @typesql/drizzle drizzle-orm
 ```
 
-`drizzle-orm` (0.45 or later) is a peer dependency. Queries run on node-postgres or postgres.js
-databases.
+Requires `drizzle-orm` 0.45 or later, on node-postgres or postgres.js.
 
 ## Usage
 
 ```ts
-// schema.ts — your existing Drizzle schema
-import { relations } from "drizzle-orm";
-import { integer, pgEnum, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core";
-
-export const mood = pgEnum("mood", ["happy", "sad"]);
+// schema.ts: your Drizzle schema
+import { integer, pgTable, serial, text } from "drizzle-orm/pg-core";
 
 export const users = pgTable("users", {
   id: serial().primaryKey(),
   email: text().notNull(),
   displayName: text("display_name"),
-  mood: mood(),
 });
 
 export const posts = pgTable("posts", {
   id: serial().primaryKey(),
   authorId: integer("author_id").notNull().references(() => users.id),
   title: text().notNull(),
-  createdAt: timestamp("created_at").notNull().defaultNow(),
 });
-
-export const usersRelations = relations(users, ({ many }) => ({ posts: many(posts) }));
 ```
 
 ```ts
@@ -48,188 +39,25 @@ import * as schema from "./schema";
 const db = drizzle(new Pool(), { schema });
 const sql = createSql<typeof schema>(db);
 
-const q = sql(
-  "SELECT u.email, u.display_name, p.title FROM users u JOIN posts p ON p.author_id = u.id WHERE u.mood = $1",
-  "happy",
-);
-// Query<{ email: string; display_name: string | null; title: string }, ["happy" | "sad"]>
-
-const post = await sql("INSERT INTO posts (author_id, title) VALUES ($1, $2) RETURNING id, created_at", 1, "Hello").executeTakeFirstOrThrow();
-// id and created_at have defaults, so they can be left out
-
-await sql.transaction(async (tx) => {
-  await tx("UPDATE posts SET title = upper(title) WHERE author_id = $1", 1).execute();
-});
-```
-
-Queries use SQL names: `display_name`, not `displayName`. Relations and any other
-non-table exports are ignored, so `typeof schema` can be passed as is.
-
-`createSql<Schema, TypeMap, Options>(db)` uses core's `DefaultTypeMap` unless you pass
-another one, such as `PgTypeMap` from `@typesql/pg` for node-postgres' exact types:
-`createSql<typeof schema, PgTypeMap>(db)`.
-
-## Running queries
-
-`db` is a Drizzle database on node-postgres or postgres.js (`drizzle-orm/node-postgres`,
-`drizzle-orm/postgres-js`), or a transaction from `db.transaction(fn)`. Queries run on the
-driver client Drizzle holds: the `Pool`, `Client` or postgres.js `sql` you gave `drizzle()`, or
-the transaction's connection. Rows are what the driver returns; Drizzle's column mappers and
-its logger are not involved.
-
-| | |
-|---|---|
-| `q.execute()`, `q.executeTakeFirst()`, `q.executeTakeFirstOrThrow()`, `q.executeCount()` | `Promise<Row[]>`, `Promise<Row \| undefined>`, `Promise<Row>` (`NoResultError` on 0 rows), `Promise<number>` (the driver's row count) |
-| `sql.transaction(fn)` | `db.transaction(fn)` with `tx` bound to the transaction; `tx.transaction(fn)` is Drizzle's nested transaction (a savepoint) |
-| `executor(db)` | an `Executor` for `q.execute(executor)` and core's `createSql(executor)` |
-| `DrizzleSql<Schema, TM, Options>`, `DrizzleDatabase` | the type `createSql` returns, and what it accepts |
-
-To mix ORM and SQL queries in one transaction, bind a `sql` to Drizzle's `tx`:
-
-```ts
-await db.transaction(async (tx) => {
-  await tx.insert(schema.users).values({ email: "a@b.c" });
-  await createSql<typeof schema>(tx)("UPDATE users SET mood = 'happy' WHERE email = $1", "a@b.c").execute();
-});
+const rows = await sql(
+  `SELECT u.email, u.display_name, p.title
+   FROM users u JOIN posts p ON p.author_id = u.id
+   WHERE u.id = $1`,
+  1,
+).execute();
+// { email: string; display_name: string | null; title: string }[]
 ```
 
-`drizzle-orm/postgres-js` turns off postgres.js' date parsers on the client it is given, so on
-that driver `date`, `timestamp`, `timestamptz` and `interval` come back as strings: pass a type
-map that says so.
+Good to know:
 
-To pair the schema with a driver adapter instead, convert it with `FromDrizzle` and use the
-adapter's `createSql` on the same pool:
+- SQL uses the database names (`display_name`), not the TypeScript keys (`displayName`).
+- `.$defaultFn()` and `.$default()` run in Drizzle, not in Postgres, so a SQL `INSERT` must set those columns.
+- Drizzle's types don't record `withTimezone`, so `timestamp()` columns are `timestamp`. Pin a column with `pgType` from this package: `pgType(timestamp("at", { withTimezone: true }), "timestamptz")`.
 
-```ts
-import { createSql } from "@typesql/pg";
-import type { FromDrizzle } from "@typesql/drizzle";
-import type * as schema from "./schema";
+## Documentation
 
-const sql = createSql<FromDrizzle<typeof schema>>(pool);
-```
+See [From Kysely, Drizzle or Prisma](https://typesql.karsli.net/guide/orms#drizzle) for how the schema is converted, running queries and overrides, and [Limits](https://typesql.karsli.net/guide/limits#orm-schemas) for what the conversion can't tell.
 
-`FromDrizzle` also accepts a single table (`FromDrizzle<typeof users>`) or a record of
-tables (`FromDrizzle<{ users: typeof users; posts: typeof posts }>`).
-
-## What gets converted
-
-| Drizzle | TypeSQL |
-|---|---|
-| `pgTable("users", …)` | `DB["users"]`, keyed by the SQL table name, not the export name |
-| `displayName: text("display_name")` | column `display_name`; columns without an explicit name use the key |
-| `.notNull()`, `.primaryKey()`, `serial`, identity | `NOT NULL`; otherwise the column is nullable |
-| `.default(…)`, `.defaultNow()`, `.defaultRandom()`, `serial`, `generatedAlwaysAsIdentity()`, `generatedByDefaultAsIdentity()`, `generatedAlwaysAs(…)` | has a default: optional in `INSERT` |
-| `.$defaultFn(…)` / `.$default(…)` | **no** default: these run in Drizzle, not in Postgres |
-| `export const mood = pgEnum("mood", […])` | `DB["$types"]["mood"]`, keyed by the **export name** (see below) |
-| `pgSchema("auth").table("users", …)` | `DB["auth"]["users"]` (`auth.users` in SQL) |
-| `pgView(…)`, `pgMaterializedView(…)` | a `View<…>`: readable, rejected as an `INSERT`/`UPDATE`/`DELETE` target |
-| `relations(…)`, sequences, other exports | ignored |
-
-## Column types
-
-The Postgres type comes from Drizzle's column kind. Drizzle's `mode` options change the JS
-value Drizzle produces, but TypeSQL queries go straight to the driver, so the row type comes
-from the type map: `bigint({ mode: "number" })` is `int8`, a `string` under node-postgres.
-
-| Drizzle | Postgres |
-|---|---|
-| `smallint`, `smallserial` | `int2` |
-| `integer`, `serial` | `int4` |
-| `bigint`, `bigserial` (any mode) | `int8` |
-| `numeric` / `decimal` (any mode) | `numeric` |
-| `real` | `float4` |
-| `doublePrecision` | `float8` |
-| `boolean` | `bool` |
-| `text` | `text` |
-| `varchar` | `varchar` |
-| `char` | `bpchar` |
-| `uuid` | `uuid` |
-| `date` (any mode) | `date` |
-| `time` | `time`, or `timetz` (see below) |
-| `timestamp` (any mode) | `timestamp`, or `timestamptz` (see below) |
-| `interval` | `interval` |
-| `json`, `jsonb` | `json`, `jsonb` |
-| `inet`, `cidr`, `macaddr`, `macaddr8` | same name |
-| `point` (any mode), `line` (any mode) | `point`, `line` |
-| `geometry` (PostGIS) | `geometry` |
-| `vector`, `halfvec`, `sparsevec`, `bit` (pgvector) | `vector`, `halfvec`, `sparsevec`, `bit` |
-| an enum column | the enum's export name, values in `$types` |
-| `customType(…)` | `unknown`, unless pinned with `pgType` |
-| `.array()`, `.array().array()` | `T[]`, `T[][]` |
-
-Types TypeSQL has no TS mapping for (`geometry`, `vector`, …) read as `unknown` unless your
-type map has an entry for them.
-
-### `timestamp` with time zone, and other types Drizzle's types do not record
-
-`timestamp("at", { withTimezone: true })` and `timestamp("at")` have the same TypeScript type
-in Drizzle, so `FromDrizzle` cannot tell them apart. Both read as `Date` under the default
-type maps, but `timestamp` and `timestamptz` behave differently in SQL (`AT TIME ZONE`,
-`date_trunc`, comparisons with `now()`). Either set the default for all of them:
-
-```ts
-createSql<typeof schema, DefaultTypeMap, { timestamp: "timestamptz"; time: "timetz" }>(db);
-// or: FromDrizzle<typeof schema, { timestamp: "timestamptz" }>
-```
-
-or pin a column's type with `pgType`, which returns the builder unchanged at runtime:
-
-```ts
-import { pgType } from "@typesql/drizzle";
-
-export const events = pgTable("events", {
-  at: pgType(timestamp("at", { withTimezone: true }).notNull(), "timestamptz"),
-  handle: pgType(citext("handle"), "text"), // a customType
-});
-```
-
-`pgType` takes precedence over everything else and works for any column. For an array
-column, wrap the whole array: `pgType(citext().array(), "text[]")`.
-
-### Enums
-
-Drizzle's types do not carry an enum's SQL name (`pgEnum("mood", …)` is typed as
-`string`), so enums are registered in `$types` under their **export name**, and an enum
-column is typed by finding the exported enum with the same values. To use casts such as
-`'happy'::mood`, name the export like the SQL type (`export const mood = pgEnum("mood", …)`).
-Object enums need `as const` (`pgEnum("role", { Admin: "admin" } as const)`) for their
-values to be known. An enum column whose enum is not exported (or when you pass only a
-table or a record of tables) is typed as `text`.
-
-### `casing`
-
-If you create Drizzle with `drizzle(client, { casing: "snake_case" })`, pass the same
-setting so column names match what Drizzle sends to Postgres:
-
-```ts
-createSql<typeof schema, DefaultTypeMap, { casing: "snake_case" }>(db);
-// createdAt: timestamp() → column created_at
-```
+## License
 
-## Limitations
-
-- **Generated-always columns** (`generatedAlwaysAs`, `generatedAlwaysAsIdentity`) are treated
-  as columns with a default. TypeSQL has no read-only columns, so an `INSERT` that sets one
-  type-checks but fails in Postgres (unless `OVERRIDING SYSTEM VALUE` for identities).
-- **`$onUpdate` / `$onUpdateFn`** mark the column as having a default in Drizzle's types, with
-  no way to tell them from a SQL default, so such a column is optional in `INSERT` even
-  though Postgres will not fill it.
-- **`.$type<T>()`** is ignored: rows use the type map (`jsonb().$type<Settings>()` is
-  `unknown` under the default map). Branded ids lose their brand.
-- **`text({ enum: [...] })`, `varchar({ enum: [...] })`** are plain `text` / `varchar`: the
-  values are only a TypeScript constraint in Drizzle, not a Postgres type.
-- **Views** take their column types from the selected Drizzle columns. Columns from the
-  outer side of a join keep their own nullability, and `sql\`…\`.as("x")` fields are
-  `unknown`. Views created with `pgSchema(…).view(…)` are placed at the top level, because
-  Drizzle's view types do not record the schema.
-- **`pgTableCreator`** prefixes are applied at runtime only; tables appear under the name
-  passed to the table function.
-- **`casing`** is applied to every column name, including explicitly named ones; Drizzle
-  applies it only to columns named after their key. These agree unless an explicit name is
-  not already in the target casing.
-- Multi-dimensional arrays are typed `T[][]`; Postgres itself does not distinguish them
-  from `T[]`.
-
-## Examples
-
-[`examples/schema.ts`](examples/schema.ts) and [`examples/basic.ts`](examples/basic.ts) walk through the features above; they are type-checked with the package (`pnpm typecheck`).
+[MIT](LICENSE)

package/dist/casing.d.ts

@@ -3,15 +3,21 @@ type Upper = Uppercase<Lower>;
 type Digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
 type Cls<C extends string> = C extends Lower ? "l" : C extends Digit ? "d" : C extends Upper ? "u" : "o";
 /** A new word starts at `C` (class `K`) after a char of class `P`, `R` being the rest of the input. */
-type Starts<P, K, R extends string> = K extends "u" ? (P extends "l" | "d" ? true : P extends "u" ? (R extends `${Lower}${string}` ? true : false) : false) : K extends "d" ? (P extends "u" ? true : false) : false;
+type Starts<P, K, R extends string> = K extends "u" ? P extends "l" | "d" ? true : P extends "u" ? R extends `${Lower}${string}` ? true : false : false : K extends "d" ? P extends "u" ? true : false : false;
 type Push<A extends string[], W extends string> = W extends "" ? A : [...A, W];
 /**
  * Words of an identifier, as Drizzle's `casing` splits them
  * (`/[\da-z]+|[A-Z]+(?![a-z])|[A-Z][\da-z]+/g`): `"userID2fa"` → `["user", "ID", "2fa"]`.
  */
 export type Words<S extends string, W extends string = "", Acc extends string[] = [], P = "o"> = S extends `${infer C}${infer R}` ? Cls<C> extends "o" ? Words<R, "", Push<Acc, W>, "o"> : Starts<P, Cls<C>, R> extends true ? Words<R, C, Push<Acc, W>, Cls<C>> : Words<R, `${W}${C}`, Acc, Cls<C>> : Push<Acc, W>;
-type Snake<Ws extends string[], Acc extends string = ""> = Ws extends [infer W extends string, ...infer R extends string[]] ? Snake<R, Acc extends "" ? Lowercase<W> : `${Acc}_${Lowercase<W>}`> : Acc;
-type Camel<Ws extends string[], Acc extends string = ""> = Ws extends [infer W extends string, ...infer R extends string[]] ? Camel<R, Acc extends "" ? Lowercase<W> : `${Acc}${Capitalize<W>}`> : Acc;
+type Snake<Ws extends string[], Acc extends string = ""> = Ws extends [
+    infer W extends string,
+    ...infer R extends string[]
+] ? Snake<R, Acc extends "" ? Lowercase<W> : `${Acc}_${Lowercase<W>}`> : Acc;
+type Camel<Ws extends string[], Acc extends string = ""> = Ws extends [
+    infer W extends string,
+    ...infer R extends string[]
+] ? Camel<R, Acc extends "" ? Lowercase<W> : `${Acc}${Capitalize<W>}`> : Acc;
 /** Drizzle's `toSnakeCase`: `"displayName"` → `"display_name"`. */
 export type ToSnakeCase<S extends string> = Snake<Words<S>>;
 /** Drizzle's `toCamelCase`: `"display_name"` → `"displayName"`. */

package/dist/casing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"casing.d.ts","sources":["../src/casing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"casing.d.ts","sources":["../src/casing.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GACP,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,CAAC;AACP,KAAK,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;AAC9B,KAAK,KAAK,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEvE,KAAK,GAAG,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,KAAK,GACzC,GAAG,GACH,CAAC,SAAS,KAAK,GACd,GAAG,GACH,CAAC,SAAS,KAAK,GACd,GAAG,GACH,GAAG,CAAC;AAET,uGAAuG;AACvG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,GAChD,CAAC,SAAS,GAAG,GAAG,GAAG,GAClB,IAAI,GACJ,CAAC,SAAS,GAAG,GACZ,CAAC,SAAS,GAAG,KAAK,GAAG,MAAM,EAAE,GAC5B,IAAI,GACJ,KAAK,GACN,KAAK,GACP,CAAC,SAAS,GAAG,GACZ,CAAC,SAAS,GAAG,GACZ,IAAI,GACJ,KAAK,GACN,KAAK,CAAC;AAEV,KAAK,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,KAAK,CAChB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,GAAG,EAAE,EACrB,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,EACzB,CAAC,GAAG,GAAG,IACJ,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,GACjC,GAAG,CAAC,CAAC,CAAC,SAAS,GAAG,GACjB,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,GAC/B,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GAChC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GACjC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GACnC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAEhB,KAAK,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,SAAS,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS;IACrE,MAAM,CAAC,SAAS,MAAM;IACtB,GAAG,MAAM,CAAC,SAAS,MAAM,EAAE;CAC3B,GACE,KAAK,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAClE,GAAG,CAAC;AACP,KAAK,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,SAAS,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS;IACrE,MAAM,CAAC,SAAS,MAAM;IACtB,GAAG,MAAM,CAAC,SAAS,MAAM,EAAE;CAC3B,GACE,KAAK,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,GAClE,GAAG,CAAC;AAEP,mEAAmE;AACnE,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,mEAAmE;AACnE,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/dist/client.d.ts

@@ -1,4 +1,5 @@
-import type { Executor, SqlDriver } from "@typesql/core";
+import type { Executor } from "@typesql/core";
+import type { SqlDriver } from "@typesql/core/adapter";
 /**
  * What the adapter uses from a Drizzle database (`drizzle(client)` from `drizzle-orm/node-postgres`,
  * `drizzle-orm/postgres-js`, ...) or a transaction from `db.transaction(fn)`.

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEzD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACrE;AAmBD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,eAAe,GAAG,QAAQ,CAUtD;AAOD,yDAAyD;AACzD,eAAO,MAAM,MAAM,EAAE,SAAS,CAAC,eAAe,CAA6B,CAAC"}
+{"version":3,"file":"client.d.ts","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACpE;AAyBD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,eAAe,GAAG,QAAQ,CAgBtD;AAWD,yDAAyD;AACzD,eAAO,MAAM,MAAM,EAAE,SAAS,CAAC,eAAe,CAA6B,CAAC"}

package/dist/client.js

@@ -5,7 +5,8 @@
  */
 function clientOf(db) {
     const client = db._.session.client;
-    if (client && (typeof client.unsafe === "function" || typeof client.query === "function"))
+    if (client &&
+        (typeof client.unsafe === "function" || typeof client.query === "function"))
         return client;
     throw new Error("typesql: createSql(db) needs a Drizzle database on node-postgres or postgres.js (its session client has no query or unsafe method)");
 }

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../src/client.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,SAAS,QAAQ,CAAC,EAAmB;IACnC,MAAM,MAAM,GAAI,EAAE,CAAC,CAAC,CAAC,OAA8C,CAAC,MAAM,CAAC;IAC3E,IAAI,MAAM,IAAI,CAAC,OAAO,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC;QAAE,OAAO,MAAM,CAAC;IACzG,MAAM,IAAI,KAAK,CAAC,oIAAoI,CAAC,CAAC;AACxJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,EAAmB;IAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAmD,CAAC;YACjH,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,KAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAkD,CAAC;QAChH,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;IAClE,CAAC,CAAC;AACJ,CAAC;AAED,qGAAqG;AACrG,SAAS,WAAW,CAAI,EAAmB,EAAE,MAAc,EAAE,EAAuC;IAClG,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,MAAM,GAA+B,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"client.js","sources":["../src/client.ts"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH,SAAS,QAAQ,CAAC,EAAmB;IACpC,MAAM,MAAM,GAAI,EAAE,CAAC,CAAC,CAAC,OAA8C,CAAC,MAAM,CAAC;IAC3E,IACC,MAAM;QACN,CAAC,OAAO,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC;QAE3E,OAAO,MAAM,CAAC;IACf,MAAM,IAAI,KAAK,CACd,oIAAoI,CACpI,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,EAAmB;IAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAClC,IAAI,EACJ,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAClB,CAAmD,CAAC;YACrD,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACrE,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,KAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAG5D,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;IACjE,CAAC,CAAC;AACH,CAAC;AAED,qGAAqG;AACrG,SAAS,WAAW,CACnB,EAAmB,EACnB,MAAc,EACd,EAAuC;IAEvC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,MAAM,GAA+B,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC"}

package/dist/from-drizzle.d.ts

@@ -86,18 +86,16 @@ type ColumnConfig = {
 /** Values of an exported `pgEnum` (array or object form). */
 type EnumValues<X> = X extends {
     readonly enumValues: readonly [string, ...string[]];
-} ? X["enumValues"][number] : X extends {
-    (): {
-        readonly _: {
-            readonly data: infer D extends string;
-        };
+} ? X["enumValues"][number] : X extends () => {
+    readonly _: {
+        readonly data: infer D extends string;
     };
 } ? D : never;
 /** `$types` registry: exported enums by export name. */
 type Enums<S> = {
     -readonly [K in keyof S as S[K] extends EnumLike ? K : never]: EnumValues<S[K]>;
 };
-type LastOf<U> = (U extends unknown ? (x: () => U) => void : never) extends (x: infer F) => void ? (F extends () => infer L ? L : never) : never;
+type LastOf<U> = (U extends unknown ? (x: () => U) => void : never) extends (x: infer F) => void ? F extends () => infer L ? L : never : never;
 /** Name of the exported enum whose values are exactly `V` (any one when several match), else `text`. */
 type EnumName<V, E> = {
     [K in keyof E]: [E[K]] extends [V] ? ([V] extends [E[K]] ? K : never) : never;
@@ -108,10 +106,10 @@ type Opt<Opts, K extends keyof FromDrizzleOptions, D> = Opts extends {
 /** Postgres type of a column config. */
 type PgTypeOf<D extends ColumnConfig, Opts = {}, E = {}> = D extends {
     readonly typesqlType: infer T extends string;
-} ? T : D["columnType"] extends keyof DrizzleColumnTypes ? DrizzleColumnTypes[D["columnType"]] : D["columnType"] extends "PgArray" ? (D["baseColumn"] extends ColumnLike ? `${PgTypeOf<D["baseColumn"]["_"], Opts, E>}[]` : "unknown[]") : D["columnType"] extends "PgTimestamp" | "PgTimestampString" ? Opt<Opts, "timestamp", "timestamp"> : D["columnType"] extends "PgTime" ? Opt<Opts, "time", "time"> : D["columnType"] extends "PgEnumColumn" ? EnumName<(D["enumValues"] & readonly string[])[number], E> : D["columnType"] extends "PgEnumObjectColumn" ? EnumName<D["data"], E> : "unknown";
+} ? T : D["columnType"] extends keyof DrizzleColumnTypes ? DrizzleColumnTypes[D["columnType"]] : D["columnType"] extends "PgArray" ? D["baseColumn"] extends ColumnLike ? `${PgTypeOf<D["baseColumn"]["_"], Opts, E>}[]` : "unknown[]" : D["columnType"] extends "PgTimestamp" | "PgTimestampString" ? Opt<Opts, "timestamp", "timestamp"> : D["columnType"] extends "PgTime" ? Opt<Opts, "time", "time"> : D["columnType"] extends "PgEnumColumn" ? EnumName<(D["enumValues"] & readonly string[])[number], E> : D["columnType"] extends "PgEnumObjectColumn" ? EnumName<D["data"], E> : "unknown";
 /** The descriptor as the matching core helper (`Col`, `Nullable`, `Generated`, `NullableGenerated`). */
-type Desc<T extends string, N, H> = N extends true ? (H extends true ? NullableGenerated<T> : Nullable<T>) : H extends true ? Generated<T> : Col<T>;
-type ColOf<D extends ColumnConfig, Opts, E> = Desc<PgTypeOf<D, Opts, E>, D["notNull"] extends true ? false : true, D["hasDefault"] extends true ? (D["hasRuntimeDefault"] extends true ? false : true) : false>;
+type Desc<T extends string, N, H> = N extends true ? H extends true ? NullableGenerated<T> : Nullable<T> : H extends true ? Generated<T> : Col<T>;
+type ColOf<D extends ColumnConfig, Opts, E> = Desc<PgTypeOf<D, Opts, E>, D["notNull"] extends true ? false : true, D["hasDefault"] extends true ? D["hasRuntimeDefault"] extends true ? false : true : false>;
 type Cased<N extends string, Opts> = Opts extends {
     readonly casing: "snake_case";
 } ? ToSnakeCase<N> : Opts extends {
@@ -133,8 +131,8 @@ type Relation<X, Opts, E> = X extends TableLike ? Columns<X["_"]["columns"], Opt
 } : never;
 /** Postgres schema of a table outside `public`. */
 type SchemaOf<X> = X extends TableLike ? Exclude<X["_"]["schema"], undefined | "public"> : never;
-type NameIn<X, N> = X extends TableLike ? (X["_"]["schema"] extends N ? X["_"]["name"] : never) : never;
-type TopName<X> = X extends TableLike ? ([SchemaOf<X>] extends [never] ? X["_"]["name"] : never) : X extends ViewLike ? X["_"]["name"] : never;
+type NameIn<X, N> = X extends TableLike ? X["_"]["schema"] extends N ? X["_"]["name"] : never : never;
+type TopName<X> = X extends TableLike ? [SchemaOf<X>] extends [never] ? X["_"]["name"] : never : X extends ViewLike ? X["_"]["name"] : never;
 type Build<S, Opts, E = Enums<S>> = {
     -readonly [K in keyof S as TopName<S[K]>]: Relation<S[K], Opts, E>;
 } & {

package/dist/from-drizzle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"from-drizzle.d.ts","sources":["../src/from-drizzle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"from-drizzle.d.ts","sources":["../src/from-drizzle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,GAAG,EACH,SAAS,EACT,QAAQ,EACR,iBAAiB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE5D,0EAA0E;AAC1E,MAAM,WAAW,kBAAkB;IAClC,+FAA+F;IAC/F,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,WAAW,GAAG,SAAS,CAAC;IACzD,2HAA2H;IAC3H,QAAQ,CAAC,SAAS,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;IAC7D,2EAA2E;IAC3E,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC9C;AAED,wEAAwE;AACxE,MAAM,WAAW,kBAAkB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,SAAS,CAAC;IAC3B,eAAe,EAAE,SAAS,CAAC;IAC3B,MAAM,EAAE,QAAQ,CAAC;IACjB,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,KAAK,CAAC;IACtB,cAAc,EAAE,SAAS,CAAC;CAC1B;AAED,KAAK,SAAS,GAAG;IAChB,QAAQ,CAAC,CAAC,EAAE;QACX,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;KACzB,CAAC;CACF,CAAC;AACF,KAAK,QAAQ,GAAG;IACf,QAAQ,CAAC,CAAC,EAAE;QACX,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;KAChC,CAAC;CACF,CAAC;AACF,KAAK,QAAQ,GAAG;IACf,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC,CAAC;AACF,KAAK,UAAU,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAC/C,KAAK,YAAY,GAAG;IACnB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,6DAA6D;AAC7D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS;IAC9B,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;CACpD,GACE,CAAC,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GACvB,CAAC,SAAS,MAAM;IAAE,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;KAAE,CAAA;CAAE,GACxE,CAAC,GACD,KAAK,CAAC;AAEV,wDAAwD;AACxD,KAAK,KAAK,CAAC,CAAC,IAAI;IACf,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK,GAAG,UAAU,CACxE,CAAC,CAAC,CAAC,CAAC,CACJ;CACD,CAAC;AAEF,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CAC3E,CAAC,EAAE,MAAM,CAAC,KACN,IAAI,GACN,CAAC,SAAS,MAAM,MAAM,CAAC,GACtB,CAAC,GACD,KAAK,GACN,KAAK,CAAC;AAET,wGAAwG;AACxG,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI;KACpB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK;CAC7E,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GACvB,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAClB,MAAM,GACN,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GACnB,KAAK,CAAC;AAET,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC,SAAS,MAAM,kBAAkB,EAAE,CAAC,IAAI,IAAI,SAAS;IACpE,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,MAAM;CACzC,GACE,CAAC,GACD,CAAC,CAAC;AAEL,wCAAwC;AACxC,KAAK,QAAQ,CAAC,CAAC,SAAS,YAAY,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS;IACpE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,MAAM,CAAC;CAC7C,GACE,CAAC,GACD,CAAC,CAAC,YAAY,CAAC,SAAS,MAAM,kBAAkB,GAC/C,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GACnC,CAAC,CAAC,YAAY,CAAC,SAAS,SAAS,GAChC,CAAC,CAAC,YAAY,CAAC,SAAS,UAAU,GACjC,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAC9C,WAAW,GACZ,CAAC,CAAC,YAAY,CAAC,SAAS,aAAa,GAAG,mBAAmB,GAC1D,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,GACnC,CAAC,CAAC,YAAY,CAAC,SAAS,QAAQ,GAC/B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,GACzB,CAAC,CAAC,YAAY,CAAC,SAAS,cAAc,GACrC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,SAAS,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAC1D,CAAC,CAAC,YAAY,CAAC,SAAS,oBAAoB,GAC3C,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GACtB,SAAS,CAAC;AAEnB,wGAAwG;AACxG,KAAK,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,IAAI,GAC/C,CAAC,SAAS,IAAI,GACb,iBAAiB,CAAC,CAAC,CAAC,GACpB,QAAQ,CAAC,CAAC,CAAC,GACZ,CAAC,SAAS,IAAI,GACb,SAAS,CAAC,CAAC,CAAC,GACZ,GAAG,CAAC,CAAC,CAAC,CAAC;AAEX,KAAK,KAAK,CAAC,CAAC,SAAS,YAAY,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,CACjD,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EACpB,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,IAAI,EACxC,CAAC,CAAC,YAAY,CAAC,SAAS,IAAI,GACzB,CAAC,CAAC,mBAAmB,CAAC,SAAS,IAAI,GAClC,KAAK,GACL,IAAI,GACL,KAAK,CACR,CAAC;AAEF,KAAK,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,IAAI,IAAI,SAAS;IACjD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;CAC9B,GACE,WAAW,CAAC,CAAC,CAAC,GACd,IAAI,SAAS;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAC5C,WAAW,CAAC,CAAC,CAAC,GACd,CAAC,CAAC;AAEN,KAAK,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI;IAC1B,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAC/C,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAC9B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,KAAK;CACtE,CAAC;AAEF,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAA;KAAE,CAAA;CAAE,CAAC;AACjE,KAAK,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI;IAC9B,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAC/C,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAC9B,CAAC,CAAC,CAAC,CAAC,SAAS,OAAO,GACnB,CAAC,GACD,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAChC,IAAI,CACJ,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAC5B,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,IAAI,EAChD,KAAK,CACL,GACA,QAAQ,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,KAAK,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5C,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,GACnC,CAAC,SAAS,QAAQ,GACjB;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;CAAE,GAClE,KAAK,CAAC;AAEV,mDAAmD;AACnD,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACnC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC/C,KAAK,CAAC;AACT,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,SAAS,GACpC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,GACzB,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GACd,KAAK,GACN,KAAK,CAAC;AACT,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAClC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC5B,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GACd,KAAK,GACN,CAAC,SAAS,QAAQ,GACjB,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GACd,KAAK,CAAC;AAEV,KAAK,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI;IACnC,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;CAClE,GAAG;KACF,CAAC,IAAI;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE,CAAC,MAAM,CAAC,CAAC,GAAG;QACnD,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;KACpE;CACD,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAEjD,KAAK,IAAI,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,CACtB,MAAM,EACN,IAAI,SAAS,kBAAkB,GAAG,EAAE,IACjC,MAAM,SAAS,SAAS,GAAG,QAAQ,GACpC,IAAI,CAAC,KAAK,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM;CAAE,EAAE,IAAI,CAAC,CAAC,GACzD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,11 +1,9 @@
-import { type DefaultTypeMap, type TransactionalSql } from "@typesql/core";
+import type { DefaultTypeMap, TransactionalSql } from "@typesql/core";
 import { type DrizzleDatabase } from "./client.js";
 import type { FromDrizzle, FromDrizzleOptions } from "./from-drizzle.js";
-export type { FromDrizzle, FromDrizzleOptions, DrizzleColumnTypes } from "./from-drizzle.js";
+export { type DrizzleDatabase, executor } from "./client.js";
+export type { DrizzleColumnTypes, FromDrizzle, FromDrizzleOptions, } from "./from-drizzle.js";
 export { pgType } from "./pg-type.js";
-export { executor, type DrizzleDatabase } from "./client.js";
-export type { Sql, Query, RowType, ParamsType, DefaultTypeMap, TypeMap, Executor, TransactionalSql } from "@typesql/core";
-export { NoResultError } from "@typesql/core";
 /** What `createSql<typeof schema>(db)` returns: core's `Sql` over `FromDrizzle<Schema, Opts>`, with `transaction(fn)`. */
 export type DrizzleSql<Schema, TM = DefaultTypeMap, Opts extends FromDrizzleOptions = {}> = TransactionalSql<FromDrizzle<Schema, Opts>, TM>;
 /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,cAAc,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnG,OAAO,EAAU,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAC7D,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1H,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,0HAA0H;AAC1H,MAAM,MAAM,UAAU,CAAC,MAAM,EAAE,EAAE,GAAG,cAAc,EAAE,IAAI,SAAS,kBAAkB,GAAG,EAAE,IAAI,gBAAgB,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AAE5I;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,cAAc,EAAE,IAAI,SAAS,kBAAkB,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,eAAe,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAE/I"}
+{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,KAAK,eAAe,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC7D,YAAY,EACX,kBAAkB,EAClB,WAAW,EACX,kBAAkB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,0HAA0H;AAC1H,MAAM,MAAM,UAAU,CACrB,MAAM,EACN,EAAE,GAAG,cAAc,EACnB,IAAI,SAAS,kBAAkB,GAAG,EAAE,IACjC,gBAAgB,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AAEpD;;;;;GAKG;AACH,wBAAgB,SAAS,CACxB,MAAM,EACN,EAAE,GAAG,cAAc,EACnB,IAAI,SAAS,kBAAkB,GAAG,EAAE,EACnC,EAAE,CAAC,EAAE,eAAe,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAKpD"}

package/dist/index.js

@@ -1,8 +1,7 @@
-import { createTransactionalSql } from "@typesql/core";
+import { createTransactionalSql } from "@typesql/core/adapter";
 import { driver } from "./client.js";
-export { pgType } from "./pg-type.js";
 export { executor } from "./client.js";
-export { NoResultError } from "@typesql/core";
+export { pgType } from "./pg-type.js";
 /**
  * `createSql` from core with the schema converted from Drizzle definitions:
  * `createSql<typeof schema>(db)`, or `createSql<typeof schema, PgTypeMap>(db)` for a driver's type map.

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAA8C,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,MAAM,EAAwB,MAAM,aAAa,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAwB,MAAM,aAAa,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK9C;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAoE,EAAoB;IAC/G,OAAO,sBAAsB,CAAiD,EAAE,EAAE,MAAM,CAAiC,CAAC;AAC5H,CAAC"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAwB,MAAM,EAAE,MAAM,aAAa,CAAC;AAG3D,OAAO,EAAwB,QAAQ,EAAE,MAAM,aAAa,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAStC;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAIvB,EAAoB;IACrB,OAAO,sBAAsB,CAC5B,EAAE,EACF,MAAM,CAC0B,CAAC;AACnC,CAAC"}

package/dist/pg-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-type.d.ts","sources":["../src/pg-type.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;KAAE,CAAA;CAAE,CAGtH"}
+{"version":3,"file":"pg-type.d.ts","sources":["../src/pg-type.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,MAAM,EAC/C,OAAO,EAAE,CAAC,EACV,IAAI,EAAE,CAAC,GACL,CAAC,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;KAAE,CAAA;CAAE,CAGjD"}

package/dist/pg-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg-type.js","sources":["../src/pg-type.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAA4B,OAAU,EAAE,IAAO;IACnE,KAAK,IAAI,CAAC;IACV,OAAO,OAA0D,CAAC;AACpE,CAAC"}
+{"version":3,"file":"pg-type.js","sources":["../src/pg-type.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,MAAM,CACrB,OAAU,EACV,IAAO;IAEP,KAAK,IAAI,CAAC;IACV,OAAO,OAA0D,CAAC;AACnE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typesql/drizzle",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "Use Drizzle ORM table definitions as a TypeSQL schema.",
   "license": "MIT",
   "repository": {
@@ -28,14 +28,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@typesql/core": "0.4.0"
+    "@typesql/core": "0.6.0"
   },
   "peerDependencies": {
     "drizzle-orm": ">=0.45"
   },
   "devDependencies": {
     "@types/pg": "^8.23.1",
-    "@typesql/pg": "0.1.5",
+    "@typesql/pg": "0.2.1",
     "drizzle-orm": "^0.45.4",
     "pg": "^8.23.1",
     "postgres": "^3.4.9",

package/src/casing.ts

@@ -1,14 +1,55 @@
-type Lower = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z";
+type Lower =
+	| "a"
+	| "b"
+	| "c"
+	| "d"
+	| "e"
+	| "f"
+	| "g"
+	| "h"
+	| "i"
+	| "j"
+	| "k"
+	| "l"
+	| "m"
+	| "n"
+	| "o"
+	| "p"
+	| "q"
+	| "r"
+	| "s"
+	| "t"
+	| "u"
+	| "v"
+	| "w"
+	| "x"
+	| "y"
+	| "z";
 type Upper = Uppercase<Lower>;
 type Digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
 
-type Cls<C extends string> = C extends Lower ? "l" : C extends Digit ? "d" : C extends Upper ? "u" : "o";
+type Cls<C extends string> = C extends Lower
+	? "l"
+	: C extends Digit
+		? "d"
+		: C extends Upper
+			? "u"
+			: "o";
 
 /** A new word starts at `C` (class `K`) after a char of class `P`, `R` being the rest of the input. */
-type Starts<P, K, R extends string> =
-  K extends "u" ? (P extends "l" | "d" ? true : P extends "u" ? (R extends `${Lower}${string}` ? true : false) : false)
-  : K extends "d" ? (P extends "u" ? true : false)
-  : false;
+type Starts<P, K, R extends string> = K extends "u"
+	? P extends "l" | "d"
+		? true
+		: P extends "u"
+			? R extends `${Lower}${string}`
+				? true
+				: false
+			: false
+	: K extends "d"
+		? P extends "u"
+			? true
+			: false
+		: false;
 
 type Push<A extends string[], W extends string> = W extends "" ? A : [...A, W];
 
@@ -16,17 +57,31 @@ type Push<A extends string[], W extends string> = W extends "" ? A : [...A, W];
  * Words of an identifier, as Drizzle's `casing` splits them
  * (`/[\da-z]+|[A-Z]+(?![a-z])|[A-Z][\da-z]+/g`): `"userID2fa"` → `["user", "ID", "2fa"]`.
  */
-export type Words<S extends string, W extends string = "", Acc extends string[] = [], P = "o"> =
-  S extends `${infer C}${infer R}`
-    ? Cls<C> extends "o" ? Words<R, "", Push<Acc, W>, "o">
-      : Starts<P, Cls<C>, R> extends true ? Words<R, C, Push<Acc, W>, Cls<C>>
-      : Words<R, `${W}${C}`, Acc, Cls<C>>
-    : Push<Acc, W>;
+export type Words<
+	S extends string,
+	W extends string = "",
+	Acc extends string[] = [],
+	P = "o",
+> = S extends `${infer C}${infer R}`
+	? Cls<C> extends "o"
+		? Words<R, "", Push<Acc, W>, "o">
+		: Starts<P, Cls<C>, R> extends true
+			? Words<R, C, Push<Acc, W>, Cls<C>>
+			: Words<R, `${W}${C}`, Acc, Cls<C>>
+	: Push<Acc, W>;
 
-type Snake<Ws extends string[], Acc extends string = ""> =
-  Ws extends [infer W extends string, ...infer R extends string[]] ? Snake<R, Acc extends "" ? Lowercase<W> : `${Acc}_${Lowercase<W>}`> : Acc;
-type Camel<Ws extends string[], Acc extends string = ""> =
-  Ws extends [infer W extends string, ...infer R extends string[]] ? Camel<R, Acc extends "" ? Lowercase<W> : `${Acc}${Capitalize<W>}`> : Acc;
+type Snake<Ws extends string[], Acc extends string = ""> = Ws extends [
+	infer W extends string,
+	...infer R extends string[],
+]
+	? Snake<R, Acc extends "" ? Lowercase<W> : `${Acc}_${Lowercase<W>}`>
+	: Acc;
+type Camel<Ws extends string[], Acc extends string = ""> = Ws extends [
+	infer W extends string,
+	...infer R extends string[],
+]
+	? Camel<R, Acc extends "" ? Lowercase<W> : `${Acc}${Capitalize<W>}`>
+	: Acc;
 
 /** Drizzle's `toSnakeCase`: `"displayName"` → `"display_name"`. */
 export type ToSnakeCase<S extends string> = Snake<Words<S>>;

package/src/client.ts

@@ -1,18 +1,19 @@
-import type { Executor, SqlDriver } from "@typesql/core";
+import type { Executor } from "@typesql/core";
+import type { SqlDriver } from "@typesql/core/adapter";
 
 /**
  * What the adapter uses from a Drizzle database (`drizzle(client)` from `drizzle-orm/node-postgres`,
  * `drizzle-orm/postgres-js`, ...) or a transaction from `db.transaction(fn)`.
  */
 export interface DrizzleDatabase {
-  readonly _: { readonly session: object };
-  transaction<T>(fn: (tx: DrizzleDatabase) => Promise<T>): Promise<T>;
+	readonly _: { readonly session: object };
+	transaction<T>(fn: (tx: DrizzleDatabase) => Promise<T>): Promise<T>;
 }
 
 /** The driver client a Drizzle session holds: node-postgres' `query` or postgres.js' `unsafe`. */
 interface DriverClient {
-  query?(text: string, values: unknown[]): Promise<unknown>;
-  unsafe?(text: string, values: unknown[]): PromiseLike<unknown>;
+	query?(text: string, values: unknown[]): Promise<unknown>;
+	unsafe?(text: string, values: unknown[]): PromiseLike<unknown>;
 }
 
 /**
@@ -21,9 +22,15 @@ interface DriverClient {
  * `session.client`.
  */
 function clientOf(db: DrizzleDatabase): DriverClient {
-  const client = (db._.session as { readonly client?: DriverClient }).client;
-  if (client && (typeof client.unsafe === "function" || typeof client.query === "function")) return client;
-  throw new Error("typesql: createSql(db) needs a Drizzle database on node-postgres or postgres.js (its session client has no query or unsafe method)");
+	const client = (db._.session as { readonly client?: DriverClient }).client;
+	if (
+		client &&
+		(typeof client.unsafe === "function" || typeof client.query === "function")
+	)
+		return client;
+	throw new Error(
+		"typesql: createSql(db) needs a Drizzle database on node-postgres or postgres.js (its session client has no query or unsafe method)",
+	);
 }
 
 /**
@@ -32,20 +39,30 @@ function clientOf(db: DrizzleDatabase): DriverClient {
  * `{ rows, rowCount }` so `q.executeCount()` works.
  */
 export function executor(db: DrizzleDatabase): Executor {
-  return async (text, values) => {
-    const client = clientOf(db);
-    if (client.unsafe) {
-      const result = (await client.unsafe(text, Array.from(values))) as unknown[] & { readonly count?: number | null };
-      return { rows: Array.from(result), rowCount: result.count ?? null };
-    }
-    const result = (await client.query!(text, Array.from(values))) as { rows: unknown[]; rowCount?: number | null };
-    return { rows: result.rows, rowCount: result.rowCount ?? null };
-  };
+	return async (text, values) => {
+		const client = clientOf(db);
+		if (client.unsafe) {
+			const result = (await client.unsafe(
+				text,
+				Array.from(values),
+			)) as unknown[] & { readonly count?: number | null };
+			return { rows: Array.from(result), rowCount: result.count ?? null };
+		}
+		const result = (await client.query!(text, Array.from(values))) as {
+			rows: unknown[];
+			rowCount?: number | null;
+		};
+		return { rows: result.rows, rowCount: result.rowCount ?? null };
+	};
 }
 
 /** Run `fn` inside `db.transaction(fn)`; Drizzle nests a transaction inside one with a savepoint. */
-function transaction<T>(db: DrizzleDatabase, _depth: number, fn: (tx: DrizzleDatabase) => Promise<T>): Promise<T> {
-  return db.transaction(fn);
+function transaction<T>(
+	db: DrizzleDatabase,
+	_depth: number,
+	fn: (tx: DrizzleDatabase) => Promise<T>,
+): Promise<T> {
+	return db.transaction(fn);
 }
 
 /** How `createSql(db)` runs queries and transactions. */

package/src/from-drizzle.ts

@@ -1,146 +1,233 @@
-import type { Col, Generated, Nullable, NullableGenerated } from "@typesql/core";
+import type {
+	Col,
+	Generated,
+	Nullable,
+	NullableGenerated,
+} from "@typesql/core";
 import type { ToCamelCase, ToSnakeCase } from "./casing.js";
 
 /** Settings of your Drizzle setup that the column types do not record. */
 export interface FromDrizzleOptions {
-  /** The `casing` passed to `drizzle()`: applied to column names, as Drizzle does at runtime. */
-  readonly casing?: "snake_case" | "camelCase" | undefined;
-  /** Type of `timestamp()` columns not marked with `pgType` (Drizzle's types drop `withTimezone`). Default `"timestamp"`. */
-  readonly timestamp?: "timestamp" | "timestamptz" | undefined;
-  /** Type of `time()` columns not marked with `pgType`. Default `"time"`. */
-  readonly time?: "time" | "timetz" | undefined;
+	/** The `casing` passed to `drizzle()`: applied to column names, as Drizzle does at runtime. */
+	readonly casing?: "snake_case" | "camelCase" | undefined;
+	/** Type of `timestamp()` columns not marked with `pgType` (Drizzle's types drop `withTimezone`). Default `"timestamp"`. */
+	readonly timestamp?: "timestamp" | "timestamptz" | undefined;
+	/** Type of `time()` columns not marked with `pgType`. Default `"time"`. */
+	readonly time?: "time" | "timetz" | undefined;
 }
 
 /** Postgres type of each pg-core `columnType` with a fixed SQL type. */
 export interface DrizzleColumnTypes {
-  PgSmallInt: "int2";
-  PgInteger: "int4";
-  PgBigInt53: "int8";
-  PgBigInt64: "int8";
-  PgSmallSerial: "int2";
-  PgSerial: "int4";
-  PgBigSerial53: "int8";
-  PgBigSerial64: "int8";
-  PgNumeric: "numeric";
-  PgNumericNumber: "numeric";
-  PgNumericBigInt: "numeric";
-  PgReal: "float4";
-  PgDoublePrecision: "float8";
-  PgBoolean: "bool";
-  PgText: "text";
-  PgVarchar: "varchar";
-  PgChar: "bpchar";
-  PgUUID: "uuid";
-  PgDate: "date";
-  PgDateString: "date";
-  PgInterval: "interval";
-  PgJson: "json";
-  PgJsonb: "jsonb";
-  PgInet: "inet";
-  PgCidr: "cidr";
-  PgMacaddr: "macaddr";
-  PgMacaddr8: "macaddr8";
-  PgPointTuple: "point";
-  PgPointObject: "point";
-  PgLine: "line";
-  PgLineABC: "line";
-  PgGeometry: "geometry";
-  PgGeometryObject: "geometry";
-  PgVector: "vector";
-  PgHalfVector: "halfvec";
-  PgSparseVector: "sparsevec";
-  PgBinaryVector: "bit";
-  PgCustomColumn: "unknown";
+	PgSmallInt: "int2";
+	PgInteger: "int4";
+	PgBigInt53: "int8";
+	PgBigInt64: "int8";
+	PgSmallSerial: "int2";
+	PgSerial: "int4";
+	PgBigSerial53: "int8";
+	PgBigSerial64: "int8";
+	PgNumeric: "numeric";
+	PgNumericNumber: "numeric";
+	PgNumericBigInt: "numeric";
+	PgReal: "float4";
+	PgDoublePrecision: "float8";
+	PgBoolean: "bool";
+	PgText: "text";
+	PgVarchar: "varchar";
+	PgChar: "bpchar";
+	PgUUID: "uuid";
+	PgDate: "date";
+	PgDateString: "date";
+	PgInterval: "interval";
+	PgJson: "json";
+	PgJsonb: "jsonb";
+	PgInet: "inet";
+	PgCidr: "cidr";
+	PgMacaddr: "macaddr";
+	PgMacaddr8: "macaddr8";
+	PgPointTuple: "point";
+	PgPointObject: "point";
+	PgLine: "line";
+	PgLineABC: "line";
+	PgGeometry: "geometry";
+	PgGeometryObject: "geometry";
+	PgVector: "vector";
+	PgHalfVector: "halfvec";
+	PgSparseVector: "sparsevec";
+	PgBinaryVector: "bit";
+	PgCustomColumn: "unknown";
 }
 
-type TableLike = { readonly _: { readonly brand: "Table"; readonly name: string; readonly schema: string | undefined; readonly columns: object } };
-type ViewLike = { readonly _: { readonly brand: "View"; readonly name: string; readonly selectedFields: object } };
-type EnumLike = { readonly enumName: string; readonly enumValues: readonly string[] };
+type TableLike = {
+	readonly _: {
+		readonly brand: "Table";
+		readonly name: string;
+		readonly schema: string | undefined;
+		readonly columns: object;
+	};
+};
+type ViewLike = {
+	readonly _: {
+		readonly brand: "View";
+		readonly name: string;
+		readonly selectedFields: object;
+	};
+};
+type EnumLike = {
+	readonly enumName: string;
+	readonly enumValues: readonly string[];
+};
 type ColumnLike = { readonly _: ColumnConfig };
 type ColumnConfig = {
-  readonly brand: "Column";
-  readonly name: string;
-  readonly columnType: string;
-  readonly notNull: boolean;
-  readonly hasDefault: boolean;
-  readonly hasRuntimeDefault: boolean;
-  readonly enumValues: readonly string[] | undefined;
-  readonly data: unknown;
-  readonly baseColumn: unknown;
+	readonly brand: "Column";
+	readonly name: string;
+	readonly columnType: string;
+	readonly notNull: boolean;
+	readonly hasDefault: boolean;
+	readonly hasRuntimeDefault: boolean;
+	readonly enumValues: readonly string[] | undefined;
+	readonly data: unknown;
+	readonly baseColumn: unknown;
 };
 
 /** Values of an exported `pgEnum` (array or object form). */
-type EnumValues<X> =
-  X extends { readonly enumValues: readonly [string, ...string[]] } ? X["enumValues"][number]
-  : X extends { (): { readonly _: { readonly data: infer D extends string } } } ? D
-  : never;
+type EnumValues<X> = X extends {
+	readonly enumValues: readonly [string, ...string[]];
+}
+	? X["enumValues"][number]
+	: X extends () => { readonly _: { readonly data: infer D extends string } }
+		? D
+		: never;
 
 /** `$types` registry: exported enums by export name. */
-type Enums<S> = { -readonly [K in keyof S as S[K] extends EnumLike ? K : never]: EnumValues<S[K]> };
+type Enums<S> = {
+	-readonly [K in keyof S as S[K] extends EnumLike ? K : never]: EnumValues<
+		S[K]
+	>;
+};
 
-type LastOf<U> = (U extends unknown ? (x: () => U) => void : never) extends (x: infer F) => void ? (F extends () => infer L ? L : never) : never;
+type LastOf<U> = (U extends unknown ? (x: () => U) => void : never) extends (
+	x: infer F,
+) => void
+	? F extends () => infer L
+		? L
+		: never
+	: never;
 
 /** Name of the exported enum whose values are exactly `V` (any one when several match), else `text`. */
-type EnumName<V, E> =
-  { [K in keyof E]: [E[K]] extends [V] ? ([V] extends [E[K]] ? K : never) : never }[keyof E] extends infer N
-    ? [N] extends [never] ? "text" : LastOf<N> & string
-    : never;
-
-type Opt<Opts, K extends keyof FromDrizzleOptions, D> = Opts extends { readonly [P in K]: infer V extends string } ? V : D;
+type EnumName<V, E> = {
+	[K in keyof E]: [E[K]] extends [V] ? ([V] extends [E[K]] ? K : never) : never;
+}[keyof E] extends infer N
+	? [N] extends [never]
+		? "text"
+		: LastOf<N> & string
+	: never;
+
+type Opt<Opts, K extends keyof FromDrizzleOptions, D> = Opts extends {
+	readonly [P in K]: infer V extends string;
+}
+	? V
+	: D;
 
 /** Postgres type of a column config. */
-type PgTypeOf<D extends ColumnConfig, Opts = {}, E = {}> =
-  D extends { readonly typesqlType: infer T extends string } ? T
-  : D["columnType"] extends keyof DrizzleColumnTypes ? DrizzleColumnTypes[D["columnType"]]
-  : D["columnType"] extends "PgArray" ? (D["baseColumn"] extends ColumnLike ? `${PgTypeOf<D["baseColumn"]["_"], Opts, E>}[]` : "unknown[]")
-  : D["columnType"] extends "PgTimestamp" | "PgTimestampString" ? Opt<Opts, "timestamp", "timestamp">
-  : D["columnType"] extends "PgTime" ? Opt<Opts, "time", "time">
-  : D["columnType"] extends "PgEnumColumn" ? EnumName<(D["enumValues"] & readonly string[])[number], E>
-  : D["columnType"] extends "PgEnumObjectColumn" ? EnumName<D["data"], E>
-  : "unknown";
+type PgTypeOf<D extends ColumnConfig, Opts = {}, E = {}> = D extends {
+	readonly typesqlType: infer T extends string;
+}
+	? T
+	: D["columnType"] extends keyof DrizzleColumnTypes
+		? DrizzleColumnTypes[D["columnType"]]
+		: D["columnType"] extends "PgArray"
+			? D["baseColumn"] extends ColumnLike
+				? `${PgTypeOf<D["baseColumn"]["_"], Opts, E>}[]`
+				: "unknown[]"
+			: D["columnType"] extends "PgTimestamp" | "PgTimestampString"
+				? Opt<Opts, "timestamp", "timestamp">
+				: D["columnType"] extends "PgTime"
+					? Opt<Opts, "time", "time">
+					: D["columnType"] extends "PgEnumColumn"
+						? EnumName<(D["enumValues"] & readonly string[])[number], E>
+						: D["columnType"] extends "PgEnumObjectColumn"
+							? EnumName<D["data"], E>
+							: "unknown";
 
 /** The descriptor as the matching core helper (`Col`, `Nullable`, `Generated`, `NullableGenerated`). */
-type Desc<T extends string, N, H> =
-  N extends true ? (H extends true ? NullableGenerated<T> : Nullable<T>) : H extends true ? Generated<T> : Col<T>;
+type Desc<T extends string, N, H> = N extends true
+	? H extends true
+		? NullableGenerated<T>
+		: Nullable<T>
+	: H extends true
+		? Generated<T>
+		: Col<T>;
 
 type ColOf<D extends ColumnConfig, Opts, E> = Desc<
-  PgTypeOf<D, Opts, E>,
-  D["notNull"] extends true ? false : true,
-  D["hasDefault"] extends true ? (D["hasRuntimeDefault"] extends true ? false : true) : false
+	PgTypeOf<D, Opts, E>,
+	D["notNull"] extends true ? false : true,
+	D["hasDefault"] extends true
+		? D["hasRuntimeDefault"] extends true
+			? false
+			: true
+		: false
 >;
 
-type Cased<N extends string, Opts> =
-  Opts extends { readonly casing: "snake_case" } ? ToSnakeCase<N>
-  : Opts extends { readonly casing: "camelCase" } ? ToCamelCase<N>
-  : N;
+type Cased<N extends string, Opts> = Opts extends {
+	readonly casing: "snake_case";
+}
+	? ToSnakeCase<N>
+	: Opts extends { readonly casing: "camelCase" }
+		? ToCamelCase<N>
+		: N;
 
 type Columns<C, Opts, E> = {
-  -readonly [K in keyof C as C[K] extends ColumnLike ? Cased<C[K]["_"]["name"], Opts> : never]: C[K] extends ColumnLike ? ColOf<C[K]["_"], Opts, E> : never;
+	-readonly [K in keyof C as C[K] extends ColumnLike
+		? Cased<C[K]["_"]["name"], Opts>
+		: never]: C[K] extends ColumnLike ? ColOf<C[K]["_"], Opts, E> : never;
 };
 
 type Aliased = { readonly _: { readonly brand: "SQL.Aliased" } };
 type ViewColumns<F, Opts, E> = {
-  -readonly [K in keyof F as F[K] extends ColumnLike ? Cased<F[K]["_"]["name"], Opts> : F[K] extends Aliased ? K : never]:
-    F[K] extends ColumnLike ? Desc<PgTypeOf<F[K]["_"], Opts, E>, F[K]["_"]["notNull"] extends true ? false : true, false> : Nullable<"unknown">;
+	-readonly [K in keyof F as F[K] extends ColumnLike
+		? Cased<F[K]["_"]["name"], Opts>
+		: F[K] extends Aliased
+			? K
+			: never]: F[K] extends ColumnLike
+		? Desc<
+				PgTypeOf<F[K]["_"], Opts, E>,
+				F[K]["_"]["notNull"] extends true ? false : true,
+				false
+			>
+		: Nullable<"unknown">;
 };
 
-type Relation<X, Opts, E> =
-  X extends TableLike ? Columns<X["_"]["columns"], Opts, E>
-  : X extends ViewLike ? { readonly $view: ViewColumns<X["_"]["selectedFields"], Opts, E> }
-  : never;
+type Relation<X, Opts, E> = X extends TableLike
+	? Columns<X["_"]["columns"], Opts, E>
+	: X extends ViewLike
+		? { readonly $view: ViewColumns<X["_"]["selectedFields"], Opts, E> }
+		: never;
 
 /** Postgres schema of a table outside `public`. */
-type SchemaOf<X> = X extends TableLike ? Exclude<X["_"]["schema"], undefined | "public"> : never;
-type NameIn<X, N> = X extends TableLike ? (X["_"]["schema"] extends N ? X["_"]["name"] : never) : never;
-type TopName<X> =
-  X extends TableLike ? ([SchemaOf<X>] extends [never] ? X["_"]["name"] : never)
-  : X extends ViewLike ? X["_"]["name"]
-  : never;
-
-type Build<S, Opts, E = Enums<S>> =
-  { -readonly [K in keyof S as TopName<S[K]>]: Relation<S[K], Opts, E> }
-  & { [N in { [K in keyof S]: SchemaOf<S[K]> }[keyof S]]: { -readonly [K in keyof S as NameIn<S[K], N>]: Relation<S[K], Opts, E> } }
-  & (keyof E extends never ? {} : { $types: E });
+type SchemaOf<X> = X extends TableLike
+	? Exclude<X["_"]["schema"], undefined | "public">
+	: never;
+type NameIn<X, N> = X extends TableLike
+	? X["_"]["schema"] extends N
+		? X["_"]["name"]
+		: never
+	: never;
+type TopName<X> = X extends TableLike
+	? [SchemaOf<X>] extends [never]
+		? X["_"]["name"]
+		: never
+	: X extends ViewLike
+		? X["_"]["name"]
+		: never;
+
+type Build<S, Opts, E = Enums<S>> = {
+	-readonly [K in keyof S as TopName<S[K]>]: Relation<S[K], Opts, E>;
+} & {
+	[N in { [K in keyof S]: SchemaOf<S[K]> }[keyof S]]: {
+		-readonly [K in keyof S as NameIn<S[K], N>]: Relation<S[K], Opts, E>;
+	};
+} & (keyof E extends never ? {} : { $types: E });
 
 type Flat<T> = { [K in keyof T]: T[K] } & {};
 
@@ -152,5 +239,9 @@ type Flat<T> = { [K in keyof T]: T[K] } & {};
  * exported `pgEnum`s are registered under `$types` by export name. Anything else exported
  * (relations, sequences, helpers) is ignored.
  */
-export type FromDrizzle<Schema, Opts extends FromDrizzleOptions = {}> =
-  Schema extends TableLike | ViewLike ? Flat<Build<{ [K in Schema["_"]["name"]]: Schema }, Opts>> : Flat<Build<Schema, Opts>>;
+export type FromDrizzle<
+	Schema,
+	Opts extends FromDrizzleOptions = {},
+> = Schema extends TableLike | ViewLike
+	? Flat<Build<{ [K in Schema["_"]["name"]]: Schema }, Opts>>
+	: Flat<Build<Schema, Opts>>;

package/src/index.ts

@@ -1,15 +1,22 @@
-import { createTransactionalSql, type DefaultTypeMap, type TransactionalSql } from "@typesql/core";
-import { driver, type DrizzleDatabase } from "./client.js";
+import type { DefaultTypeMap, TransactionalSql } from "@typesql/core";
+import { createTransactionalSql } from "@typesql/core/adapter";
+import { type DrizzleDatabase, driver } from "./client.js";
 import type { FromDrizzle, FromDrizzleOptions } from "./from-drizzle.js";
 
-export type { FromDrizzle, FromDrizzleOptions, DrizzleColumnTypes } from "./from-drizzle.js";
+export { type DrizzleDatabase, executor } from "./client.js";
+export type {
+	DrizzleColumnTypes,
+	FromDrizzle,
+	FromDrizzleOptions,
+} from "./from-drizzle.js";
 export { pgType } from "./pg-type.js";
-export { executor, type DrizzleDatabase } from "./client.js";
-export type { Sql, Query, RowType, ParamsType, DefaultTypeMap, TypeMap, Executor, TransactionalSql } from "@typesql/core";
-export { NoResultError } from "@typesql/core";
 
 /** What `createSql<typeof schema>(db)` returns: core's `Sql` over `FromDrizzle<Schema, Opts>`, with `transaction(fn)`. */
-export type DrizzleSql<Schema, TM = DefaultTypeMap, Opts extends FromDrizzleOptions = {}> = TransactionalSql<FromDrizzle<Schema, Opts>, TM>;
+export type DrizzleSql<
+	Schema,
+	TM = DefaultTypeMap,
+	Opts extends FromDrizzleOptions = {},
+> = TransactionalSql<FromDrizzle<Schema, Opts>, TM>;
 
 /**
  * `createSql` from core with the schema converted from Drizzle definitions:
@@ -17,6 +24,13 @@ export type DrizzleSql<Schema, TM = DefaultTypeMap, Opts extends FromDrizzleOpti
  * The queries' `execute*` methods run on `db` (a Drizzle database or transaction, on node-postgres
  * or postgres.js), and `sql.transaction(fn)` runs `fn` with a `sql` bound to `db.transaction`.
  */
-export function createSql<Schema, TM = DefaultTypeMap, Opts extends FromDrizzleOptions = {}>(db?: DrizzleDatabase): DrizzleSql<Schema, TM, Opts> {
-  return createTransactionalSql<FromDrizzle<Schema, Opts>, TM, DrizzleDatabase>(db, driver) as DrizzleSql<Schema, TM, Opts>;
+export function createSql<
+	Schema,
+	TM = DefaultTypeMap,
+	Opts extends FromDrizzleOptions = {},
+>(db?: DrizzleDatabase): DrizzleSql<Schema, TM, Opts> {
+	return createTransactionalSql<FromDrizzle<Schema, Opts>, TM, DrizzleDatabase>(
+		db,
+		driver,
+	) as DrizzleSql<Schema, TM, Opts>;
 }

package/src/pg-type.ts

@@ -3,7 +3,10 @@
  * cannot tell it: `pgType(timestamp("at", { withTimezone: true }), "timestamptz")`, or a
  * `customType` column. Returns the builder unchanged at runtime.
  */
-export function pgType<B, const T extends string>(builder: B, type: T): B & { readonly _: { readonly typesqlType: T } } {
-  void type;
-  return builder as B & { readonly _: { readonly typesqlType: T } };
+export function pgType<B, const T extends string>(
+	builder: B,
+	type: T,
+): B & { readonly _: { readonly typesqlType: T } } {
+	void type;
+	return builder as B & { readonly _: { readonly typesqlType: T } };
 }