From dc2c9ccc3b04fa47d460cac7e515581b35c6c2e8 Mon Sep 17 00:00:00 2001
From: peze <954152927@qq.com>
Date: Wed, 13 Aug 2025 18:57:33 +0800
Subject: [PATCH 1/2] fix catch error

---
 lib/generator.js                              |  4 ++--
 .../complex/tea_python_tests/client.py        | 24 +++++++++----------
 tests/fixtures/complex/main.dara              | 12 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/generator.js b/lib/generator.js
index 8d15b40..51c6747 100644
--- a/lib/generator.js
+++ b/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);
       });
diff --git a/tests/expected/complex/tea_python_tests/client.py b/tests/expected/complex/tea_python_tests/client.py
index 5533e4c..ee53c00 100644
--- a/tests/expected/complex/tea_python_tests/client.py
+++ b/tests/expected/complex/tea_python_tests/client.py
@@ -1115,12 +1115,12 @@ def multi_try_catch(
                     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 @@ async def multi_try_catch_async(
                     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:
diff --git a/tests/fixtures/complex/main.dara b/tests/fixtures/complex/main.dara
index d64f5ec..fb650d7 100644
--- a/tests/fixtures/complex/main.dara
+++ b/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 {

From 763db400c002359fe328aa695793afe42cb5b338 Mon Sep 17 00:00:00 2001
From: peze <954152927@qq.com>
Date: Wed, 13 Aug 2025 18:58:09 +0800
Subject: [PATCH 2/2] bump 2.0.12

---
 CHANGELOG.md | 3 +++
 ChangeLog.md | 3 +++
 package.json | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5c727c..774c980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+# 2.0.12
+- Fixed the catch id error.
+
 # 2.0.10
 - Upgrade the sse function generate function.
 
diff --git a/ChangeLog.md b/ChangeLog.md
index b5c727c..774c980 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+# 2.0.12
+- Fixed the catch id error.
+
 # 2.0.10
 - Upgrade the sse function generate function.
 
diff --git a/package.json b/package.json
index 2e4e7c9..315b183 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "The darabonba generator for Python",
   "main": "lib/generator.js",
   "directories": {