refactor(enrichment): share mapFieldType helper between block and tool

Author: TheodoreSpeaks

apps/sim/blocks/blocks/enrichment.ts

@@ -2,17 +2,10 @@ import { EnrichmentIcon } from '@/components/icons'
 import type { BlockConfig, OutputFieldDefinition, ParamType } from '@/blocks/types'
 import { IntegrationType } from '@/blocks/types'
 import { ALL_ENRICHMENTS, getEnrichment } from '@/enrichments'
-import type { EnrichmentInputField, EnrichmentOutputField } from '@/enrichments/types'
+import { mapFieldType } from '@/enrichments/providers'
+import type { EnrichmentOutputField } from '@/enrichments/types'
 import type { EnrichmentRunResponse } from '@/tools/enrichment/types'
 
-/** Maps an enrichment input/output column type to a block field type. */
-function fieldType(type: EnrichmentInputField['type'] | EnrichmentOutputField['type']): ParamType {
-  if (type === 'number') return 'number'
-  if (type === 'boolean') return 'boolean'
-  if (type === 'json') return 'json'
-  return 'string'
-}
-
 /** Stable subBlock id for an enrichment input (unique across enrichments). */
 const inputFieldId = (enrichmentId: string, inputId: string) => `${enrichmentId}__${inputId}`
 
@@ -35,7 +28,7 @@ const blockInputs: Record<string, { type: ParamType; description: string }> = {
 for (const enrichment of ALL_ENRICHMENTS) {
   for (const input of enrichment.inputs) {
     blockInputs[inputFieldId(enrichment.id, input.id)] = {
-      type: fieldType(input.type),
+      type: mapFieldType(input.type),
       description: `${input.name} (for ${enrichment.name})`,
     }
   }
@@ -60,7 +53,7 @@ const blockOutputs: Record<string, OutputFieldDefinition> = {
 }
 for (const [id, { field, operations }] of outputProducers) {
   blockOutputs[id] = {
-    type: fieldType(field.type),
+    type: mapFieldType(field.type),
     description: field.name,
     condition: { field: 'operation', value: operations },
   }

apps/sim/enrichments/providers.ts

@@ -1,4 +1,25 @@
-import type { EnrichmentProvider } from '@/enrichments/types'
+import type {
+  EnrichmentInputField,
+  EnrichmentOutputField,
+  EnrichmentProvider,
+} from '@/enrichments/types'
+
+/**
+ * Narrow union of the field types enrichments declare. Assignable to both the
+ * tool `OutputType` and the block `ParamType` unions, so a single mapping
+ * function feeds both sides without per-call casts.
+ */
+export type EnrichmentFieldType = 'string' | 'number' | 'boolean' | 'json'
+
+/** Maps an enrichment input/output column type to a block/tool field type. */
+export function mapFieldType(
+  type: EnrichmentInputField['type'] | EnrichmentOutputField['type']
+): EnrichmentFieldType {
+  if (type === 'number') return 'number'
+  if (type === 'boolean') return 'boolean'
+  if (type === 'json') return 'json'
+  return 'string'
+}
 
 /** Coerces an unknown input value to a trimmed string (`''` when nullish). */
 export function str(value: unknown): string {

apps/sim/tools/enrichment/run.ts

@@ -1,29 +1,15 @@
 import { ALL_ENRICHMENTS } from '@/enrichments'
-import type { EnrichmentOutputField } from '@/enrichments/types'
+import { mapFieldType } from '@/enrichments/providers'
 import type { EnrichmentRunParams, EnrichmentRunResponse } from '@/tools/enrichment/types'
-import type { OutputProperty, OutputType, ToolConfig } from '@/tools/types'
-
-/** Maps an enrichment output's column type to a tool OutputType. */
-function toOutputType(type: EnrichmentOutputField['type']): OutputType {
-  switch (type) {
-    case 'number':
-      return 'number'
-    case 'boolean':
-      return 'boolean'
-    case 'json':
-      return 'json'
-    default:
-      return 'string'
-  }
-}
+import type { OutputProperty, ToolConfig } from '@/tools/types'
 
 /** Union of every distinct output across all registry enrichments. */
 const enrichmentOutputs: Record<string, OutputProperty> = {}
 for (const enrichment of ALL_ENRICHMENTS) {
   for (const output of enrichment.outputs) {
     if (!enrichmentOutputs[output.id]) {
       enrichmentOutputs[output.id] = {
-        type: toOutputType(output.type),
+        type: mapFieldType(output.type),
         description: `${output.name} (from the selected enrichment)`,
         optional: true,
       }