effect-cf 0.3.0 → 0.5.0

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;
@@ -120,11 +203,11 @@ const Service$4 = () => (id, definition) => {
 //#region src/QueueDefinition.ts
 var QueueDefinition_exports = /* @__PURE__ */ __exportAll({
 	Queue: () => Queue$1,
-	Tag: () => Tag$7,
+	Tag: () => Tag$8,
 	implement: () => implement$7,
 	make: () => make$9
 });
-const makeDefinition$3 = (id, definition) => {
+const makeDefinition$4 = (id, definition) => {
 	const queueDefinition = {
 		id,
 		message: definition.message
@@ -144,9 +227,9 @@ const makeDefinition$3 = (id, definition) => {
 		})
 	});
 };
-const make$9 = makeDefinition$3;
-const Tag$7 = () => (id, definition) => {
-	const queueDefinition = makeDefinition$3(id, definition);
+const make$9 = makeDefinition$4;
+const Tag$8 = () => (id, definition) => {
+	const queueDefinition = makeDefinition$4(id, definition);
 	class QueueDefinitionClass {
 		static id = queueDefinition.id;
 		static message = queueDefinition.message;
@@ -156,7 +239,7 @@ const Tag$7 = () => (id, definition) => {
 	}
 	return QueueDefinitionClass;
 };
-const Queue$1 = Tag$7;
+const Queue$1 = Tag$8;
 const wrapHandler$1 = (definition, handler) => {
 	const decodeBody = Schema.decodeUnknownEffect(definition.message);
 	return (batch) => Effect.gen(function* () {
@@ -168,7 +251,7 @@ const implement$7 = (_definition, handler) => handler;
 //#region src/Queue.ts
 var Queue_exports = /* @__PURE__ */ __exportAll({
 	QueueMessageDecodeError: () => QueueMessageDecodeError,
-	Tag: () => Tag$6,
+	Tag: () => Tag$7,
 	decodeBatch: () => decodeBatch,
 	fromMessage: () => fromMessage,
 	fromMessageBatch: () => fromMessageBatch,
@@ -206,7 +289,7 @@ const decodeBatch = (batch, decodeBody) => Effect.gen(function* () {
 	}
 	return fromMessageBatch(batch, messages);
 });
-const Tag$6 = Tag$7;
+const Tag$7 = Tag$8;
 const implement$6 = implement$7;
 //#endregion
 //#region src/RpcDefinition.ts
@@ -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({
@@ -480,7 +563,7 @@ const makeDirectMethods$1 = (rpcDefinition, call) => {
 //#endregion
 //#region src/WorkerDefinition.ts
 var WorkerDefinition_exports = /* @__PURE__ */ __exportAll({
-	Tag: () => Tag$5,
+	Tag: () => Tag$6,
 	Worker: () => Worker,
 	implement: () => implement$5,
 	make: () => make$7,
@@ -519,7 +602,7 @@ const method$3 = method$4;
 * });
 * ```
 */
-const makeDefinition$2 = (id, methods) => {
+const makeDefinition$3 = (id, methods) => {
 	assertNoReservedMethods("Worker", methods, reservedMethodNames$3);
 	const definition = make$8(id, methods);
 	return Object.assign(definition, {
@@ -537,9 +620,9 @@ const makeDefinition$2 = (id, methods) => {
 		})
 	});
 };
-const make$7 = makeDefinition$2;
-const Tag$5 = () => (id, methods) => {
-	const definition = makeDefinition$2(id, methods);
+const make$7 = makeDefinition$3;
+const Tag$6 = () => (id, methods) => {
+	const definition = makeDefinition$3(id, methods);
 	class WorkerDefinitionClass {
 		static id = definition.id;
 		static methods = definition.methods;
@@ -549,7 +632,7 @@ const Tag$5 = () => (id, methods) => {
 	}
 	return WorkerDefinitionClass;
 };
-const Worker = Tag$5;
+const Worker = Tag$6;
 const wrapHandlers$1 = (definition, handlers) => {
 	const wrapped = {};
 	for (const key of Object.keys(definition.methods)) {
@@ -605,7 +688,7 @@ const fromExecutionContext = (ctx, runPromiseExit) => {
 var Worker_exports = /* @__PURE__ */ __exportAll({
 	ExecutionContext: () => ExecutionContext,
 	NativeRequest: () => NativeRequest,
-	Tag: () => Tag$4,
+	Tag: () => Tag$5,
 	WorkerContext: () => WorkerContext,
 	implement: () => implement$4,
 	isWebSocketUpgrade: () => isWebSocketUpgrade,
@@ -672,7 +755,7 @@ const makeFetchHandler = (layer, options) => {
 	const WorkerClass = make$6(layer, options);
 	return { fetch: (request, env, ctx) => Promise.resolve(new WorkerClass(ctx, env).fetch(request)) };
 };
-const Tag$4 = Tag$5;
+const Tag$5 = Tag$6;
 const method$2 = method$3;
 const implement$4 = implement$5;
 //#endregion
@@ -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);
 	});
@@ -1106,7 +1189,7 @@ const makeDirectMethods = (rpcDefinition, helpers) => {
 //#region src/DurableObjectDefinition.ts
 var DurableObjectDefinition_exports = /* @__PURE__ */ __exportAll({
 	DurableObject: () => DurableObject$1,
-	Tag: () => Tag$3,
+	Tag: () => Tag$4,
 	implement: () => implement$3,
 	make: () => make$5,
 	method: () => method$1
@@ -1137,7 +1220,7 @@ const method$1 = method$4;
 * });
 * ```
 */
-const makeDefinition$1 = (id, methods) => {
+const makeDefinition$2 = (id, methods) => {
 	assertNoReservedMethods("Durable Object", methods, reservedMethodNames$1);
 	const definition = make$8(id, methods);
 	return Object.assign(definition, {
@@ -1155,9 +1238,9 @@ const makeDefinition$1 = (id, methods) => {
 		})
 	});
 };
-const make$5 = makeDefinition$1;
-const Tag$3 = () => (id, methods) => {
-	const definition = makeDefinition$1(id, methods);
+const make$5 = makeDefinition$2;
+const Tag$4 = () => (id, methods) => {
+	const definition = makeDefinition$2(id, methods);
 	class DurableObjectDefinitionClass {
 		static id = definition.id;
 		static methods = definition.methods;
@@ -1167,7 +1250,7 @@ const Tag$3 = () => (id, methods) => {
 	}
 	return DurableObjectDefinitionClass;
 };
-const DurableObject$1 = Tag$3;
+const DurableObject$1 = Tag$4;
 const wrapHandlers = (definition, handlers) => {
 	const wrapped = {};
 	for (const key of Object.keys(definition.methods)) {
@@ -1185,7 +1268,7 @@ const implement$3 = (_definition, handlers) => handlers;
 //#endregion
 //#region src/DurableObject.ts
 var DurableObject_exports = /* @__PURE__ */ __exportAll({
-	Tag: () => Tag$2,
+	Tag: () => Tag$3,
 	implement: () => implement$2,
 	make: () => make$4,
 	method: () => method
@@ -1242,7 +1325,7 @@ const make$4 = (layer, options = {}) => {
 	defineEntrypointRpcMethods("Durable Object", EffectDurableObject.prototype, options.rpc, reservedMethodNames, (self, effect) => self[RunSymbol](effect));
 	return assumeEntrypointClass(EffectDurableObject);
 };
-const Tag$2 = Tag$3;
+const Tag$3 = Tag$4;
 const method = method$1;
 const implement$2 = implement$3;
 //#endregion
@@ -1698,6 +1781,7 @@ const writeAttachment = (socket, key, clientId) => {
 var Kv_exports = /* @__PURE__ */ __exportAll({
 	KvOperationError: () => KvOperationError,
 	Service: () => Service$1,
+	Tag: () => Tag$2,
 	make: () => make$3
 });
 const TypeId$1 = "effect-cf/Kv";
@@ -1718,6 +1802,36 @@ const tryKvPromise = (binding, operation, evaluate) => Effect.tryPromise({
 * Creates a typed KV service tag plus Effect helpers.
 */
 const make$3 = (id, definition) => Service$1()(id, definition);
+const makeDefinition$1 = (id, definition) => {
+	const kvDefinition = {
+		id,
+		key: definition.key,
+		value: definition.value
+	};
+	return Object.assign(kvDefinition, {
+		Binding: () => (bindingId, binding) => Service$1()(bindingId, {
+			...binding,
+			key: definition.key,
+			value: definition.value
+		}),
+		binding: (bindingId, binding) => Service$1()(bindingId, {
+			...binding,
+			key: definition.key,
+			value: definition.value
+		})
+	});
+};
+const Tag$2 = () => (id, definition) => {
+	const kvDefinition = makeDefinition$1(id, definition);
+	class KvDefinitionClass {
+		static id = kvDefinition.id;
+		static key = kvDefinition.key;
+		static value = kvDefinition.value;
+		static Binding = kvDefinition.Binding;
+		static binding = kvDefinition.binding;
+	}
+	return KvDefinitionClass;
+};
 /**
 * Builds a KV service around a Cloudflare KV namespace binding.
 *
@@ -1739,7 +1853,7 @@ const make$3 = (id, definition) => Service$1()(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";
@@ -1841,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) => {
@@ -2025,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.3.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/Kv.ts

@@ -52,6 +52,26 @@ export interface KvDefinition<Key, Value, EncodedValue> {
   readonly value: S.Codec<Value, EncodedValue>;
 }
 
+/**
+ * Reusable typed KV resource definition without a concrete Cloudflare binding name.
+ */
+export interface Definition<
+  Id extends string = string,
+  Key = unknown,
+  Value = unknown,
+  EncodedValue = unknown,
+> {
+  readonly id: Id;
+  /** Codec used to encode/decode keys. */
+  readonly key: S.Codec<Key, string>;
+  /** Codec used to encode/decode values. */
+  readonly value: S.Codec<Value, EncodedValue>;
+}
+
+export namespace Definition {
+  export type Any = Definition<string, any, any, any>;
+}
+
 declare const KvServiceTypeId: unique symbol;
 
 /** Nominal service marker for KV services created with {@link make}. */
@@ -64,6 +84,16 @@ export interface KvService<Id extends string, Key, Value, EncodedValue> {
   };
 }
 
+declare const BindingServiceTypeId: unique symbol;
+
+/** Nominal service marker for KV bindings created from a reusable {@link Definition}. */
+export interface BindingService<Id extends string, Self extends Definition.Any> {
+  readonly [BindingServiceTypeId]: {
+    readonly id: Id;
+    readonly definition: Self;
+  };
+}
+
 const maybeString = (value: string | null | undefined): Option.Option<string> =>
   value == null ? Option.none() : Option.some(value);
 
@@ -92,6 +122,66 @@ export const make = <Id extends string, Key, Value, EncodedValue>(
 ) =>
   Service<KvService<Id, Key, Value, EncodedValue>>()<Id, Key, Value, EncodedValue>(id, definition);
 
+const makeDefinition = <Id extends string, Key, Value, EncodedValue>(
+  id: Id,
+  definition: { readonly key: S.Codec<Key, string>; readonly value: S.Codec<Value, EncodedValue> },
+) => {
+  type SelfDefinition = Definition<Id, Key, Value, EncodedValue>;
+  const kvDefinition: SelfDefinition = {
+    id,
+    key: definition.key,
+    value: definition.value,
+  };
+
+  return Object.assign(kvDefinition, {
+    Binding:
+      <Self>() =>
+      <BindingId extends string>(
+        bindingId: BindingId,
+        binding: Omit<KvDefinition<Key, Value, EncodedValue>, "key" | "value">,
+      ) =>
+        Service<Self>()<BindingId, Key, Value, EncodedValue>(bindingId, {
+          ...binding,
+          key: definition.key,
+          value: definition.value,
+        }),
+    binding: <BindingId extends string>(
+      bindingId: BindingId,
+      binding: Omit<KvDefinition<Key, Value, EncodedValue>, "key" | "value">,
+    ) =>
+      Service<BindingService<BindingId, SelfDefinition>>()<BindingId, Key, Value, EncodedValue>(
+        bindingId,
+        {
+          ...binding,
+          key: definition.key,
+          value: definition.value,
+        },
+      ),
+  });
+};
+
+export const Tag =
+  <_Self>() =>
+  <Id extends string, Key, Value, EncodedValue>(
+    id: Id,
+    definition: {
+      readonly key: S.Codec<Key, string>;
+      readonly value: S.Codec<Value, EncodedValue>;
+    },
+  ) => {
+    const kvDefinition = makeDefinition(id, definition);
+
+    abstract class KvDefinitionClass {
+      static readonly id = kvDefinition.id;
+      static readonly key = kvDefinition.key;
+      static readonly value = kvDefinition.value;
+      static readonly Binding = kvDefinition.Binding;
+      static readonly binding = kvDefinition.binding;
+    }
+
+    return KvDefinitionClass as (abstract new () => object) & typeof kvDefinition;
+  };
+
 /**
  * Builds a KV service around a Cloudflare KV namespace binding.
  *

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";