infinity-data 2.0.0__tar.gz → 2.1.0__tar.gz

{infinity_data-2.0.0/src/infinity_data.egg-info → infinity_data-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infinity-data
-Version: 2.0.0
+Version: 2.1.0
 Summary: InfinityData：声明式配置语言（.infd/.inft）的 Python 编译器库
 Author: infinity_system: yin_bailiang
 License: MIT

{infinity_data-2.0.0 → infinity_data-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "infinity-data"
-version = "2.0.0"
+version = "2.1.0"
 description = "InfinityData：声明式配置语言（.infd/.inft）的 Python 编译器库"
 readme = "README.md"
 license = { text = "MIT" }

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/parser/__init__.py

@@ -22,6 +22,7 @@ from infinity_data.parser.models import (
     DictValue,
     Document,
     DollarValue,
+    EnvImportItem,
     EnvImportStmt,
     ErrorConstraint,
     ErrorStatement,
@@ -59,6 +60,7 @@ __all__ = [
     'DictValue',
     'Document',
     'DollarValue',
+    'EnvImportItem',
     'EnvImportStmt',
     'ErrorConstraint',
     'ErrorStatement',

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/parser/models.py

@@ -120,16 +120,30 @@ class TemplateImportStmt(AstNode):
 
 
 @dataclass
-class EnvImportStmt(AstNode):
-    """环境变量导入: !env import NAME [as NEW_NAME]"""
+class EnvImportItem(AstNode):
+    """环境变量导入项: NAME [as NEW_NAME]。"""
 
     name: str  # 环境变量名
-    alias: str | None  # 别名（可选）
+    alias: str | None = None  # 别名（可选）
 
     def canonical(self) -> str:
         if self.alias is None:
-            return f'!env import {self.name}'
-        return f'!env import {self.name} as {self.alias}'
+            return self.name
+        return f'{self.name} as {self.alias}'
+
+
+@dataclass
+class EnvImportStmt(AstNode):
+    """环境变量导入: !env import NAME1 [as NEW1], NAME2 [as NEW2], ..."""
+
+    items: list[EnvImportItem]  # 导入项列表（项之间必须用逗号分隔）
+
+    def children(self) -> Iterable[AstNode]:
+        return self.items
+
+    def canonical(self) -> str:
+        items = ', '.join(i.canonical() for i in self.items)
+        return f'!env import {items}'
 
 
 @dataclass
@@ -178,7 +192,7 @@ class FileImportStmt(AstNode):
     """配置文件导入: !file "path" as <format> import .path.to.key as alias, ..."""
 
     file_path: str  # 文件路径
-    format: str | None  # 文件格式: "yaml", "json", "toml" 或 None（自动检测后缀）
+    format: str | None  # 文件格式: "yaml", "json", "toml", "raw" 或 None（自动检测后缀）
     imports: list[FileImportItem]
 
     def children(self) -> Iterable[AstNode]:

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/parser/parser.py

@@ -17,6 +17,7 @@ from infinity_data.parser.models import (
     DictValue,
     Document,
     DollarValue,
+    EnvImportItem,
     EnvImportStmt,
     ErrorConstraint,
     ErrorStatement,
@@ -272,18 +273,29 @@ class Parser:
 
     @staticmethod
     def _parse_env_import(stream: TokenStream, collector: DiagnosticCollector, kw_tok: EnvImportToken) -> EnvImportStmt:
-        """!env import NAME [as NEW_NAME]"""
+        """!env import NAME1 [as NEW1], NAME2 [as NEW2], ..."""
         Parser._expect_keyword(stream, collector, 'import')
-        name_tok = stream.expect(IdentifierToken)
 
-        alias = None
-        if Parser._peek_keyword(stream, 'as'):
-            stream.advance()
-            alias = stream.expect(IdentifierToken).name
+        # 导入项列表（项之间必须用逗号分隔）
+        items: list[EnvImportItem] = []
+        items.append(Parser._parse_env_import_item(stream, collector))
+
+        while True:
+            tok = stream.peek()
+            if isinstance(tok, CommaToken):
+                stream.advance()
+                items.append(Parser._parse_env_import_item(stream, collector))
+            elif isinstance(tok, IdentifierToken):
+                # 同一行内空格分隔（无逗号/换行）→ 报缺失逗号，容错继续（漏逗号）
+                collector.add(diag('parse.import_missing_comma', {}, tok.raw.source))
+                items.append(Parser._parse_env_import_item(stream, collector))
+            else:
+                # 换行/EOF 等 → 导入列表结束（换行后是新的顶层语句，不是导入项）
+                break
 
-        # 导入语句必须换行/EOF 结尾：!env 无导入项列表，若不加检查，同一行的逗号会被
-        # 顶层 skip_separators 吞掉（`!env import A as a, x = 1` 被误认为合法），与
-        # !from / !file 的「尾部必须换行」行为不一致。
+        # 导入语句必须换行/EOF 结尾：若不检查，同一行的逗号会被顶层 skip_separators
+        # 吞掉（`!env import A as a, x = 1` 被误认为合法），与 !from / !file 的
+        # 「尾部必须换行」行为不一致。
         tok = stream.peek()
         # 显式排除 NoNextType 以收窄类型：stream.eof() 是方法调用，无法据此收窄 tok，
         # 否则 tok 仍为 Token | NoNextType，访问 tok.raw 会触发类型错误。
@@ -300,6 +312,22 @@ class Parser:
         # 否则语句 source 会把下一行行首吞入（与 Field 不一致）
         return EnvImportStmt(
             source=stream.span_from(kw_tok),
+            items=items,
+        )
+
+    @staticmethod
+    def _parse_env_import_item(stream: TokenStream, collector: DiagnosticCollector) -> EnvImportItem:
+        """解析单个导入项: NAME [as NEW_NAME]。"""
+        first = stream.peek()
+        name_tok = stream.expect(IdentifierToken)
+
+        alias = None
+        if Parser._peek_keyword(stream, 'as'):
+            stream.advance()
+            alias = stream.expect(IdentifierToken).name
+
+        return EnvImportItem(
+            source=stream.span_from(first),
             name=name_tok.name,
             alias=alias,
         )
@@ -890,7 +918,7 @@ class Parser:
 
         支持:
         - int, str, bool, float, list, dict, ?, object
-        - type? → one(type, ?)
+        - type? → any(type, ?)
         - <constraint, constraint, ...> → all(constraint, ...)
         - <any(...)>, <one(...)>, <not(...)>, <all(...)>
         """
@@ -929,7 +957,7 @@ class Parser:
 
                 if isinstance(stream.peek(), QuestionToken):
                     stream.advance()
-                    # 直接展开: type? → one(type, ?)
+                    # 直接展开: type? → any(type, ?)
                     return Constraints(
                         source=stream.span_from(first),
                         constraints=[Parser._nullable(ident)],
@@ -938,7 +966,7 @@ class Parser:
                 # 单约束函数调用可省略尖括号: field: regex("re") = ...
                 if isinstance(stream.peek(), LparenToken):
                     call = Parser._parse_constraint_call(stream, collector, first)
-                    # 调用后也可空: regex("re")? → one(regex("re"), ?)
+                    # 调用后也可空: regex("re")? → any(regex("re"), ?)
                     if isinstance(stream.peek(), QuestionToken):
                         stream.advance()
                         call = Parser._nullable(call)
@@ -971,10 +999,10 @@ class Parser:
 
     @staticmethod
     def _nullable(c: Constraint) -> ConstraintCall:
-        """可空包装：constraint? → one(constraint, ?)。"""
+        """可空包装：constraint? → any(constraint, ?)。"""
         return ConstraintCall(
             source=c.source,
-            name='one',
+            name='any',
             arguments=[c, ConstraintIdent(source=c.source, name='?')],
         )
 
@@ -1025,7 +1053,7 @@ class Parser:
                     message=f'无法解析的约束: {bad_tok.raw.type.name}',
                 )
 
-        # 可空后缀: constraint? → one(constraint, ?)
+        # 可空后缀: constraint? → any(constraint, ?)
         if isinstance(stream.peek(), QuestionToken):
             stream.advance()
             return Parser._nullable(base)

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/builder/builder.py

@@ -522,6 +522,11 @@ class AstBuilder:
             return raw
         if isinstance(raw, (StdArray, StdObject)):
             return raw  # 结构化值 cast 不适用
+        # 空字面量：as 转换**保持传播**（null → null、noexist → noexist），
+        # 不做任何转换、不产生警告——三态可空语义不因显式 as 而丢失
+        # （此时 raw 已收窄为 StdLiteral）
+        if raw.kind in ('null', 'noexist'):
+            return raw
         raw = raw.value  # StdLiteral：提取 Python 值走转换
 
         match type_cast:
@@ -588,6 +593,17 @@ class AstBuilder:
                     )
                     return StdLiteral(kind='float', value=decimal.Decimal(0))
             case 'str':
+                # as str = 字符串化：任意字面量按**语言字面量风格**转为字符串，
+                # 保证可 round-trip 还原回原值（bool → true/false、float 特殊值
+                # → nan/+inf/-inf），不泄漏 Python 内部表示；null/noexist 已在上方
+                # 保持传播，不进入本分支
+                if isinstance(raw, bool):
+                    return StdLiteral(kind='str', value='true' if raw else 'false')
+                if isinstance(raw, decimal.Decimal):
+                    if raw.is_nan():
+                        return StdLiteral(kind='str', value='nan')
+                    if raw.is_infinite():
+                        return StdLiteral(kind='str', value='+inf' if raw > 0 else '-inf')
                 return StdLiteral(kind='str', value=str(raw))
             case _:
                 return StdLiteral(kind='str', value=str(raw))

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/constraints.py

@@ -38,7 +38,7 @@ _INVALID_CONSTRAINT = '@invalid'
 def expand_annotation(annotation: Constraints) -> Constraints:
     """展开约束语法糖：多约束 ``<a, b, c>`` → ``all(a, b, c)``。
 
-    （``type?`` → ``one(type, ?)`` 已在 parser 阶段展开。）
+    （``type?`` → ``any(type, ?)`` 已在 parser 阶段展开。）
     """
     if len(annotation.constraints) > 1:
         return Constraints(

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/diagnostics.py

@@ -171,6 +171,10 @@ register_diagnostic_define(
     diagnostic_define('constraint.size_out', '{path_prefix}大小 {size} 不在范围 [{lo}, {hi}] 内'),
     diagnostic_define('constraint.each_need', '{path_prefix}each() 需要一个约束参数'),
     diagnostic_define('constraint.each_only', '{path_prefix}each 约束适用于 list/dict，实际 {actual}'),
+    diagnostic_define('constraint.position_only', '{path_prefix}position 约束只适用于 list，实际 {actual}'),
+    diagnostic_define('constraint.position_index', '{path_prefix}position 下标必须是整数: {value!r}'),
+    diagnostic_define('constraint.position_need', '{path_prefix}position() 需要一个约束参数'),
+    diagnostic_define('constraint.position_out', '{path_prefix}下标 {index} 越界（list 大小 {size}）'),
     diagnostic_define('constraint.in_not_in', '{path_prefix}值 {value} 不在允许的值 {choices!r} 中'),
     diagnostic_define('constraint.string_only', '{path_prefix}{constraint} 约束只适用于字符串'),
     diagnostic_define('constraint.invalid_value', '{path_prefix}无效的{what} {value!r}'),

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/registry/__init__.py

@@ -33,6 +33,7 @@ from infinity_data.semantic.registry.general import (
     _check_ip6,
     _check_negative,
     _check_nonnegative,
+    _check_position,
     _check_positive,
     _check_range,
     _check_regex,
@@ -139,6 +140,13 @@ class ConstraintRegistry:
         self.register('range', _check_range, min_args=1, max_args=2, description='数值范围 range(ge[, le])，可省略一端')
         self.register('size', _check_size, min_args=1, max_args=2, description='集合大小或字符串长度 size(ge[, le])')
         self.register('each', _check_each, min_args=1, max_args=1, description='每个元素均满足 each(constraint)')
+        self.register(
+            'position',
+            _check_position,
+            min_args=2,
+            max_args=2,
+            description='指定下标元素约束 position(index, constraint)',
+        )
         self.register('in', _check_in, min_args=1, description='值在给定选项中 in(choice, ...)')
         self.register('ip', _check_ip, description='IPv4 或 IPv6 地址')
         self.register('ip4', _check_ip4, description='IPv4 地址')

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/registry/general.py

@@ -41,6 +41,7 @@ __all__ = [
     '_check_range',
     '_check_size',
     '_check_each',
+    '_check_position',
     '_check_in',
     '_check_ip',
     '_check_ip4',
@@ -137,6 +138,33 @@ def _check_each(
     return ok_result()
 
 
+def _check_position(
+    val: StdValue | None,
+    source: SourceRange | None,
+    path: str,
+    args: list[Any],
+    executor: Executor,
+) -> ConstraintResult:
+    """position(index, constraint)：list 指定下标（0-based）元素满足约束。
+
+    - 值不是 list → 不满足
+    - 下标参数非整数（含 bool）→ 不满足（参数错误）
+    - 下标越界（< 0 或 >= size，元素不存在）→ 不满足
+    - 否则递归执行 constraint 于该元素
+    """
+    if not isinstance(val, StdArray):
+        return fail_result('constraint.position_only', {'actual': describe(val)}, source, path)
+    idx = args[0]
+    if isinstance(idx, bool) or not isinstance(idx, int):
+        return fail_result('constraint.position_index', {'value': idx}, source, path)
+    spec = _as_spec(args[1])
+    if spec is None:
+        return fail_result('constraint.position_need', {}, source, path)
+    if idx < 0 or idx >= len(val.elements):
+        return fail_result('constraint.position_out', {'index': idx, 'size': len(val.elements)}, source, path)
+    return executor(spec, val.elements[idx], source, f'{path}[{idx}]')
+
+
 def _check_in(
     val: StdValue | None,
     source: SourceRange | None,

{infinity_data-2.0.0 → infinity_data-2.1.0}/src/infinity_data/semantic/resolver/imports.py

@@ -36,6 +36,10 @@ _FORMAT_MAP: dict[str, str] = {
     '.yaml': 'yaml',
     '.yml': 'yaml',
     '.toml': 'toml',
+    '.txt': 'raw',
+    '.text': 'raw',
+    '.md': 'raw',
+    '.log': 'raw',
 }
 
 
@@ -93,14 +97,15 @@ class ImportResolver:
         namespace: dict[str, StdValue],
         collector: DiagnosticCollector,
     ) -> None:
-        """!env import NAME [as NEW_NAME]
+        """!env import NAME1 [as NEW1], NAME2 [as NEW2], ...
 
         未授权环境变量**总是失败**（无论 strict）：Sandbox.getenv 直接抛
         :class:`SandboxError`，不会退化为空字符串注入。
         """
-        name = stmt.alias or stmt.name
-        raw = self._sandbox.getenv(stmt.name, source=stmt.source)
-        self._bind(namespace, name, python_to_std(raw), collector, stmt.source)
+        for item in stmt.items:
+            name = item.alias or item.name
+            raw = self._sandbox.getenv(item.name, source=item.source)
+            self._bind(namespace, name, python_to_std(raw), collector, item.source)
 
     def _resolve_file(
         self,
@@ -162,6 +167,9 @@ class ImportResolver:
     ) -> Any | None:
         """按格式解析数据内容（文本 loads）。"""
         try:
+            if fmt == 'raw':
+                # raw：直接导入字符串（不做任何解析，保留文件原文）
+                return text
             if fmt == 'json':
                 return json.loads(text)
             if fmt in ('yaml', 'yml'):

{infinity_data-2.0.0 → infinity_data-2.1.0/src/infinity_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infinity-data
-Version: 2.0.0
+Version: 2.1.0
 Summary: InfinityData：声明式配置语言（.infd/.inft）的 Python 编译器库
 Author: infinity_system: yin_bailiang
 License: MIT