@restatedev/restate-sdk-gen 1.16.8 → 1.17.0

package/dist/index.cjs

@@ -31,10 +31,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let __restatedev_restate_sdk = require("@restatedev/restate-sdk");
 __restatedev_restate_sdk = __toESM(__restatedev_restate_sdk);
-let __restatedev_restate_sdk_clients = require("@restatedev/restate-sdk-clients");
-__restatedev_restate_sdk_clients = __toESM(__restatedev_restate_sdk_clients);
 let __restatedev_restate_sdk_core = require("@restatedev/restate-sdk-core");
 __restatedev_restate_sdk_core = __toESM(__restatedev_restate_sdk_core);
+let __restatedev_restate_sdk_clients = require("@restatedev/restate-sdk-clients");
+__restatedev_restate_sdk_clients = __toESM(__restatedev_restate_sdk_clients);
 
 //#region src/current.ts
 let CURRENT = null;
@@ -79,11 +79,11 @@ var InvocationReferenceImpl = class {
 		this.id = id;
 		this._outputSerde = _outputSerde;
 	}
-	attach(serde$1) {
-		return getCurrent().attach(this.id, serde$1 ?? this._outputSerde);
+	attach(serde$2) {
+		return getCurrent().attach(this.id, serde$2 ?? this._outputSerde);
 	}
-	signal(name, serde$1) {
-		return getCurrent().invocationSignal(this.id, name, serde$1);
+	signal(name, serde$2) {
+		return getCurrent().invocationSignal(this.id, name, serde$2);
 	}
 	cancel() {
 		getCurrent().cancel(this.id);
@@ -120,11 +120,11 @@ const handlerRequest = () => currentOps().handlerRequest();
 */
 const run = (action, opts) => currentOps().run(action, opts);
 const sleep = (duration, name) => currentOps().sleep(duration, name);
-const awakeable = (serde$1) => currentOps().awakeable(serde$1);
-const resolveAwakeable = (id, payload, serde$1) => currentOps().resolveAwakeable(id, payload, serde$1);
+const awakeable = (serde$2) => currentOps().awakeable(serde$2);
+const resolveAwakeable = (id, payload, serde$2) => currentOps().resolveAwakeable(id, payload, serde$2);
 const rejectAwakeable = (id, reason) => currentOps().rejectAwakeable(id, reason);
-const signal = (name, serde$1) => currentOps().signal(name, serde$1);
-const attach = (invocationId, serde$1) => currentOps().attach(invocationId, serde$1);
+const signal = (name, serde$2) => currentOps().signal(name, serde$2);
+const attach = (invocationId, serde$2) => currentOps().attach(invocationId, serde$2);
 function client(def, key) {
 	return currentOps().client(def, key);
 }
@@ -155,7 +155,7 @@ const cancel = (invocationId) => currentOps().cancel(invocationId);
 const channel = () => currentOps().channel();
 const state = () => currentOps().state();
 const sharedState = () => currentOps().sharedState();
-const workflowPromise = (name, serde$1) => currentOps().workflowPromise(name, serde$1);
+const workflowPromise = (name, serde$2) => currentOps().workflowPromise(name, serde$2);
 /**
 * Wait for every future to settle; return their values in input order.
 * Heterogeneous-tuple typing — `all([fA, fB])` where `fA: Future<A>`
@@ -1091,14 +1091,14 @@ var Scheduler = class {
 function makeState(ctx, sched, adapt$1) {
 	const writeCtx = ctx;
 	return {
-		get(name, serde$1) {
-			return sched.makeJournalFuture(adapt$1(ctx.get(name, serde$1)));
+		get(name, serde$2) {
+			return sched.makeJournalFuture(adapt$1(ctx.get(name, serde$2)));
 		},
 		keys() {
 			return sched.makeJournalFuture(adapt$1(ctx.stateKeys()));
 		},
-		set(name, value, serde$1) {
-			writeCtx.set(name, value, serde$1);
+		set(name, value, serde$2) {
+			writeCtx.set(name, value, serde$2);
 		},
 		clear(name) {
 			writeCtx.clear(name);
@@ -1114,7 +1114,7 @@ function makeState(ctx, sched, adapt$1) {
 function makeClient(def, key, call$1, scope$2) {
 	return new Proxy({}, { get(_target, methodName) {
 		return (...args) => {
-			const { parameter, opts } = optsFromArgs$1(args);
+			const { parameter, opts } = optsFromArgs(args);
 			const callOpts = opts;
 			const desc = def._handlers[methodName];
 			const outputSerde = callOpts?.output ?? desc?._outputSerde;
@@ -1137,7 +1137,7 @@ function makeClient(def, key, call$1, scope$2) {
 function makeSendClient(def, key, send$1, scope$2) {
 	return new Proxy({}, { get(_target, methodName) {
 		return (...args) => {
-			const { parameter, opts } = optsFromArgs$1(args);
+			const { parameter, opts } = optsFromArgs(args);
 			const sendOpts = opts;
 			const desc = def._handlers[methodName];
 			return send$1({
@@ -1156,7 +1156,7 @@ function makeSendClient(def, key, send$1, scope$2) {
 		};
 	} });
 }
-function optsFromArgs$1(args) {
+function optsFromArgs(args) {
 	let parameter;
 	let opts;
 	switch (args.length) {
@@ -1355,24 +1355,24 @@ var RestateOperations = class {
 	sleep(duration, name) {
 		return this.sched.makeJournalFuture(adapt(this.ctx.sleep(duration, name)));
 	}
-	awakeable(serde$1) {
-		const { id, promise } = this.ctx.awakeable(serde$1);
+	awakeable(serde$2) {
+		const { id, promise } = this.ctx.awakeable(serde$2);
 		return {
 			id,
 			promise: this.sched.makeJournalFuture(adapt(promise))
 		};
 	}
-	resolveAwakeable(id, payload, serde$1) {
-		this.ctx.resolveAwakeable(id, payload, serde$1);
+	resolveAwakeable(id, payload, serde$2) {
+		this.ctx.resolveAwakeable(id, payload, serde$2);
 	}
 	rejectAwakeable(id, reason) {
 		this.ctx.rejectAwakeable(id, reason);
 	}
-	signal(name, serde$1) {
-		return this.sched.makeJournalFuture(adapt(this.ctx.signal(name, serde$1)));
+	signal(name, serde$2) {
+		return this.sched.makeJournalFuture(adapt(this.ctx.signal(name, serde$2)));
 	}
-	attach(invocationId, serde$1) {
-		return this.sched.makeJournalFuture(adapt(this.ctx.attach(invocationId, serde$1)));
+	attach(invocationId, serde$2) {
+		return this.sched.makeJournalFuture(adapt(this.ctx.attach(invocationId, serde$2)));
 	}
 	/**
 	* Returns the current invocation's request metadata plus the optional
@@ -1401,7 +1401,7 @@ var RestateOperations = class {
 		return makeClient(def, key, (o) => this.call(o));
 	}
 	sendClient(def, key) {
-		return makeSendClient(def, key, (o, serde$1) => this.send(o, serde$1));
+		return makeSendClient(def, key, (o, serde$2) => this.send(o, serde$2));
 	}
 	/**
 	* Route all outgoing calls/sends through a named scope.
@@ -1423,7 +1423,7 @@ var RestateOperations = class {
 	scope(scopeKey) {
 		return {
 			client: (def, key) => makeClient(def, key, (o) => this.call(o), scopeKey),
-			sendClient: (def, key) => makeSendClient(def, key, (o, serde$1) => this.send(o, serde$1), scopeKey)
+			sendClient: (def, key) => makeSendClient(def, key, (o, serde$2) => this.send(o, serde$2), scopeKey)
 		};
 	}
 	call(opts) {
@@ -1442,8 +1442,8 @@ var RestateOperations = class {
 			return new InvocationReferenceImpl(yield* idFuture, outputSerde);
 		}));
 	}
-	invocationSignal(invocationId, name, serde$1) {
-		return this.ctx.invocation(invocationId).signal(name, serde$1);
+	invocationSignal(invocationId, name, serde$2) {
+		return this.ctx.invocation(invocationId).signal(name, serde$2);
 	}
 	/**
 	* Cancel another invocation by its id. To observe cancellation
@@ -1460,9 +1460,9 @@ var RestateOperations = class {
 	* `WorkflowSharedContext`). Returns a wrapper whose `peek`/`get`/
 	* `resolve`/`reject` methods return Futures.
 	*/
-	workflowPromise(name, serde$1) {
+	workflowPromise(name, serde$2) {
 		const wfCtx = this.ctx;
-		return wrapDurablePromise(wfCtx.promise(name, serde$1), (p) => this.toFuture(p));
+		return wrapDurablePromise(wfCtx.promise(name, serde$2), (p) => this.toFuture(p));
 	}
 	/**
 	* Register `op` as a fresh routine and return a `Future<T>` for its
@@ -1612,20 +1612,10 @@ async function execute(context, op, options) {
 
 //#endregion
 //#region src/define.ts
-function makeDescriptor(inputSerde, outputSerde) {
-	return {
-		_inputSerde: inputSerde,
-		_outputSerde: outputSerde
-	};
-}
 /** HandlerDef has _genFn as an object property; bare gen fns are plain functions */
 function isHandlerDef(entry) {
 	return typeof entry === "object" && entry !== null && typeof entry._genFn === "function";
 }
-/** Convert a Standard Schema to a Serde via restate.serde.schema() */
-function toSerde(schema) {
-	return __restatedev_restate_sdk.serde.schema(schema);
-}
 function extractEntry(entry) {
 	if (isHandlerDef(entry)) return {
 		genFn: entry._genFn,
@@ -1650,8 +1640,8 @@ function serdes(opts, fn) {
 function schemas(opts, fn) {
 	return {
 		_genFn: fn,
-		_inputSerde: toSerde(opts.input),
-		_outputSerde: toSerde(opts.output)
+		_inputSerde: __restatedev_restate_sdk_core.serde.schema(opts.input),
+		_outputSerde: __restatedev_restate_sdk_core.serde.schema(opts.output)
 	};
 }
 function service(config) {
@@ -1667,7 +1657,7 @@ function service(config) {
 			output: outputSerde,
 			...handlerOpts
 		}, async (ctx, input) => execute(ctx, genFn(input)));
-		descriptors[handlerName] = makeDescriptor(inputSerde, outputSerde);
+		descriptors[handlerName] = (0, __restatedev_restate_sdk_core.makeHandlerDescriptor)(inputSerde, outputSerde);
 	}
 	const coreDef = __restatedev_restate_sdk.service({
 		name,
@@ -1696,7 +1686,7 @@ function object(config) {
 		};
 		const fn = async (ctx, input) => execute(ctx, genFn(input));
 		coreHandlers[handlerName] = shared ? __restatedev_restate_sdk.handlers.object.shared(sdkOpts, fn) : __restatedev_restate_sdk.handlers.object.exclusive(sdkOpts, fn);
-		descriptors[handlerName] = makeDescriptor(inputSerde, outputSerde);
+		descriptors[handlerName] = (0, __restatedev_restate_sdk_core.makeHandlerDescriptor)(inputSerde, outputSerde);
 	}
 	const coreDef = __restatedev_restate_sdk.object({
 		name,
@@ -1724,7 +1714,7 @@ function workflow(config) {
 		};
 		const fn = async (ctx, input) => execute(ctx, genFn(input));
 		coreHandlers[handlerName] = handlerName === "run" ? __restatedev_restate_sdk.handlers.workflow.workflow(sdkOpts, fn) : __restatedev_restate_sdk.handlers.workflow.shared(sdkOpts, fn);
-		descriptors[handlerName] = makeDescriptor(inputSerde, outputSerde);
+		descriptors[handlerName] = (0, __restatedev_restate_sdk_core.makeHandlerDescriptor)(inputSerde, outputSerde);
 	}
 	const coreDef = __restatedev_restate_sdk.workflow({
 		name,
@@ -1741,51 +1731,9 @@ function workflow(config) {
 
 //#endregion
 //#region src/interface.ts
-var interface_exports = /* @__PURE__ */ __export({
-	implement: () => implement,
-	json: () => json,
-	object: () => object$1,
-	schemas: () => schemas$1,
-	serdes: () => serdes$1,
-	service: () => service$1,
-	workflow: () => workflow$1
-});
-/** json<I, O>() — type params, default JSON serde */
-function json() {
-	return makeDescriptor(void 0, void 0);
-}
-/** serdes(opts) — explicit Serde per field */
-function serdes$1(opts) {
-	return makeDescriptor(opts.input, opts.output);
-}
-/** schemas(opts) — Standard Schema (Zod, TypeBox, Valibot, …) per field */
-function schemas$1(opts) {
-	return makeDescriptor(opts.input ? toSerde(opts.input) : void 0, opts.output ? toSerde(opts.output) : void 0);
-}
-function service$1(name, handlers) {
-	return {
-		name,
-		_kind: "service",
-		_handlers: handlers
-	};
-}
-function object$1(name, handlers) {
-	return {
-		name,
-		_kind: "object",
-		_handlers: handlers
-	};
-}
-function workflow$1(name, handlers) {
-	return {
-		name,
-		_kind: "workflow",
-		_handlers: handlers
-	};
-}
-function implement(iface, config) {
+function implement(iface$1, config) {
 	const handlerEntries = {};
-	for (const [name, desc] of Object.entries(iface._handlers)) {
+	for (const [name, desc] of Object.entries(iface$1._handlers)) {
 		const genFn = config.handlers[name];
 		if (!genFn) throw new Error(`implement(): missing handler "${name}"`);
 		handlerEntries[name] = {
@@ -1794,18 +1742,18 @@ function implement(iface, config) {
 			_outputSerde: desc._outputSerde
 		};
 	}
-	if (iface._kind === "service") return service({
-		name: iface.name,
+	if (iface$1._kind === "service") return service({
+		name: iface$1.name,
 		handlers: handlerEntries,
 		options: config.options
 	});
-	else if (iface._kind === "object") return object({
-		name: iface.name,
+	else if (iface$1._kind === "object") return object({
+		name: iface$1.name,
 		handlers: handlerEntries,
 		options: config.options
 	});
 	else return workflow({
-		name: iface.name,
+		name: iface$1.name,
 		handlers: handlerEntries,
 		options: config.options
 	});
@@ -1824,98 +1772,28 @@ var ingress_exports = /* @__PURE__ */ __export({
 	sendClient: () => sendClient$1
 });
 /**
-* Connect to the Restate Ingress.
-*
-* @param opts connection options
-* @returns a connection the the restate ingress
+* @deprecated Use `connect` from `@restatedev/restate-sdk-clients` and its typed
+* client methods, e.g. `connect({ url }).serviceClient(def)`
 */
 function connect(opts) {
 	return (0, __restatedev_restate_sdk_clients.connect)(opts);
 }
 function client$1(ingress, def, key) {
-	return makeIngressClient(ingress, def, key);
+	return key === void 0 ? ingress.client(def) : ingress.client(def, key);
 }
 function sendClient$1(ingress, def, key) {
-	return makeIngressSendClient(ingress, def, key);
+	return key === void 0 ? ingress.sendClient(def) : ingress.sendClient(def, key);
 }
 /**
-* Route all ingress calls/sends through a named scope. The in-handler
-* `scope(scopeKey)` and this `scope(ingress, scopeKey)` produce the same
-* `.client(def)` / `.sendClient(def)` shape, so handler and ingress code
-* read identically (modulo the explicit `ingress`).
-*
-* @example
-*   await clients.scope(ingress, "tenant-123").client(Greeter).greet(name);
-*   await clients.scope(ingress, "tenant-123").client(Cart, "cart-42").add(item);
+* @deprecated Use `ingress.scope(scopeKey)` from
+* `@restatedev/restate-sdk-clients`, then `.client(def)` / `.sendClient(def)`
+* on the returned scoped ingress.
 */
 function scope$1(ingress, scopeKey) {
+	const scoped = ingress.scope(scopeKey);
 	return {
-		client: (def, key) => makeIngressClient(ingress, def, key, scopeKey),
-		sendClient: (def, key) => makeIngressSendClient(ingress, def, key, scopeKey)
-	};
-}
-function makeIngressClient(ingress, def, key, scope$2) {
-	return new Proxy({}, { get(_target, methodName) {
-		return (...args) => {
-			const { parameter, opts } = optsFromArgs(args);
-			const desc = def._handlers[methodName];
-			const mergedOpts = __restatedev_restate_sdk_clients.Opts.from({
-				...opts?.opts,
-				input: opts?.opts?.input ?? desc?._inputSerde,
-				output: opts?.opts?.output ?? desc?._outputSerde
-			});
-			return ingress.call({
-				service: def.name,
-				handler: methodName,
-				parameter,
-				key,
-				scope: scope$2,
-				opts: mergedOpts
-			});
-		};
-	} });
-}
-function makeIngressSendClient(ingress, def, key, scope$2) {
-	return new Proxy({}, { get(_target, methodName) {
-		return (...args) => {
-			const { parameter, opts } = optsFromArgs(args);
-			const desc = def._handlers[methodName];
-			const mergedOpts = __restatedev_restate_sdk_clients.SendOpts.from({
-				...opts?.opts,
-				input: opts?.opts?.input ?? desc?._inputSerde
-			});
-			return ingress.send({
-				service: def.name,
-				handler: methodName,
-				parameter,
-				key,
-				scope: scope$2,
-				opts: mergedOpts
-			});
-		};
-	} });
-}
-function optsFromArgs(args) {
-	let parameter;
-	let opts;
-	switch (args.length) {
-		case 0: break;
-		case 1:
-			if (args[0] instanceof __restatedev_restate_sdk_clients.Opts) opts = args[0];
-			else if (args[0] instanceof __restatedev_restate_sdk_clients.SendOpts) opts = args[0];
-			else parameter = args[0];
-			break;
-		case 2:
-			parameter = args[0];
-			if (args[1] instanceof __restatedev_restate_sdk_clients.Opts) opts = args[1];
-			else if (args[1] instanceof __restatedev_restate_sdk_clients.SendOpts) opts = args[1];
-			else throw new TypeError("The second argument must be either Opts or SendOpts");
-			break;
-		default: throw new TypeError("unexpected number of arguments");
-	}
-	return {
-		parameter,
-		opts
+		client: (def, key) => key === void 0 ? scoped.client(def) : scoped.client(def, key),
+		sendClient: (def, key) => key === void 0 ? scoped.sendClient(def) : scoped.sendClient(def, key)
 	};
 }
 
@@ -1943,6 +1821,13 @@ function isProcessing() {
 	return current instanceof RestateOperations ? current.isProcessing() : void 0;
 }
 
+//#endregion
+//#region src/index.ts
+const iface = {
+	...__restatedev_restate_sdk_core.iface,
+	implement
+};
+
 //#endregion
 exports.InterruptedError = InterruptedError;
 exports.all = all;
@@ -1965,12 +1850,7 @@ exports.date = date;
 exports.execute = execute;
 exports.gen = gen;
 exports.handlerRequest = handlerRequest;
-Object.defineProperty(exports, 'iface', {
-  enumerable: true,
-  get: function () {
-    return interface_exports;
-  }
-});
+exports.iface = iface;
 exports.implement = implement;
 Object.defineProperty(exports, 'internal', {
   enumerable: true,