Set the order in node template

ballerina-platform · Mar 5, 2025 · 83f0557 · 83f0557
1 parent dbea43b
commit 83f0557
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 52 deletions.
diff --git a/...model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java b/...model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java
@@ -110,6 +110,7 @@
 import io.ballerina.flowmodelgenerator.core.model.Property;
 import io.ballerina.flowmodelgenerator.core.model.node.AssignBuilder;
 import io.ballerina.flowmodelgenerator.core.model.node.BinaryBuilder;
+import io.ballerina.flowmodelgenerator.core.model.node.CallBuilder;
 import io.ballerina.flowmodelgenerator.core.model.node.DataMapperBuilder;
 import io.ballerina.flowmodelgenerator.core.model.node.FailBuilder;
 import io.ballerina.flowmodelgenerator.core.model.node.FunctionCall;
@@ -1280,24 +1281,7 @@ private void processFunctionSymbol(NonTerminalNode callNode, SeparatedNodeList<F
 
             // Generate the property of the inferred type param
             nodeBuilder.codedata().inferredReturnType(functionData.returnError() ? returnType : null);
-            String unescapedParamName = ParamUtils.removeLeadingSingleQuote(paramResult.name());
-            nodeBuilder.properties().custom()
-                    .metadata()
-                        .label(unescapedParamName)
-                        .description(paramResult.description())
-                        .stepOut()
-                    .type(Property.ValueType.TYPE)
-                    .typeConstraint(paramResult.type())
-                    .value(inferredTypeName)
-                    .placeholder(paramResult.defaultValue())
-                    .editable()
-                    .codedata()
-                        .kind(paramResult.kind().name())
-                        .originalName(paramResult.name())
-                        .importStatements(paramResult.importStatements())
-                        .stepOut()
-                    .stepOut()
-                    .addProperty(unescapedParamName);
+            CallBuilder.buildInferredTypeProperty(nodeBuilder, paramResult, inferredTypeName);
         });
         buildPropsFromFuncCallArgs(arguments, functionTypeSymbol, funcParamMap, positionalArgs, namedArgValueMap);
         handleCheckFlag(callNode, functionTypeSymbol);

diff --git a/...rator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/CallBuilder.java b/...rator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/CallBuilder.java
@@ -118,8 +118,39 @@ public void setConcreteTemplateData(TemplateContext context) {
         }
     }
 
+    public static void buildInferredTypeProperty(NodeBuilder nodeBuilder, ParameterData paramData, String value) {
+        String unescapedParamName = ParamUtils.removeLeadingSingleQuote(paramData.name());
+        nodeBuilder.properties().custom()
+                .metadata()
+                    .label(unescapedParamName)
+                    .description(paramData.description())
+                    .stepOut()
+                .codedata()
+                    .kind(paramData.kind().name())
+                    .originalName(paramData.name())
+                    .importStatements(paramData.importStatements())
+                    .stepOut()
+                .value(value)
+                .placeholder(paramData.defaultValue())
+                .typeConstraint(paramData.type())
+                .typeMembers(paramData.typeMembers())
+                .editable()
+                .defaultable(paramData.optional())
+                .stepOut()
+                .addProperty(unescapedParamName);
+    }
+
     protected void setParameterProperties(FunctionData function) {
         boolean hasOnlyRestParams = function.parameters().size() == 1;
+
+        // Build the inferred type property at the top if exists
+        if (function.inferredReturnType()) {
+            function.parameters().values().stream()
+                    .filter(param -> param.kind().equals(ParameterData.Kind.PARAM_FOR_TYPE_INFER))
+                    .findFirst()
+                    .ifPresent(param -> buildInferredTypeProperty(this, param, null));
+        }
+
         for (ParameterData paramResult : function.parameters().values()) {
             if (paramResult.kind().equals(ParameterData.Kind.INCLUDED_RECORD)) {
                 continue;

diff --git a/...-ls-extension/src/test/resources/node_template/config/remote_action_call-mysql-query.json b/...-ls-extension/src/test/resources/node_template/config/remote_action_call-mysql-query.json
@@ -47,6 +47,23 @@
         "editable": false,
         "advanced": false
       },
+      "rowType": {
+        "metadata": {
+          "label": "rowType",
+          "description": "The `typedesc` of the record to which the result needs to be returned"
+        },
+        "valueType": "TYPE",
+        "valueTypeConstraint": "record {|anydata...;|}",
+        "placeholder": "record {|anydata...;|}",
+        "optional": false,
+        "editable": true,
+        "advanced": false,
+        "codedata": {
+          "kind": "PARAM_FOR_TYPE_INFER",
+          "originalName": "rowType"
+        },
+        "typeMembers": []
+      },
       "sqlQuery": {
         "metadata": {
           "label": "sqlQuery",
@@ -72,23 +89,6 @@
           }
         ]
       },
-      "rowType": {
-        "metadata": {
-          "label": "rowType",
-          "description": "The `typedesc` of the record to which the result needs to be returned"
-        },
-        "valueType": "TYPE",
-        "valueTypeConstraint": "record {|anydata...;|}",
-        "placeholder": "record {|anydata...;|}",
-        "optional": false,
-        "editable": true,
-        "advanced": false,
-        "codedata": {
-          "kind": "PARAM_FOR_TYPE_INFER",
-          "originalName": "rowType"
-        },
-        "typeMembers": []
-      },
       "type": {
         "metadata": {
           "label": "Variable Type",

diff --git a/...-extension/src/test/resources/node_template/config/remote_action_call-mysql-queryRow.json b/...-extension/src/test/resources/node_template/config/remote_action_call-mysql-queryRow.json
@@ -47,6 +47,23 @@
         "editable": false,
         "advanced": false
       },
+      "returnType": {
+        "metadata": {
+          "label": "returnType",
+          "description": "The `typedesc` of the record to which the result needs to be returned.\nIt can be a basic type if the query result contains only one column"
+        },
+        "valueType": "TYPE",
+        "valueTypeConstraint": "anydata",
+        "placeholder": "anydata",
+        "optional": false,
+        "editable": true,
+        "advanced": false,
+        "codedata": {
+          "kind": "PARAM_FOR_TYPE_INFER",
+          "originalName": "returnType"
+        },
+        "typeMembers": []
+      },
       "sqlQuery": {
         "metadata": {
           "label": "sqlQuery",
@@ -72,23 +89,6 @@
           }
         ]
       },
-      "returnType": {
-        "metadata": {
-          "label": "returnType",
-          "description": "The `typedesc` of the record to which the result needs to be returned.\nIt can be a basic type if the query result contains only one column"
-        },
-        "valueType": "TYPE",
-        "valueTypeConstraint": "anydata",
-        "placeholder": "anydata",
-        "optional": false,
-        "editable": true,
-        "advanced": false,
-        "codedata": {
-          "kind": "PARAM_FOR_TYPE_INFER",
-          "originalName": "returnType"
-        },
-        "typeMembers": []
-      },
       "type": {
         "metadata": {
           "label": "Variable Type",