refactor: Move cleanEmptyProperties to schema_generation and update references

Author: jirispilka

src/tools/common/get_actor_output.ts

@@ -6,6 +6,7 @@ import type { InternalToolArgs, ToolEntry, ToolInputSchema } from '../../types.j
 import { compileSchema } from '../../utils/ajv.js';
 import { getValuesByDotKeys, parseCommaSeparatedList } from '../../utils/generic.js';
 import { buildMCPResponse } from '../../utils/mcp.js';
+import { cleanEmptyProperties } from '../../utils/schema_generation.js';
 import { datasetItemsOutputSchema } from '../structured_output_schemas.js';
 
 /**
@@ -28,39 +29,6 @@ const getActorOutputArgs = z.object({
         .describe('Maximum number of items to return (default: 100).'),
 });
 
-/**
- * Cleans empty properties (null, undefined, empty strings, empty arrays, empty objects) from an object.
- * Looser sibling: `cleanEmptyArrays` in `src/utils/schema_generation.ts` strips only empty arrays.
- * @param obj - The object to clean
- * @returns The cleaned object or undefined if the result is empty
- */
-export function cleanEmptyProperties(obj: unknown): unknown {
-    if (obj === null || obj === undefined || obj === '') {
-        return undefined;
-    }
-
-    if (typeof obj !== 'object') {
-        return obj;
-    }
-
-    if (Array.isArray(obj)) {
-        const cleaned = obj
-            .map((item) => cleanEmptyProperties(item))
-            .filter((item) => item !== undefined);
-        return cleaned.length > 0 ? cleaned : undefined;
-    }
-
-    const cleaned: Record<string, unknown> = {};
-    for (const [key, value] of Object.entries(obj)) {
-        const cleanedValue = cleanEmptyProperties(value);
-        if (cleanedValue !== undefined) {
-            cleaned[key] = cleanedValue;
-        }
-    }
-
-    return Object.keys(cleaned).length > 0 ? cleaned : undefined;
-}
-
 /**
  * This tool is used specifically for retrieving Actor output.
  * It is a simplified version of the get-dataset-items tool.

src/tools/core/actor_run_response.ts

@@ -8,7 +8,7 @@ import { getWidgetConfig, WIDGET_URIS } from '../../resources/widgets.js';
 import { logHttpError } from '../../utils/logging.js';
 import { buildMCPResponse } from '../../utils/mcp.js';
 import { formatRunStatusMessage, type ProgressTracker, TERMINAL_RUN_STATUSES } from '../../utils/progress.js';
-import { cleanEmptyProperties } from '../common/get_actor_output.js';
+import { cleanEmptyProperties } from '../../utils/schema_generation.js';
 
 /** Cap on `storages.keyValueStores.default.keys` array length. */
 const KV_KEYS_LIMIT = 50;

src/utils/schema_generation.ts

@@ -24,7 +24,7 @@ export type SchemaGenerationOptions = {
 /**
  * Local counterpart to the dataset API's `clean=true` — empty arrays carry no schema info.
  * Strips only empty arrays; keeps null / '' / empty objects so schema inference still sees those fields.
- * Stricter sibling: `cleanEmptyProperties` in `src/tools/common/get_actor_output.ts` also strips nullish and empty strings.
+ * Stricter sibling: {@link cleanEmptyProperties} also strips nullish and empty strings.
  */
 export function cleanEmptyArrays(obj: unknown): unknown {
     if (Array.isArray(obj)) {
@@ -43,6 +43,39 @@ export function cleanEmptyArrays(obj: unknown): unknown {
     }, {} as Record<string, unknown>);
 }
 
+/**
+ * Cleans empty properties (null, undefined, empty strings, empty arrays, empty objects) from an object.
+ * Looser sibling: {@link cleanEmptyArrays} strips only empty arrays.
+ * @param obj - The object to clean
+ * @returns The cleaned object or undefined if the result is empty
+ */
+export function cleanEmptyProperties(obj: unknown): unknown {
+    if (obj === null || obj === undefined || obj === '') {
+        return undefined;
+    }
+
+    if (typeof obj !== 'object') {
+        return obj;
+    }
+
+    if (Array.isArray(obj)) {
+        const cleaned = obj
+            .map((item) => cleanEmptyProperties(item))
+            .filter((item) => item !== undefined);
+        return cleaned.length > 0 ? cleaned : undefined;
+    }
+
+    const cleaned: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(obj)) {
+        const cleanedValue = cleanEmptyProperties(value);
+        if (cleanedValue !== undefined) {
+            cleaned[key] = cleanedValue;
+        }
+    }
+
+    return Object.keys(cleaned).length > 0 ? cleaned : undefined;
+}
+
 const FORMAT_DETECTORS: [string, (s: string) => boolean][] = [
     ['date-time', (s) => /^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}:\d{2}(\.\d+)?([Zz]|[+-]\d{2}:\d{2})?$/.test(s)],
     ['date', (s) => /^\d{4}-\d{2}-\d{2}$/.test(s)],