From ced2ec64aa0939d453ce45635338a018b2291d92 Mon Sep 17 00:00:00 2001 From: Dario Pranjic Date: Sat, 31 May 2025 00:35:52 +0200 Subject: [PATCH 1/2] Apply changes for GenericCombinationStrategy to FunctionGenericMapper --- proto/shared/shared.runtime_function.proto | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/proto/shared/shared.runtime_function.proto b/proto/shared/shared.runtime_function.proto index 5bf712d..a6e6196 100644 --- a/proto/shared/shared.runtime_function.proto +++ b/proto/shared/shared.runtime_function.proto @@ -9,11 +9,14 @@ import "shared.data_type.proto"; import "shared.struct.proto"; message FunctionGenericMapper { - // can point to another generic or to a resolved data type - DataTypeIdentifier source = 1; - // can only be a generic key - string target = 2; - optional string parameter_id = 3; + // can point to another generic or to a resolved data type + repeated DataTypeIdentifier source = 1; + // can only be a generic key + string target = 2; + + repeated shared.GenericMapper.GenericCombinationStrategy generic_combinations = 3; + + optional string parameter_id = 4; } // Definition of a function used for execution From 46fcd449b898399c8ec52049b26020d0143d485c Mon Sep 17 00:00:00 2001 From: Dario Pranjic Date: Sat, 31 May 2025 01:31:49 +0200 Subject: [PATCH 2/2] Make parent type a data type identifier instead of DataType --- proto/shared/shared.data_type.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/shared/shared.data_type.proto b/proto/shared/shared.data_type.proto index c8d9762..f0aab51 100644 --- a/proto/shared/shared.data_type.proto +++ b/proto/shared/shared.data_type.proto @@ -31,7 +31,7 @@ message DataType { // Rules of the data type (e.g. Regex, contains...) repeated DataTypeRule rules = 4; // Optional identifier it the given data type is a child of another - optional string parent_type_identifier = 5; + optional DataTypeIdentifier parent_type = 5; // List of generic keys repeated string generic_keys = 6; }