@darabonba/python-generator 2.0.8 → 2.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/ChangeLog.md +3 -0
  2. package/lib/generator.js +4 -4
  3. package/package.json +1 -1
  4. package/tests/expected/model/tea_python_tests/models/_my_model.py +7 -7
  5. package/tests/expected/modelConfig/tea_python_tests/models/_my_model.py +7 -7
  6. package/tests/output/model/tea_python_tests/models/_my_model.py +7 -7
  7. package/tests/output/modelConfig/tea_python_tests/models/_my_model.py +7 -7
package/ChangeLog.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # ChangeLog
2
2
 
3
+ # 2.0.9
4
+ - Fixed the arr & map init error in from map
5
+
3
6
  # 2.0.8
4
7
  - Optimized the directory structure of models
5
8
 
package/lib/generator.js CHANGED
@@ -1242,23 +1242,23 @@ setup(
1242
1242
  this.emit(`temp_model = ${this.getModelName(subModelName)}()\n`, level);
1243
1243
  this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
1244
1244
  } else if (fieldValue.type === 'array' || fieldValue.fieldType === 'array') {
1245
- this.emit(`for k${deep} in ${value}:\n`, level);
1246
1245
  let subKey = key;
1247
1246
  if(deep > 1) {
1248
1247
  subKey = `l${deep - 1}`;
1249
- this.emit(`${subKey} = []\n`, level + 2);
1248
+ this.emit(`${subKey} = []\n`, level);
1250
1249
  }
1250
+ this.emit(`for k${deep} in ${value}:\n`, level);
1251
1251
  this.visitFromField(fieldValue.fieldItemType || fieldValue.subType, fieldName, `${subKey}`, `k${deep}`, level + 2, true);
1252
1252
  if(deep > 1) {
1253
1253
  this.emitFieldConvert(key, subKey, level, arr);
1254
1254
  }
1255
1255
  } else if (fieldValue.fieldType === 'map' || fieldValue.type === 'map') {
1256
- this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
1257
1256
  let subKey = key;
1258
1257
  if(deep > 1) {
1259
1258
  subKey = `d${deep - 1}`;
1260
- this.emit(`${subKey} = {}\n`, level + 2);
1259
+ this.emit(`${subKey} = {}\n`, level);
1261
1260
  }
1261
+ this.emit(`for k${deep}, v${deep} in ${value}.items():\n`, level);
1262
1262
  this.visitFromField(fieldValue.valueType, fieldName, `${subKey}[k${deep}]`, `v${deep}`, level + 2);
1263
1263
  if(deep > 1) {
1264
1264
  this.emitFieldConvert(key, subKey, level, arr);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@darabonba/python-generator",
3
- "version": "2.0.8",
3
+ "version": "2.0.9",
4
4
  "description": "The darabonba generator for Python",
5
5
  "main": "lib/generator.js",
6
6
  "directories": {
package/tests/expected/model/tea_python_tests/models/_my_model.py CHANGED
@@ -450,8 +450,8 @@ class MyModel(DaraModel):
450
450
  self.ssubarray = []
451
451
  if m.get('ssubarray') is not None:
452
452
  for k1 in m.get('ssubarray'):
453
+ l1 = []
453
454
  for k2 in k1:
454
- l1 = []
455
455
  temp_model = main_models.M()
456
456
  l1.append(temp_model.from_map(k2))
457
457
  self.ssubarray.append(l1)
@@ -465,8 +465,8 @@ class MyModel(DaraModel):
465
465
  self.ssubmmarray = []
466
466
  if m.get('ssubmmarray') is not None:
467
467
  for k1 in m.get('ssubmmarray'):
468
+ l1 = []
468
469
  for k2 in k1:
469
- l1 = []
470
470
  temp_model = source_models.Request()
471
471
  l1.append(temp_model.from_map(k2))
472
472
  self.ssubmmarray.append(l1)
@@ -474,10 +474,10 @@ class MyModel(DaraModel):
474
474
  self.sssubmmarray = []
475
475
  if m.get('sssubmmarray') is not None:
476
476
  for k1 in m.get('sssubmmarray'):
477
+ l1 = []
477
478
  for k2 in k1:
478
- l1 = []
479
+ l2 = []
479
480
  for k3 in k2:
480
- l2 = []
481
481
  temp_model = source_models.Request()
482
482
  l2.append(temp_model.from_map(k3))
483
483
  l1.append(l2)
@@ -498,8 +498,8 @@ class MyModel(DaraModel):
498
498
  self.arr_module_model_map = []
499
499
  if m.get('arrModuleModelMap') is not None:
500
500
  for k1 in m.get('arrModuleModelMap'):
501
+ d1 = {}
501
502
  for k2, v2 in k1.items():
502
- d1 = {}
503
503
  temp_model = source_models.Request()
504
504
  d1[k2] = temp_model.from_map(v2)
505
505
  self.arr_module_model_map.append(d1)
@@ -507,10 +507,10 @@ class MyModel(DaraModel):
507
507
  self.arrs_module_model_map = []
508
508
  if m.get('arrsModuleModelMap') is not None:
509
509
  for k1 in m.get('arrsModuleModelMap'):
510
+ l1 = []
510
511
  for k2 in k1:
511
- l1 = []
512
+ d2 = {}
512
513
  for k3, v3 in k2.items():
513
- d2 = {}
514
514
  temp_model = source_models.Request()
515
515
  d2[k3] = temp_model.from_map(v3)
516
516
  l1.append(d2)
package/tests/expected/modelConfig/tea_python_tests/models/_my_model.py CHANGED
@@ -450,8 +450,8 @@ class MyModel(DaraModel):
450
450
  if m.get('ssubarray') is not None:
451
451
  self.ssubarray = []
452
452
  for k1 in m.get('ssubarray'):
453
+ l1 = []
453
454
  for k2 in k1:
454
- l1 = []
455
455
  temp_model = main_models.M()
456
456
  l1.append(temp_model.from_map(k2))
457
457
  self.ssubarray.append(l1)
@@ -465,8 +465,8 @@ class MyModel(DaraModel):
465
465
  if m.get('ssubmmarray') is not None:
466
466
  self.ssubmmarray = []
467
467
  for k1 in m.get('ssubmmarray'):
468
+ l1 = []
468
469
  for k2 in k1:
469
- l1 = []
470
470
  temp_model = source_models.Request()
471
471
  l1.append(temp_model.from_map(k2))
472
472
  self.ssubmmarray.append(l1)
@@ -474,10 +474,10 @@ class MyModel(DaraModel):
474
474
  if m.get('sssubmmarray') is not None:
475
475
  self.sssubmmarray = []
476
476
  for k1 in m.get('sssubmmarray'):
477
+ l1 = []
477
478
  for k2 in k1:
478
- l1 = []
479
+ l2 = []
479
480
  for k3 in k2:
480
- l2 = []
481
481
  temp_model = source_models.Request()
482
482
  l2.append(temp_model.from_map(k3))
483
483
  l1.append(l2)
@@ -498,8 +498,8 @@ class MyModel(DaraModel):
498
498
  if m.get('arrModuleModelMap') is not None:
499
499
  self.arr_module_model_map = []
500
500
  for k1 in m.get('arrModuleModelMap'):
501
+ d1 = {}
501
502
  for k2, v2 in k1.items():
502
- d1 = {}
503
503
  temp_model = source_models.Request()
504
504
  d1[k2] = temp_model.from_map(v2)
505
505
  self.arr_module_model_map.append(d1)
@@ -507,10 +507,10 @@ class MyModel(DaraModel):
507
507
  if m.get('arrsModuleModelMap') is not None:
508
508
  self.arrs_module_model_map = []
509
509
  for k1 in m.get('arrsModuleModelMap'):
510
+ l1 = []
510
511
  for k2 in k1:
511
- l1 = []
512
+ d2 = {}
512
513
  for k3, v3 in k2.items():
513
- d2 = {}
514
514
  temp_model = source_models.Request()
515
515
  d2[k3] = temp_model.from_map(v3)
516
516
  l1.append(d2)
package/tests/output/model/tea_python_tests/models/_my_model.py CHANGED
@@ -450,8 +450,8 @@ class MyModel(DaraModel):
450
450
  self.ssubarray = []
451
451
  if m.get('ssubarray') is not None:
452
452
  for k1 in m.get('ssubarray'):
453
+ l1 = []
453
454
  for k2 in k1:
454
- l1 = []
455
455
  temp_model = main_models.M()
456
456
  l1.append(temp_model.from_map(k2))
457
457
  self.ssubarray.append(l1)
@@ -465,8 +465,8 @@ class MyModel(DaraModel):
465
465
  self.ssubmmarray = []
466
466
  if m.get('ssubmmarray') is not None:
467
467
  for k1 in m.get('ssubmmarray'):
468
+ l1 = []
468
469
  for k2 in k1:
469
- l1 = []
470
470
  temp_model = source_models.Request()
471
471
  l1.append(temp_model.from_map(k2))
472
472
  self.ssubmmarray.append(l1)
@@ -474,10 +474,10 @@ class MyModel(DaraModel):
474
474
  self.sssubmmarray = []
475
475
  if m.get('sssubmmarray') is not None:
476
476
  for k1 in m.get('sssubmmarray'):
477
+ l1 = []
477
478
  for k2 in k1:
478
- l1 = []
479
+ l2 = []
479
480
  for k3 in k2:
480
- l2 = []
481
481
  temp_model = source_models.Request()
482
482
  l2.append(temp_model.from_map(k3))
483
483
  l1.append(l2)
@@ -498,8 +498,8 @@ class MyModel(DaraModel):
498
498
  self.arr_module_model_map = []
499
499
  if m.get('arrModuleModelMap') is not None:
500
500
  for k1 in m.get('arrModuleModelMap'):
501
+ d1 = {}
501
502
  for k2, v2 in k1.items():
502
- d1 = {}
503
503
  temp_model = source_models.Request()
504
504
  d1[k2] = temp_model.from_map(v2)
505
505
  self.arr_module_model_map.append(d1)
@@ -507,10 +507,10 @@ class MyModel(DaraModel):
507
507
  self.arrs_module_model_map = []
508
508
  if m.get('arrsModuleModelMap') is not None:
509
509
  for k1 in m.get('arrsModuleModelMap'):
510
+ l1 = []
510
511
  for k2 in k1:
511
- l1 = []
512
+ d2 = {}
512
513
  for k3, v3 in k2.items():
513
- d2 = {}
514
514
  temp_model = source_models.Request()
515
515
  d2[k3] = temp_model.from_map(v3)
516
516
  l1.append(d2)
package/tests/output/modelConfig/tea_python_tests/models/_my_model.py CHANGED
@@ -450,8 +450,8 @@ class MyModel(DaraModel):
450
450
  if m.get('ssubarray') is not None:
451
451
  self.ssubarray = []
452
452
  for k1 in m.get('ssubarray'):
453
+ l1 = []
453
454
  for k2 in k1:
454
- l1 = []
455
455
  temp_model = main_models.M()
456
456
  l1.append(temp_model.from_map(k2))
457
457
  self.ssubarray.append(l1)
@@ -465,8 +465,8 @@ class MyModel(DaraModel):
465
465
  if m.get('ssubmmarray') is not None:
466
466
  self.ssubmmarray = []
467
467
  for k1 in m.get('ssubmmarray'):
468
+ l1 = []
468
469
  for k2 in k1:
469
- l1 = []
470
470
  temp_model = source_models.Request()
471
471
  l1.append(temp_model.from_map(k2))
472
472
  self.ssubmmarray.append(l1)
@@ -474,10 +474,10 @@ class MyModel(DaraModel):
474
474
  if m.get('sssubmmarray') is not None:
475
475
  self.sssubmmarray = []
476
476
  for k1 in m.get('sssubmmarray'):
477
+ l1 = []
477
478
  for k2 in k1:
478
- l1 = []
479
+ l2 = []
479
480
  for k3 in k2:
480
- l2 = []
481
481
  temp_model = source_models.Request()
482
482
  l2.append(temp_model.from_map(k3))
483
483
  l1.append(l2)
@@ -498,8 +498,8 @@ class MyModel(DaraModel):
498
498
  if m.get('arrModuleModelMap') is not None:
499
499
  self.arr_module_model_map = []
500
500
  for k1 in m.get('arrModuleModelMap'):
501
+ d1 = {}
501
502
  for k2, v2 in k1.items():
502
- d1 = {}
503
503
  temp_model = source_models.Request()
504
504
  d1[k2] = temp_model.from_map(v2)
505
505
  self.arr_module_model_map.append(d1)
@@ -507,10 +507,10 @@ class MyModel(DaraModel):
507
507
  if m.get('arrsModuleModelMap') is not None:
508
508
  self.arrs_module_model_map = []
509
509
  for k1 in m.get('arrsModuleModelMap'):
510
+ l1 = []
510
511
  for k2 in k1:
511
- l1 = []
512
+ d2 = {}
512
513
  for k3, v3 in k2.items():
513
- d2 = {}
514
514
  temp_model = source_models.Request()
515
515
  d2[k3] = temp_model.from_map(v3)
516
516
  l1.append(d2)