dotted-notation 0.43.0__tar.gz → 0.43.2__tar.gz

{dotted_notation-0.43.0/dotted_notation.egg-info → dotted_notation-0.43.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotted_notation
-Version: 0.43.0
+Version: 0.43.2
 Summary: Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms
 Home-page: https://github.com/freywaid/dotted
 Author: Frey Waid

{dotted_notation-0.43.0 → dotted_notation-0.43.2}/dotted/grammar.py

@@ -69,9 +69,9 @@ transform_name = pp.Word(pp.alphas + '_', pp.alphanums + '_.')
 quoted = pp.QuotedString('"', esc_char='\\') | pp.QuotedString("'", esc_char='\\')
 plus = pp.Literal('+')
 integer = ppc.signed_integer
-none = pp.Literal('None').set_parse_action(matchers.NoneValue)
-true = pp.Literal('True').set_parse_action(matchers.Boolean)
-false = pp.Literal('False').set_parse_action(matchers.Boolean)
+none = (pp.Literal('None') | pp.Literal('null')).set_parse_action(matchers.NoneValue)
+true = (pp.Literal('True') | pp.Literal('true')).set_parse_action(matchers.Boolean)
+false = (pp.Literal('False') | pp.Literal('false')).set_parse_action(matchers.Boolean)
 
 reserved = '.[]*:|+?/=,@&()!~#{}$<>' # {} for container syntax, $ for substitution, <> for comparisons
 breserved = ''.join('\\' + i for i in reserved)

{dotted_notation-0.43.0 → dotted_notation-0.43.2}/dotted/matchers.py

@@ -13,6 +13,9 @@ from .base import MatchOp
 from .utypes import ANY
 
 
+_MISSING = object()
+
+
 class Const(MatchOp):
     _match_from = ('Const',)
 
@@ -119,7 +122,7 @@ class Boolean(Const):
     """
     @property
     def value(self):
-        return self.args[0] == 'True'
+        return self.args[0].lower() == 'true'
     def __repr__(self):
         return str(self.value)
 
@@ -190,14 +193,26 @@ class Subst(Pattern):
     def resolve(self, bindings, partial=False):
         """
         Resolve this substitution against bindings.
-        """
-        try:
-            val = self._apply_transforms(bindings[self.value])
-            return ResolvedValue(val)
-        except (KeyError, IndexError, TypeError):
-            if partial:
-                return self
-            raise
+
+        For string names, honor dotted notation for nested lookup: `$(a.b)`
+        resolves to `bindings['a']['b']` when present. Falls back to a
+        literal `bindings[name]` lookup (preserves the rare case of a key
+        that actually contains a dot). Integer names always use positional
+        lookup via __getitem__.
+        """
+        name = self.value
+        val = _MISSING
+        if isinstance(name, str):
+            from .api import get
+            val = get(bindings, name, default=_MISSING)
+        if val is _MISSING:
+            try:
+                val = bindings[name]
+            except (KeyError, IndexError, TypeError):
+                if partial:
+                    return self
+                raise
+        return ResolvedValue(self._apply_transforms(val))
 
     def __repr__(self):
         suffix = self._transform_suffix()

{dotted_notation-0.43.0 → dotted_notation-0.43.2}/dotted/sqlize.py

@@ -46,6 +46,46 @@ def _quote_ident(name):
     return '"' + name.replace('"', '""') + '"'
 
 
+# Subst names may themselves be dotted paths. To survive as SQL bind
+# parameter names (which must be plain identifiers), the access operators
+# are encoded with mnemonic tokens. This preserves the distinction
+# between `a.b`, `a@b`, and `a[0]` in the placeholder name.
+_OP_ENCODE = {
+    '.': '_dot_',
+    '@': '_at_',
+    '[': '_br_',
+    ']': '',
+}
+
+
+def _encode_subst_name(name):
+    """
+    Encode a subst name (a dotted path) into a plain SQL identifier.
+    Recognised access ops become mnemonic tokens; unsupported characters
+    raise TranslationError.
+    """
+    if _IDENT_RE.fullmatch(name):
+        return name
+    out = []
+    for c in name:
+        if c in _OP_ENCODE:
+            out.append(_OP_ENCODE[c])
+        elif c.isalnum() or c == '_':
+            out.append(c)
+        else:
+            raise TranslationError(
+                f'cannot encode character {c!r} in substitution name {name!r}; '
+                'resolve via bindings= at sqlize time'
+            )
+    encoded = ''.join(out)
+    if not _IDENT_RE.fullmatch(encoded):
+        raise TranslationError(
+            f'substitution name {name!r} does not encode to a valid '
+            'SQL identifier'
+        )
+    return encoded
+
+
 def _pg_path_segment(seg):
     """
     Escape a segment for a Postgres text[] path literal like '{a,b,c}'.
@@ -93,12 +133,17 @@ class _ParamState:
     def hoist_named(self, name):
         """
         Hoist a named substitution. If a value is supplied later it lands
-        under `name`; until then the name is recorded in `missing`.
+        under the encoded name; until then it's recorded in `missing`.
+
+        Names that already are plain identifiers are used as-is. Dotted
+        paths (`$(user.age)`, `$(users[0].name)`, `$(obj@attr)`) are
+        encoded into plain identifiers using mnemonic tokens for access
+        ops so they can serve as SQL bind-parameter names.
         """
-        name = str(name)
-        if name not in self.params and name not in self.missing:
-            self.missing.append(name)
-        return name
+        encoded = _encode_subst_name(str(name))
+        if encoded not in self.params and encoded not in self.missing:
+            self.missing.append(encoded)
+        return encoded
 
 
 class _Translator:

{dotted_notation-0.43.0 → dotted_notation-0.43.2/dotted_notation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotted_notation
-Version: 0.43.0
+Version: 0.43.2
 Summary: Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms
 Home-page: https://github.com/freywaid/dotted
 Author: Frey Waid

{dotted_notation-0.43.0 → dotted_notation-0.43.2}/dotted_notation.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ tests/test_filter_keyvalue.py
 tests/test_get.py
 tests/test_guard_transforms.py
 tests/test_invert.py
+tests/test_json_sentinels.py
 tests/test_keys_values.py
 tests/test_match.py
 tests/test_matchable.py

{dotted_notation-0.43.0 → dotted_notation-0.43.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "rt") as f:
 
 setuptools.setup(
     name="dotted_notation",
-    version="0.43.0",
+    version="0.43.2",
     author="Frey Waid",
     author_email="logophage1@gmail.com",
     description="Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms",