Skip to content

Arr map append #132

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
peze merged 2 commits into from
Jul 14, 2025
Merged

Arr map append #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b67f839
fix the arr & map init error in from map
peze Jul 9, 2025
6db8e03
Bump 2.0.9
Jul 14, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ChangeLog

# 2.0.9
- Fixed the arr & map init error in from map

# 2.0.8
- Optimized the directory structure of models

Expand Down
3 changes: 3 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ChangeLog

# 2.0.9
- Fixed the arr & map init error in from map

# 2.0.8
- Optimized the directory structure of models

Expand Down
8 changes: 4 additions & 4 deletions lib/generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,23 +1242,23 @@ setup(
this.emit(`temp_model = ${this.getModelName(subModelName)}()\n`, level);
this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
} else if (fieldValue.type === 'array' || fieldValue.fieldType === 'array') {
this.emit(`for k${deep} in ${value}:\n`, level);
let subKey = key;
if(deep > 1) {
subKey = `l${deep - 1}`;
this.emit(`${subKey} = []\n`, level + 2);
this.emit(`${subKey} = []\n`, level);
}
this.emit(`for k${deep} in ${value}:\n`, level);
this.visitFromField(fieldValue.fieldItemType || fieldValue.subType, fieldName, `${subKey}`, `k${deep}`, level + 2, true);
if(deep > 1) {
this.emitFieldConvert(key, subKey, level, arr);
}
} else if (fieldValue.fieldType === 'map' || fieldValue.type === 'map') {
this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
let subKey = key;
if(deep > 1) {
subKey = `d${deep - 1}`;
this.emit(`${subKey} = {}\n`, level + 2);
this.emit(`${subKey} = {}\n`, level);
}
this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
this.visitFromField(fieldValue.valueType, fieldName, `${subKey}[k${deep}]`, `v${deep}`, level + 2);
if(deep > 1) {
this.emitFieldConvert(key, subKey, level, arr);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@darabonba/python-generator",
"version": "2.0.8",
"version": "2.0.9",
"description": "The darabonba generator for Python",
"main": "lib/generator.js",
"directories": {
Expand Down
14 changes: 7 additions & 7 deletions tests/expected/model/tea_python_tests/models/_my_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ def from_map(self, m: dict = None):
self.ssubarray = []
if m.get('ssubarray') is not None:
for k1 in m.get('ssubarray'):
l1 = []
for k2 in k1:
l1 = []
temp_model = main_models.M()
l1.append(temp_model.from_map(k2))
self.ssubarray.append(l1)
Expand All @@ -465,19 +465,19 @@ def from_map(self, m: dict = None):
self.ssubmmarray = []
if m.get('ssubmmarray') is not None:
for k1 in m.get('ssubmmarray'):
l1 = []
for k2 in k1:
l1 = []
temp_model = source_models.Request()
l1.append(temp_model.from_map(k2))
self.ssubmmarray.append(l1)

self.sssubmmarray = []
if m.get('sssubmmarray') is not None:
for k1 in m.get('sssubmmarray'):
l1 = []
for k2 in k1:
l1 = []
l2 = []
for k3 in k2:
l2 = []
temp_model = source_models.Request()
l2.append(temp_model.from_map(k3))
l1.append(l2)
Expand All @@ -498,19 +498,19 @@ def from_map(self, m: dict = None):
self.arr_module_model_map = []
if m.get('arrModuleModelMap') is not None:
for k1 in m.get('arrModuleModelMap'):
d1 = {}
for k2, v2 in k1.items():
d1 = {}
temp_model = source_models.Request()
d1[k2] = temp_model.from_map(v2)
self.arr_module_model_map.append(d1)

self.arrs_module_model_map = []
if m.get('arrsModuleModelMap') is not None:
for k1 in m.get('arrsModuleModelMap'):
l1 = []
for k2 in k1:
l1 = []
d2 = {}
for k3, v3 in k2.items():
d2 = {}
temp_model = source_models.Request()
d2[k3] = temp_model.from_map(v3)
l1.append(d2)
Expand Down
14 changes: 7 additions & 7 deletions tests/expected/modelConfig/tea_python_tests/models/_my_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ def from_map(self, m: dict = None):
if m.get('ssubarray') is not None:
self.ssubarray = []
for k1 in m.get('ssubarray'):
l1 = []
for k2 in k1:
l1 = []
temp_model = main_models.M()
l1.append(temp_model.from_map(k2))
self.ssubarray.append(l1)
Expand All @@ -465,19 +465,19 @@ def from_map(self, m: dict = None):
if m.get('ssubmmarray') is not None:
self.ssubmmarray = []
for k1 in m.get('ssubmmarray'):
l1 = []
for k2 in k1:
l1 = []
temp_model = source_models.Request()
l1.append(temp_model.from_map(k2))
self.ssubmmarray.append(l1)

if m.get('sssubmmarray') is not None:
self.sssubmmarray = []
for k1 in m.get('sssubmmarray'):
l1 = []
for k2 in k1:
l1 = []
l2 = []
for k3 in k2:
l2 = []
temp_model = source_models.Request()
l2.append(temp_model.from_map(k3))
l1.append(l2)
Expand All @@ -498,19 +498,19 @@ def from_map(self, m: dict = None):
if m.get('arrModuleModelMap') is not None:
self.arr_module_model_map = []
for k1 in m.get('arrModuleModelMap'):
d1 = {}
for k2, v2 in k1.items():
d1 = {}
temp_model = source_models.Request()
d1[k2] = temp_model.from_map(v2)
self.arr_module_model_map.append(d1)

if m.get('arrsModuleModelMap') is not None:
self.arrs_module_model_map = []
for k1 in m.get('arrsModuleModelMap'):
l1 = []
for k2 in k1:
l1 = []
d2 = {}
for k3, v3 in k2.items():
d2 = {}
temp_model = source_models.Request()
d2[k3] = temp_model.from_map(v3)
l1.append(d2)
Expand Down