Separate handler from spec in OperationRegistry, update pubsub API
- Split OperationRegistry into separate specs and handlers maps
- Add registerSpec(), registerHandler(), getHandler() methods
- register() still accepts IOperationDefinition (backward compatible)
- execute() now requires both spec and handler, throws if missing
- Update @alkdev/pubsub integration for v0.1.0 API:
- subscribe(type, id) now requires id parameter (use for all events)
- publish(type, id, payload) now requires 3 args
- Events unwrapped from EventEnvelope via .payload
- Update buildCallHandler to use getSpec() + getHandler() separately
- Update subscribe.ts to use getHandler()
- Update buildEnv to use getAllSpecs() instead of list()
- Update scanner to validate against OperationSpecSchema
- Update from_mcp and from_openapi to use OperationSpec & { handler } types
- Remove OperationDefinitionSchema from public exports
- Add 7 new registry tests for handler separation
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { OperationRegistry } from "../src/registry.js";
|
||||
import { OperationType, type IOperationDefinition, type OperationContext } from "../src/index.js";
|
||||
import { OperationType, type IOperationDefinition, type OperationContext, type OperationSpec, type OperationHandler } from "../src/index.js";
|
||||
import * as Type from "@alkdev/typebox";
|
||||
import { Value } from "@alkdev/typebox/value";
|
||||
|
||||
@@ -19,19 +19,40 @@ function makeOperation(overrides: Partial<IOperationDefinition> = {}): IOperatio
|
||||
};
|
||||
}
|
||||
|
||||
function makeSpec(overrides: Partial<OperationSpec> = {}): OperationSpec {
|
||||
return {
|
||||
name: "testOp",
|
||||
namespace: "test",
|
||||
version: "1.0.0",
|
||||
type: OperationType.QUERY,
|
||||
description: "A test operation",
|
||||
inputSchema: Type.Object({ value: Type.String() }),
|
||||
outputSchema: Type.Object({ result: Type.String() }),
|
||||
accessControl: { requiredScopes: [] },
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
const testHandler: OperationHandler = async (input: any) => ({ result: `processed: ${input.value}` });
|
||||
|
||||
describe("OperationRegistry", () => {
|
||||
it("registers and retrieves an operation", () => {
|
||||
const registry = new OperationRegistry();
|
||||
const op = makeOperation();
|
||||
registry.register(op);
|
||||
expect(registry.get("test.testOp")).toBe(op);
|
||||
const retrieved = registry.get("test.testOp")!;
|
||||
expect(retrieved).toStrictEqual(op);
|
||||
expect(retrieved.name).toBe("testOp");
|
||||
expect(retrieved.handler).toBeDefined();
|
||||
});
|
||||
|
||||
it("retrieves by namespace and name", () => {
|
||||
const registry = new OperationRegistry();
|
||||
const op = makeOperation();
|
||||
registry.register(op);
|
||||
expect(registry.getByName("test", "testOp")).toBe(op);
|
||||
const retrieved = registry.getByName("test", "testOp")!;
|
||||
expect(retrieved).toStrictEqual(op);
|
||||
expect(retrieved.name).toBe("testOp");
|
||||
});
|
||||
|
||||
it("returns undefined for missing operations", () => {
|
||||
@@ -90,6 +111,14 @@ describe("OperationRegistry", () => {
|
||||
).rejects.toThrow("Operation not found");
|
||||
});
|
||||
|
||||
it("throws on missing handler", async () => {
|
||||
const registry = new OperationRegistry();
|
||||
registry.registerSpec(makeSpec());
|
||||
await expect(
|
||||
registry.execute("test.testOp", { value: "hello" }, {} as OperationContext)
|
||||
).rejects.toThrow("No handler registered");
|
||||
});
|
||||
|
||||
it("warns on output mismatch but returns result", async () => {
|
||||
const registry = new OperationRegistry();
|
||||
registry.register(makeOperation({
|
||||
@@ -98,4 +127,52 @@ describe("OperationRegistry", () => {
|
||||
const result = await registry.execute("test.testOp", { value: "x" }, {} as OperationContext);
|
||||
expect(result).toEqual({ unexpected: "field" });
|
||||
});
|
||||
|
||||
it("registerSpec and registerHandler separately", async () => {
|
||||
const registry = new OperationRegistry();
|
||||
const spec = makeSpec();
|
||||
registry.registerSpec(spec);
|
||||
registry.registerHandler("test.testOp", testHandler);
|
||||
|
||||
const retrieved = registry.get("test.testOp")!;
|
||||
expect(retrieved.name).toBe("testOp");
|
||||
expect(retrieved.handler).toBeDefined();
|
||||
|
||||
const result = await registry.execute("test.testOp", { value: "hello" }, {} as OperationContext);
|
||||
expect(result).toEqual({ result: "processed: hello" });
|
||||
});
|
||||
|
||||
it("registerHandler throws for unknown operation", () => {
|
||||
const registry = new OperationRegistry();
|
||||
expect(() => registry.registerHandler("unknown.op", testHandler)).toThrow("Cannot register handler for unknown operation");
|
||||
});
|
||||
|
||||
it("getHandler returns handler", () => {
|
||||
const registry = new OperationRegistry();
|
||||
registry.register(makeOperation());
|
||||
expect(registry.getHandler("test.testOp")).toBeDefined();
|
||||
});
|
||||
|
||||
it("getHandler returns undefined for spec-only registration", () => {
|
||||
const registry = new OperationRegistry();
|
||||
registry.registerSpec(makeSpec());
|
||||
expect(registry.getHandler("test.testOp")).toBeUndefined();
|
||||
});
|
||||
|
||||
it("register with spec-only (no handler)", () => {
|
||||
const registry = new OperationRegistry();
|
||||
const spec = makeSpec();
|
||||
registry.register(spec);
|
||||
const retrieved = registry.get("test.testOp")!;
|
||||
expect(retrieved.name).toBe("testOp");
|
||||
expect(retrieved.handler).toBeUndefined();
|
||||
});
|
||||
|
||||
it("getSpec returns spec without handler after combined register", () => {
|
||||
const registry = new OperationRegistry();
|
||||
registry.register(makeOperation());
|
||||
const spec = registry.getSpec("test.testOp")!;
|
||||
expect(spec.name).toBe("testOp");
|
||||
expect((spec as any).handler).toBeUndefined();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user