@typed-sql/postgres 1.0.0-rc.0 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,76 @@
 # @typed-sql/postgres
 
+## 1.0.0
+
+### Major Changes
+
+- 7ca256b: Release the first public typed-sql beta: exact TypeScript 7 row inference from static PostgreSQL and
+  MySQL, versioned schema introspection, application-owned drivers, config-driven grammar plugins,
+  CLI verification, editor language-server integration, versioned diagnostics, bounded parsing, and
+  real-database plus packed-tarball verification.
+
+### Minor Changes
+
+- eb16de7: Add grammar-neutral stream and ordered-result type contracts, and add lazy prepared-query factories to the PostgreSQL and MySQL runtime adapters. Prepared factories retain exact query types, validate stable SQL shapes, and remain available inside nested transactions.
+- eb16de7: Add lazy, exactly typed query streams to the PostgreSQL and MySQL runtime adapters. PostgreSQL
+  uses an application-owned optional `pg-cursor` installation for bounded cursor reads. MySQL uses
+  mysql2's execute-protocol stream and shared decoder plan. Both adapters enforce deterministic
+  cleanup, transaction ownership, and positive safe-integer batch sizes.
+- eb16de7: Add a grammar-neutral validated query-batch type and ordered, exactly typed query batches to the
+  PostgreSQL and MySQL runtime adapters. Non-empty root batches execute sequentially on one leased
+  connection, transaction batches reuse their transaction connection, and empty batches avoid
+  connection acquisition. Batch execution preserves prepared metadata and adapter codecs, stops at
+  the first failure, and rejects transaction work that escapes its callback.
+- b6389e4: Add an exactly typed PostgreSQL `pipeline()` capability backed by node-postgres's documented opt-in pipeline mode. Pipelines lease one client, dispatch independent queries before awaiting their results, preserve tuple order and prepared metadata, settle every in-flight query before cleanup, and integrate with transaction rollback and non-escape guarantees without changing sequential `batch()` semantics.
+
+### Patch Changes
+
+- b6389e4: Cache immutable SQL rendering skeletons for prepared query factories so repeated calls only bind changing values while still rejecting structural drift before driver dispatch.
+- eb16de7: Own in-flight transaction executions through settlement so unawaited work can never race commit, savepoint release, rollback, or connection release.
+
+  The PostgreSQL adapter now also rejects pg's client-side `query_timeout` option because it can settle before the connection is safe to reuse. Root batches discard checked-out clients after query rejection, while caught transaction query, batch, and stream failures force rollback and discard the lease. Use PostgreSQL's server-enforced `statement_timeout` for statement deadlines.
+- eb16de7: Allow adapters to retain enriched capabilities in transaction callbacks and nested transactions
+  through a self-typed core database contract. Transaction cleanup now also preserves the original
+  operation error when rollback or connection-release cleanup fails.
+- 1563a7a: Declare and enforce the 1.0 package stability boundary. Core SQL, compiler, schema, config, AST,
+  PostgreSQL, MySQL, and CLI packages form the stable train; the TypeScript preview bridge and
+  language server remain explicitly experimental. Freeze public entrypoints and query type contracts,
+  and remove internal compiler/type helpers from stable package-root exports before 1.0.
+- 9dd6bc4: Finalize dialect contract version 3 with explicit identifier quoting and grammar-owned capability
+  declarations. Accept third-party snapshot dialects, validate grammar versions, and document the
+  public grammar-authoring and conformance workflow.
+- 16e2475: Prove npm trusted publishing and provenance after the initial registry bootstrap.
+- 642cebd: Prove and document runtime codec fidelity against live PostgreSQL and MySQL values. PostgreSQL now
+  delegates non-policy OIDs to the installed pg parser table, MySQL maps BIT to Uint8Array, and the
+  mysql2 adapter rejects pool settings that would contradict its type policy.
+- 3e2c75c: Infer ordered query parameter tuples and let TypeScript reject interpolation values that do not
+  match their SQL context. Dialect contract version 2 adds explicit parameter analysis; unresolved
+  positions remain `unknown`. Add typed nullable predicate composition through `sql.fragment()`,
+  `sql.and()`, `sql.or()`, `sql.where()`, and `sql.append()` while preserving row and parameter tuples.
+  Direct append fragments are grammar-analyzed cumulatively against their static base, so TypeScript
+  rejects fragment interpolation values that disagree with the referenced database columns.
+  Add `sql.empty` and SQL-template-native conditional structural fragments. The compiler analyzes
+  complete branch variants, preserves literal boolean-dependent result rows, and type-checks nested
+  fragment parameters without adding a query-builder DSL. Bound independent structural expansion at
+  64 variants by default, correlate repeated conditions, merge diagnostics and fragment expectations
+  across variants, and fail closed on incompatible contexts. Share indexed catalog and conservative
+  parameter-resolution primitives across grammars, harden cooked-template scanning, and add runtime,
+  resolver, scanner, and structural performance gates.
+- Updated dependencies [eb16de7]
+- Updated dependencies [b6389e4]
+- Updated dependencies [eb16de7]
+- Updated dependencies [b6389e4]
+- Updated dependencies [eb16de7]
+- Updated dependencies [1563a7a]
+- Updated dependencies [9dd6bc4]
+- Updated dependencies [7ca256b]
+- Updated dependencies [16e2475]
+- Updated dependencies [69c7d87]
+- Updated dependencies [3e2c75c]
+  - @typed-sql/core@1.0.0
+  - @typed-sql/ast@1.0.0
+  - @typed-sql/schema@1.0.0
+
 ## 1.0.0-rc.0
 
 ### Patch Changes

