ssc_codegen 0.24.0__tar.gz → 0.25.1__tar.gz

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.24.0
+Version: 0.25.1
 Summary: Python-dsl code converter to html parser for web scraping 
 Project-URL: Documentation, https://github.com/vypivshiy/selector_schema_codegen#readme
 Project-URL: Issues, https://github.com/vypivshiy/selector_schema_codegen/issues
@@ -57,7 +57,7 @@ uv tool install ssc_codegen
 `books.kdl`:
 
 ```kdl
-struct Book type=list {
+(list)struct Book {
     @split-doc { css-all ".product-card" }
 
     title { css ".title"; text }

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/README.md

@@ -25,7 +25,7 @@ uv tool install ssc_codegen
 `books.kdl`:
 
 ```kdl
-struct Book type=list {
+(list)struct Book {
     @split-doc { css-all ".product-card" }
 
     title { css ".title"; text }

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssc_codegen"
-version = "0.24.0"
+version = "0.25.1"
 description = "Python-dsl code converter to html parser for web scraping "
 readme = "README.md"
 requires-python = ">=3.10"

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/ssc_codegen/ast/jsondef.py

@@ -34,7 +34,7 @@ class JsonDefField(Node):
 class JsonDef(Node):
     """
     JSON mapping definition.
-    DSL: json Name { ... } / json Name array=#true { ... } / json Name path="a.b" { ... }
+    DSL: json Name { ... } / (array)json Name { ... } / json Name path="a.b" { ... }
     body: list[JsonDefField]
     """
 

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/ssc_codegen/core/linting.py

@@ -680,7 +680,8 @@ def lint_struct_node(
         )
         return
 
-    struct_type = lint.get_prop(node, "type") or "item"
+    raw = node.type_annotation
+    struct_type = raw[1:-1] if raw else (lint.get_prop(node, "type") or "item")
     if struct_type not in _VALID_STRUCT_TYPES:
         lint.error(
             node,
@@ -952,15 +953,6 @@ def lint_json_node(node: KdlNode, lint: LintContext, ctx: ParseContext) -> None:
             hint=f"rename or remove one of the 'json {name}' definitions",
         )
 
-    array_prop = node.properties.get("array")
-    if array_prop is not None and not isinstance(array_prop.value, bool):
-        lint.error(
-            node,
-            message=f"'array' property must be boolean (#true/#false), got {array_prop.value!r}",
-            code="E002",
-            hint="example: json MySchema array=#true { ... }",
-        )
-
     path_prop = node.properties.get("path")
     if path_prop is not None:
         path_val = str(path_prop.value)
@@ -975,9 +967,29 @@ def lint_json_node(node: KdlNode, lint: LintContext, ctx: ParseContext) -> None:
     # ── field-level checks ───────────────────────────────────────────────────
 
     seen_fields: set[str] = set()
-    for field_node in lint.get_children_nodes(node):
+    _lint_json_children(lint.get_children_nodes(node), lint, ctx, seen_fields)
+
+
+def _lint_json_children(
+    children: list[KdlNode],
+    lint: LintContext,
+    ctx: ParseContext,
+    seen_fields: set[str],
+) -> None:
+    """Lint json field children, expanding block define references."""
+    for field_node in children:
         field_name = lint.node_name(field_node)
         args = lint.get_args(field_node)
+
+        # Block define expansion
+        if not args and field_name in ctx.children_defines:
+            lint.push(field_name)
+            _lint_json_children(
+                ctx.children_defines[field_name], lint, ctx, seen_fields
+            )
+            lint.pop()
+            continue
+
         has_type = False
         has_skip = False
         for arg in args:

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/ssc_codegen/core/module_handler.py

@@ -47,9 +47,16 @@ def handle_struct(
     node: KdlNode, module: Module, ctx: ParseContext, lint: LintContext
 ) -> Struct:
     lint_struct_node(node, module, ctx, lint)
-    type_ = node.properties.get(
-        "type", KdlArg(value="item", span=node.span, is_identifier=True)
-    ).value
+    raw = node.type_annotation
+    type_ = (
+        raw[1:-1]
+        if raw
+        else str(
+            node.properties.get(
+                "type", KdlArg(value="item", span=node.span, is_identifier=True)
+            ).value
+        )
+    )
     keep_order = node.properties.get(
         "keep-order", KdlArg(value=False, span=node.span, is_identifier=False)
     ).value
@@ -83,9 +90,7 @@ def handle_json(
     node: KdlNode, module: Module, ctx: ParseContext, lint: LintContext
 ) -> JsonDef:
     name = str(node.args[0].value) if node.args else ""
-    is_array = node.properties.get(
-        "array", KdlArg(value=False, span=node.span, is_identifier=False)
-    ).value
+    is_array = node.type_annotation == "(array)"
     path = str(
         node.properties.get(
             "path", KdlArg(value="", span=node.span, is_identifier=False)
@@ -93,7 +98,7 @@ def handle_json(
     )
     json_def = JsonDef(parent=module, name=name, is_array=is_array, path=path)
     lint_json_node(node, lint, ctx)
-    parse_json_fields(node.children, json_def)
+    parse_json_fields(node.children, json_def, ctx)
     ctx.json_defs[json_def.name] = json_def
     if name:
         lint.json_kdl_nodes[name] = node

{ssc_codegen-0.24.0 → ssc_codegen-0.25.1}/ssc_codegen/core/struct_parser.py

@@ -184,8 +184,14 @@ def parse_struct(
     lint.walk_context = prev_ctx
 
 
-def parse_json_fields(nodes: Sequence[KdlNode], parent: JsonDef) -> None:
+def parse_json_fields(
+    nodes: Sequence[KdlNode], parent: JsonDef, ctx: ParseContext
+) -> None:
     for node in nodes:
+        # Block define expansion in json context
+        if not node.args and node.name in ctx.children_defines:
+            parse_json_fields(ctx.children_defines[node.name], parent, ctx)
+            continue
         name = node.name
         modifiers: list[str] = []
         type_ = ""