pytest-dsl 0.15.1__py3-none-any.whl → 0.15.3__py3-none-any.whl

pytest_dsl/core/parser.py

@@ -198,9 +198,27 @@ def p_expr_atom(p):
     elif isinstance(p[1], Node):
         p[0] = p[1]
     else:
-        # 为基本表达式设置行号信息
+        # 为基本表达式设置行号信息和类型信息
         expr_line = getattr(p.slice[1], 'lineno', None)
-        expr_node = Node('Expression', value=p[1])
+        
+        # 根据token类型创建不同的节点类型
+        token_type = p.slice[1].type
+        if token_type == 'STRING':
+            # 字符串字面量
+            expr_node = Node('StringLiteral', value=p[1])
+        elif token_type == 'NUMBER':
+            # 数字字面量
+            expr_node = Node('NumberLiteral', value=p[1])
+        elif token_type == 'ID':
+            # 变量引用
+            expr_node = Node('VariableRef', value=p[1])
+        elif token_type == 'PLACEHOLDER':
+            # 变量占位符 ${var}
+            expr_node = Node('PlaceholderRef', value=p[1])
+        else:
+            # 其他类型，保持原来的行为
+            expr_node = Node('Expression', value=p[1])
+        
         if expr_line is not None:
             expr_node.set_position(expr_line)
         p[0] = expr_node

pytest_dsl/core/validator.py

@@ -47,6 +47,7 @@ class DSLValidator:
     def __init__(self):
         self.errors: List[DSLValidationError] = []
         self.warnings: List[DSLValidationError] = []
+        self._temp_registered_keywords = []  # 记录临时注册的关键字，用于清理
 
     def validate(self, content: str, dsl_id: Optional[str] = None
                  ) -> Tuple[bool, List[DSLValidationError]]:
@@ -61,6 +62,7 @@ class DSLValidator:
         """
         self.errors = []
         self.warnings = []
+        self._temp_registered_keywords = []
 
         # 基础验证
         self._validate_basic_format(content)
@@ -68,8 +70,12 @@ class DSLValidator:
         # 语法验证
         ast = self._validate_syntax(content)
 
-        # 如果语法验证通过，进行语义验证
+        # 如果语法验证通过，进行预处理和语义验证
         if ast and not self.errors:
+            # 预注册自定义关键字
+            self._preregister_custom_keywords(ast)
+
+            # 语义验证
             self._validate_semantics(ast)
 
         # 元数据验证
@@ -80,8 +86,72 @@ class DSLValidator:
         if ast and not self.errors:
             self._validate_keywords(ast)
 
+        # 清理临时注册的关键字
+        self._cleanup_temp_keywords()
+
         return len(self.errors) == 0, self.errors + self.warnings
 
+    def _preregister_custom_keywords(self, ast: Node) -> None:
+        """预注册AST中定义的自定义关键字
+
+        Args:
+            ast: 解析后的AST
+        """
+        try:
+            from pytest_dsl.core.custom_keyword_manager import custom_keyword_manager
+
+            # 查找并注册自定义关键字
+            self._find_and_register_custom_keywords(ast)
+
+        except Exception as e:
+            # 如果预注册失败，记录警告但不影响验证流程
+            self.warnings.append(DSLValidationError(
+                "关键字预处理警告",
+                f"预注册自定义关键字时出现警告: {str(e)}"
+            ))
+
+    def _find_and_register_custom_keywords(self, node: Node) -> None:
+        """递归查找并注册自定义关键字
+
+        Args:
+            node: 当前节点
+        """
+        # 检查当前节点是否是自定义关键字定义
+        if node.type in ['CustomKeyword', 'Function']:
+            try:
+                from pytest_dsl.core.custom_keyword_manager import custom_keyword_manager
+
+                # 注册自定义关键字
+                custom_keyword_manager._register_custom_keyword(
+                    node, "validation_temp")
+
+                # 记录已注册的关键字名称，用于后续清理
+                keyword_name = node.value
+                self._temp_registered_keywords.append(keyword_name)
+
+            except Exception as e:
+                self.warnings.append(DSLValidationError(
+                    "关键字注册警告",
+                    f"注册自定义关键字 '{node.value}' 时出现警告: {str(e)}"
+                ))
+
+        # 递归处理子节点
+        if hasattr(node, 'children') and node.children:
+            for child in node.children:
+                if isinstance(child, Node):
+                    self._find_and_register_custom_keywords(child)
+
+    def _cleanup_temp_keywords(self) -> None:
+        """清理临时注册的关键字"""
+        try:
+            for keyword_name in self._temp_registered_keywords:
+                # 从关键字管理器中移除临时注册的关键字
+                if keyword_name in keyword_manager._keywords:
+                    del keyword_manager._keywords[keyword_name]
+        except Exception as e:
+            # 清理失败不影响验证结果，只记录警告
+            pass
+
     def _validate_basic_format(self, content: str) -> None:
         """基础格式验证"""
         if not content or not content.strip():

{pytest_dsl-0.15.1.dist-info → pytest_dsl-0.15.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.15.1
+Version: 0.15.3
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT

{pytest_dsl-0.15.1.dist-info → pytest_dsl-0.15.3.dist-info}/RECORD

@@ -9,7 +9,7 @@ pytest_dsl/core/auto_decorator.py,sha256=9Mga-GB4AzV5nkB6zpfaq8IuHa0KOH8LlFvnWyH
 pytest_dsl/core/auto_directory.py,sha256=egyTnVxtGs4P75EIivRauLRPJfN9aZpoGVvp_Ma72AM,2714
 pytest_dsl/core/context.py,sha256=fXpVQon666Lz_PCexjkWMBBr-Xcd1SkDMp2vHar6eIs,664
 pytest_dsl/core/custom_keyword_manager.py,sha256=F9aSbth4x4-5nHb0N5uG04CpgwGnQv4RDGeRKR2WuIk,16001
-pytest_dsl/core/dsl_executor.py,sha256=aDK7rXbE5xLg4DcQ5VMbexSBuh4YGMDrVqtXENFCbsw,48638
+pytest_dsl/core/dsl_executor.py,sha256=G3Ad97REt1jWwRvp7LS2Nq7zy3S2ZtYKlJeAJANDstI,60200
 pytest_dsl/core/dsl_executor_utils.py,sha256=ZJLSYSsiKHqg53d3Bl--ZF8m9abd5kpqdevWl31KEZg,2276
 pytest_dsl/core/execution_tracker.py,sha256=Pwcxraxt_xkOouq32KBqola-OVfnbaomCoMTyUIqoN4,9476
 pytest_dsl/core/global_context.py,sha256=NcEcS2V61MT70tgAsGsFWQq0P3mKjtHQr1rgT3yTcyY,3535
@@ -23,11 +23,11 @@ pytest_dsl/core/keyword_loader.py,sha256=3GQ4w5Zf2XdkoJ85uYXh9YB93_8L8OAb7vvuKE3
 pytest_dsl/core/keyword_manager.py,sha256=5WZWwlYk74kGHh1T6WjCuVd8eelq2-UEXvDIe4U7rEI,7730
 pytest_dsl/core/keyword_utils.py,sha256=1zIKzbA8Lhifc97skzN4oJV-2Cljzf9aVSutwjU7LaA,19847
 pytest_dsl/core/lexer.py,sha256=o_EJIadfhgyCImI73Y9ybqlBE9AisgA6nOhxpXNlaMw,4648
-pytest_dsl/core/parser.py,sha256=LCyFNwrIO0dEup7HubnCkceAPqY7Qt5aoSKQddqG7Os,15898
+pytest_dsl/core/parser.py,sha256=SvTQ4jgMSe3MITSu9PftraElPAzVaBbNPHMEk1H_lFY,16597
 pytest_dsl/core/parsetab.py,sha256=o4XbFKwpsi3fYmfI_F6u5NSM61Qp6gTx-Sfh1jDINxI,31767
 pytest_dsl/core/plugin_discovery.py,sha256=3pt3EXJ7EPF0rkUlyDZMVHkIiTy2vicdIIQJkrHXZjY,8305
 pytest_dsl/core/utils.py,sha256=q0AMdw5HO33JvlA3UJeQ7IXh1Z_8K1QlwiM1_yiITrU,5350
-pytest_dsl/core/validator.py,sha256=Zl7aSRF52HifE0vsRj5cXsLInLiyfcuWPuIlgxYY_dY,14686
+pytest_dsl/core/validator.py,sha256=2mjw7yiDEMu80FjJ_y2KCS-vA1Tb4kotrKkmLwpRe8Y,17420
 pytest_dsl/core/variable_utils.py,sha256=sx5DFZAO_syi0E_0ACisiZUQL9yxGeOfNmMtV6w9V3E,13947
 pytest_dsl/core/yaml_loader.py,sha256=PC-R05bmHDI1QyBhhnt2jEK2c50Sg2xKsMDDY7p5rRg,8165
 pytest_dsl/core/yaml_vars.py,sha256=PqbCGT_TmOXH09Pmm72sYtMEvV-sp9ocLqkuAUQYhhc,5047
@@ -73,9 +73,9 @@ pytest_dsl/remote/keyword_client.py,sha256=BL80MOaLroUi0v-9sLtkJ55g1R0Iw9SE1k11I
 pytest_dsl/remote/keyword_server.py,sha256=vGIE3Bhh461xX_u1U-Cf5nrWL2GQFYdtQdcMWfFIYgE,22320
 pytest_dsl/remote/variable_bridge.py,sha256=dv-d3Gq9ttvvrXM1fdlLtoSOPB6vRp0_GBOwX4wvcy8,7121
 pytest_dsl/templates/keywords_report.html,sha256=7x84iq6hi08nf1iQ95jZ3izcAUPx6JFm0_8xS85CYws,31241
-pytest_dsl-0.15.1.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.15.1.dist-info/METADATA,sha256=tBZyIhox0tvZCCVK2aaP2EIUNyawij9coLH0NFn8PUo,29655
-pytest_dsl-0.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.15.1.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
-pytest_dsl-0.15.1.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.15.1.dist-info/RECORD,,
+pytest_dsl-0.15.3.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.15.3.dist-info/METADATA,sha256=579CxhlZ843PKOTXZX93BkD_m85h36LCIthwXShHgcw,29655
+pytest_dsl-0.15.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.15.3.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.15.3.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.15.3.dist-info/RECORD,,