@shivaedev/sql 0.39.0 → 0.40.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.40.0 - 2026-11-04
+
+### Added
+
+- `keysetPage` builds native statement fragments without requiring a `SqlClient` service; its read callback retains its own service requirements.
+
 ## 0.39.0 - 2026-11-04
 
 ### Added

package/README.md

@@ -69,7 +69,7 @@ const backend = Effect.gen(function* () {
 }).pipe(Effect.scoped, Effect.provide(database));
 ```
 
-The Layer owns the pool and waits for every socket to close during shutdown. A reserved connection sees committed writes from client transactions in the same database; it does not implicitly join a client's open transaction. `appDatabase` from `@shivaedev/server/appDatabase.ts` and database-backed `appHost` from `@shivaedev/server/appHost.ts` compose this Layer and expose the pool to application services.
+The Layer owns the pool and waits for every socket to close during shutdown. A reserved connection sees committed writes from client transactions in the same database; it does not implicitly join a client's open transaction. `appDatabase` from `@shivaedev/server/appDatabase.ts` and database-backed `appHost` from `@shivaedev/server/appDatabase.ts` compose this Layer and expose the pool to application services.
 
 ### SQL names: configure the client once
 
@@ -87,7 +87,7 @@ const database = PgClient.layer(
 
 `clientOptions` enables Effect SQL's `transformQueryNames` with Effect's `String.camelToSnake` and `transformResultNames` with `String.snakeToCamel` by default. A model field `createdAt` writes the migration-created `created_at` column, and returned rows contain `createdAt`. Inserts, selects, filters, ordering, updates and raw SQL share the client's transforms; column aliases are unnecessary. Write literal migration SQL with snake_case columns. In tagged SQL, interpolated identifiers such as `sql("createdAt")` are transformed; literal SQL text stays as written.
 
-To opt out for an existing database with quoted camelCase columns or models with snake_case fields, use `PgClient.layer(clientOptions(options, { snakeCase: false }))`. Existing native clients are unchanged until configured with this helper. Native `transformQueryNames` and `transformResultNames` supplied in `options` take precedence. For `appHost` from `@shivaedev/server/appHost.ts` or `appDatabase` from `@shivaedev/server/appDatabase.ts`, use `clientOptions` on their `config` object; the host forwards those native transforms to its client.
+To opt out for an existing database with quoted camelCase columns or models with snake_case fields, use `PgClient.layer(clientOptions(options, { snakeCase: false }))`. Existing native clients are unchanged until configured with this helper. Native `transformQueryNames` and `transformResultNames` supplied in `options` take precedence. For `appHost` from `@shivaedev/server/appDatabase.ts` or `appDatabase` from `@shivaedev/server/appDatabase.ts`, use `clientOptions` on their `config` object; the host forwards those native transforms to its client.
 
 ### Grouped values in flat columns
 
@@ -398,7 +398,7 @@ const rows = yield* paymentsBySequence([]);
 
 ### Keyset pages over native SQL
 
-`keysetPage` builds seek and ordering fragments and asks your `read` callback for one extra row. It returns `{ rows, next }`, where `next` is an `Option` containing the last returned row's cursor only when another row exists. Your query keeps its predicates, joins and result schema:
+`keysetPage` builds seek and ordering fragments and asks your `read` callback for one extra row. It returns `{ rows, next }`, where `next` is an `Option` containing the last returned row's cursor only when another row exists. Your query keeps its predicates, joins and result schema. The helper builds native statement fragments without reading `SqlClient`; its service requirements come from your `read` callback:
 
 ```ts
 import { Effect, Schema } from "effect";

package/dist/keysetPage.d.ts

@@ -1,15 +1,14 @@
 import { Effect, Option, Schema } from "effect";
-import { SqlClient } from "effect/sql";
-import type { Fragment } from "effect/sql/Statement";
+import * as Statement from "effect/sql/Statement";
 export interface KeysetOrder<TCursor> {
-    readonly column: string | Fragment;
+    readonly column: string | Statement.Fragment;
     readonly direction: "asc" | "desc";
     readonly value: (cursor: TCursor) => string | number | bigint | boolean;
 }
 export interface KeysetPageQuery {
     readonly limit: number;
-    readonly orderBy: Fragment;
-    readonly seek: Fragment;
+    readonly orderBy: Statement.Fragment;
+    readonly seek: Statement.Fragment;
 }
 export interface KeysetPage<TRow, TCursor> {
     readonly next: Option.Option<TCursor>;
@@ -22,5 +21,5 @@ export declare const keysetPage: <TRow, TCursor, E, R>(options: {
     readonly tieBreaker: KeysetOrder<TCursor>;
     readonly cursorFor: (row: TRow) => TCursor;
     readonly read: (query: KeysetPageQuery) => Effect.Effect<readonly TRow[], E, R>;
-}) => Effect.Effect<KeysetPage<TRow, TCursor>, E | Schema.SchemaError, R | SqlClient.SqlClient>;
+}) => Effect.Effect<KeysetPage<TRow, TCursor>, E | Schema.SchemaError, R>;
 //# sourceMappingURL=keysetPage.d.ts.map

