fix: type errors

Author: MichalKalita

src/tools/actor.ts

@@ -17,7 +17,7 @@ import { getActorMCPServerPath, getActorMCPServerURL } from '../mcp/actors.js';
 import { connectMCPClient } from '../mcp/client.js';
 import { getMCPServerTools } from '../mcp/proxy.js';
 import { actorDefinitionPrunedCache } from '../state.js';
-import type { ActorDefinitionStorage, ActorInfo, ApifyToken, DatasetItem, ToolEntry } from '../types.js';
+import type { ActorDefinitionStorage, ActorInfo, ApifyToken, DatasetItem, IActorInputSchema, ToolEntry } from '../types.js';
 import { ensureOutputWithinCharLimit, getActorDefinitionStorageFieldNames, getActorMcpUrlCached } from '../utils/actor.js';
 import { fetchActorDetails } from '../utils/actor-details.js';
 import { buildActorResponseContent } from '../utils/actor-response.js';
@@ -389,7 +389,7 @@ The step parameter enforces this workflow - you cannot call an Actor without fir
                             client = await connectMCPClient(mcpServerUrl, apifyToken);
                             const toolsResponse = await client.listTools();
 
-                            const toolsInfo = toolsResponse.tools.map((tool) => `**${tool.name}**\n${tool.description || 'No description'}\n\n${jsonSchemaToMarkdown(tool.inputSchema)}`,
+                            const toolsInfo = toolsResponse.tools.map((tool) => `**${tool.name}**\n${tool.description || 'No description'}\n\n${jsonSchemaToMarkdown(tool.inputSchema as IActorInputSchema)}`,
                             ).join('\n\n');
 
                             return buildMCPResponse([`This is an MCP Server Actor with the following tools:\n\n${toolsInfo}\n\nTo call a tool, use step="call" with actor name format: "${baseActorName}:{toolName}"`]);
@@ -479,7 +479,7 @@ The step parameter enforces this workflow - you cannot call an Actor without fir
                     if (errors && errors.length > 0) {
                         return buildMCPResponse([
                             `Input validation failed for Actor '${actorName}': ${errors.map((e) => e.message).join(', ')}`,
-                            jsonSchemaToMarkdown(actor.tool.inputSchema),
+                            jsonSchemaToMarkdown(actor.tool.inputSchema as IActorInputSchema),
                         ]);
                     }
                 }

src/tools/build.ts

@@ -8,6 +8,7 @@ import { ACTOR_README_MAX_LENGTH, HelperTools } from '../const.js';
 import type {
     ActorDefinitionPruned,
     ActorDefinitionWithDesc,
+    IActorInputSchema,
     InternalTool,
     ISchemaProperties,
     ToolEntry,
@@ -132,7 +133,7 @@ export const actorDefinitionTool: ToolEntry = {
                 const properties = filterSchemaProperties(v.input.properties as { [key: string]: ISchemaProperties });
                 v.input.properties = shortenProperties(properties);
             }
-            return { content: [{ type: 'text', text: jsonSchemaToMarkdown(v.input) }] };
+            return { content: [{ type: 'text', text: jsonSchemaToMarkdown((v.input || {}) as IActorInputSchema) }] };
         },
     } as InternalTool,
 };

src/tools/dataset.ts

@@ -6,7 +6,6 @@ import { HelperTools } from '../const.js';
 import type { InternalTool, ToolEntry } from '../types.js';
 import { ajv } from '../utils/ajv.js';
 import { parseCommaSeparatedList } from '../utils/generic.js';
-import { jsonSchemaToMarkdown } from '../utils/json-schema-to-markdown.js';
 import { jsonToMarkdown } from '../utils/json-to-markdown.js';
 import { generateSchemaFromItems } from '../utils/schema-generation.js';
 
@@ -178,7 +177,7 @@ export const getDatasetSchema: ToolEntry = {
             return {
                 content: [{
                     type: 'text',
-                    text: jsonSchemaToMarkdown(schema),
+                    text: JSON.stringify(schema), // TODO: jsonSchemaToMarkdown don't have implemented array support
                 }],
             };
         },

src/tools/key_value_store.ts

@@ -31,7 +31,7 @@ export const getKeyValueStore: ToolEntry = {
             const parsed = getKeyValueStoreArgs.parse(args);
             const client = new ApifyClient({ token: apifyToken });
             const store = await client.keyValueStore(parsed.storeId).get();
-            return { content: [{ type: 'text', text: jsonToMarkdown(store) }] };
+            return { content: [{ type: 'text', text: store ? jsonToMarkdown(store) : 'Value not found' }] };
         },
     } as InternalTool,
 };
@@ -105,7 +105,7 @@ export const getKeyValueStoreRecord: ToolEntry = {
             const parsed = getKeyValueStoreRecordArgs.parse(args);
             const client = new ApifyClient({ token: apifyToken });
             const record = await client.keyValueStore(parsed.storeId).getRecord(parsed.recordKey);
-            return { content: [{ type: 'text', text: jsonToMarkdown(record) }] };
+            return { content: [{ type: 'text', text: record ? jsonToMarkdown(record) : 'Value not found' }] };
         },
     } as InternalTool,
 };

src/types.ts

