@darabonba/python-generator 1.2.11 → 1.2.12

package/ChangeLog.md

@@ -1,5 +1,9 @@
 # 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`).

package/package.json

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

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/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/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/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'),
+}