@krak-stack/registry 0.1.13 → 0.1.15

package/dist/lib/httpapi-helpers.js

@@ -9,25 +9,25 @@ import {
   SchemaRepresentation
 } from "effect";
 import { HttpApi, OpenApi } from "effect/unstable/httpapi";
-var JsonObjectSchema = Schema.Record(Schema.String, Schema.Unknown).annotate({
+var JsonObjectSchema = Schema.Record(Schema.String, Schema.Json).annotate({
   identifier: "HttpJsonObject",
   title: "HTTP JSON object",
   description: "A JSON object passed to an HTTP API operation.",
   examples: [{ id: "example-id" }]
 });
 var JsonObjectFromString = Schema.fromJsonString(JsonObjectSchema);
-var JsonValueFromString = Schema.fromJsonString(Schema.Unknown);
+var JsonValueFromString = Schema.fromJsonString(Schema.Json);
 var JsonSchemaAnnotations = Schema.Struct({
   title: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
-  examples: Schema.optional(Schema.Array(Schema.Unknown))
+  examples: Schema.optional(Schema.Array(Schema.Json))
 }).annotate({
   identifier: "HttpJsonSchemaAnnotations",
   title: "HTTP JSON Schema annotations",
   description: "JSON Schema annotations surfaced on generated tool inputs."
 });
 var HttpApiToolInputSchema = Schema.Struct({
-  body: Schema.optional(Schema.Unknown)
+  body: Schema.optional(Schema.Json)
 }).annotate({
   identifier: "HttpApiToolInput",
   title: "HTTP API tool input",
@@ -41,6 +41,8 @@ var HttpApiMethods = [
   "patch",
   "delete"
 ];
+var HttpApiOperationSchema = Schema.declare((value) => Schema.is(JsonObjectSchema)(value)).annotate({ identifier: "HttpApiOperation" });
+var decodeHttpApiOperation = Schema.decodeUnknownOption(HttpApiOperationSchema);
 var toHttpError = (message, error) => new Error(message, { cause: error });
 var sanitizeHttpName = (name) => name.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
 var httpApiToolName = (method, path, operation) => {
@@ -54,9 +56,10 @@ var httpApiOperations = ({
   const operations = [];
   for (const [path, pathItem] of Object.entries(spec.paths)) {
     for (const method of methods) {
-      const operation = pathItem[method];
-      if (operation)
-        operations.push({ method, path, operation });
+      const operation = decodeHttpApiOperation(pathItem[method]);
+      if (Option.isSome(operation)) {
+        operations.push({ method, path, operation: operation.value });
+      }
     }
   }
   return operations;
@@ -85,30 +88,36 @@ var schemaWithVisibleAnnotations = (schema) => {
     ...acc,
     ...decodeAnnotations(item).pipe(Option.getOrElse(() => ({})))
   }), directAnnotations);
-  return {
-    ...schema,
-    ..."title" in annotations && !("title" in schema) ? { title: annotations.title } : {},
-    ..."description" in annotations && !("description" in schema) ? { description: annotations.description } : {},
-    ..."examples" in annotations && !("examples" in schema) ? { examples: annotations.examples } : {}
-  };
+  const visible = { ...schema };
+  if ("title" in annotations && !("title" in schema)) {
+    visible.title = annotations.title;
+  }
+  if ("description" in annotations && !("description" in schema)) {
+    visible.description = annotations.description;
+  }
+  if ("examples" in annotations && !("examples" in schema)) {
+    visible.examples = annotations.examples;
+  }
+  return visible;
 };
 var referencedDefinitions = (schema, definitions) => {
   const names = new Set;
-  const pending = [schema];
+  const pending = [Schema.decodeUnknownSync(Schema.Json)(schema)];
   while (pending.length > 0) {
     const current = pending.pop();
-    if (!current || typeof current !== "object")
-      continue;
     if (Array.isArray(current)) {
       pending.push(...current);
       continue;
     }
-    for (const [key, value] of Object.entries(current)) {
-      if (key === "$ref" && typeof value === "string") {
+    const record = Schema.decodeUnknownOption(Schema.Record(Schema.String, Schema.Json))(current);
+    if (Option.isNone(record))
+      continue;
+    for (const [key, value] of Object.entries(record.value)) {
+      if (key === "$ref" && Schema.is(Schema.String)(value)) {
         const name = value.match(/^#\/(?:\$defs|components\/schemas)\/(.+)$/)?.[1];
         if (name && !names.has(name) && definitions[name]) {
           names.add(name);
-          pending.push(definitions[name]);
+          pending.push(Schema.decodeUnknownSync(Schema.Json)(definitions[name]));
         }
       } else if (key !== "$defs") {
         pending.push(value);
@@ -131,10 +140,12 @@ var httpApiOperationInputSchema = (operation) => {
     ...queryParameters,
     ...headerParameters
   ]) {
-    properties[parameter.name] = {
-      ...parameter.schema ? schemaWithVisibleAnnotations(parameter.schema) : { type: "string" },
-      ...parameter.description ? { description: parameter.description } : {}
+    const property = {
+      ...parameter.schema ? schemaWithVisibleAnnotations(parameter.schema) : { type: "string" }
     };
+    if (parameter.description)
+      property.description = parameter.description;
+    properties[parameter.name] = property;
     if (parameter.required)
       required.push(parameter.name);
   }
@@ -200,10 +211,11 @@ class HttpApiSpec extends Context.Service()("HttpApiSpec", {
         });
         const definitions = document.definitions ?? {};
         const usedDefinitions = referencedDefinitions(document.schema, definitions);
-        return {
-          ...document.schema,
-          ...Object.keys(usedDefinitions).length > 0 ? { $defs: usedDefinitions } : {}
-        };
+        const result = { ...document.schema };
+        if (Object.keys(usedDefinitions).length > 0) {
+          result.$defs = usedDefinitions;
+        }
+        return result;
       };
       return {
         info: spec.info,

package/dist/lib/httpapi-mcp.js

@@ -1,18 +1,34 @@
 // ../../src/lib/httpapi-mcp.ts
-import { Context as Context3, Effect as Effect3, Layer as Layer3, Option as Option2, Schema as Schema2 } from "effect";
+import { Context as Context3, Effect as Effect3, Layer as Layer3, Option as Option2, Schema as Schema3 } from "effect";
 import { McpSchema, McpServer } from "effect/unstable/ai";
 
 // ../../src/lib/httpapi-client.ts
-import { Context, Effect, Layer } from "effect";
+import { Context, Effect, Layer, Schema } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import {
   HttpApiClient as EffectHttpApiClient
 } from "effect/unstable/httpapi";
+var HttpApiOperationResultValue = Schema.suspend(() => Schema.Union([
+  Schema.Null,
+  Schema.String,
+  Schema.Number,
+  Schema.Boolean,
+  Schema.DateFromString,
+  Schema.Uint8ArrayFromBase64,
+  Schema.Array(HttpApiOperationResultValue),
+  Schema.Record(Schema.String, HttpApiOperationResultValue)
+]));
+var HttpApiOperationResult = Schema.Union([
+  HttpApiOperationResultValue,
+  Schema.Undefined
+]).annotate({ identifier: "HttpApiOperationResult" });
+var encodeHttpApiOperationResult = Effect.fn("HttpApiClient.encodeOperationResult")((result) => Schema.encodeUnknownEffect(HttpApiOperationResult)(result).pipe(Effect.map((encoded) => encoded ?? null), Effect.mapError((cause) => new Error("HTTP API result is not serializable", { cause }))));
+var GeneratedOperation = Schema.declare((value) => value instanceof Function).annotate({ identifier: "GeneratedOperation" });
+var GeneratedOperationEffect = Schema.declare((value) => Effect.isEffect(value)).annotate({ identifier: "GeneratedOperationEffect" });
 var makeGeneratedClient = (api, http, baseUrl) => EffectHttpApiClient.makeWith(api, {
   baseUrl,
   httpClient: http
 });
-var isClientEffect = (value) => Effect.isEffect(value);
 var executeGeneratedOperation = Effect.fn("HttpApiClient.executeGeneratedOperation")(function* (client, { input, operation: entry }) {
   const operationId = entry.operation.operationId;
   if (!operationId) {
@@ -20,22 +36,23 @@ var executeGeneratedOperation = Effect.fn("HttpApiClient.executeGeneratedOperati
   }
   const target = Object(client);
   const groupName = Object.keys(target).filter((name) => operationId.startsWith(`${name}.`)).sort((a, b) => b.length - a.length)[0];
-  const group = groupName ? Reflect.get(target, groupName) : target;
+  const group = groupName ? Object.entries(target).find(([name]) => name === groupName)?.[1] : target;
   const endpointName = groupName ? operationId.slice(groupName.length + 1) : operationId;
-  const endpoint = Reflect.get(Object(group), endpointName);
-  if (typeof endpoint !== "function") {
+  const endpointCandidate = group instanceof Function ? undefined : Object.entries(Object(group)).find(([name]) => name === endpointName)?.[1];
+  const endpoint = Schema.decodeUnknownOption(GeneratedOperation)(endpointCandidate);
+  if (endpoint._tag === "None") {
     return yield* Effect.fail(new Error(`No generated API client operation for ${operationId}`));
   }
-  const result = endpoint({
+  const result = Schema.decodeUnknownOption(GeneratedOperationEffect)(endpoint.value({
     headers: input.headers,
     params: input.params,
     query: input.query,
     payload: input.body
-  });
-  if (!isClientEffect(result)) {
+  }));
+  if (result._tag === "None") {
     return yield* Effect.fail(new Error(`Generated API client operation ${operationId} is invalid`));
   }
-  return yield* result;
+  return yield* result.value;
 });
 
 class ApiClient extends Context.Service()("ApiClient") {
@@ -43,6 +60,7 @@ class ApiClient extends Context.Service()("ApiClient") {
     const http = yield* HttpClient.HttpClient;
     const client = yield* makeGeneratedClient(config.api, http, config.baseUrl);
     return {
+      encodeResult: config.encodeResult ?? ((result) => encodeHttpApiOperationResult(result)),
       execute: Effect.fn("ApiClient.execute")(function* (options) {
         return yield* executeGeneratedOperation(client, options);
       })
@@ -57,29 +75,29 @@ import {
   JsonSchema,
   Layer as Layer2,
   Option,
-  Schema,
+  Schema as Schema2,
   SchemaRepresentation
 } from "effect";
 import { HttpApi as HttpApi2, OpenApi } from "effect/unstable/httpapi";
-var JsonObjectSchema = Schema.Record(Schema.String, Schema.Unknown).annotate({
+var JsonObjectSchema = Schema2.Record(Schema2.String, Schema2.Json).annotate({
   identifier: "HttpJsonObject",
   title: "HTTP JSON object",
   description: "A JSON object passed to an HTTP API operation.",
   examples: [{ id: "example-id" }]
 });
-var JsonObjectFromString = Schema.fromJsonString(JsonObjectSchema);
-var JsonValueFromString = Schema.fromJsonString(Schema.Unknown);
-var JsonSchemaAnnotations = Schema.Struct({
-  title: Schema.optional(Schema.String),
-  description: Schema.optional(Schema.String),
-  examples: Schema.optional(Schema.Array(Schema.Unknown))
+var JsonObjectFromString = Schema2.fromJsonString(JsonObjectSchema);
+var JsonValueFromString = Schema2.fromJsonString(Schema2.Json);
+var JsonSchemaAnnotations = Schema2.Struct({
+  title: Schema2.optional(Schema2.String),
+  description: Schema2.optional(Schema2.String),
+  examples: Schema2.optional(Schema2.Array(Schema2.Json))
 }).annotate({
   identifier: "HttpJsonSchemaAnnotations",
   title: "HTTP JSON Schema annotations",
   description: "JSON Schema annotations surfaced on generated tool inputs."
 });
-var HttpApiToolInputSchema = Schema.Struct({
-  body: Schema.optional(Schema.Unknown)
+var HttpApiToolInputSchema = Schema2.Struct({
+  body: Schema2.optional(Schema2.Json)
 }).annotate({
   identifier: "HttpApiToolInput",
   title: "HTTP API tool input",
@@ -93,6 +111,8 @@ var HttpApiMethods = [
   "patch",
   "delete"
 ];
+var HttpApiOperationSchema = Schema2.declare((value) => Schema2.is(JsonObjectSchema)(value)).annotate({ identifier: "HttpApiOperation" });
+var decodeHttpApiOperation = Schema2.decodeUnknownOption(HttpApiOperationSchema);
 var toHttpError = (message, error) => new Error(message, { cause: error });
 var httpApiToolName = (method, path, operation) => {
   const fallback = `${method}_${path.replace(/^\/api\//, "").replace(/[/:{}]/g, "_")}`;
@@ -105,9 +125,10 @@ var httpApiOperations = ({
   const operations = [];
   for (const [path, pathItem] of Object.entries(spec.paths)) {
     for (const method of methods) {
-      const operation = pathItem[method];
-      if (operation)
-        operations.push({ method, path, operation });
+      const operation = decodeHttpApiOperation(pathItem[method]);
+      if (Option.isSome(operation)) {
+        operations.push({ method, path, operation: operation.value });
+      }
     }
   }
   return operations;
@@ -128,7 +149,7 @@ var httpApiToolEntries = Effect2.fn("Http.toolEntries")(function* (operations) {
     catch: (error) => error instanceof Error ? error : new Error(String(error))
   });
 });
-var decodeAnnotations = Schema.decodeUnknownOption(JsonSchemaAnnotations);
+var decodeAnnotations = Schema2.decodeUnknownOption(JsonSchemaAnnotations);
 var schemaWithVisibleAnnotations = (schema) => {
   const directAnnotations = decodeAnnotations(schema).pipe(Option.getOrElse(() => ({})));
   const allOf = Array.isArray(schema.allOf) ? schema.allOf : [];
@@ -136,30 +157,36 @@ var schemaWithVisibleAnnotations = (schema) => {
     ...acc,
     ...decodeAnnotations(item).pipe(Option.getOrElse(() => ({})))
   }), directAnnotations);
-  return {
-    ...schema,
-    ..."title" in annotations && !("title" in schema) ? { title: annotations.title } : {},
-    ..."description" in annotations && !("description" in schema) ? { description: annotations.description } : {},
-    ..."examples" in annotations && !("examples" in schema) ? { examples: annotations.examples } : {}
-  };
+  const visible = { ...schema };
+  if ("title" in annotations && !("title" in schema)) {
+    visible.title = annotations.title;
+  }
+  if ("description" in annotations && !("description" in schema)) {
+    visible.description = annotations.description;
+  }
+  if ("examples" in annotations && !("examples" in schema)) {
+    visible.examples = annotations.examples;
+  }
+  return visible;
 };
 var referencedDefinitions = (schema, definitions) => {
   const names = new Set;
-  const pending = [schema];
+  const pending = [Schema2.decodeUnknownSync(Schema2.Json)(schema)];
   while (pending.length > 0) {
     const current = pending.pop();
-    if (!current || typeof current !== "object")
-      continue;
     if (Array.isArray(current)) {
       pending.push(...current);
       continue;
     }
-    for (const [key, value] of Object.entries(current)) {
-      if (key === "$ref" && typeof value === "string") {
+    const record = Schema2.decodeUnknownOption(Schema2.Record(Schema2.String, Schema2.Json))(current);
+    if (Option.isNone(record))
+      continue;
+    for (const [key, value] of Object.entries(record.value)) {
+      if (key === "$ref" && Schema2.is(Schema2.String)(value)) {
         const name = value.match(/^#\/(?:\$defs|components\/schemas)\/(.+)$/)?.[1];
         if (name && !names.has(name) && definitions[name]) {
           names.add(name);
-          pending.push(definitions[name]);
+          pending.push(Schema2.decodeUnknownSync(Schema2.Json)(definitions[name]));
         }
       } else if (key !== "$defs") {
         pending.push(value);
@@ -182,10 +209,12 @@ var httpApiOperationInputSchema = (operation) => {
     ...queryParameters,
     ...headerParameters
   ]) {
-    properties[parameter.name] = {
-      ...parameter.schema ? schemaWithVisibleAnnotations(parameter.schema) : { type: "string" },
-      ...parameter.description ? { description: parameter.description } : {}
+    const property = {
+      ...parameter.schema ? schemaWithVisibleAnnotations(parameter.schema) : { type: "string" }
     };
+    if (parameter.description)
+      property.description = parameter.description;
+    properties[parameter.name] = property;
     if (parameter.required)
       required.push(parameter.name);
   }
@@ -201,10 +230,10 @@ var httpApiOperationInputSchema = (operation) => {
     additionalProperties: false
   };
 };
-var decodeJsonObject = Schema.decodeUnknownOption(JsonObjectSchema);
+var decodeJsonObject = Schema2.decodeUnknownOption(JsonObjectSchema);
 var decodeHttpApiOperationInput = Effect2.fn("Http.decodeApiOperationInput")(function* (input, operation) {
-  const payload = yield* Schema.decodeUnknownEffect(JsonObjectSchema)(input ?? {}).pipe(Effect2.mapError(() => new Error("Tool input must be a JSON object")));
-  const decoded = yield* Schema.decodeUnknownEffect(HttpApiToolInputSchema)(payload).pipe(Effect2.mapError(() => new Error("Tool input must be a JSON object")));
+  const payload = yield* Schema2.decodeUnknownEffect(JsonObjectSchema)(input ?? {}).pipe(Effect2.mapError(() => new Error("Tool input must be a JSON object")));
+  const decoded = yield* Schema2.decodeUnknownEffect(HttpApiToolInputSchema)(payload).pipe(Effect2.mapError(() => new Error("Tool input must be a JSON object")));
   const parameters = operation.parameters ?? [];
   const pickParameters = (location) => {
     const nestedKey = location === "path" ? "params" : location;
@@ -224,12 +253,12 @@ var decodeHttpApiOperationInput = Effect2.fn("Http.decodeApiOperationInput")(fun
 var parseJsonObject = Effect2.fn("Http.parseJsonObject")(function* (value, label) {
   if (!value)
     return {};
-  return yield* Schema.decodeUnknownEffect(JsonObjectFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be a JSON object`)));
+  return yield* Schema2.decodeUnknownEffect(JsonObjectFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be a JSON object`)));
 });
 var parseJsonValue = Effect2.fn("Http.parseJsonValue")(function* (value, label) {
   if (!value)
     return;
-  return yield* Schema.decodeUnknownEffect(JsonValueFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be valid JSON`)));
+  return yield* Schema2.decodeUnknownEffect(JsonValueFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be valid JSON`)));
 });
 
 class HttpApiSpec extends Context2.Service()("HttpApiSpec", {
@@ -251,10 +280,11 @@ class HttpApiSpec extends Context2.Service()("HttpApiSpec", {
         });
         const definitions = document.definitions ?? {};
         const usedDefinitions = referencedDefinitions(document.schema, definitions);
-        return {
-          ...document.schema,
-          ...Object.keys(usedDefinitions).length > 0 ? { $defs: usedDefinitions } : {}
-        };
+        const result = { ...document.schema };
+        if (Object.keys(usedDefinitions).length > 0) {
+          result.$defs = usedDefinitions;
+        }
+        return result;
       };
       return {
         info: spec.info,
@@ -285,7 +315,7 @@ class HttpApiMcp extends Context3.Service()("HttpApiMcp", {
 }) {
   static layer = (config) => Layer3.effect(this, this.make(config));
 }
-var decodeStructuredContent = Schema2.decodeUnknownOption(JsonObjectSchema);
+var decodeStructuredContent = Schema3.decodeUnknownOption(JsonObjectSchema);
 var structuredContent = (value) => decodeStructuredContent(value).pipe(Option2.getOrElse(() => ({ result: value ?? null })));
 var toolResult = (value) => new McpSchema.CallToolResult({
   isError: false,
@@ -303,7 +333,7 @@ var toolError = (error) => new McpSchema.CallToolResult({
 });
 var executeOperation = Effect3.fn("HttpApiMcp.executeOperation")(function* (method, path, operation, input, spec, client) {
   const payload = yield* spec.decodeOperationInput(input, operation);
-  return yield* client.execute({
+  const result = yield* client.execute({
     operation: { method, path, operation },
     input: {
       body: payload.body,
@@ -312,6 +342,7 @@ var executeOperation = Effect3.fn("HttpApiMcp.executeOperation")(function* (meth
       query: payload.query
     }
   });
+  return yield* client.encodeResult(result, { method, path, operation });
 });
 var registerOperation = (method, path, operation, name, config, spec, client) => Effect3.gen(function* () {
   const server = yield* McpServer.McpServer;

package/dist/lib/httpapi-toolkit.d.ts

@@ -1,17 +1,18 @@
 import { Effect, JsonSchema, Layer, Schema } from "effect";
+import type { Json } from "effect/Schema";
 import { Tool, Toolkit } from "effect/unstable/ai";
 import { ApiClient } from "./httpapi-client.js";
 import { HttpApiSpec, type HttpApiOperationEntry } from "./httpapi-helpers.js";
 export type HttpApiToolkitConfig = {
     readonly needsApproval?: (operation: HttpApiOperationEntry) => boolean;
     readonly strict?: (operation: HttpApiOperationEntry) => boolean;
-    readonly transformResult?: (operation: HttpApiOperationEntry, result: unknown) => unknown;
+    readonly transformResult?: (operation: HttpApiOperationEntry, result: Json) => Json;
 };
 export declare const makeOpenAiStrictJsonSchema: (schema: JsonSchema.JsonSchema) => JsonSchema.JsonSchema;
 export declare const HttpApiToolkit: (config: HttpApiToolkitConfig) => Effect.Effect<Toolkit.Toolkit<{
     readonly [x: string]: Tool.Tool<string, {
         readonly parameters: Schema.Struct<{}>;
-        readonly success: Schema.Unknown;
+        readonly success: Schema.Codec<Json, Json, never, never>;
         readonly failure: Schema.String;
         readonly failureMode: "return";
     }, never>;