tw-framework 0.2.4__tar.gz → 0.2.6__tar.gz

{tw_framework-0.2.4 → tw_framework-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tw-framework
-Version: 0.2.4
+Version: 0.2.6
 Summary: TW framework CLI with create, dev, build, and deploy commands
 Author: TW Framework
 Requires-Python: >=3.9

{tw_framework-0.2.4 → tw_framework-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tw-framework"
-version = "0.2.4"
+version = "0.2.6"
 description = "TW framework CLI with create, dev, build, and deploy commands"
 readme = "README.md"
 requires-python = ">=3.9"

{tw_framework-0.2.4 → tw_framework-0.2.6}/tw_framework/compiler.py

@@ -1136,7 +1136,22 @@ def tokenize(code, allow_inline_scripts=False):
         start_line, start_col = line, col
         word = []
         # Read until whitespace, braces, quotes, or common operators.
-        while i < n and (code[i] not in ' \t\r\n{}"\'' and code[i] not in ONE_CHAR_OPS):
+        # Exception: a `-` surrounded by alnum chars on both sides is kept as
+        # part of the word (kebab-case identifiers like `aria-label`,
+        # `data-foo`), since HTML/ARIA attribute names rely on this.
+        while i < n:
+            ch = code[i]
+            if ch in ' \t\r\n{}"\'' or ch in ONE_CHAR_OPS:
+                if (
+                    ch == "-"
+                    and word
+                    and word[-1].isalnum()
+                    and i + 1 < n
+                    and code[i + 1].isalnum()
+                ):
+                    word.append(advance_one())
+                    continue
+                break
             word.append(advance_one())
         word = "".join(word)
         if not word:
@@ -1569,6 +1584,11 @@ def parse_literal_value(raw):
                 if os.environ.get("TW_WARN_LITERAL_PARSE", "").strip().lower() in {"1", "true", "yes", "on"}:
                     log(f"⚠️ Literal parse failed, treating as string: {raw!r}", level="warning")
                 return raw
+    if stripped.startswith('"') and stripped.endswith('"') and len(stripped) >= 2:
+        try:
+            return json.loads(stripped)
+        except json.JSONDecodeError:
+            return stripped[1:-1]
     return raw
 
 

{tw_framework-0.2.4 → tw_framework-0.2.6}/tw_framework/framework.py

@@ -605,6 +605,20 @@ def parse_value_token(tokens, i):
     return compiler.parse_literal_value(expr), j
 
 
+def parse_single_value_token(tokens, i):
+    """Parse exactly one literal token (STRING or WORD), without consuming
+    the rest of the line. Needed for directives that carry more than one
+    value on the same line, e.g. `auth "cookie" "redirect"`."""
+    if i >= len(tokens):
+        raise RuntimeError("Expected value token")
+    tok = tokens[i]
+    if tok.type == "STRING":
+        return tok.value, i + 1
+    if tok.type == "WORD" and tok.value not in {"{", "}", "[", "]", "(", ")"}:
+        return compiler.parse_literal_value(tok.value), i + 1
+    raise RuntimeError("Expected value token")
+
+
 def parse_middleware_rules(project_root: str) -> List[dict]:
     source_path = next((path for path in middleware_file_candidates(project_root) if os.path.exists(path)), None)
     if not source_path:
@@ -890,16 +904,16 @@ def parse_middleware_rules(project_root: str) -> List[dict]:
                     if i < len(tokens) and tokens[i].type == "BRACE" and tokens[i].value == "{":
                         rule["auth_rule"], i = parse_auth_block(i)
                     else:
-                        cookie_name, i = parse_value_token(tokens, i)
-                        redirect_to, i = parse_value_token(tokens, i)
+                        cookie_name, i = parse_single_value_token(tokens, i)
+                        redirect_to, i = parse_single_value_token(tokens, i)
                         rule["auth"] = {"cookie": cookie_name, "redirect": redirect_to}
                 elif key == "header":
-                    header_name, i = parse_value_token(tokens, i)
-                    header_value, i = parse_value_token(tokens, i)
+                    header_name, i = parse_single_value_token(tokens, i)
+                    header_value, i = parse_single_value_token(tokens, i)
                     rule["headers"].append((str(header_name), str(header_value)))
                 elif key == "cookie":
-                    cookie_name, i = parse_value_token(tokens, i)
-                    cookie_value, i = parse_value_token(tokens, i)
+                    cookie_name, i = parse_single_value_token(tokens, i)
+                    cookie_value, i = parse_single_value_token(tokens, i)
                     rule["cookies"].append((str(cookie_name), str(cookie_value)))
                 elif key == "rate_limit":
                     rule["rate_limit"], i = parse_rate_limit_block(i)
@@ -1153,12 +1167,12 @@ def parse_api_route_file(tw_path: str) -> Dict[str, dict]:
             elif key in {"json", "text", "html", "redirect"}:
                 spec[key], i = parse_value_token(tokens, i)
             elif key == "header":
-                header_name, i = parse_value_token(tokens, i)
-                header_value, i = parse_value_token(tokens, i)
+                header_name, i = parse_single_value_token(tokens, i)
+                header_value, i = parse_single_value_token(tokens, i)
                 spec["headers"].append((header_name, header_value))
             elif key == "cookie":
-                cookie_name, i = parse_value_token(tokens, i)
-                cookie_value, i = parse_value_token(tokens, i)
+                cookie_name, i = parse_single_value_token(tokens, i)
+                cookie_value, i = parse_single_value_token(tokens, i)
                 spec["cookies"].append((cookie_name, cookie_value))
             else:
                 raise RuntimeError(f"Unsupported API key `{key}` in {tw_path}")

{tw_framework-0.2.4 → tw_framework-0.2.6}/tw_framework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tw-framework
-Version: 0.2.4
+Version: 0.2.6
 Summary: TW framework CLI with create, dev, build, and deploy commands
 Author: TW Framework
 Requires-Python: >=3.9