feat(Execute Workflow Node): Move Type Conversion functionality to ResourceMapper

cypress/e2e/48-subworkflow-inputs.cy.ts

@@ -107,6 +107,7 @@ function validateAndReturnToParent(targetChild: string, offset: number, fields:
 	// Due to our workaround to remain in the same tab we need to select the correct tab manually
 	navigateWorkflowSelectionDropdown(offset, targetChild);
 
+	// This fails, pointing to `usePushConnection` `const triggerNode = subWorkflow?.nodes.find` being `undefined.find()`I <think>
 	ndv.actions.execute();
 
 	getOutputTableHeaders().should('have.length', fields.length + 1);

cypress/fixtures/Test_Subworkflow-Inputs.json

@@ -23,13 +23,23 @@
 		},
 		{
 			"parameters": {
+				"workflowId": {},
+				"workflowInputs": {
+					"mappingMode": "defineBelow",
+					"value": {},
+					"matchingColumns": [],
+					"schema": [],
+					"ignoreTypeMismatchErrors": false,
+					"attemptToConvertTypes": false,
+					"convertFieldsToString": true
+				},
 				"options": {}
 			},
-			"id": "ddc82976-edd9-4488-a5a5-7f558a7d905b",
-			"name": "Execute Workflow",
 			"type": "n8n-nodes-base.executeWorkflow",
-			"typeVersion": 1.1,
-			"position": [500, 240]
+			"typeVersion": 1.2,
+			"position": [500, 240],
+			"id": "6b6e2e34-c6ab-4083-b8e3-6b0d56be5453",
+			"name": "Execute Workflow"
 		}
 	],
 	"connections": {

packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts

@@ -1,3 +1,4 @@
+import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
 import type {
 	INodeTypeBaseDescription,
 	ISupplyDataFunctions,
@@ -6,7 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { loadWorkflowInputMappings } from './methods/resourceMapping';
 import { WorkflowToolService } from './utils/WorkflowToolService';
 import { versionDescription } from './versionDescription';
 

packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts

@@ -4,6 +4,7 @@ import get from 'lodash/get';
 import isObject from 'lodash/isObject';
 import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
 import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
+import { getCurrentWorkflowInputData } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
 import type {
 	ExecuteWorkflowData,
 	ExecutionError,
@@ -22,7 +23,6 @@ import { z } from 'zod';
 
 import type { FromAIArgument } from './FromAIParser';
 import { AIParametersParser } from './FromAIParser';
-import { getCurrentWorkflowInputData } from '../methods/resourceMapping';
 
 /**
 	Main class for creating the Workflow tool

packages/core/src/node-execution-context/utils.ts

@@ -83,7 +83,6 @@ const validateResourceMapperValue = (
 	for (let i = 0; i < paramValueNames.length; i++) {
 		const key = paramValueNames[i];
 		const resolvedValue = paramValues[key];
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 		const schemaEntry = schema.find((s) => s.id === key);
 
 		if (
@@ -99,15 +98,19 @@ const validateResourceMapperValue = (
 			};
 		}
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		if (schemaEntry?.type) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 				valueOptions: schemaEntry.options,
+				strict: !resourceMapperField.attemptToConvertTypes,
+				parseStrings: !!resourceMapperField.convertFieldsToString,
 			});
+
 			if (!validationResult.valid) {
-				return { ...validationResult, fieldName: key };
+				if (!resourceMapperField.ignoreTypeMismatchErrors) {
+					return { ...validationResult, fieldName: key };
+				} else {
+					paramValues[key] = resolvedValue;
+				}
 			} else {
 				// If it's valid, set the casted value
 				paramValues[key] = validationResult.newValue;

packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue

@@ -7,6 +7,7 @@ import type {
 	INodeParameters,
 	INodeProperties,
 	INodeTypeDescription,
+	NodeParameterValueType,
 	ResourceMapperField,
 	ResourceMapperValue,
 } from 'n8n-workflow';
@@ -52,6 +53,12 @@ const state = reactive({
 		value: {},
 		matchingColumns: [] as string[],
 		schema: [] as ResourceMapperField[],
+		ignoreTypeMismatchErrors: false,
+		attemptToConvertTypes: false,
+		// This should always be true if `showTypeConversionOptions` is provided
+		// It's used to avoid accepting any value as string without casting it
+		// Which is the legacy behavior without these type options.
+		convertFieldsToString: false,
 	} as ResourceMapperValue,
 	parameterValues: {} as INodeParameters,
 	loading: false,
@@ -97,6 +104,10 @@ onMounted(async () => {
 			...state.parameterValues,
 			parameters: props.node.parameters,
 		};
+
+		if (showTypeConversionOptions.value) {
+			state.paramValue.convertFieldsToString = true;
+		}
 	}
 	const params = state.parameterValues.parameters as INodeParameters;
 	const parameterName = props.parameter.name;
@@ -161,6 +172,10 @@ const showMappingModeSelect = computed<boolean>(() => {
 	return props.parameter.typeOptions?.resourceMapper?.supportAutoMap !== false;
 });
 
+const showTypeConversionOptions = computed<boolean>(() => {
+	return props.parameter.typeOptions?.resourceMapper?.showTypeConversionOptions === true;
+});
+
 const showMatchingColumnsSelector = computed<boolean>(() => {
 	return (
 		!state.loading &&
@@ -572,5 +587,52 @@ defineExpose({
 				})
 			}}
 		</N8nNotice>
+		<div
+			v-if="showTypeConversionOptions && state.paramValue.schema.length > 0"
+			:class="$style.typeConversionOptions"
+		>
+			<ParameterInputFull
+				:parameter="{
+					name: 'attemptToConvertTypes',
+					type: 'boolean',
+					displayName: locale.baseText('resourceMapper.attemptToConvertTypes.displayName'),
+					default: false,
+					description: locale.baseText('resourceMapper.attemptToConvertTypes.description'),
+				}"
+				:path="props.path + '.attemptToConvertTypes'"
+				:value="state.paramValue.attemptToConvertTypes"
+				@update="
+					(x: IUpdateInformation<NodeParameterValueType>) => {
+						state.paramValue.attemptToConvertTypes = x.value as boolean;
+						emitValueChanged();
+					}
+				"
+			/>
+			<ParameterInputFull
+				:parameter="{
+					name: 'ignoreTypeMismatchErrors',
+					type: 'boolean',
+					displayName: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.displayName'),
+					default: false,
+					description: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.description'),
+				}"
+				:path="props.path + '.ignoreTypeMismatchErrors'"
+				:value="state.paramValue.ignoreTypeMismatchErrors"
+				@update="
+					(x: IUpdateInformation<NodeParameterValueType>) => {
+						state.paramValue.ignoreTypeMismatchErrors = x.value as boolean;
+						emitValueChanged();
+					}
+				"
+			/>
+		</div>
 	</div>
 </template>
+
+<style module lang="scss">
+.typeConversionOptions {
+	display: grid;
+	padding: var(--spacing-m);
+	gap: var(--spacing-2xs);
+}
+</style>

packages/editor-ui/src/plugins/i18n/locales/en.json

@@ -1588,6 +1588,10 @@
 	"resourceMapper.addAllFields": "Add All {fieldWord}",
 	"resourceMapper.removeAllFields": "Remove All {fieldWord}",
 	"resourceMapper.refreshFieldList": "Refresh {fieldWord} List",
+	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
+	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
+	"resourceMapper.ignoreTypeMismatchErrors.displayName": "Ignore type mismatch errors",
+	"resourceMapper.ignoreTypeMismatchErrors.description": "Whether type mismatches should be ignored, rather than returning an Error",
 	"runData.openSubExecution": "Inspect Sub-Execution {id}",
 	"runData.openParentExecution": "Inspect Parent Execution {id}",
 	"runData.emptyItemHint": "This is an item, but it's empty.",

packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts

@@ -1,59 +1,18 @@
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ExecuteWorkflowData,
-	FieldValueOption,
-	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	ResourceMapperField,
 } from 'n8n-workflow';
 
 import { getWorkflowInfo } from './GenericFunctions';
-import { loadWorkflowInputMappings } from './methods/resourceMapping';
 import { generatePairedItemData } from '../../../utils/utilities';
-import { getWorkflowInputData } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
-
-function getWorkflowInputValues(this: IExecuteFunctions) {
-	const inputData = this.getInputData();
-
-	return inputData.map((item, itemIndex) => {
-		const itemFieldValues = this.getNodeParameter(
-			'workflowInputs.value',
-			itemIndex,
-			{},
-		) as IDataObject;
-
-		return {
-			json: {
-				...item.json,
-				...itemFieldValues,
-			},
-			index: itemIndex,
-			pairedItem: {
-				item: itemIndex,
-			},
-		};
-	});
-}
-
-function getCurrentWorkflowInputData(this: IExecuteFunctions) {
-	const inputData = getWorkflowInputValues.call(this);
-
-	const schema = this.getNodeParameter('workflowInputs.schema', 0, []) as ResourceMapperField[];
-
-	if (schema.length === 0) {
-		return inputData;
-	} else {
-		const newParams = schema
-			.filter((x) => !x.removed)
-			.map((x) => ({ name: x.displayName, type: x.type ?? 'any' })) as FieldValueOption[];
-
-		return getWorkflowInputData.call(this, inputData, newParams);
-	}
-}
-
+import {
+	getCurrentWorkflowInputData,
+	loadWorkflowInputMappings,
+} from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Execute Workflow',
@@ -84,6 +43,13 @@ export class ExecuteWorkflow implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+				name: 'outdatedVersionWarning',
+				type: 'notice',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+				default: '',
+			},
 			{
 				displayName: 'Source',
 				name: 'source',
@@ -254,6 +220,7 @@ export class ExecuteWorkflow implements INodeType {
 						addAllFields: true,
 						multiKeyMatch: false,
 						supportAutoMap: false,
+						showTypeConversionOptions: true,
 					},
 				},
 				displayOptions: {