@@ -19,6 +19,7 @@ export interface ISchemaProperties {
     enumTitles?: string[]; // Array of string titles for the enum
     default?: unknown;
     prefill?: unknown;
+    format?: string;
 
     items?: ISchemaProperties;
     editor?: string;

src/utils/actor-response.ts

@@ -1,5 +1,5 @@
 import type { CallActorGetDatasetResult } from '../tools/actor.js';
-import { jsonSchemaToMarkdown } from './json-schema-to-markdown.js';
+import { jsonToMarkdown } from './json-to-markdown.js';
 
 /**
  * Builds the response content for Actor tool calls.
@@ -38,16 +38,17 @@ Results summary:
 
 Actor output data schema:
 * You can use this schema to understand the structure of the output data and, for example, retrieve specific fields based on your current task.
-
-${jsonSchemaToMarkdown(displaySchema)}
+\`\`\`json
+${JSON.stringify(displaySchema, null, 2)}
+\`\`\`
 
 Above this text block is a preview of the Actor output containing ${result.previewItems.length} item(s).${itemCount !== result.previewItems.length ? ` You have access only to a limited preview of the Actor output. Do not present this as the full output, as you have only ${result.previewItems.length} item(s) available instead of the full ${itemCount} item(s). Be aware of this and inform users about the currently loaded count and the total available output items count.` : ''}
 
 If you need to retrieve additional data, use the "get-actor-output" tool with: datasetId: "${datasetId}". Be sure to limit the number of results when using the "get-actor-output" tool, since you never know how large the items may be, and they might exceed the output limits.
 `;
 
     const itemsPreviewText = result.previewItems.length > 0
-        ? JSON.stringify(result.previewItems)
+        ? jsonToMarkdown(result.previewItems)
         : `No items available for preview—either the Actor did not return any items or they are too large for preview. In this case, use the "get-actor-output" tool.`;
 
     // Build content array

src/utils/json-schema-to-markdown.ts

@@ -1,10 +1,10 @@
-import type { IActorInputSchema } from '../types';
+import type { IActorInputSchema, ISchemaProperties } from '../types';
 
 function visibleEmpty(value: string) {
     return value === '' ? '<empty>' : value;
 }
 
-function formatProperty(key: string, value: any, requiredFields: Set<string>, level = 2): string {
+function formatProperty(key: string, value: ISchemaProperties, requiredFields: Set<string>, level = 2): string {
     const isRequired = requiredFields.has(key);
     const requiredText = isRequired ? 'required' : 'optional';
 
@@ -53,7 +53,7 @@ function formatProperty(key: string, value: any, requiredFields: Set<string>, le
 }
 
 export function jsonSchemaToMarkdown(inputSchema: IActorInputSchema) {
-    const requiredFields = new Set(inputSchema.required || []);
+    const requiredFields = new Set(Array.isArray(inputSchema.required) ? inputSchema.required : []);
 
     let markdown = '# JSON Schema';
     if (inputSchema.description) {
@@ -62,7 +62,7 @@ export function jsonSchemaToMarkdown(inputSchema: IActorInputSchema) {
     }
     markdown += '\n\n'; // Add blank line after title/description
 
-    const properties = Object.entries(inputSchema.properties);
+    const properties = inputSchema.properties ? Object.entries(inputSchema.properties) : [];
     for (let i = 0; i < properties.length; i++) {
         const [key, value] = properties[i];
         markdown += formatProperty(key, value, requiredFields);

src/utils/json-to-markdown.ts

@@ -1,4 +1,4 @@
-type JSON = string | number | boolean | null | JSON[] | { [key: string]: JSON };
+type JSON = string | number | boolean | null | JSON[] | object;
 
 function isEmpty(json: JSON): boolean {
     return (
@@ -74,17 +74,12 @@ function simplifyJson(json: JSON): JSON {
 
 function serializeJsonTopLevel(json: JSON): string {
     switch (typeOfJson(json)) {
+        case 'null':
+            return '';
         case 'string':
         case 'number':
         case 'boolean':
             return String(json);
-        case 'null':
-            return '';
-        case 'object':
-            return serializeJson(json, 0);
-        case 'array-simple':
-        case 'array-mixed':
-            return serializeJson(json, 0);
         case 'array-object':
             return (json as JSON[]).map((unknownItem, index) => {
                 const item = unknownItem as Record<string, object>;
@@ -117,8 +112,8 @@ function serializeJson(json: JSON, pad: number): string {
             return pad === 0 ? getIndent(pad, true) + String(json) : String(json);
         case 'object':
             return Object.entries(json as Record<string, JSON>)
-                .filter(([key, value]) => !isEmpty(value))
-                .map(([key, value], index) => {
+                .filter(([_key, value]) => !isEmpty(value))
+                .map(([key, value]) => {
                     const indentLevel = pad;
                     const prefix = `${getIndent(indentLevel, true)}${key}:`;
                     if (isOneLiner(value)) {
@@ -137,7 +132,7 @@ function serializeJson(json: JSON, pad: number): string {
                 }
                 if (itemType === 'object') {
                     return Object.entries(unknownItem as Record<string, JSON>)
-                        .filter(([key, value]) => !isEmpty(value))
+                        .filter(([_key, value]) => !isEmpty(value))
                         .map(([key, value], index) => {
                             const prefix = `${getIndent(pad, index === 0)}${key}:`;
                             if (isOneLiner(value)) {
@@ -152,7 +147,7 @@ function serializeJson(json: JSON, pad: number): string {
         case 'array-object':
             return (json as JSON[]).filter(isNotEmpty).map((unknownItem) => {
                 return Object.entries(unknownItem as Record<string, JSON>)
-                    .filter(([key, value]) => !isEmpty(value))
+                    .filter(([_key, value]) => !isEmpty(value))
                     .map(([key, value], index) => {
                         const indentLevel = pad === 1 ? 1 : pad;
                         const withBullet = pad === 1 ? index === 0 : true;