package/dist/keysetPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keysetPage.d.ts","sourceRoot":"","sources":["../src/keysetPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,WAAW,CAAC,OAAO;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CACxB;AAED,MAAM,WAAW,UAAU,CAAC,IAAI,EAAE,OAAO;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC;CAC/B;AAID,eAAO,MAAM,UAAU,GAAgC,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;oBACzD,MAAM;qBACL,OAAO,GAAG,SAAS;sBAClB,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE;yBAC5B,WAAW,CAAC,OAAO,CAAC;wBACrB,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO;mBAC3B,CAAC,KAAK,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;+FAwB9E,CAAC"}
+{"version":3,"file":"keysetPage.d.ts","sourceRoot":"","sources":["../src/keysetPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAElD,MAAM,WAAW,WAAW,CAAC,OAAO;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC;CAClC;AAED,MAAM,WAAW,UAAU,CAAC,IAAI,EAAE,OAAO;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC;CAC/B;AAID,eAAO,MAAM,UAAU,GAAgC,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;oBACzD,MAAM;qBACL,OAAO,GAAG,SAAS;sBAClB,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE;yBAC5B,WAAW,CAAC,OAAO,CAAC;wBACrB,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO;mBAC3B,CAAC,KAAK,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;yEAiC9E,CAAC"}

package/dist/keysetPage.js

@@ -1,20 +1,29 @@
 import { Effect, Option, Schema } from "effect";
-import { SqlClient } from "effect/sql";
+import * as Statement from "effect/sql/Statement";
 const PageSize = Schema.Number.check(Schema.isInt(), Schema.isGreaterThan(0), Schema.isLessThan(Number.MAX_SAFE_INTEGER));
 export const keysetPage = Effect.fnUntraced(function* (options) {
     const limit = yield* Schema.decodeUnknownEffect(PageSize)(options.limit);
-    const sql = yield* SqlClient.SqlClient;
-    const order = [...options.orderBy, options.tieBreaker];
-    const columns = order.map(({ column }) => (typeof column === "string" ? sql `${sql(column)}` : column));
+    const order = [...options.orderBy, options.tieBreaker].map((part) => ({
+        ...part,
+        column: typeof part.column === "string" ? Statement.fragment([Statement.identifier(part.column)]) : part.column,
+    }));
     const after = options.after;
     const values = after === undefined ? undefined : order.map(({ value }) => value(after));
-    const seek = values === undefined
-        ? sql `true`
-        : sql.or(order.map(({ direction }, index) => sql.and([
-            ...columns.slice(0, index).map((column, previous) => sql `${column} = ${values[previous]}`),
-            direction === "asc" ? sql `${columns[index]} > ${values[index]}` : sql `${columns[index]} < ${values[index]}`,
-        ])));
-    const orderBy = sql.csv(order.map(({ direction }, index) => sql `${columns[index]} ${sql.literal(direction === "asc" ? "asc" : "desc")}`));
+    const conditions = values === undefined
+        ? []
+        : order.map(({ column, direction }, index) => {
+            const prefix = order
+                .slice(0, index)
+                .map(({ column: previousColumn }, previous) => Statement.fragment([...previousColumn.segments, Statement.literal(" = "), Statement.parameter(values[previous])]));
+            const comparison = Statement.fragment([
+                ...column.segments,
+                Statement.literal(direction === "asc" ? " > " : " < "),
+                Statement.parameter(values[index]),
+            ]);
+            return Statement.and([...prefix, comparison]);
+        });
+    const seek = values === undefined ? Statement.fragment([Statement.literal("true")]) : Statement.or(conditions);
+    const orderBy = Statement.csv(order.map(({ column, direction }) => Statement.fragment([...column.segments, Statement.literal(direction === "asc" ? " asc" : " desc")])));
     const found = yield* options.read({ limit: limit + 1, orderBy, seek });
     const rows = found.slice(0, limit);
     const last = rows.at(-1);

package/dist/keysetPage.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/sql",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "description": "Schema-derived repositories over native Effect SQL",
   "keywords": [
     "effect"
@@ -51,11 +51,11 @@
     "@effect/sql-pg": "4.0.7",
     "@effect/sql-sqlite-node": "4.0.7",
     "@shivaedev/contract": "0.36.1",
-    "@shivaedev/jobs": "0.36.0",
-    "@shivaedev/quality": "0.61.1",
-    "@shivaedev/test-kits": "0.4.0",
-    "@shivaedev/test-sql": "0.21.1",
-    "@shivaedev/test-story": "0.39.1",
+    "@shivaedev/jobs": "0.37.0",
+    "@shivaedev/quality": "0.62.0",
+    "@shivaedev/test-kits": "0.5.0",
+    "@shivaedev/test-sql": "0.21.2",
+    "@shivaedev/test-story": "0.39.2",
     "@types/node": "24.19.2",
     "effect": "4.0.7",
     "typescript": "7.0.2",

package/src/keysetPage.ts

@@ -1,17 +1,16 @@
 import { Effect, Option, Schema } from "effect";
-import { SqlClient } from "effect/sql";
-import type { Fragment } from "effect/sql/Statement";
+import * as Statement from "effect/sql/Statement";
 
 export interface KeysetOrder<TCursor> {
-	readonly column: string | Fragment;
+	readonly column: string | Statement.Fragment;
 	readonly direction: "asc" | "desc";
 	readonly value: (cursor: TCursor) => string | number | bigint | boolean;
 }
 
 export interface KeysetPageQuery {
 	readonly limit: number;
-	readonly orderBy: Fragment;
-	readonly seek: Fragment;
+	readonly orderBy: Statement.Fragment;
+	readonly seek: Statement.Fragment;
 }
 
 export interface KeysetPage<TRow, TCursor> {
@@ -28,25 +27,34 @@ export const keysetPage = Effect.fnUntraced(function* <TRow, TCursor, E, R>(opti
 	readonly tieBreaker: KeysetOrder<TCursor>;
 	readonly cursorFor: (row: TRow) => TCursor;
 	readonly read: (query: KeysetPageQuery) => Effect.Effect<readonly TRow[], E, R>;
-}): Effect.fn.Return<KeysetPage<TRow, TCursor>, E | Schema.SchemaError, R | SqlClient.SqlClient> {
+}): Effect.fn.Return<KeysetPage<TRow, TCursor>, E | Schema.SchemaError, R> {
 	const limit = yield* Schema.decodeUnknownEffect(PageSize)(options.limit);
-	const sql = yield* SqlClient.SqlClient;
-	const order = [...options.orderBy, options.tieBreaker];
-	const columns = order.map(({ column }) => (typeof column === "string" ? sql`${sql(column)}` : column));
+	const order = [...options.orderBy, options.tieBreaker].map((part) => ({
+		...part,
+		column: typeof part.column === "string" ? Statement.fragment([Statement.identifier(part.column)]) : part.column,
+	}));
 	const after = options.after;
 	const values = after === undefined ? undefined : order.map(({ value }) => value(after));
-	const seek =
+	const conditions =
 		values === undefined
-			? sql`true`
-			: sql.or(
-					order.map(({ direction }, index) =>
-						sql.and([
-							...columns.slice(0, index).map((column, previous) => sql`${column} = ${values[previous]}`),
-							direction === "asc" ? sql`${columns[index]} > ${values[index]}` : sql`${columns[index]} < ${values[index]}`,
-						]),
-					),
-				);
-	const orderBy = sql.csv(order.map(({ direction }, index) => sql`${columns[index]} ${sql.literal(direction === "asc" ? "asc" : "desc")}`));
+			? []
+			: order.map(({ column, direction }, index) => {
+					const prefix = order
+						.slice(0, index)
+						.map(({ column: previousColumn }, previous) =>
+							Statement.fragment([...previousColumn.segments, Statement.literal(" = "), Statement.parameter(values[previous])]),
+						);
+					const comparison = Statement.fragment([
+						...column.segments,
+						Statement.literal(direction === "asc" ? " > " : " < "),
+						Statement.parameter(values[index]),
+					]);
+					return Statement.and([...prefix, comparison]);
+				});
+	const seek = values === undefined ? Statement.fragment([Statement.literal("true")]) : Statement.or(conditions);
+	const orderBy = Statement.csv(
+		order.map(({ column, direction }) => Statement.fragment([...column.segments, Statement.literal(direction === "asc" ? " asc" : " desc")])),
+	);
 	const found = yield* options.read({ limit: limit + 1, orderBy, seek });
 	const rows = found.slice(0, limit);
 	const last = rows.at(-1);