@elementor/editor-canvas 3.35.0-470 → 3.35.0-471

package/src/mcp/utils/do-update-element-property.ts

@@ -7,7 +7,11 @@ import {
 } from '@elementor/editor-elements';
 import { getPropSchemaFromCache, type PropValue, Schema, type TransformablePropValue } from '@elementor/editor-props';
 import { type CustomCss, getStylesSchema } from '@elementor/editor-styles';
+import { type Utils as IUtils } from '@elementor/editor-variables';
+import { type z } from '@elementor/schema';
 
+// TODO: see https://elementor.atlassian.net/browse/ED-22513 for better cross-module access
+type XElementor = z.infer< z.ZodAny >;
 type OwnParams = {
 	elementId: string;
 	elementType: string;
@@ -15,8 +19,14 @@ type OwnParams = {
 	propertyValue: string | PropValue | TransformablePropValue< string, unknown >;
 };
 
-function resolvePropValue( value: unknown, forceKey?: string ): PropValue {
-	return Schema.adjustLlmPropValueSchema( value as PropValue, { forceKey } );
+export function resolvePropValue( value: unknown, forceKey?: string ): PropValue {
+	// TODO: see https://elementor.atlassian.net/browse/ED-22513 for better cross-module access
+	const Utils = ( ( ( window as XElementor ).elementorV2 as XElementor ).editorVariables as XElementor )
+		.Utils as typeof IUtils;
+	return Schema.adjustLlmPropValueSchema( value as PropValue, {
+		forceKey,
+		transformers: Utils.globalVariablesLLMResolvers,
+	} );
 }
 
 /*
@@ -25,7 +35,6 @@ function resolvePropValue( value: unknown, forceKey?: string ): PropValue {
  */
 export const doUpdateElementProperty = ( params: OwnParams ) => {
 	const { elementId, propertyName, propertyValue, elementType } = params;
-
 	if ( propertyName === '_styles' ) {
 		const elementStyles = getElementStyles( elementId ) || {};
 		const propertyMapValue = propertyValue as Record< string, PropValue >;

package/src/mcp/utils/validate-input.ts

@@ -2,6 +2,8 @@ import { getWidgetsCache } from '@elementor/editor-elements';
 import { type PropsSchema, type PropValue, Schema } from '@elementor/editor-props';
 import { getStylesSchema } from '@elementor/editor-styles';
 
+import { STYLE_SCHEMA_URI } from '../resources/widgets-schema-resource';
+
 let _widgetsSchema: Record< string, PropsSchema > | null = null;
 
 type ValidationResult = {
@@ -48,9 +50,14 @@ export const validateInput = {
 			} else if ( ! Schema.isPropKeyConfigurable( propName ) ) {
 				errors.push( `Property "${ propName }" is not configurable.` );
 			} else {
-				const { valid, jsonSchema } = Schema.validatePropValue( propSchema, propValue as PropValue );
+				const { valid } = Schema.validatePropValue( propSchema, propValue as PropValue );
 				if ( ! valid ) {
-					errors.push( `Invalid property "${ propName }". Expected schema: ${ jsonSchema }` );
+					errors.push(
+						`Invalid property "${ propName }". Validate input with resource [${ STYLE_SCHEMA_URI.replace(
+							'{category}',
+							propName
+						) }]`
+					);
 				}
 			}
 		} );