@darabonba/python-generator 1.2.15 → 1.2.16

package/ChangeLog.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 1.2.16 - 2023-09-13
+* Feat: support importing additional package
+
 ## 1.2.15 - 2022-12-26
 * Fix: array assign and access with variables name
 

package/package.json

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

package/src/generator.js

@@ -15,12 +15,14 @@ class Generator {
     }
     this.lang = lang;
     this.typedef = meta[lang] && meta[lang].typedef ? meta[lang].typedef : {};
+    this.additionalPackage = meta[lang] && meta[lang].additionalPackage ? meta[lang].additionalPackage : [];
     this.initConfig(meta);
   }
 
   visit(ast) {
     this.imports = this.resolveImports(ast);
     this.imports.typedef = this.typedef;
+    this.imports.additionalPackage = this.additionalPackage;
     Object.keys(this.typedef).forEach((def) => {
       if (this.typedef[def].package && !this.imports.requirePackage.includes(this.typedef[def].package)) {
         this.imports.requirePackage.push(this.typedef[def].package);

package/src/langs/common/combinator.js

@@ -38,6 +38,7 @@ class BaseCombinator {
     this.thirdPackageModel = imports.thirdPackageModel;
     this.typedef = imports.typedef;
     this.importsTypedef = imports.importsTypedef;
+    this.additionalPackage = imports.additionalPackage;
 
     _config(this.config);
   }

package/src/langs/python/combinator.js

@@ -1234,7 +1234,8 @@ class Combinator extends CombinatorBase {
     let list = this.includeList.filter(node => node.from && !node.alias);
 
     let from = {};
-    let fromList = [];
+    let fromList =  [];
+    fromList = fromList.concat(this.additionalPackage);
 
     list.forEach(item => {
       if (!from[item.from]) {

package/tests/expected/python2/import/setup.py

@@ -25,7 +25,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 24/12/2022
+Created on 13/09/2023
 
 @author: Alibaba
 """

package/tests/expected/python3/import/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 24/12/2022
+Created on 13/09/2023
 
 @author: Alibaba
 """

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
 from Source.source_client import SourceClient
 from typing import List
 

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

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+
+
 class Client:
     def __init__(self):
         pass

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
 from Tea.model import TeaModel
 from typing import List, Dict, Any, BinaryIO
 

package/tests/python3.tests.js

@@ -170,7 +170,13 @@ describe('Python Generator', function () {
           github: 'https://github.com/',
           author: 'Alibaba',
           email: 'sdk-team@alibabacloud.com'
-        }
+        },
+        additionalPackage: [
+          {
+            from: '__future__',
+            import: 'annotations'
+          }
+        ]
       }
     });
   });
@@ -195,7 +201,13 @@ describe('Python Generator', function () {
     {
       python: {
         package: 'tea_python_tests',
-        clientName: 'client'
+        clientName: 'client',
+        additionalPackage: [
+          {
+            from: '__future__',
+            import: 'annotations'
+          }
+        ]
       }
     });
   });