Skip to content

Retrieve correct model for multi dimentional arrays #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KavinduZoysa merged 1 commit into from
Sep 8, 2025
Merged

Retrieve correct model for multi dimentional arrays #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...del-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/DataMapManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ private TargetNode getTargetNode(Node parentNode, String targetField, SemanticMo
String[] fieldSplits = targetField.split(DOT);
int idx = 1;
if (initializer.kind() == SyntaxKind.QUERY_EXPRESSION) {
if (fieldSplits.length == 2 && fieldSplits[1].equals("0")) {
if (fieldSplits.length >= 2 && fieldSplits[1].equals(ZERO)) {
idx = 2;
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...tension/src/test/java/io/ballerina/flowmodelgenerator/extension/DataMappingModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ protected Object[] getConfigsList() {
{Path.of("variable50.json")},
{Path.of("variable51.json")},
{Path.of("variable52.json")},
{Path.of("query18.json")},
{Path.of("query19.json")},
};
}

Expand Down
96 changes: 40 additions & 56 deletions ...low-model-generator-ls-extension/src/test/resources/data_mapper_model/config/query13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,9 @@
"offset": 4
},
"propertyKey": "expression",
"targetField": "myTypes4.0.0",
"targetField": "myTypes4.0",
"model": {
"inputs": [
{
"member": {
"fields": [],
"name": "myType3",
"displayName": "<myType3Item>",
"typeName": "MyType",
"kind": "record",
"ref": "2079019383"
},
"name": "myType3",
"displayName": "myType3",
"typeName": "MyType[]",
"kind": "array",
"category": "variable",
"focusExpression": "myTypes3",
"ref": "2079019383"
},
{
"member": {
"fields": [],
Expand Down Expand Up @@ -106,54 +89,75 @@
"ref": "-1223228350"
},
{
"fields": [],
"name": "y",
"displayName": "y",
"typeName": "MyType",
"kind": "record",
"focusExpression": "myType3",
"member": {
"fields": [],
"name": "myType3",
"displayName": "<myType3Item>",
"typeName": "MyType",
"kind": "record",
"ref": "2079019383"
},
"name": "myType3",
"displayName": "myType3",
"typeName": "MyType[]",
"kind": "array",
"focusExpression": "myTypes3",
"ref": "2079019383"
}
],
"output": {
"fields": [],
"member": {
"member": {
"fields": [],
"name": "0",
"displayName": "<0ItemItem>",
"typeName": "MyType",
"kind": "record",
"ref": "2079019383"
},
"name": "0",
"displayName": "<0Item>",
"typeName": "MyType[]",
"kind": "array",
"ref": "2079019383"
},
"name": "0",
"displayName": "0",
"typeName": "record {|string name1; int i;|}",
"kind": "record",
"ref": "-353186209"
"typeName": "MyType[][]",
"kind": "array",
"ref": "2079019383"
},
"mappings": [
{
"output": "0",
"inputs": [
"y"
"myType3"
],
"expression": "y",
"expression": "from var y in myType3 select y",
"diagnostics": [],
"elements": [],
"isQueryExpression": false,
"isQueryExpression": true,
"isFunctionCall": false
}
],
"query": {
"output": "0",
"inputs": [
"myType3"
"myTypes3"
],
"fromClause": {
"type": "from",
"properties": {
"name": "y",
"type": "MyType",
"expression": "myType3"
"name": "myType3",
"type": "MyType[]",
"expression": "myTypes3"
}
},
"intermediateClauses": [],
"resultClause": {
"type": "select",
"properties": {
"expression": "y"
"expression": "from var y in myType3 select y"
}
}
},
Expand Down Expand Up @@ -206,26 +210,6 @@
],
"typeName": "Types",
"kind": "record"
},
"-353186209": {
"fields": [
{
"name": "name1",
"displayName": "name1",
"typeName": "string",
"kind": "string",
"optional": false
},
{
"name": "i",
"displayName": "i",
"typeName": "int",
"kind": "int",
"optional": false
}
],
"typeName": "record {|string name1; int i;|}",
"kind": "record"
}
}
}
Expand Down
37 changes: 12 additions & 25 deletions ...low-model-generator-ls-extension/src/test/resources/data_mapper_model/config/query15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"codedata": {
"node": "VARIABLE",
"lineRange": {
"fileName": "query7.bal",
"fileName": "query8.bal",
"startLine": {
"line": 14,
"offset": 4
Expand Down Expand Up @@ -116,12 +116,19 @@
}
],
"output": {
"fields": [],
"member": {
"fields": [],
"name": "0",
"displayName": "<0Item>",
"typeName": "MyType",
"kind": "record",
"ref": "2079019383"
},
"name": "0",
"displayName": "0",
"typeName": "record {|string name1; int i;|}",
"kind": "record",
"ref": "-353186209"
"typeName": "MyType[]",
"kind": "array",
"ref": "2079019383"
},
"mappings": [
{
Expand Down Expand Up @@ -206,26 +213,6 @@
],
"typeName": "Types",
"kind": "record"
},
"-353186209": {
"fields": [
{
"name": "name1",
"displayName": "name1",
"typeName": "string",
"kind": "string",
"optional": false
},
{
"name": "i",
"displayName": "i",
"typeName": "int",
"kind": "int",
"optional": false
}
],
"typeName": "record {|string name1; int i;|}",
"kind": "record"
}
}
}
Expand Down
140 changes: 140 additions & 0 deletions ...low-model-generator-ls-extension/src/test/resources/data_mapper_model/config/query18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"source": "query9.bal",
"description": "Sample diagram node",
"codedata": {
"node": "VARIABLE",
"lineRange": {
"fileName": "query9.bal",
"startLine": {
"line": 6,
"offset": 4
},
"endLine": {
"line": 8,
"offset": 42
}
},
"sourceCode": ""
},
"position": {
"line": 6,
"offset": 4
},
"propertyKey": "expression",
"targetField": "arr4.0.0",
"model": {
"inputs": [
{
"member": {
"member": {
"fields": [],
"name": "arr3",
"displayName": "<arr3ItemItem>",
"typeName": "RecType",
"kind": "record",
"ref": "-1897494121"
},
"name": "arr3",
"displayName": "<arr3Item>",
"typeName": "RecType[]",
"kind": "array",
"ref": "-1897494121"
},
"name": "arr3",
"displayName": "arr3",
"typeName": "RecType[][]",
"kind": "array",
"category": "variable",
"ref": "-1897494121"
},
{
"member": {
"fields": [],
"name": "arr3Item",
"displayName": "<arr3ItemItem>",
"typeName": "RecType",
"kind": "record",
"ref": "-1897494121"
},
"name": "arr3Item",
"displayName": "arr3Item",
"typeName": "RecType[]",
"kind": "array",
"category": "variable",
"focusExpression": "arr3",
"ref": "-1897494121"
},
{
"fields": [],
"name": "arr3ItemItem",
"displayName": "arr3ItemItem",
"typeName": "RecType",
"kind": "record",
"focusExpression": "arr3Item",
"ref": "-1897494121"
}
],
"output": {
"member": {
"fields": [],
"name": "0",
"displayName": "<0Item>",
"typeName": "RecType",
"kind": "record",
"ref": "-1897494121"
},
"name": "0",
"displayName": "0",
"typeName": "RecType[]",
"kind": "array",
"ref": "-1897494121"
},
"mappings": [
{
"output": "0.i",
"inputs": [],
"expression": "0",
"diagnostics": [],
"elements": [],
"isQueryExpression": false,
"isFunctionCall": false
}
],
"query": {
"output": "0",
"inputs": [
"arr3Item"
],
"fromClause": {
"type": "from",
"properties": {
"name": "arr3ItemItem",
"type": "RecType",
"expression": "arr3Item"
}
},
"intermediateClauses": [],
"resultClause": {
"type": "select",
"properties": {
"expression": "{i: 0}"
}
}
},
"refs": {
"-1897494121": {
"fields": [
{
"name": "i",
"displayName": "i",
"typeName": "int",
"kind": "int",
"optional": false
}
],
"typeName": "RecType",
"kind": "record"
}
}
}
}
Loading
Loading