ya-tagscript 1.7.1__tar.gz → 1.7.2__tar.gz

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 *Currently none*
 
+# v1.7.2 (2026-07-15)
+
+- More parsing loop performance improvements
+- Fix escapement bug causing 0-level escaped blocks to not be properly escaped
+    - This change may cause output differences in scripts with escaped blocks.
+
 # v1.7.1 (2026-07-03)
 
 - Added `ACTIONS_KEY` constants to all blocks which add data to the `Response.actions`

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ya_tagscript
-Version: 1.7.1
+Version: 1.7.2
 Summary: Yet Another TagScript fork. An easy drop in user-provided Templating system.
 Project-URL: Changelog, https://ya-tagscript.readthedocs.io/en/latest/changelog.html
 Project-URL: Documentation, https://ya-tagscript.readthedocs.io
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 ![Read the Docs (version)](https://img.shields.io/readthedocs/ya_tagscript/latest)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
-Current stable version: v1.7.1
+Current stable version: v1.7.2
 
 ## Information
 
@@ -92,7 +92,7 @@ or
 <!--VERSIONED TAG SECTION START-->
 
 ```
-pip install git+https://github.com/MajorTanya/ya_tagscript.git@v1.7.1
+pip install git+https://github.com/MajorTanya/ya_tagscript.git@v1.7.2
 ```
 
 <!--VERSIONED TAG SECTION END-->

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/README.md

@@ -5,7 +5,7 @@
 ![Read the Docs (version)](https://img.shields.io/readthedocs/ya_tagscript/latest)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
-Current stable version: v1.7.1
+Current stable version: v1.7.2
 
 ## Information
 
@@ -67,7 +67,7 @@ or
 <!--VERSIONED TAG SECTION START-->
 
 ```
-pip install git+https://github.com/MajorTanya/ya_tagscript.git@v1.7.1
+pip install git+https://github.com/MajorTanya/ya_tagscript.git@v1.7.2
 ```
 
 <!--VERSIONED TAG SECTION END-->

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/docs/conf.py

@@ -17,7 +17,7 @@ project_copyright = "2025, MajorTanya"
 author = "MajorTanya"
 
 ### VERSION SECTION START
-version = "1.7.1"
+version = "1.7.2"
 ### VERSION SECTION END
 release = version
 

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ya_tagscript"
-version = "1.7.1"
+version = "1.7.2"
 description = "Yet Another TagScript fork. An easy drop in user-provided Templating system."
 readme = "README.md"
 license = "CC-BY-4.0"

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/src/ya_tagscript/interpreter/ts_parser.py

@@ -29,6 +29,8 @@ _SPECIAL_TOKENS: set[str] = {
     PAREN_CLOSE,
     COLON,
 }
+# COLON isn't special in several places
+_SPECIAL_TOKENS_NO_COLON = _SPECIAL_TOKENS - {COLON}
 
 
 class TagScriptParser:
@@ -48,6 +50,7 @@ class TagScriptParser:
         i = 0
         input_len = len(input_str)
         special_chars = _SPECIAL_TOKENS
+        specials_no_colon = _SPECIAL_TOKENS_NO_COLON
 
         # region processing loop
         # this is an extremely hot loop so there are additional local references to
@@ -68,6 +71,7 @@ class TagScriptParser:
                     i += 1
                 text = input_str[start:i]
                 self._text_buffer += text
+                char = input_str[i - 1]
                 continue
 
             # mainly a typing crutch since current_state = block.state (top of loop)
@@ -124,7 +128,16 @@ class TagScriptParser:
                     block.declaration = char
 
             elif current_state is ParseState.IN_DECLARATION:
-                if char == BRACE_OPEN:
+                if char not in special_chars:
+                    # covers BACKSLASH and any other char
+                    # fast-path accumulation
+                    start = i
+                    while i < input_len and input_str[i] not in special_chars:
+                        i += 1
+                    block.declaration = (block.declaration or "") + input_str[start:i]
+                    char = input_str[i - 1]
+                    continue
+                elif char == BRACE_OPEN:
                     if not is_escaped:
                         block.block_depth += 1
                     block.declaration = (block.declaration or "") + char
@@ -157,10 +170,19 @@ class TagScriptParser:
                     else:
                         block.declaration = (block.declaration or "") + char
                 else:
-                    block.declaration = (block.declaration or "") + char
+                    raise ValueError(f"Unknown special char {char!r} in IN_DECLARATION")
 
             elif current_state is ParseState.IN_PARAMETER:
-                if char == BRACE_OPEN:
+                if char not in specials_no_colon:
+                    # covers BACKSLASH, COLON, any other char
+                    # fast-path accumulation
+                    start = i
+                    while i < input_len and input_str[i] not in specials_no_colon:
+                        i += 1
+                    block.parameter = (block.parameter or "") + input_str[start:i]
+                    char = input_str[i - 1]
+                    continue
+                elif char == BRACE_OPEN:
                     if not is_escaped:
                         block.block_depth += 1
                     block.parameter = (block.parameter or "") + char
@@ -187,8 +209,7 @@ class TagScriptParser:
                         block.parameter = (block.parameter or "") + char
                     block.paren_depth -= 1
                 else:
-                    # includes BACKSLASH, COLON, any other char
-                    block.parameter = (block.parameter or "") + char
+                    raise ValueError(f"Unknown special char {char!r} in IN_PARAMETER")
 
             elif current_state is ParseState.POST_PARAMETER:
                 if char == BRACE_CLOSE and block.block_depth == 1:
@@ -207,7 +228,16 @@ class TagScriptParser:
                     self._state = None
 
             elif current_state is ParseState.IN_PAYLOAD:
-                if char == BRACE_OPEN:
+                if char not in specials_no_colon:
+                    # covers BACKSLASH, COLON, any other char
+                    # fast-path accumulation
+                    start = i
+                    while i < input_len and input_str[i] not in specials_no_colon:
+                        i += 1
+                    block.payload = (block.payload or "") + input_str[start:i]
+                    char = input_str[i - 1]
+                    continue
+                elif char == BRACE_OPEN:
                     if not is_escaped:
                         block.block_depth += 1
                     block.payload = (block.payload or "") + char
@@ -230,8 +260,8 @@ class TagScriptParser:
                     if block.paren_depth > 0:
                         block.paren_depth -= 1
                 else:
-                    # covers BACKSLASH, COLON, any other char
-                    block.payload = (block.payload or "") + char
+                    raise ValueError(f"Unknown special char {char!r} in IN_PAYLOAD")
+
             else:
                 assert_never(current_state)
 

{ya_tagscript-1.7.1 → ya_tagscript-1.7.2}/tests/ya_tagscript/interpreter/test_ts_parser.py

@@ -3,10 +3,13 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
+from ya_tagscript.interpreter import ts_parser
 from ya_tagscript.interpreter.node import Node
 
 # noinspection PyProtectedMember
 from ya_tagscript.interpreter.ts_parser import (
+    _SPECIAL_TOKENS,
+    _SPECIAL_TOKENS_NO_COLON,
     TagScriptParser,
     _reconstruct_partial_block,
 )
@@ -26,6 +29,24 @@ def mock_reconstruct_fn():
         yield mocked_fn
 
 
+@pytest.fixture
+def mock_special_tokens():
+    # don't look at it
+    with patch.object(ts_parser, "_SPECIAL_TOKENS", _SPECIAL_TOKENS.union({"~"})):
+        yield
+
+
+@pytest.fixture
+def mock_special_tokens_no_colon():
+    # don't look at it
+    with patch.object(
+        ts_parser,
+        "_SPECIAL_TOKENS_NO_COLON",
+        _SPECIAL_TOKENS_NO_COLON.union({"~"}),
+    ):
+        yield
+
+
 def test_unclosed_block_becomes_text(
     parser: TagScriptParser,
     mock_reconstruct_fn: MagicMock,
@@ -310,3 +331,57 @@ def test_lone_opening_brace_is_rejected(parser: TagScriptParser):
     assert nodes == [
         Node.text(text_value=input_str),
     ]
+
+
+def test_unhandled_special_char_in_declaration(
+    parser: TagScriptParser,
+    mock_special_tokens: None,
+):
+    # don't look at it
+    input_str = "{hi~}"
+    with pytest.raises(ValueError) as exc:
+        parser.parse(input_str)
+
+    assert exc.value.args[0] == "Unknown special char '~' in IN_DECLARATION"
+
+
+def test_unhandled_special_char_in_parameter(
+    parser: TagScriptParser,
+    mock_special_tokens_no_colon: None,
+):
+    # don't look at it
+    input_str = "{hello(wo~ah)}"
+    with pytest.raises(ValueError) as exc:
+        parser.parse(input_str)
+
+    assert exc.value.args[0] == "Unknown special char '~' in IN_PARAMETER"
+
+
+def test_unhandled_special_char_in_payload(
+    parser: TagScriptParser,
+    mock_special_tokens_no_colon: None,
+):
+    # don't look at it
+    input_str = "{hello(world):crazy~}"
+    with pytest.raises(ValueError) as exc:
+        parser.parse(input_str)
+
+    assert exc.value.args[0] == "Unknown special char '~' in IN_PAYLOAD"
+
+
+def test_backslash_escapes_block_after_text(parser: TagScriptParser):
+    input_str = r"hello\{world}"
+    nodes = parser.parse(input_str)
+    assert nodes == [
+        Node.text(text_value=input_str),
+    ]
+
+
+def test_two_backslashes_escaping_block_in_text_are_not_collapsed(
+    parser: TagScriptParser,
+):
+    input_str = r"hello\\{there}"
+    nodes = parser.parse(input_str)
+    assert nodes == [
+        Node.text(text_value=input_str),
+    ]