package/README.md

@@ -1,95 +1,62 @@
 # @typed-sql/postgres
 
-PostgreSQL grammar, catalog introspection, exact result inference, type policy, runtime codecs, and
-an optional application-owned `pg` adapter for [typed-sql](https://github.com/Lojhan/typed-sql).
+The stable PostgreSQL grammar for [typed-sql](https://github.com/Lojhan/typed-sql), including
+catalog introspection, row and parameter inference, type policy, runtime codecs, and an optional
+application-owned `pg` adapter.
 
 ```sh
-pnpm add @typed-sql/core@next @typed-sql/postgres@next pg
-pnpm add -D @typed-sql/cli@next typescript@7.0.2
+pnpm add @typed-sql/core @typed-sql/postgres pg
+pnpm add -D @typed-sql/cli typescript@7.0.2
 ```
 
-`pg` is intentionally not a dependency or peer dependency of this package. Your application chooses
-its driver version, pool configuration, and lifecycle; the adapter loads it only when you import
-`@typed-sql/postgres/pg`.
-
-## Configure and generate
-
-```ts
-import { defineConfig } from "@typed-sql/core";
-import { postgres, typePolicy } from "@typed-sql/postgres";
-import { pg } from "@typed-sql/postgres/pg";
-
-export default defineConfig({
-  dialect: postgres({ typePolicy }),
-  schema: {
-    file: "generated/db/schema.json",
-    provider: pg({
-      connectionString: () => process.env.DATABASE_URL!,
-      schemas: ["public"],
-      typePolicy,
-    }),
-  },
-  outDir: "generated/db",
-  projects: ["tsconfig.json"],
-  typePolicy,
-});
-```
+`pg` is loaded only through `@typed-sql/postgres/pg`; it is not a dependency or peer dependency of
+the grammar. Applications that stream rows also install the optional application-owned cursor:
 
 ```sh
-pnpm exec typed-sql generate
+pnpm add pg-cursor
 ```
 
-## Query and execute
-
 ```ts
 import { sql, typePolicy } from "@typed-sql/postgres";
 import { createPgDatabase } from "@typed-sql/postgres/pg";
 
 const query = sql`
-  SELECT account.id, account.email, account.status, project.budget
+  SELECT account.id, account.email, project.budget
   FROM users AS account
   LEFT JOIN projects AS project ON project.owner_id = account.id
-  ORDER BY account.id
 `;
 
 const database = await createPgDatabase({
   connectionString: process.env.DATABASE_URL!,
+  poolConfig: { pipeline: true },
   typePolicy,
 });
 
+// pipeline() requires the application-owned pg 8.23.0 or newer.
+
 const rows = await database.execute(query);
-// readonly {
-//   id: bigint;
-//   email: string;
-//   status: "active" | "suspended";
-//   budget: string | null;
-// }[]
-```
 
-The default lossless policy maps PostgreSQL `bigint` to `bigint`, `numeric` to `string`, temporal
-types to `Date`, JSON to `unknown`, enums to literal unions, arrays recursively, and `bytea` to
-`Uint8Array`. Per-query parsers do not mutate `pg` globals and delegate non-policy OIDs to the
-installed driver's native parser table. See the tested
-[runtime codec matrix](https://github.com/Lojhan/typed-sql/blob/main/docs/CODEC_FIDELITY.md#postgresql-and-pg).
+const accountById = database.prepare("account-by-id", (id: bigint) => sql`
+  SELECT account.id, account.email
+  FROM users AS account
+  WHERE account.id = ${id}
+`);
+
+const [selectedAccounts, allAccounts] = await database.batch([accountById(42n), query]);
+const [pipelinedAccount, pipelinedAll] = await database.pipeline([accountById(42n), query]);
 
-## Supported SQL
+for await (const account of database.stream(accountById(42n), { batchSize: 500 })) {
+  // account retains the query's inferred row type
+}
+```
 
-| Surface | Status | Notes |
-| --- | --- | --- |
-| Static tagged templates | Supported | Imports and aliases from `@typed-sql/postgres` are recognized. |
-| `SELECT`, `DISTINCT`, `DISTINCT ON` | Supported | Static row-shape inference. |
-| Tables, schemas, aliases and stars | Supported | Catalog lookup, ambiguity checks and `USING` column merging. |
-| Inner and outer joins | Supported | Outer-join nullability propagates into result columns. |
-| CTEs and derived/correlated/scalar subqueries | Supported | Recursive CTEs and unsafe scalar/IN arity diagnose. |
-| Grouping, aggregates and windows | Supported | Includes common aggregates, `FILTER`, named and inline windows. |
-| Expressions, `CASE`, casts and `$n` parameters | Supported | Parameters infer from columns, casts, DML targets, ranges, limits, and catalog functions; ambiguous positions remain `unknown`. |
-| Arrays, enums, domains, JSON and catalog functions | Supported | Known types and function name/arity are validated. |
-| `INSERT`, `UPDATE`, `DELETE`, `RETURNING` | Supported | Commands without `RETURNING` infer `Query<never, Parameters>`. |
-| Set operations and `WITHIN GROUP` | Not supported | Fail safely during parsing. |
-| Dynamic SQL or identifiers | No static inference | Use runtime values and `sql.ident()` explicitly. |
+The package root exports `sql`, `postgres`, and the PostgreSQL type policy. The `/pg` entrypoint
+exports the schema provider and execution adapter; `/runtime` exposes driver-neutral PostgreSQL
+rendering and codecs.
 
-A feature not marked supported produces a diagnostic or `Query<unknown>`; it never receives an
-optimistic row type. Introspection covers tables, views, columns, defaults, server version, arrays,
-enums, domains and user functions.
+Read the [PostgreSQL grammar guide](https://github.com/Lojhan/typed-sql/blob/main/docs/dialects/postgresql.md),
+[execution guide](https://github.com/Lojhan/typed-sql/blob/main/docs/guides/execution.md),
+[configuration](https://github.com/Lojhan/typed-sql/blob/main/docs/getting-started/configuration.md), and
+[database type mappings](https://github.com/Lojhan/typed-sql/blob/main/docs/reference/type-mappings.md).
 
 MIT © typed-sql contributors

package/dist/packages/postgres/src/pg.d.ts

@@ -1,12 +1,21 @@
 import type { Pool as PgPool, PoolConfig } from "pg";
 import type { PostgresSchemaSnapshot, PostgresTypePolicy } from "./index.js";
 import { type PostgresQueryable } from "./provider.js";
-import { type PostgresDatabase, type PostgresPoolLike } from "./runtime.js";
+import { type PostgresDatabase, type PostgresPoolLike, type PostgresQueryConfig } from "./runtime.js";
+export interface PgCursorConstructor {
+    new (text: string, values?: readonly unknown[], config?: {
+        readonly types?: PostgresQueryConfig["types"];
+    }): unknown;
+}
+export type PgCursorImporter = () => Promise<unknown>;
+export declare function loadPgCursorDriver(importer?: PgCursorImporter): Promise<PgCursorConstructor>;
 export interface PgOptions {
     readonly connectionString: string | (() => string | Promise<string>);
-    readonly poolConfig?: Omit<PoolConfig, "connectionString" | "types">;
+    readonly poolConfig?: Omit<PoolConfig, "connectionString" | "query_timeout" | "types">;
     readonly typePolicy?: PostgresTypePolicy;
     readonly decimal?: (value: string) => unknown;
+    /** Host-injected loader for workspaces or runtimes with nonstandard package resolution. */
+    readonly cursorImporter?: PgCursorImporter;
 }
 export interface PgSchemaProviderOptions {
     readonly connectionString?: string | (() => string | Promise<string>);
@@ -15,7 +24,7 @@ export interface PgSchemaProviderOptions {
     readonly typePolicy?: PostgresTypePolicy;
 }
 export declare function loadPgDriver(importer?: () => Promise<typeof import("pg")>): Promise<typeof import("pg")>;
-export declare function adaptPgPool(pool: PgPool): PostgresPoolLike;
+export declare function adaptPgPool(pool: PgPool, cursorImporter?: PgCursorImporter): PostgresPoolLike;
 export declare function createPgDatabase(options: PgOptions): Promise<PostgresDatabase>;
 export declare function pg(options: PgSchemaProviderOptions): {
     introspect(): Promise<PostgresSchemaSnapshot>;

package/dist/packages/postgres/src/pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../src/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAc,UAAU,EAAe,MAAM,IAAI,CAAC;AAC9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,KAAK,iBAAiB,EAA0B,MAAM,eAAe,CAAC;AAC/E,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAGtB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC;IACrE,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/C;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;CAC1C;AAED,wBAAsB,YAAY,CAChC,QAAQ,GAAE,MAAM,OAAO,CAAC,cAAc,IAAI,CAAC,CAAsB,GAChE,OAAO,CAAC,cAAc,IAAI,CAAC,CAAC,CAW9B;AAwBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CA4B1D;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAYpF;AAED,wBAAgB,EAAE,CAAC,OAAO,EAAE,uBAAuB,GAAG;IAAE,UAAU,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAA;CAAE,CAiBtG"}
+{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../src/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAc,UAAU,EAAe,MAAM,IAAI,CAAC;AAC9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,KAAK,iBAAiB,EAA0B,MAAM,eAAe,CAAC;AAC/E,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,mBAAmB;IAClC,KACE,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,EAC3B,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,KAAK,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;KAC/C,GACA,OAAO,CAAC;CACZ;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAqBtD,wBAAsB,kBAAkB,CACtC,QAAQ,GAAE,gBAA0C,GACnD,OAAO,CAAC,mBAAmB,CAAC,CAY9B;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,GAAG,OAAO,CAAC,CAAC;IACvF,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,2FAA2F;IAC3F,QAAQ,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC;CAC5C;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;CAC1C;AAED,wBAAsB,YAAY,CAChC,QAAQ,GAAE,MAAM,OAAO,CAAC,cAAc,IAAI,CAAC,CAAsB,GAChE,OAAO,CAAC,cAAc,IAAI,CAAC,CAAC,CAW9B;AAsCD,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,gBAA0C,GACzD,gBAAgB,CAqFlB;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAcpF;AAED,wBAAgB,EAAE,CAAC,OAAO,EAAE,uBAAuB,GAAG;IAAE,UAAU,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAA;CAAE,CAiBtG"}

package/dist/packages/postgres/src/pg.js

@@ -1,5 +1,30 @@
 import { PostgresSchemaProvider } from "./provider.js";
 import { createPostgresDatabase, } from "./runtime.js";
+const pgCursorPackage = "pg-cursor";
+const queryTimeoutError = "@typed-sql/postgres/pg does not accept pg query_timeout because pg can reject before the connection is ready for reuse; use PostgreSQL statement_timeout instead";
+async function defaultPgCursorImporter() {
+    return import(pgCursorPackage);
+}
+function pgCursorConstructor(module) {
+    const candidate = typeof module === "object" && module !== null && "default" in module
+        ? module.default
+        : module;
+    if (typeof candidate !== "function") {
+        throw new TypeError("The application-owned pg-cursor package does not export a default Cursor constructor");
+    }
+    return candidate;
+}
+export async function loadPgCursorDriver(importer = defaultPgCursorImporter) {
+    try {
+        return pgCursorConstructor(await importer());
+    }
+    catch (error) {
+        if (error instanceof Error && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") {
+            throw new Error("@typed-sql/postgres/pg streaming requires the application-owned pg-cursor package. Install it with: pnpm add pg-cursor", { cause: error });
+        }
+        throw error;
+    }
+}
 export async function loadPgDriver(importer = () => import("pg")) {
     try {
         return await importer();
@@ -20,29 +45,99 @@ async function connectionString(value) {
     return resolved;
 }
 function validatePoolConfig(poolConfig) {
+    if (poolConfig !== undefined && "query_timeout" in poolConfig)
+        throw new TypeError(queryTimeoutError);
     if (poolConfig !== undefined && "types" in poolConfig) {
         throw new TypeError("@typed-sql/postgres/pg owns poolConfig.types so decoded values match typePolicy; remove that option");
     }
 }
+function validateConnectionStringQueryTimeout(value) {
+    try {
+        const url = new URL(value);
+        for (const name of url.searchParams.keys()) {
+            if (name === "query_timeout")
+                throw new TypeError(queryTimeoutError);
+        }
+    }
+    catch (error) {
+        if (error instanceof TypeError && error.message === queryTimeoutError)
+            throw error;
+        // Let pg report malformed or non-URL connection strings through its normal validation path.
+    }
+}
 function queryConfig(config) {
     return {
+        ...(config.name === undefined ? {} : { name: config.name }),
         text: config.text,
         ...(config.values === undefined ? {} : { values: [...config.values] }),
         ...(config.types === undefined ? {} : { types: config.types }),
     };
 }
-export function adaptPgPool(pool) {
-    const wrapClient = (client) => ({
-        async query(config) {
-            const result = typeof config === "string"
-                ? await client.query(config)
-                : await client.query(queryConfig(config));
-            return { rows: result.rows };
-        },
-        release() {
-            client.release();
-        },
-    });
+export function adaptPgPool(pool, cursorImporter = defaultPgCursorImporter) {
+    const options = pool.options;
+    if (options !== undefined && "query_timeout" in options)
+        throw new TypeError(queryTimeoutError);
+    if (typeof options?.connectionString === "string")
+        validateConnectionStringQueryTimeout(options.connectionString);
+    let cursorConstructorPromise;
+    const loadCursor = () => {
+        cursorConstructorPromise ??= loadPgCursorDriver(cursorImporter);
+        return cursorConstructorPromise;
+    };
+    const wrapClient = (client) => {
+        let fatalError;
+        let rejectFatal;
+        const fatalSettlement = new Promise((_resolve, reject) => {
+            rejectFatal = reject;
+        });
+        // The promise intentionally remains pending for a healthy lease and must never be unhandled.
+        void fatalSettlement.catch(() => undefined);
+        const recordFatal = (error) => {
+            if (fatalError !== undefined)
+                return;
+            fatalError = error;
+            rejectFatal(error);
+        };
+        const onError = (error) => recordFatal(error);
+        const onEnd = () => recordFatal(new Error("The PostgreSQL connection ended while it was leased"));
+        client.on("error", onError);
+        client.on("end", onEnd);
+        return {
+            pipeline: client.pipeline,
+            async query(config) {
+                const result = typeof config === "string"
+                    ? await client.query(config)
+                    : await client.query(queryConfig(config));
+                return { rows: result.rows };
+            },
+            async openCursor(config) {
+                const Cursor = await loadCursor();
+                // pg-cursor always parses an unnamed statement. Keep the prepared name in typed-sql's
+                // driver-neutral config, but do not pretend the native cursor can honor it.
+                const cursor = new Cursor(config.text, config.values, {
+                    ...(config.types === undefined ? {} : { types: config.types }),
+                });
+                const queryCursor = client.query.bind(client);
+                const nativeCursor = queryCursor(cursor);
+                return {
+                    read: (rowCount) => nativeCursor.read(rowCount),
+                    async close() {
+                        if (fatalError !== undefined)
+                            throw fatalError;
+                        const nativeClose = nativeCursor.close();
+                        // Keep observing the native promise even when fatal settlement wins the race.
+                        void nativeClose.catch(() => undefined);
+                        await Promise.race([nativeClose, fatalSettlement]);
+                    },
+                };
+            },
+            release(error) {
+                client.removeListener("error", onError);
+                client.removeListener("end", onEnd);
+                client.release(error === undefined ? fatalError : error);
+            },
+        };
+    };
     return {
         async query(config) {
             const result = typeof config === "string"
@@ -50,6 +145,9 @@ export function adaptPgPool(pool) {
                 : await pool.query(queryConfig(config));
             return { rows: result.rows };
         },
+        async ensureCursor() {
+            await loadCursor();
+        },
         async connect() {
             return wrapClient(await pool.connect());
         },
@@ -60,11 +158,13 @@ export function adaptPgPool(pool) {
 }
 export async function createPgDatabase(options) {
     validatePoolConfig(options.poolConfig);
+    const resolvedConnectionString = await connectionString(options.connectionString);
+    validateConnectionStringQueryTimeout(resolvedConnectionString);
     const driver = await loadPgDriver();
     const { Pool } = driver;
-    const pool = new Pool({ ...options.poolConfig, connectionString: await connectionString(options.connectionString) });
+    const pool = new Pool({ ...options.poolConfig, connectionString: resolvedConnectionString });
     return createPostgresDatabase({
-        pool: adaptPgPool(pool),
+        pool: adaptPgPool(pool, options.cursorImporter),
         ownsPool: true,
         fallbackTypeParsers: driver.types,
         ...(options.typePolicy === undefined ? {} : { typePolicy: options.typePolicy }),

package/dist/packages/postgres/src/pg.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../src/pg.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../src/pg.ts"],"names":[],"mappings":"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"}

package/dist/packages/postgres/src/prepared.d.ts

@@ -0,0 +1,20 @@
+import { type Query, type QueryRenderSkeleton, type RenderedQuery, type SqlRenderer } from "@typed-sql/core";
+export interface PostgresPreparedQueryFactory<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]> {
+    (...args: Arguments): Query<Row, Params>;
+    readonly statementName: string;
+}
+export interface PostgresPreparedQueryMetadata {
+    readonly statementName: string;
+    readonly rendered: RenderedQuery;
+}
+interface PreparedStatement {
+    skeleton: QueryRenderSkeleton | undefined;
+}
+export interface PostgresPreparedQueryState {
+    readonly statements: Map<string, PreparedStatement>;
+    readonly queries: WeakMap<object, PostgresPreparedQueryMetadata>;
+}
+export declare function createPostgresPreparedQueryState(): PostgresPreparedQueryState;
+export declare function preparePostgresQuery<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]>(state: PostgresPreparedQueryState, renderer: SqlRenderer, statementName: string, factory: (...args: Arguments) => Query<Row, Params>): PostgresPreparedQueryFactory<Arguments, Row, Params>;
+export {};
+//# sourceMappingURL=prepared.d.ts.map

package/dist/packages/postgres/src/prepared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepared.d.ts","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,mBAAmB,EACxB,KAAK,aAAa,EAClB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4BAA4B,CAC3C,SAAS,SAAS,SAAS,OAAO,EAAE,EACpC,GAAG,EACH,MAAM,SAAS,SAAS,OAAO,EAAE;IAEjC,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;CAClC;AAED,UAAU,iBAAiB;IACzB,QAAQ,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC3C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;CAClE;AAED,wBAAgB,gCAAgC,IAAI,0BAA0B,CAK7E;AAQD,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,SAAS,SAAS,OAAO,EAAE,EAC/G,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,SAAS,KAAK,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,GAClD,4BAA4B,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,CAwCtD"}

package/dist/packages/postgres/src/prepared.js

@@ -0,0 +1,47 @@
+import { bindQueryRenderSkeleton, compileQueryRenderSkeleton, } from "@typed-sql/core";
+export function createPostgresPreparedQueryState() {
+    return {
+        statements: new Map(),
+        queries: new WeakMap(),
+    };
+}
+function validateStatementName(statementName) {
+    if (typeof statementName !== "string" || statementName.length === 0 || statementName.includes("\0")) {
+        throw new TypeError("Prepared statement names must be non-empty and cannot contain NUL");
+    }
+}
+export function preparePostgresQuery(state, renderer, statementName, factory) {
+    validateStatementName(statementName);
+    if (state.statements.has(statementName)) {
+        throw new TypeError(`Prepared statement name ${JSON.stringify(statementName)} is already registered`);
+    }
+    const statement = { skeleton: undefined };
+    state.statements.set(statementName, statement);
+    const prepared = (...args) => {
+        const query = factory(...args);
+        const existing = state.queries.get(query);
+        if (existing !== undefined && existing.statementName !== statementName) {
+            throw new TypeError(`A query cannot use both prepared statement ${JSON.stringify(existing.statementName)} and ${JSON.stringify(statementName)}`);
+        }
+        let rendered = existing?.rendered;
+        const skeleton = statement.skeleton;
+        if (rendered === undefined) {
+            if (skeleton === undefined) {
+                const compiled = compileQueryRenderSkeleton(query, renderer);
+                statement.skeleton = compiled.skeleton;
+                rendered = compiled.rendered;
+            }
+            else {
+                rendered = bindQueryRenderSkeleton(query, skeleton);
+            }
+        }
+        if (rendered === undefined) {
+            throw new TypeError(`Prepared statement ${JSON.stringify(statementName)} must always render the same SQL text and structure`);
+        }
+        if (existing === undefined)
+            state.queries.set(query, { statementName, rendered });
+        return query;
+    };
+    return Object.freeze(Object.assign(prepared, { statementName }));
+}
+//# sourceMappingURL=prepared.js.map

package/dist/packages/postgres/src/prepared.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepared.js","sourceRoot":"","sources":["../../../../src/prepared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,0BAA0B,GAK3B,MAAM,iBAAiB,CAAC;AAyBzB,MAAM,UAAU,gCAAgC;IAC9C,OAAO;QACL,UAAU,EAAE,IAAI,GAAG,EAAE;QACrB,OAAO,EAAE,IAAI,OAAO,EAAE;KACvB,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,aAAqB;IAClD,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACpG,MAAM,IAAI,SAAS,CAAC,mEAAmE,CAAC,CAAC;IAC3F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAiC,EACjC,QAAqB,EACrB,aAAqB,EACrB,OAAmD;IAEnD,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,SAAS,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;IACxG,CAAC;IAED,MAAM,SAAS,GAAsB,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC7D,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAe,EAAsB,EAAE;QAC1D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;YACvE,MAAM,IAAI,SAAS,CACjB,8CAA8C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAC5H,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,0BAA0B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7D,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACvC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,uBAAuB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,SAAS,CACjB,sBAAsB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,qDAAqD,CACzG,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS;YAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;AACnE,CAAC"}

package/dist/packages/postgres/src/runtime.d.ts

@@ -1,4 +1,8 @@
-import { type Database, type SqlRenderer } from "@typed-sql/core";
+import { type Database, type Query, type QueryBatch, type QueryResults, type QueryStream, type SqlRenderer, type StreamOptions } from "@typed-sql/core";
+import { type PostgresPreparedQueryFactory } from "./prepared.js";
+import { type PostgresCursorLike } from "./stream.js";
+export type { PostgresPreparedQueryFactory } from "./prepared.js";
+export type { PostgresCursorLike } from "./stream.js";
 export interface PostgresCodecPolicy {
     readonly bigint: "bigint" | "string" | "number";
     readonly numeric: "string" | "number" | "Decimal";
@@ -9,6 +13,7 @@ export interface PostgresTypeParserSet {
     getTypeParser(oid: number, format?: string): (value: string) => unknown;
 }
 export interface PostgresQueryConfig {
+    readonly name?: string;
     readonly text: string;
     readonly values?: readonly unknown[];
     readonly types?: PostgresTypeParserSet;
@@ -17,15 +22,28 @@ export interface PostgresQueryResult {
     readonly rows: readonly Record<string, unknown>[];
 }
 export interface PostgresClientLike {
+    readonly pipeline?: boolean;
     query(config: PostgresQueryConfig | string): Promise<PostgresQueryResult>;
-    release(): void;
+    openCursor?(config: PostgresQueryConfig): PostgresCursorLike | Promise<PostgresCursorLike>;
+    release(error?: Error | boolean): void;
 }
 export interface PostgresPoolLike {
     query(config: PostgresQueryConfig | string): Promise<PostgresQueryResult>;
+    ensureCursor?(): Promise<void>;
     connect(): Promise<PostgresClientLike>;
     end(): Promise<void>;
 }
-export interface PostgresDatabase extends Database {
+export interface PostgresTransaction extends Database<PostgresTransaction> {
+    batch<const Queries extends readonly unknown[]>(queries: QueryBatch<Queries>): Promise<QueryResults<Queries>>;
+    pipeline<const Queries extends readonly unknown[]>(queries: QueryBatch<Queries>): Promise<QueryResults<Queries>>;
+    prepare<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]>(statementName: string, factory: (...args: Arguments) => Query<Row, Params>): PostgresPreparedQueryFactory<Arguments, Row, Params>;
+    stream<Row, Params extends readonly unknown[]>(query: Query<Row, Params>, options?: StreamOptions): QueryStream<Row>;
+}
+export interface PostgresDatabase extends Database<PostgresTransaction> {
+    batch<const Queries extends readonly unknown[]>(queries: QueryBatch<Queries>): Promise<QueryResults<Queries>>;
+    pipeline<const Queries extends readonly unknown[]>(queries: QueryBatch<Queries>): Promise<QueryResults<Queries>>;
+    prepare<Arguments extends readonly unknown[], Row, Params extends readonly unknown[]>(statementName: string, factory: (...args: Arguments) => Query<Row, Params>): PostgresPreparedQueryFactory<Arguments, Row, Params>;
+    stream<Row, Params extends readonly unknown[]>(query: Query<Row, Params>, options?: StreamOptions): QueryStream<Row>;
     close(): Promise<void>;
 }
 export interface PostgresDatabaseOptions {

package/dist/packages/postgres/src/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAA2B,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG3F,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAChD,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;CACnD;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CACzE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACnD;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1E,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1E,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACvC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,MAAM,WAAW,gBAAiB,SAAQ,QAAQ;IAChD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9C,6EAA6E;IAC7E,QAAQ,CAAC,mBAAmB,CAAC,EAAE,qBAAqB,CAAC;CACtD;AA4ED,wBAAgB,yBAAyB,CACvC,MAAM,GAAE,mBAAmC,EAC3C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,EACpC,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,qBAAqB,CAqBvB;AAED,eAAO,MAAM,gBAAgB,EAAE,WAG7B,CAAC;AA+EH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,uBAAuB,GAAG,gBAAgB,CAQzF"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/runtime.ts"],"names":[],"mappings":"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"}