@darabonba/python-generator 1.2.9 → 1.2.12

package/ChangeLog.md

@@ -1,5 +1,17 @@
 # ChangeLog
 
+## 1.2.12 - 2022-07-20
+
+* Support infinite loop reference in model.
+
+## 1.2.11 - 2022-07-11
+
+* Support complex list(`array-in-array`).
+
+## 1.2.10 - 2022-05-31
+
+* Fix import package for typedef.
+
 ## 1.2.9 - 2022-05-31
 
 * Support Typedef.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.9",
+  "version": "1.2.12",
   "description": "The darabonba generator for Python",
   "main": "src/generator.js",
   "directories": {

package/src/generator.js

@@ -175,7 +175,7 @@ class Generator {
               }
               importsTypedef[aliasId][types].import = moduleTypedef[types].import;
               importsTypedef[aliasId][types].type = moduleTypedef[types].type;
-              if (!requirePackage.includes(moduleTypedef[types].package)) {
+              if (moduleTypedef[types].package && !requirePackage.includes(moduleTypedef[types].package)) {
                 requirePackage.push(moduleTypedef[types].package);
               }
             });

package/src/langs/python/combinator.js

@@ -393,6 +393,7 @@ class Combinator extends CombinatorBase {
     if (_contain(this.definedModels, model.name)) {
       return;
     }
+    this.definedModels.push(model_name);
     if (model.subObject.length) {
       model.subObject.forEach(obj => {
         this.emitModel(emitter, obj);
@@ -401,7 +402,6 @@ class Combinator extends CombinatorBase {
     model.body.filter(node => node instanceof PropItem && !this.hasModel(node.type, model.name)).forEach(item => {
       this.findUndefinedModel(emitter, item.type);
     });
-    this.definedModels.push(model_name);
     this.emitClass(emitter, model);
     emitter.emitln().emitln();
   }

package/src/resolver/base.js

@@ -153,7 +153,7 @@ class BaseResolver {
   }
 
   resolveType(typeNode, sourceNode, prop) {
-    let typeInfo = {objectType: 'module'};
+    let typeInfo = { objectType: 'module' };
     if (typeNode.idType) {
       if (typeNode.idType === 'model') {
         typeInfo['objectType'] = 'model';
@@ -172,7 +172,7 @@ class BaseResolver {
       debug.stack(typeNode, sourceNode);
     } else if (typeNode.type) {
       if (typeNode.type === 'fieldType') {
-        return this.resolveType(typeNode.fieldType, typeNode);
+        return this.resolveType(typeNode.fieldType, typeNode, prop);
       } else if (typeNode.type === 'modelBody') {
         // is sub model
         typeInfo['objectType'] = 'model';
@@ -239,14 +239,14 @@ class BaseResolver {
       let itemType;
       if (sourceNode.fieldItemType.type === 'modelBody') {
         typeInfo['objectType'] = 'model';
-        typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.itemType);
+        typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.itemType ? sourceNode.itemType : prop);
         itemType = typeInfo;
       } else if (sourceNode.fieldItemType.idType === 'model') {
         typeInfo['objectType'] = 'model';
         typeInfo['lexeme'] = this.combinator.addModelInclude(sourceNode.fieldItemType.lexeme);
         itemType = typeInfo;
       } else {
-        itemType = this.resolveType(sourceNode.fieldItemType, sourceNode);
+        itemType = this.resolveType(sourceNode.fieldItemType, sourceNode, sourceNode.itemType ? sourceNode.itemType : prop);
       }
       const arrayType = {
         lexeme: 'array',

package/tests/expected/python2/complex/tea_python_tests/client.py

@@ -163,6 +163,18 @@ class Client(SourceClient):
             '1'
         ]
 
+    @staticmethod
+    def array_2():
+        temp = source_models.Config()
+        any_arr = [
+            temp
+        ]
+        return [
+            [
+                any_arr
+            ]
+        ]
+
     def template_string(self):
         return '/%s' % TeaConverter.to_unicode(self._protocol)
 

package/tests/expected/python2/complex/tea_python_tests/models.py

@@ -89,8 +89,38 @@ class ComplexRequestPart(TeaModel):
         return self
 
 
+class ComplexRequestComplexList(TeaModel):
+    def __init__(self, name=None, code=None):
+        self.name = name  # type: str
+        self.code = code  # type: int
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super(ComplexRequestComplexList, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.name is not None:
+            result['Name'] = self.name
+        if self.code is not None:
+            result['Code'] = self.code
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.name = m.get('Name')
+        if m.get('Code') is not None:
+            self.code = m.get('Code')
+        return self
+
+
 class ComplexRequest(TeaModel):
-    def __init__(self, access_key=None, body=None, strs=None, header=None, num=None, configs=None, part=None):
+    def __init__(self, access_key=None, body=None, strs=None, header=None, num=None, configs=None, part=None,
+                 complex_list=None, complex_list_1=None):
         self.access_key = access_key  # type: str
         # Body
         self.body = body  # type: READABLE
@@ -102,6 +132,8 @@ class ComplexRequest(TeaModel):
         self.configs = configs  # type: ComplexRequestConfigs
         # Part
         self.part = part  # type: list[ComplexRequestPart]
+        self.complex_list = complex_list  # type: list[list[list[ComplexRequestComplexList]]]
+        self.complex_list_1 = complex_list_1  # type: list[list[dict[str, str]]]
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -118,6 +150,14 @@ class ComplexRequest(TeaModel):
             for k in self.part:
                 if k:
                     k.validate()
+        self.validate_required(self.complex_list, 'complex_list')
+        if self.complex_list:
+            for k in self.complex_list:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
+        self.validate_required(self.complex_list_1, 'complex_list_1')
 
     def to_map(self):
         _map = super(ComplexRequest, self).to_map()
@@ -141,6 +181,18 @@ class ComplexRequest(TeaModel):
         if self.part is not None:
             for k in self.part:
                 result['Part'].append(k.to_map() if k else None)
+        result['complexList'] = []
+        if self.complex_list is not None:
+            for k in self.complex_list:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['complexList'].append(l1)
+        if self.complex_list_1 is not None:
+            result['complexList1'] = self.complex_list_1
         return result
 
     def from_map(self, m=None):
@@ -164,6 +216,19 @@ class ComplexRequest(TeaModel):
             for k in m.get('Part'):
                 temp_model = ComplexRequestPart()
                 self.part.append(temp_model.from_map(k))
+        self.complex_list = []
+        if m.get('complexList') is not None:
+            for k in m.get('complexList'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list.append(l1)
+        if m.get('complexList1') is not None:
+            self.complex_list_1 = m.get('complexList1')
         return self
 
 

package/tests/expected/python2/model/tea_python_tests/models.py

@@ -468,3 +468,81 @@ class M(TeaModel):
         return self
 
 
+class NodeChildSubChild(TeaModel):
+    def __init__(self, child_node=None):
+        self.child_node = child_node  # type: Node
+
+    def validate(self):
+        if self.child_node:
+            self.child_node.validate()
+
+    def to_map(self):
+        _map = super(NodeChildSubChild, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.child_node is not None:
+            result['childNode'] = self.child_node.to_map()
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('childNode') is not None:
+            temp_model = Node()
+            self.child_node = temp_model.from_map(m['childNode'])
+        return self
+
+
+class NodeChild(TeaModel):
+    def __init__(self, sub_child=None):
+        self.sub_child = sub_child  # type: NodeChildSubChild
+
+    def validate(self):
+        if self.sub_child:
+            self.sub_child.validate()
+
+    def to_map(self):
+        _map = super(NodeChild, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.sub_child is not None:
+            result['subChild'] = self.sub_child.to_map()
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('subChild') is not None:
+            temp_model = NodeChildSubChild()
+            self.sub_child = temp_model.from_map(m['subChild'])
+        return self
+
+
+class Node(TeaModel):
+    def __init__(self, child=None):
+        self.child = child  # type: NodeChild
+
+    def validate(self):
+        if self.child:
+            self.child.validate()
+
+    def to_map(self):
+        _map = super(Node, self).to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.child is not None:
+            result['child'] = self.child.to_map()
+        return result
+
+    def from_map(self, m=None):
+        m = m or dict()
+        if m.get('child') is not None:
+            temp_model = NodeChild()
+            self.child = temp_model.from_map(m['child'])
+        return self
+
+

package/tests/expected/python3/complex/tea_python_tests/client.py

@@ -337,6 +337,18 @@ class Client(SourceClient):
             '1'
         ]
 
+    @staticmethod
+    def array_2() -> List[List[Any]]:
+        temp = source_models.Config()
+        any_arr = [
+            temp
+        ]
+        return [
+            [
+                any_arr
+            ]
+        ]
+
     def template_string(self) -> str:
         return f'/{self._protocol}'
 

package/tests/expected/python3/complex/tea_python_tests/models.py

@@ -101,6 +101,39 @@ class ComplexRequestPart(TeaModel):
         return self
 
 
+class ComplexRequestComplexList(TeaModel):
+    def __init__(
+        self,
+        name: str = None,
+        code: int = None,
+    ):
+        self.name = name
+        self.code = code
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.name is not None:
+            result['Name'] = self.name
+        if self.code is not None:
+            result['Code'] = self.code
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('Name') is not None:
+            self.name = m.get('Name')
+        if m.get('Code') is not None:
+            self.code = m.get('Code')
+        return self
+
+
 class ComplexRequest(TeaModel):
     def __init__(
         self,
@@ -111,6 +144,8 @@ class ComplexRequest(TeaModel):
         num: int = None,
         configs: ComplexRequestConfigs = None,
         part: List[ComplexRequestPart] = None,
+        complex_list: List[List[List[ComplexRequestComplexList]]] = None,
+        complex_list_1: List[List[Dict[str, str]]] = None,
     ):
         self.access_key = access_key
         # Body
@@ -123,6 +158,8 @@ class ComplexRequest(TeaModel):
         self.configs = configs
         # Part
         self.part = part
+        self.complex_list = complex_list
+        self.complex_list_1 = complex_list_1
 
     def validate(self):
         self.validate_required(self.access_key, 'access_key')
@@ -139,6 +176,14 @@ class ComplexRequest(TeaModel):
             for k in self.part:
                 if k:
                     k.validate()
+        self.validate_required(self.complex_list, 'complex_list')
+        if self.complex_list:
+            for k in self.complex_list:
+                for k1 in k:
+                    for k2 in k1:
+                        if k2:
+                            k2.validate()
+        self.validate_required(self.complex_list_1, 'complex_list_1')
 
     def to_map(self):
         _map = super().to_map()
@@ -162,6 +207,18 @@ class ComplexRequest(TeaModel):
         if self.part is not None:
             for k in self.part:
                 result['Part'].append(k.to_map() if k else None)
+        result['complexList'] = []
+        if self.complex_list is not None:
+            for k in self.complex_list:
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        l2.append(k2.to_map() if k2 else None)
+                    l1.append(l2)
+                result['complexList'].append(l1)
+        if self.complex_list_1 is not None:
+            result['complexList1'] = self.complex_list_1
         return result
 
     def from_map(self, m: dict = None):
@@ -185,6 +242,19 @@ class ComplexRequest(TeaModel):
             for k in m.get('Part'):
                 temp_model = ComplexRequestPart()
                 self.part.append(temp_model.from_map(k))
+        self.complex_list = []
+        if m.get('complexList') is not None:
+            for k in m.get('complexList'):
+                l1 = []
+                for k1 in k:
+                    l2 = []
+                    for k2 in k1:
+                        temp_model = ComplexRequestComplexList()
+                        l2.append(temp_model.from_map(k2))
+                    l1.append(l2)
+                self.complex_list.append(l1)
+        if m.get('complexList1') is not None:
+            self.complex_list_1 = m.get('complexList1')
         return self
 
 

package/tests/expected/python3/model/tea_python_tests/models.py

@@ -513,3 +513,90 @@ class UseBeforeDefineModel(TeaModel):
         return self
 
 
+class NodeChildSubChild(TeaModel):
+    def __init__(
+        self,
+        child_node: Node = None,
+    ):
+        self.child_node = child_node
+
+    def validate(self):
+        if self.child_node:
+            self.child_node.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.child_node is not None:
+            result['childNode'] = self.child_node.to_map()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('childNode') is not None:
+            temp_model = Node()
+            self.child_node = temp_model.from_map(m['childNode'])
+        return self
+
+
+class NodeChild(TeaModel):
+    def __init__(
+        self,
+        sub_child: NodeChildSubChild = None,
+    ):
+        self.sub_child = sub_child
+
+    def validate(self):
+        if self.sub_child:
+            self.sub_child.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.sub_child is not None:
+            result['subChild'] = self.sub_child.to_map()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('subChild') is not None:
+            temp_model = NodeChildSubChild()
+            self.sub_child = temp_model.from_map(m['subChild'])
+        return self
+
+
+class Node(TeaModel):
+    def __init__(
+        self,
+        child: NodeChild = None,
+    ):
+        self.child = child
+
+    def validate(self):
+        if self.child:
+            self.child.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.child is not None:
+            result['child'] = self.child.to_map()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('child') is not None:
+            temp_model = NodeChild()
+            self.child = temp_model.from_map(m['child'])
+        return self
+
+

package/tests/fixtures/complex/main.dara

@@ -29,6 +29,13 @@ model ComplexRequest = {
       partNumber?: string(description='PartNumber', name='PartNumber')
     }
   ](description='Part', name='Part'),
+  complexList: [[[ 
+    {
+      name?: string(name='Name'),
+      code?: int32(name='Code'),
+    }
+  ]]](name='complexList'),
+  complexList1: [[map[string]string]],
 }
 
 async function hello(request: object, strs: [ string ]): [ string ] {
@@ -138,6 +145,12 @@ static function array1(): [ string ] {
   return ["1"];
 }
 
+static function array2(): [[ any ]] {
+  var temp = new Source.Config{};
+  var anyArr : [Source.Config] = [temp];
+  return [[anyArr]];
+}
+
 async function TemplateString(): string {
   return `/${@protocol}`;
 }

package/tests/fixtures/model/main.dara

@@ -47,3 +47,11 @@ model M = {
     selfArrayMap: [ map[string]M ],
     selfArrayArray: [ [ M ] ]
 };
+
+model Node {
+  child?: {
+    subChild?: {
+      childNode?: Node(name='childNode'),
+    }(name='subChild'),
+  }(name='child'),
+}

package/tests/fixtures/typedef/libraries/alibabacloud-OSS-0.0.1/Darafile

@@ -13,6 +13,11 @@
         "import": "requests",
         "type": "Request",
         "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
       }
     }
   },
@@ -24,6 +29,11 @@
         "import": "requests",
         "type": "Request",
         "package": "requests:2.21.0"
+      },
+      "HttpHeader": {
+        "import": null,
+        "type": "Dict[str, Any]",
+        "package": null
       }
     }
   }