@darabonba/python-generator 2.0.10 → 2.0.12

package/ChangeLog.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+# 2.0.12
+- Fixed the catch id error.
+
+# 2.0.10
+- Upgrade the sse function generate function.
+
 # 2.0.9
 - Fixed the arr & map init error in from map
 

package/lib/generator.js

@@ -2209,11 +2209,11 @@ setup(
           return;
         }
         if (!catchBlock.id.type) {
-          this.emit(`except Exception as ${_avoidKeywords(_name(ast.catchId))} :\n`, level);
+          this.emit(`except Exception as ${_avoidKeywords(_name(catchBlock.id))} :\n`, level);
         } else {
           this.emit('except ', level);
           this.visitType(catchBlock.id.type);
-          this.emit(` as ${_avoidKeywords(_name(ast.catchId))} :\n`);
+          this.emit(` as ${_avoidKeywords(_name(catchBlock.id))} :\n`);
         }
         this.visitStmts(catchBlock.catchStmts, level + 2);
       });

package/lib/helper.js

@@ -35,8 +35,6 @@ const builtinModels = [
   '$ResponseError', '$FileField'
 ];
 
-const words = ['SSE'];
-
 const CORE = 'Dara';
 const REQUEST = '_request';
 const RESPONSE = '_response';
@@ -221,11 +219,6 @@ function _snakeCase(str) {
   }
   let res = '';
   let tmp = '';
-  words.forEach(word => {
-    // 只匹配驼峰词前缀，不破坏开头
-    const regex = new RegExp(word + '(?=[A-Z0-9])', 'g');
-    str = str.replace(regex, _upperFirst(word.toLowerCase()));
-  });
   for (const c of str) {
     if (/[A-Z|0-9]/.test(c)) {
       tmp += c;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "The darabonba generator for Python",
   "main": "lib/generator.js",
   "directories": {

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

@@ -1115,12 +1115,12 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_exceptions.Err1Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except main_exceptions.Err2Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except source_exceptions.Err3Exception as err :
-            logging.log(logging.NOTSET, err.name)
+        except main_exceptions.Err1Exception as err1 :
+            logging.log(logging.NOTSET, err_1.name)
+        except main_exceptions.Err2Exception as err2 :
+            logging.log(logging.NOTSET, err_2.name)
+        except source_exceptions.Err3Exception as err3 :
+            logging.log(logging.NOTSET, err_3.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)
         finally:
@@ -1157,12 +1157,12 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_exceptions.Err1Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except main_exceptions.Err2Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except source_exceptions.Err3Exception as err :
-            logging.log(logging.NOTSET, err.name)
+        except main_exceptions.Err1Exception as err1 :
+            logging.log(logging.NOTSET, err_1.name)
+        except main_exceptions.Err2Exception as err2 :
+            logging.log(logging.NOTSET, err_2.name)
+        except source_exceptions.Err3Exception as err3 :
+            logging.log(logging.NOTSET, err_3.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)
         finally:

package/tests/fixtures/complex/main.dara

@@ -608,12 +608,12 @@ async function multiTryCatch(a: number): void {
         code = "str",
       }
     }
-  } catch(err: Err1) {
-    $Logger.log(err.name);
-  } catch(err: Err2) {
-    $Logger.log(err.name);
-  } catch(err: Source.Err3) {
-    $Logger.log(err.name);
+  } catch(err1: Err1) {
+    $Logger.log(err1.name);
+  } catch(err2: Err2) {
+    $Logger.log(err2.name);
+  } catch(err3: Source.Err3) {
+    $Logger.log(err3.name);
   } catch(err) {
     $Logger.log(err.name);
   } finally {

package/tests/output/alias/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea-python-tests.
 
-Created on 12/08/2025
+Created on 13/08/2025
 
 @author: AlibabaCloud SDK Team
 """

package/tests/output/annotation/setup.py

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

package/tests/output/api/setup.py

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

package/tests/output/builtin/setup.py

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

package/tests/output/comment/setup.py

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

package/tests/output/complex/setup.py

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

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

@@ -1115,12 +1115,12 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_exceptions.Err1Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except main_exceptions.Err2Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except source_exceptions.Err3Exception as err :
-            logging.log(logging.NOTSET, err.name)
+        except main_exceptions.Err1Exception as err1 :
+            logging.log(logging.NOTSET, err_1.name)
+        except main_exceptions.Err2Exception as err2 :
+            logging.log(logging.NOTSET, err_2.name)
+        except source_exceptions.Err3Exception as err3 :
+            logging.log(logging.NOTSET, err_3.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)
         finally:
@@ -1157,12 +1157,12 @@ class Client(SourceClient):
                     code = 'str'
                 )
 
-        except main_exceptions.Err1Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except main_exceptions.Err2Exception as err :
-            logging.log(logging.NOTSET, err.name)
-        except source_exceptions.Err3Exception as err :
-            logging.log(logging.NOTSET, err.name)
+        except main_exceptions.Err1Exception as err1 :
+            logging.log(logging.NOTSET, err_1.name)
+        except main_exceptions.Err2Exception as err2 :
+            logging.log(logging.NOTSET, err_2.name)
+        except source_exceptions.Err3Exception as err3 :
+            logging.log(logging.NOTSET, err_3.name)
         except Exception as err :
             logging.log(logging.NOTSET, err.name)
         finally:

package/tests/output/const/setup.py

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

package/tests/output/empty/setup.py

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

package/tests/output/exec/setup.py

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

package/tests/output/function/setup.py

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

package/tests/output/import/setup.py

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

package/tests/output/map/setup.py

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

package/tests/output/model/setup.py

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

package/tests/output/modelConfig/setup.py

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

package/tests/output/multi/setup.py

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

package/tests/output/statements/setup.py

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

package/tests/output/super/setup.py

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

package/tests/output/typedef/setup.py

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