effect-cf 0.2.0 → 0.4.0

package/dist/index.mjs

@@ -120,11 +120,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 +144,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 +156,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 +168,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 +206,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
@@ -480,7 +480,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 +519,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 +537,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 +549,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 +605,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 +672,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
@@ -923,11 +923,11 @@ const attachment = (schema) => {
 		schema
 	};
 };
-/** Adapts wrapped websocket lifecycle handlers to `DurableObject.make` raw callbacks. */
+/** Maps compact websocket lifecycle handler names to `DurableObject.make` options. */
 const handlers = (options) => ({
-	webSocketMessage: options.message === void 0 ? void 0 : (socket, message) => options.message?.(fromWebSocket(socket), message) ?? Effect.void,
-	webSocketClose: options.close === void 0 ? void 0 : (socket, code, reason, wasClean) => options.close?.(fromWebSocket(socket), code, reason, wasClean) ?? Effect.void,
-	webSocketError: options.error === void 0 ? void 0 : (socket, error) => options.error?.(fromWebSocket(socket), error) ?? Effect.void
+	webSocketMessage: options.message,
+	webSocketClose: options.close,
+	webSocketError: options.error
 });
 //#endregion
 //#region src/DurableObjectState.ts
@@ -1106,7 +1106,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 +1137,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 +1155,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 +1167,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 +1185,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
@@ -1230,19 +1230,19 @@ const make$4 = (layer, options = {}) => {
 			if (rawAlarm !== void 0) return this[RunSymbol](rawAlarm);
 		}
 		webSocketMessage(socket, message) {
-			if (options.webSocketMessage !== void 0) return this[RunSymbol](options.webSocketMessage(socket, message));
+			if (options.webSocketMessage !== void 0) return this[RunSymbol](options.webSocketMessage(fromWebSocket(socket), message));
 		}
 		webSocketClose(socket, code, reason, wasClean) {
-			if (options.webSocketClose !== void 0) return this[RunSymbol](options.webSocketClose(socket, code, reason, wasClean));
+			if (options.webSocketClose !== void 0) return this[RunSymbol](options.webSocketClose(fromWebSocket(socket), code, reason, wasClean));
 		}
 		webSocketError(socket, error) {
-			if (options.webSocketError !== void 0) return this[RunSymbol](options.webSocketError(socket, error));
+			if (options.webSocketError !== void 0) return this[RunSymbol](options.webSocketError(fromWebSocket(socket), error));
 		}
 	}
 	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 +1698,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 +1719,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.
 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {

package/src/DurableObject.ts

@@ -4,6 +4,7 @@ import { Effect, Layer, ManagedRuntime, type Scope } from "effect";
 import { NativeRequest } from "./Worker";
 import { WorkerEnvironment, type WorkerEnv } from "./Environment";
 import { DurableObjectState, fromDurableObjectState } from "./DurableObjectState";
+import { fromWebSocket, type DurableWebSocket } from "./DurableObjectWebSocket";
 import * as DurableObjectDefinition from "./DurableObjectDefinition";
 import * as Entrypoint from "./internal/Entrypoint";
 
@@ -84,17 +85,17 @@ export interface DurableObjectOptions<ROut, Rpc extends DurableObjectRpc<ROut>>
     alarmInfo?: globalThis.AlarmInvocationInfo,
   ) => Effect.Effect<void, unknown, HandlerContext<ROut>>;
   readonly webSocketMessage?: (
-    socket: WebSocket,
+    socket: DurableWebSocket,
     message: string | ArrayBuffer,
   ) => Effect.Effect<void, unknown, HandlerContext<ROut>>;
   readonly webSocketClose?: (
-    socket: WebSocket,
+    socket: DurableWebSocket,
     code: number,
     reason: string,
     wasClean: boolean,
   ) => Effect.Effect<void, unknown, HandlerContext<ROut>>;
   readonly webSocketError?: (
-    socket: WebSocket,
+    socket: DurableWebSocket,
     error: unknown,
   ) => Effect.Effect<void, unknown, HandlerContext<ROut>>;
 }
@@ -172,7 +173,7 @@ export const make = <
 
     webSocketMessage(socket: WebSocket, message: string | ArrayBuffer): Promise<void> | void {
       if (options.webSocketMessage !== undefined) {
-        return this[RunSymbol](options.webSocketMessage(socket, message));
+        return this[RunSymbol](options.webSocketMessage(fromWebSocket(socket), message));
       }
     }
 
@@ -183,13 +184,15 @@ export const make = <
       wasClean: boolean,
     ): Promise<void> | void {
       if (options.webSocketClose !== undefined) {
-        return this[RunSymbol](options.webSocketClose(socket, code, reason, wasClean));
+        return this[RunSymbol](
+          options.webSocketClose(fromWebSocket(socket), code, reason, wasClean),
+        );
       }
     }
 
     webSocketError(socket: WebSocket, error: unknown): Promise<void> | void {
       if (options.webSocketError !== undefined) {
-        return this[RunSymbol](options.webSocketError(socket, error));
+        return this[RunSymbol](options.webSocketError(fromWebSocket(socket), error));
       }
     }
   }

package/src/DurableObjectWebSocket.ts

@@ -251,21 +251,9 @@ export interface DurableWebSocketHandlers<R = never, E = unknown> {
   readonly error?: (socket: DurableWebSocket, error: unknown) => Effect.Effect<void, E, R>;
 }
 
-/** Adapts wrapped websocket lifecycle handlers to `DurableObject.make` raw callbacks. */
+/** Maps compact websocket lifecycle handler names to `DurableObject.make` options. */
 export const handlers = <R = never, E = unknown>(options: DurableWebSocketHandlers<R, E>) => ({
-  webSocketMessage:
-    options.message === undefined
-      ? undefined
-      : (socket: WebSocket, message: string | ArrayBuffer) =>
-          options.message?.(fromWebSocket(socket), message) ?? Effect.void,
-  webSocketClose:
-    options.close === undefined
-      ? undefined
-      : (socket: WebSocket, code: number, reason: string, wasClean: boolean) =>
-          options.close?.(fromWebSocket(socket), code, reason, wasClean) ?? Effect.void,
-  webSocketError:
-    options.error === undefined
-      ? undefined
-      : (socket: WebSocket, error: unknown) =>
-          options.error?.(fromWebSocket(socket), error) ?? Effect.void,
+  webSocketMessage: options.message,
+  webSocketClose: options.close,
+  webSocketError: options.error,
 });

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.
  *