effect-cf 0.4.0 → 0.5.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # effect-cf
 
+## 0.5.0
+
+### Minor Changes
+
+- [#14](https://github.com/danieljvdm/effect-cf/pull/14) [`a31a930`](https://github.com/danieljvdm/effect-cf/commit/a31a93020a679e42a748aed54626ce7387d7e685) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Add a D1 binding helper with native Effect wrappers and an `@effect/sql-d1` backed SQL layer.
+
 ## 0.4.0
 
 ### Minor Changes

package/README.md

@@ -1,6 +1,6 @@
 # effect-cf
 
-Effect-native Cloudflare primitives for Workers, Durable Objects, bindings, KV, Queues, Workflows, and Durable Object storage.
+Effect-native Cloudflare primitives for Workers, Durable Objects, bindings, KV, D1, Queues, Workflows, and Durable Object storage.
 
 ## Install
 
@@ -31,6 +31,7 @@ Runtime creation belongs at Cloudflare entrypoints, not inside binding helpers.
 - `DurableObjectState` / `DurableObjectStorage` - Effect wrappers for state, alarms, SQL, and embedded KV
 - `DurableObjectWebSocket` - WebSocket upgrade helpers for Durable Objects
 - `Kv` - typed KV namespace helper
+- `D1` - typed D1 database binding helper with an `@effect/sql-d1` backed SQL layer
 - `Queue` / `QueueBinding` - typed Queue producer bindings and consumer handlers
 - `Workflow` / `WorkflowBinding` - typed Workflow entrypoints, steps, and starter bindings
 - `Rpc` - Cloudflare RPC type helpers and scoped disposal utilities

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { Cause, Config, ConfigProvider, Context, DateTime, Duration, Effect, Layer, Option, Schema, Scope } from "effect";
+import { D1Client } from "@effect/sql-d1";
 import { DurableObject, RpcStub, RpcTarget, WorkerEntrypoint, WorkflowEntrypoint, WorkflowEvent, WorkflowSleepDuration, WorkflowStep, WorkflowStepConfig, WorkflowStepContext, WorkflowStepEvent, WorkflowTimeoutDuration } from "cloudflare:workers";
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
@@ -7,9 +8,11 @@ import * as _$effect_Types0 from "effect/Types";
 import * as _$effect_Cause0 from "effect/Cause";
 import * as _$effect_Redacted0 from "effect/Redacted";
 import * as _$effect_Layer0 from "effect/Layer";
-import * as _$effect_Schema0 from "effect/Schema";
 import * as _$effect_Context0 from "effect/Context";
+import * as _$effect_unstable_sql_SqlClient0 from "effect/unstable/sql/SqlClient";
+import * as _$effect_Config0 from "effect/Config";
 import * as _$effect_Scope0 from "effect/Scope";
+import * as _$effect_Schema0 from "effect/Schema";
 
 //#region src/Environment.d.ts
 /** Cloudflare worker environment object (`env`). */
@@ -83,7 +86,7 @@ declare namespace WorkerConfig {
   const layerWith: (makeProvider: (env: WorkerEnv) => ConfigProvider.ConfigProvider) => _$effect_Layer0.Layer<never, never, WorkerEnvironment>;
 }
 declare namespace Binding_d_exports {
-  export { BindingNotFoundError, BindingValidationError, Service$5 as Service, TypeId$2 as TypeId };
+  export { BindingNotFoundError, BindingValidationError, Service$6 as Service, TypeId$2 as TypeId };
 }
 /** Internal type id marker used by binding helper services. */
 declare const TypeId$2: "effect-cf/Binding";
@@ -104,11 +107,82 @@ declare class BindingValidationError extends BindingValidationError_base<{
 /**
  * Creates a Context tag + layer for reading and validating a Cloudflare binding.
  */
-declare const Service$5: <Self>() => <Id extends string, Resource>(id: Id, binding: string, isResource: (value: unknown) => value is Resource) => Context.ServiceClass<Self, Id, Resource> & {
+declare const Service$6: <Self>() => <Id extends string, Resource>(id: Id, binding: string, isResource: (value: unknown) => value is Resource) => Context.ServiceClass<Self, Id, Resource> & {
   "effect-cf/Binding": "effect-cf/Binding";
   binding: string;
   layer: Layer.Layer<Self, BindingNotFoundError | BindingValidationError, WorkerEnvironment>;
 };
+declare namespace D1_d_exports {
+  export { D1Definition, D1OperationError, D1Service, D1SqlLayerOptions, Service$5 as Service, make$11 as make };
+}
+declare const D1OperationError_base: new <A extends Record<string, any> = {}>(args: _$effect_Types0.VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P] }>) => _$effect_Cause0.YieldableError & {
+  readonly _tag: "D1OperationError";
+} & Readonly<A>;
+/** Error raised when a D1 operation fails. */
+declare class D1OperationError extends D1OperationError_base<{
+  readonly binding: string;
+  readonly operation: string;
+  readonly cause: unknown;
+}> {}
+/** Typed D1 binding definition. */
+interface D1Definition {
+  /** Binding name as configured in `wrangler.jsonc`. */
+  readonly binding: string;
+}
+/** Options forwarded to `@effect/sql-d1` when building a SQL client layer. */
+type D1SqlLayerOptions = Omit<D1Client.D1ClientConfig, "db">;
+declare const D1ServiceTypeId: unique symbol;
+/** Nominal service marker for D1 services created with {@link make}. */
+interface D1Service<Id extends string> {
+  readonly [D1ServiceTypeId]: {
+    readonly id: Id;
+  };
+}
+/**
+ * Creates a typed D1 service tag plus Effect helpers.
+ */
+declare const make$11: <Id extends string>(id: Id, definition: D1Definition) => _$effect_Context0.ServiceClass<D1Service<Id>, Id, D1Database> & {
+  "effect-cf/Binding": "effect-cf/Binding";
+  binding: string;
+  layer: Layer.Layer<D1Service<Id>, BindingNotFoundError | BindingValidationError, WorkerEnvironment>;
+} & {
+  "effect-cf/D1": "effect-cf/D1";
+  definition: D1Definition;
+  sqlLayer: (options?: D1SqlLayerOptions) => Layer.Layer<D1Client.D1Client | _$effect_unstable_sql_SqlClient0.SqlClient, BindingNotFoundError | BindingValidationError | _$effect_Config0.ConfigError, WorkerEnvironment>;
+  prepare: (query: string) => Effect.Effect<D1PreparedStatement, D1OperationError, D1Service<Id>>;
+  batch: <T = unknown>(statements: readonly D1PreparedStatement[]) => Effect.Effect<D1Result<T>[], D1OperationError, D1Service<Id>>;
+  exec: (query: string) => Effect.Effect<D1ExecResult, D1OperationError, D1Service<Id>>;
+  unsafeRaw: () => Effect.Effect<D1Database, never, D1Service<Id>>;
+};
+/**
+ * Builds a D1 service around a Cloudflare D1 database binding.
+ *
+ * The returned service exposes the raw `D1Database` binding, small native D1
+ * helpers, and `sqlLayer(...)` for providing `effect/unstable/sql` via
+ * `@effect/sql-d1`.
+ *
+ * @example
+ * ```ts
+ * class TodoDatabase extends D1.Service<TodoDatabase>()("TodoDatabase", {
+ *   binding: "TODO_DB",
+ * }) {}
+ *
+ * const SqlLive = TodoDatabase.sqlLayer();
+ * ```
+ */
+declare const Service$5: <Self>() => <Id extends string>(id: Id, definition: D1Definition) => _$effect_Context0.ServiceClass<Self, Id, D1Database> & {
+  "effect-cf/Binding": "effect-cf/Binding";
+  binding: string;
+  layer: Layer.Layer<Self, BindingNotFoundError | BindingValidationError, WorkerEnvironment>;
+} & {
+  "effect-cf/D1": "effect-cf/D1";
+  definition: D1Definition;
+  sqlLayer: (options?: D1SqlLayerOptions) => Layer.Layer<D1Client.D1Client | _$effect_unstable_sql_SqlClient0.SqlClient, BindingNotFoundError | BindingValidationError | _$effect_Config0.ConfigError, WorkerEnvironment | Exclude<Exclude<Self, _$effect_Scope0.Scope>, Self>>;
+  prepare: (query: string) => Effect.Effect<D1PreparedStatement, D1OperationError, Self>;
+  batch: <T = unknown>(statements: readonly D1PreparedStatement[]) => Effect.Effect<D1Result<T>[], D1OperationError, Self>;
+  exec: (query: string) => Effect.Effect<D1ExecResult, D1OperationError, Self>;
+  unsafeRaw: () => Effect.Effect<D1Database, never, Self>;
+};
 declare namespace Rpc_d_exports {
   export { DisposableValue, MethodArgs, MethodKey, MethodReturn, Provider, Result, RpcStub, RpcTarget, Serializable, Stub, Stubable, Stubify, dispose, isDisposable, resolve, scoped };
 }
@@ -2382,4 +2456,4 @@ declare namespace Definition {
 type Handler<ROut, Self extends Definition$1.Any> = Handler$1<ROut, Self>;
 type Options<ROut, Self extends Definition$1.Any> = Options$1<ROut, Self>;
 //#endregion
-export { Binding_d_exports as Binding, DurableObject_d_exports as DurableObject, DurableObjectAlarm_d_exports as DurableObjectAlarm, DurableObjectDefinition_d_exports as DurableObjectDefinition, DurableObjectNamespace_d_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_d_exports as DurableObjectRpcWebSocket, DurableObjectState_d_exports as DurableObjectState, DurableObjectStorage_d_exports as DurableObjectStorage, DurableObjectWebSocket_d_exports as DurableObjectWebSocket, Kv_d_exports as Kv, Queue_d_exports as Queue, QueueBinding_d_exports as QueueBinding, QueueDefinition_d_exports as QueueDefinition, Rpc_d_exports as Rpc, RpcDefinition_d_exports as RpcDefinition, ServiceBinding_d_exports as ServiceBinding, Worker_d_exports as Worker, WorkerConfig, WorkerDefinition_d_exports as WorkerDefinition, type WorkerEnv, WorkerEnvironment, Workflow_d_exports as Workflow, WorkflowBinding_d_exports as WorkflowBinding, WorkflowDefinition_d_exports as WorkflowDefinition };
+export { Binding_d_exports as Binding, D1_d_exports as D1, DurableObject_d_exports as DurableObject, DurableObjectAlarm_d_exports as DurableObjectAlarm, DurableObjectDefinition_d_exports as DurableObjectDefinition, DurableObjectNamespace_d_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_d_exports as DurableObjectRpcWebSocket, DurableObjectState_d_exports as DurableObjectState, DurableObjectStorage_d_exports as DurableObjectStorage, DurableObjectWebSocket_d_exports as DurableObjectWebSocket, Kv_d_exports as Kv, Queue_d_exports as Queue, QueueBinding_d_exports as QueueBinding, QueueDefinition_d_exports as QueueDefinition, Rpc_d_exports as Rpc, RpcDefinition_d_exports as RpcDefinition, ServiceBinding_d_exports as ServiceBinding, Worker_d_exports as Worker, WorkerConfig, WorkerDefinition_d_exports as WorkerDefinition, type WorkerEnv, WorkerEnvironment, Workflow_d_exports as Workflow, WorkflowBinding_d_exports as WorkflowBinding, WorkflowDefinition_d_exports as WorkflowDefinition };

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { t as __exportAll } from "./chunk-CfYAbeIz.mjs";
 import { Cause, Clock, Config, ConfigProvider, Context, Data, DateTime, Duration, Effect, Exit, Layer, ManagedRuntime, Option, Queue, Schema } from "effect";
+import { D1Client } from "@effect/sql-d1";
 import { DurableObject, RpcStub, RpcTarget, WorkerEntrypoint, WorkflowEntrypoint } from "cloudflare:workers";
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import * as RpcMessage from "effect/unstable/rpc/RpcMessage";
@@ -28,11 +29,11 @@ let WorkerConfig;
 var Binding_exports = /* @__PURE__ */ __exportAll({
 	BindingNotFoundError: () => BindingNotFoundError,
 	BindingValidationError: () => BindingValidationError,
-	Service: () => Service$5,
-	TypeId: () => TypeId$5
+	Service: () => Service$6,
+	TypeId: () => TypeId$6
 });
 /** Internal type id marker used by binding helper services. */
-const TypeId$5 = "effect-cf/Binding";
+const TypeId$6 = "effect-cf/Binding";
 /** Error raised when a configured binding does not exist on `env`. */
 var BindingNotFoundError = class extends Data.TaggedError("BindingNotFoundError") {};
 /** Error raised when a binding exists but does not match the expected shape. */
@@ -48,18 +49,100 @@ const getBinding = (env, binding, isResource) => Effect.gen(function* () {
 /**
 * Creates a Context tag + layer for reading and validating a Cloudflare binding.
 */
-const Service$5 = () => (id, binding, isResource) => {
+const Service$6 = () => (id, binding, isResource) => {
 	const tag = Context.Service()(id);
 	const layer = Layer.effect(tag, Effect.gen(function* () {
 		return yield* getBinding(yield* WorkerEnvironment, binding, isResource);
 	}));
 	return Object.assign(tag, {
-		[TypeId$5]: TypeId$5,
+		[TypeId$6]: TypeId$6,
 		binding,
 		layer
 	});
 };
 //#endregion
+//#region src/D1.ts
+var D1_exports = /* @__PURE__ */ __exportAll({
+	D1OperationError: () => D1OperationError,
+	Service: () => Service$5,
+	make: () => make$11
+});
+const TypeId$5 = "effect-cf/D1";
+/** Error raised when a D1 operation fails. */
+var D1OperationError = class extends Data.TaggedError("D1OperationError") {};
+const isD1Database = (value) => {
+	if (typeof value !== "object" || value === null) return false;
+	const resource = value;
+	return typeof resource.prepare === "function" && typeof resource.batch === "function" && typeof resource.exec === "function";
+};
+const d1Error = (binding, operation, cause) => new D1OperationError({
+	binding,
+	operation,
+	cause
+});
+const tryD1Promise = (binding, operation, evaluate) => Effect.tryPromise({
+	try: evaluate,
+	catch: (cause) => d1Error(binding, operation, cause)
+});
+const tryD1Sync = (binding, operation, evaluate) => Effect.try({
+	try: evaluate,
+	catch: (cause) => d1Error(binding, operation, cause)
+});
+/**
+* Creates a typed D1 service tag plus Effect helpers.
+*/
+const make$11 = (id, definition) => Service$5()(id, definition);
+/**
+* Builds a D1 service around a Cloudflare D1 database binding.
+*
+* The returned service exposes the raw `D1Database` binding, small native D1
+* helpers, and `sqlLayer(...)` for providing `effect/unstable/sql` via
+* `@effect/sql-d1`.
+*
+* @example
+* ```ts
+* class TodoDatabase extends D1.Service<TodoDatabase>()("TodoDatabase", {
+*   binding: "TODO_DB",
+* }) {}
+*
+* const SqlLive = TodoDatabase.sqlLayer();
+* ```
+*/
+const Service$5 = () => (id, definition) => {
+	const tag = Service$6()(id, definition.binding, isD1Database);
+	const sqlLayer = (options) => Layer.unwrap(Effect.gen(function* () {
+		const db = yield* tag;
+		return D1Client.layer({
+			...options,
+			db
+		});
+	})).pipe(Layer.provide(tag.layer));
+	const prepare = Effect.fnUntraced(function* (query) {
+		const db = yield* tag;
+		return yield* tryD1Sync(definition.binding, "prepare", () => db.prepare(query));
+	});
+	const batch = Effect.fnUntraced(function* (statements) {
+		const db = yield* tag;
+		return yield* tryD1Promise(definition.binding, "batch", () => db.batch([...statements]));
+	});
+	const exec = Effect.fnUntraced(function* (query) {
+		const db = yield* tag;
+		return yield* tryD1Promise(definition.binding, "exec", () => db.exec(query));
+	});
+	const unsafeRaw = Effect.fnUntraced(function* () {
+		return yield* tag;
+	});
+	return Object.assign(tag, {
+		[TypeId$5]: TypeId$5,
+		definition,
+		sqlLayer,
+		prepare,
+		batch,
+		exec,
+		unsafeRaw
+	});
+};
+//#endregion
 //#region src/QueueBinding.ts
 var QueueBinding_exports = /* @__PURE__ */ __exportAll({
 	QueueOperationError: () => QueueOperationError,
@@ -88,7 +171,7 @@ const make$10 = (id, definition) => Service$4()(id, definition);
 * Builds an Effect service around a Cloudflare Queue producer binding.
 */
 const Service$4 = () => (id, definition) => {
-	const tag = Service$5()(id, definition.binding, (value) => isQueue(value));
+	const tag = Service$6()(id, definition.binding, (value) => isQueue(value));
 	const encodeMessage = Schema.encodeEffect(definition.message);
 	const send = Effect.fnUntraced(function* (message, options) {
 		const queue = yield* tag;
@@ -421,7 +504,7 @@ var ServiceBindingRpcError = class extends Data.TaggedError("ServiceBindingRpcEr
 * ```
 */
 const Service$3 = () => (id, definition) => {
-	const tag = Service$5()(id, definition.binding, (value) => typeof value === "object" && value !== null && "fetch" in value);
+	const tag = Service$6()(id, definition.binding, (value) => typeof value === "object" && value !== null && "fetch" in value);
 	const fetch = (input, init) => Effect.gen(function* () {
 		const service = yield* tag;
 		return yield* Effect.tryPromise({
@@ -1006,7 +1089,7 @@ var DurableObjectFetchError = class extends Data.TaggedError("DurableObjectFetch
 const Service$2 = () => (id, definition) => {
 	const hasFunction = (value, key) => typeof Reflect.get(value, key) === "function";
 	const isDurableObjectNamespaceClient = (value) => typeof value === "object" && value !== null && hasFunction(value, "getByName") && hasFunction(value, "get") && hasFunction(value, "idFromName") && hasFunction(value, "idFromString") && hasFunction(value, "newUniqueId") && hasFunction(value, "jurisdiction");
-	const tag = Service$5()(id, definition.binding, (value) => isDurableObjectNamespaceClient(value));
+	const tag = Service$6()(id, definition.binding, (value) => isDurableObjectNamespaceClient(value));
 	const newUniqueId = Effect.fnUntraced(function* (options) {
 		return (yield* tag).newUniqueId(options);
 	});
@@ -1770,7 +1853,7 @@ const Tag$2 = () => (id, definition) => {
 * ```
 */
 const Service$1 = () => (id, definition) => {
-	const tag = Service$5()(id, definition.binding, (value) => {
+	const tag = Service$6()(id, definition.binding, (value) => {
 		if (typeof value !== "object" || value === null) return false;
 		const resource = value;
 		return typeof resource.get === "function" && typeof resource.put === "function" && typeof resource.delete === "function" && typeof resource.getWithMetadata === "function" && typeof resource.list === "function";
@@ -1872,7 +1955,7 @@ const isWorkflow = (value) => {
 };
 const make$2 = (id, definition) => Service()(id, definition);
 const Service = () => (id, definition) => {
-	const tag = Service$5()(id, definition.binding, (value) => isWorkflow(value));
+	const tag = Service$6()(id, definition.binding, (value) => isWorkflow(value));
 	const encodePayload = Schema.encodeEffect(definition.payload);
 	const decodeResult = Schema.decodeUnknownEffect(definition.result);
 	const wrapInstance = (raw) => {
@@ -2056,4 +2139,4 @@ const waitForEvent = (name, options) => Effect.flatMap(WorkflowStep$1.asEffect()
 const Tag = Tag$1;
 const implement = implement$1;
 //#endregion
-export { Binding_exports as Binding, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, ServiceBinding_exports as ServiceBinding, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };
+export { Binding_exports as Binding, D1_exports as D1, DurableObject_exports as DurableObject, DurableObjectAlarm_exports as DurableObjectAlarm, DurableObjectDefinition_exports as DurableObjectDefinition, DurableObjectNamespace_exports as DurableObjectNamespace, DurableObjectRpcWebSocket_exports as DurableObjectRpcWebSocket, DurableObjectState_exports as DurableObjectState, DurableObjectStorage_exports as DurableObjectStorage, DurableObjectWebSocket_exports as DurableObjectWebSocket, Kv_exports as Kv, Queue_exports as Queue, QueueBinding_exports as QueueBinding, QueueDefinition_exports as QueueDefinition, Rpc_exports as Rpc, RpcDefinition_exports as RpcDefinition, ServiceBinding_exports as ServiceBinding, Worker_exports as Worker, WorkerConfig, WorkerDefinition_exports as WorkerDefinition, WorkerEnvironment, Workflow_exports as Workflow, WorkflowBinding_exports as WorkflowBinding, WorkflowDefinition_exports as WorkflowDefinition };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {
@@ -36,6 +36,7 @@
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.15.0",
     "@cloudflare/workers-types": "^4.20260421.1",
+    "@effect/sql-d1": "catalog:",
     "@effect/vitest": "catalog:",
     "effect": "catalog:",
     "typescript": "^6.0.2",
@@ -43,6 +44,7 @@
     "vitest": "catalog:"
   },
   "peerDependencies": {
+    "@effect/sql-d1": "^4.0.0-beta.65",
     "effect": "^4.0.0-beta.65"
   }
 }

package/src/D1.ts

@@ -0,0 +1,135 @@
+import { D1Client } from "@effect/sql-d1";
+import { Data, Effect, Layer } from "effect";
+
+import * as Binding from "./Binding";
+
+const TypeId = "effect-cf/D1" as const;
+
+/** Error raised when a D1 operation fails. */
+export class D1OperationError extends Data.TaggedError("D1OperationError")<{
+  readonly binding: string;
+  readonly operation: string;
+  readonly cause: unknown;
+}> {}
+
+/** Typed D1 binding definition. */
+export interface D1Definition {
+  /** Binding name as configured in `wrangler.jsonc`. */
+  readonly binding: string;
+}
+
+/** Options forwarded to `@effect/sql-d1` when building a SQL client layer. */
+export type D1SqlLayerOptions = Omit<D1Client.D1ClientConfig, "db">;
+
+declare const D1ServiceTypeId: unique symbol;
+
+/** Nominal service marker for D1 services created with {@link make}. */
+export interface D1Service<Id extends string> {
+  readonly [D1ServiceTypeId]: {
+    readonly id: Id;
+  };
+}
+
+const isD1Database = (value: unknown): value is D1Database => {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+
+  const resource = value as Record<string, unknown>;
+
+  return (
+    typeof resource.prepare === "function" &&
+    typeof resource.batch === "function" &&
+    typeof resource.exec === "function"
+  );
+};
+
+const d1Error = (binding: string, operation: string, cause: unknown) =>
+  new D1OperationError({ binding, operation, cause });
+
+const tryD1Promise = <A>(
+  binding: string,
+  operation: string,
+  evaluate: () => Promise<A>,
+): Effect.Effect<A, D1OperationError> =>
+  Effect.tryPromise({
+    try: evaluate,
+    catch: (cause) => d1Error(binding, operation, cause),
+  });
+
+const tryD1Sync = <A>(
+  binding: string,
+  operation: string,
+  evaluate: () => A,
+): Effect.Effect<A, D1OperationError> =>
+  Effect.try({
+    try: evaluate,
+    catch: (cause) => d1Error(binding, operation, cause),
+  });
+
+/**
+ * Creates a typed D1 service tag plus Effect helpers.
+ */
+export const make = <Id extends string>(id: Id, definition: D1Definition) =>
+  Service<D1Service<Id>>()(id, definition);
+
+/**
+ * Builds a D1 service around a Cloudflare D1 database binding.
+ *
+ * The returned service exposes the raw `D1Database` binding, small native D1
+ * helpers, and `sqlLayer(...)` for providing `effect/unstable/sql` via
+ * `@effect/sql-d1`.
+ *
+ * @example
+ * ```ts
+ * class TodoDatabase extends D1.Service<TodoDatabase>()("TodoDatabase", {
+ *   binding: "TODO_DB",
+ * }) {}
+ *
+ * const SqlLive = TodoDatabase.sqlLayer();
+ * ```
+ */
+export const Service =
+  <Self>() =>
+  <Id extends string>(id: Id, definition: D1Definition) => {
+    const tag = Binding.Service<Self>()(id, definition.binding, isD1Database);
+
+    const sqlLayer = (options?: D1SqlLayerOptions) =>
+      Layer.unwrap(
+        Effect.gen(function* () {
+          const db = yield* tag;
+          return D1Client.layer({ ...options, db });
+        }),
+      ).pipe(Layer.provide(tag.layer));
+
+    const prepare = Effect.fnUntraced(function* (query: string) {
+      const db = yield* tag;
+      return yield* tryD1Sync(definition.binding, "prepare", () => db.prepare(query));
+    });
+
+    const batch = Effect.fnUntraced(function* <T = unknown>(
+      statements: ReadonlyArray<D1PreparedStatement>,
+    ) {
+      const db = yield* tag;
+      return yield* tryD1Promise(definition.binding, "batch", () => db.batch<T>([...statements]));
+    });
+
+    const exec = Effect.fnUntraced(function* (query: string) {
+      const db = yield* tag;
+      return yield* tryD1Promise(definition.binding, "exec", () => db.exec(query));
+    });
+
+    const unsafeRaw = Effect.fnUntraced(function* () {
+      return yield* tag;
+    });
+
+    return Object.assign(tag, {
+      [TypeId]: TypeId,
+      definition,
+      sqlLayer,
+      prepare,
+      batch,
+      exec,
+      unsafeRaw,
+    });
+  };

package/src/index.ts

@@ -1,4 +1,5 @@
 export * as Binding from "./Binding";
+export * as D1 from "./D1";
 export * as DurableObject from "./DurableObject";
 export * as DurableObjectAlarm from "./DurableObjectAlarm";
 export * as DurableObjectDefinition from "./DurableObjectDefinition";