@darabonba/python-generator 2.0.2 → 2.0.4

package/tests/main.tests.js

@@ -14,7 +14,33 @@ const expectedDir = path.join(__dirname, 'expected/');
 const fixturesDir = path.join(__dirname, 'fixtures/');
 const outputDir = path.join(__dirname, 'output/');
 
-function check(moduleName, expectedFiles = [], option = {}) {
+function compareDirectories(expectedDir, outputDir) {
+  const expectedFiles = fs.readdirSync(expectedDir);
+  const outputFiles = fs.readdirSync(outputDir);
+  for (let fileName of expectedFiles) {
+    if (!outputFiles.includes(fileName)) {
+      assert.ok(false);
+    }
+    const expectedPath = path.join(outputDir, fileName);
+    const actualPath = path.join(expectedDir, fileName);
+    const expectedStat = fs.statSync(expectedPath);
+    const actualStat = fs.statSync(actualPath);
+
+    // 如果两个文件都是文件夹，则递归进行比较
+    if (expectedStat.isDirectory() && actualStat.isDirectory()) {
+      compareDirectories(expectedPath, actualPath);
+    }
+    // 如果是文件，则比较文件内容
+    else if (expectedStat.isFile() && actualStat.isFile()) {
+      const expectedContent = fs.readFileSync(expectedPath, 'utf8');
+      const acutalContent = fs.readFileSync(actualPath, 'utf8');
+
+      assert.deepStrictEqual(expectedContent, acutalContent);
+    }
+  }
+}
+
+function check(moduleName, expectedDir, option = {}) {
   const mainFilePath = path.join(fixturesDir, moduleName, 'main.dara') ? path.join(fixturesDir, moduleName, 'main.dara') : path.join(fixturesDir, moduleName, 'main.tea');
   const moduleOutputDir = path.join(outputDir, moduleName);
   const prefixDir = path.join(fixturesDir, moduleName);
@@ -34,195 +60,158 @@ function check(moduleName, expectedFiles = [], option = {}) {
   const dsl = fs.readFileSync(mainFilePath, 'utf8');
   const ast = DSL.parse(dsl, mainFilePath);
   generator.visit(ast);
-  expectedFiles.forEach(element => {
-    const outputFilePath = path.join(outputDir, moduleName, element);
-    const expectedFilePath = path.join(expectedDir, moduleName, element);
-    const expected = fs.readFileSync(expectedFilePath, 'utf8');
-    assert.deepStrictEqual(fs.readFileSync(outputFilePath, 'utf8'), expected);
-  });
+  compareDirectories(path.join(__dirname, 'expected', moduleName, expectedDir), path.join(moduleOutputDir, expectedDir));
 }
 
 describe('Python Generator', function () {
 
   it('multi should ok', function () {
-    check('multi', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/api.py',
-      'tea_python_tests/lib/util.py',
-      'tea_python_tests/model/user.py',
-      'tea_python_tests/model/user_exceptions.py',
-      'tea_python_tests/model/user_models.py',
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('multi', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   
   it('complex should ok', function () {
-    check('complex', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/models.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('complex', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
   
   it('model should ok', function () {
-    check('model', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/exceptions.py',
-      'tea_python_tests/models.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client',
-        additionalPackage: [
-          {
-            from: '__future__',
-            import: 'annotations'
-          }
-        ]
-      }
-    });
+    check('model', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client',
+          additionalPackage: [
+            {
+              from: '__future__',
+              import: 'annotations'
+            }
+          ]
+        }
+      });
   });
 
   it('map should ok', function () {
-    check('map', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('map', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   it('builtin should ok', function () {
-    check('builtin', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      exec: true,
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('builtin', 'tea_python_tests',
+      {
+        exec: true,
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   it('exec should ok', function () {
-    check('exec', [
-      'tea_python_tests/exec_client.py'
-    ],
-    {
-      exec: true,
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'exec_client'
-      }
-    });
+    check('exec', 'tea_python_tests',
+      {
+        exec: true,
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'exec_client'
+        }
+      });
   });
 
   it('alias should ok', function () {
-    check('alias', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client',
-        packageInfo: {
-          name: 'tea_python_tests',
-          desc: 'Generate setup.py',
-          github: 'https://github.com/',
-          author: 'Alibaba',
-          email: 'sdk-team@alibabacloud.com'
+    check('alias', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client',
+          packageInfo: {
+            name: 'tea_python_tests',
+            desc: 'Generate setup.py',
+            github: 'https://github.com/',
+            author: 'Alibaba',
+            email: 'sdk-team@alibabacloud.com'
+          }
         }
-      }
-    });
+      });
   });
 
   it('const should ok', function () {
-    check('const', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('const', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   it('statements should ok', function () {
-    check('statements', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('statements', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
   
   it('function should ok', function () {
-    check('function', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('function', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   }); 
    
   it('api should ok', function () {
-    check('api', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('api', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   it('import should ok', function () {
-    check('import', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client',
-        packageInfo: {
-          name: 'tea_python_tests',
-          desc: 'Generate setup.py',
-          github: 'https://github.com/',
-          author: 'Alibaba',
-          email: 'sdk-team@alibabacloud.com'
-        },
-        additionalPackage: [
-          {
-            from: '__future__',
-            import: 'annotations'
-          }
-        ]
-      }
-    });
+    check('import', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client',
+          packageInfo: {
+            name: 'tea_python_tests',
+            desc: 'Generate setup.py',
+            github: 'https://github.com/',
+            author: 'Alibaba',
+            email: 'sdk-team@alibabacloud.com'
+          },
+          additionalPackage: [
+            {
+              from: '__future__',
+              import: 'annotations'
+            }
+          ]
+        }
+      });
     const expected = fs.readFileSync(path.join(expectedDir, 'import', 'setup.py'), 'utf8');
     const output = fs.readFileSync(path.join(outputDir, 'import', 'setup.py'), 'utf8');
     assert.deepStrictEqual(output.replace(new RegExp('\\d{2}\\/\\d{2}\\/\\d{4}'), '*'), expected);
@@ -231,38 +220,29 @@ describe('Python Generator', function () {
 
 
   it('add annotation should ok', function () {
-    check('annotation', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/models.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('annotation', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
   it('add comments should ok', function () {
-    check('comment', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/models.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('comment', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
 
 
   it('empty should ok', function () {
-    check('empty', [
-      'tea_python_tests/client.py',
-      // '.gitignore'
-    ],
+    check('empty', 'tea_python_tests',
     {
       python: {
         package: 'tea_python_tests',
@@ -281,57 +261,52 @@ describe('Python Generator', function () {
 
 
   it('super should ok', function () {
-    check('super', [
-      'tea_python_tests/client.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client'
-      }
-    });
+    check('super', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client'
+        }
+      });
   });
 
 
   it('typedef should ok', function () {
-    check('typedef', [
-      'tea_python_tests/client.py',
-      'tea_python_tests/models.py'
-    ],
-    {
-      python: {
-        package: 'tea_python_tests',
-        clientName: 'client',
-        packageInfo: {
-          name: 'tea_python_tests',
-          desc: 'Generate setup.py',
-          github: 'https://github.com/',
-          author: 'Alibaba',
-          email: 'sdk-team@alibabacloud.com'
-        },
-        typedef: {
-          HttpResponse: {
-            import: 'requests',
-            type: 'Response',
-            package: 'requests:2.21.0'
-          },
-          HttpHeader: {
-            import: null,
-            type: 'Dict[str, Any]',
-            package: null
+    check('typedef', 'tea_python_tests',
+      {
+        python: {
+          package: 'tea_python_tests',
+          clientName: 'client',
+          packageInfo: {
+            name: 'tea_python_tests',
+            desc: 'Generate setup.py',
+            github: 'https://github.com/',
+            author: 'Alibaba',
+            email: 'sdk-team@alibabacloud.com'
           },
-          TeaModel: {
-            import: 'Tea.model',
-            type: 'TeaModel',
-            package: 'alibabacloud-tea:0.2.9'
-          },
-          TeaException: {
-            import: 'Tea.exceptions',
-            type: 'TeaException',
-            package: 'alibabacloud-tea:0.2.9'
+          typedef: {
+            HttpResponse: {
+              import: 'requests',
+              type: 'Response',
+              package: 'requests:2.21.0'
+            },
+            HttpHeader: {
+              import: null,
+              type: 'Dict[str, Any]',
+              package: null
+            },
+            TeaModel: {
+              import: 'Tea.model',
+              type: 'TeaModel',
+              package: 'alibabacloud-tea:0.2.9'
+            },
+            TeaException: {
+              import: 'Tea.exceptions',
+              type: 'TeaException',
+              package: 'alibabacloud-tea:0.2.9'
+            }
           }
         }
-      }
-    });
+      });
   });
 });

package/tests/output/annotation/tea_python_tests/models/__init__.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._test import Test
+
+__all__ = [
+    Test
+]

package/tests/output/annotation/tea_python_tests/{models.py → models/_test.py}

@@ -10,7 +10,7 @@ from darabonba.model import DaraModel
 """
 class Test(DaraModel):
     def __init__(
-        self, 
+        self, *,
         test: str = None,
     ):
         # Alichange app id

package/tests/output/builtin/tea_python_tests/client.py

@@ -16,7 +16,7 @@ from darabonba.utils.stream import Stream as DaraStream
 from darabonba.url import Url as DaraURL 
 from darabonba.utils.xml import XML as DaraXML 
 import sys 
-from typing import List, Any, BytesIO, StringIO
+from typing import List, Any
 
 
 class Client:
@@ -618,8 +618,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)
@@ -669,8 +669,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)

package/tests/output/comment/tea_python_tests/models/__init__.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
+
+from ._test_1 import Test1
+from ._test_2 import Test2
+from ._test_3 import Test3
+
+__all__ = [
+    Test1,
+    Test2,
+    Test3
+]

package/tests/output/comment/tea_python_tests/models/_test_1.py

@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from darabonba.model import DaraModel 
+from typing import List
+
+
+# import comment
+
+
+"""
+ * @remarks
+ * TestModel
+"""
+class Test1(DaraModel):
+    def __init__(
+        self, *,
+        test: str = None,
+    # odel的test back comment
+        test_2: str = None,
+    # odel的test2 back comment
+        test_3: List[List[str]] = None,
+        test_5: str = None,
+        sts: str = None,
+        a_sts: str = None,
+    ):
+        # test desc
+        self.test = test
+    # odel的test back comment
+        # test2 desc
+        self.test_2 = test_2
+    # odel的test2 back comment
+        # test3 desc
+        self.test_3 = test_3
+        # test desc
+        self.test_5 = test_5
+        # sts desc
+        self.sts = sts
+        # asts desc
+        self.a_sts = a_sts
+
+    def validate(self):
+        self.validate_required(self.test, 'test')
+    # odel的test back comment
+        self.validate_required(self.test_2, 'test_2')
+    # odel的test2 back comment
+        self.validate_required(self.test_3, 'test_3')
+        self.validate_required(self.test_5, 'test_5')
+        self.validate_required(self.sts, 'sts')
+        self.validate_required(self.a_sts, 'a_sts')
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.test is not None:
+            result['test'] = self.test
+    # odel的test back comment
+        if self.test_2 is not None:
+            result['test2'] = self.test_2
+    # odel的test2 back comment
+        if self.test_3 is not None:
+            result['test3'] = self.test_3
+        if self.test_5 is not None:
+            result['test5'] = self.test_5
+        if self.sts is not None:
+            result['sts'] = self.sts
+        if self.a_sts is not None:
+            result['asts'] = self.a_sts
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('test') is not None:
+            self.test = m.get('test')
+    # odel的test back comment
+        if m.get('test2') is not None:
+            self.test_2 = m.get('test2')
+    # odel的test2 back comment
+        if m.get('test3') is not None:
+            self.test_3 = m.get('test3')
+        if m.get('test5') is not None:
+            self.test_5 = m.get('test5')
+        if m.get('sts') is not None:
+            self.sts = m.get('sts')
+        if m.get('asts') is not None:
+            self.a_sts = m.get('asts')
+        return self
+