ssc_codegen 0.23.0__tar.gz → 0.25.0__tar.gz

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.23.0
+Version: 0.25.0
 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

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/pyproject.toml

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

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/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.23.0 → ssc_codegen-0.25.0}/ssc_codegen/ast/struct.py

@@ -291,10 +291,12 @@ class RequestConfig(Node):
 class ErrorResponse(Node):
     """
     Error response mapping for type=rest struct.
-    DSL: @error <status> <SchemaName> [field=value ...]
+    DSL: @error <status> <SchemaName> [keys...] [field=value ...]
 
     status: HTTP status code [100..599].
     schema_name: json schema reference for deserialised error body.
+    required_keys: key names that must exist in the JSON body (positional args).
+        Error triggers on matching status + all keys present.
     conditions: field=value pairs checked against the parsed JSON body.
         Keys are dot-paths (e.g. "response.success", "data.0.type").
         When non-empty, the error triggers on matching status + all conditions.
@@ -302,6 +304,7 @@ class ErrorResponse(Node):
 
     status: int = 0
     schema_name: str = ""
+    required_keys: list[str] = field(default_factory=list)
     conditions: dict[str, Any] = field(default_factory=dict)
 
 

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/ssc_codegen/converters/js_pure.py

@@ -348,6 +348,8 @@ def pre_typedef_field(node: a.TypeDefField, ctx: ConverterContext):
 
 def _js_err_subclass_name(struct_name: str, err) -> str:
     base = f"{to_pascal_case(struct_name)}Err{err.status}"
+    for key in err.required_keys:
+        base += to_pascal_case(key.replace(".", "_").replace("-", "_"))
     if err.conditions:
         for key in err.conditions:
             base += to_pascal_case(key.replace(".", "_").replace("-", "_"))
@@ -369,6 +371,8 @@ def _js_resolve_path_expr(body_var: str, path: str) -> str:
 def _js_condition_check_expr(err) -> str:
     """Build a compound JS condition expression for @error field conditions."""
     parts = []
+    for key in err.required_keys:
+        parts.append(f"{key!r} in _body")
     for path, value in err.conditions.items():
         lhs = _js_resolve_path_expr("_body", path)
         if isinstance(value, bool):
@@ -440,8 +444,10 @@ def _emit_dispatch_err_js(node: a.Struct, ctx: ConverterContext) -> list[str]:
     i3 = i2 + ctx.indent_char  # nested (if ...)
 
     errors = node.errors
-    status_errors = [e for e in errors if not e.conditions]
-    field_errors = [e for e in errors if e.conditions]
+    status_errors = [
+        e for e in errors if not e.conditions and not e.required_keys
+    ]
+    field_errors = [e for e in errors if e.conditions or e.required_keys]
 
     lines: list[str] = [
         f"{i1}static _dispatchErr(_status, _headers, _body) {{",

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/ssc_codegen/converters/py_helpers.py

@@ -257,6 +257,8 @@ def rest_utilities(node: a.Node) -> list[str]:
 def err_subclass_name(struct_name: str, err: a.ErrorResponse) -> str:
     """Naming: ``<Struct>Err<Status>[<ConditionKeys>]``."""
     base = f"{to_pascal_case(struct_name)}Err{err.status}"
+    for key in err.required_keys:
+        base += to_pascal_case(key.replace(".", "_").replace("-", "_"))
     if err.conditions:
         for key in err.conditions:
             base += to_pascal_case(key.replace(".", "_").replace("-", "_"))
@@ -304,6 +306,8 @@ def _resolve_path_expr(body_var: str, path: str) -> str:
 def _condition_check_expr(err: a.ErrorResponse) -> str:
     """Build a compound condition expression for an @error's field conditions."""
     parts: list[str] = []
+    for key in err.required_keys:
+        parts.append(f"{key!r} in _body")
     for path, value in err.conditions.items():
         lhs = _resolve_path_expr("_body", path)
         if isinstance(value, bool):
@@ -325,8 +329,10 @@ def emit_dispatch_err_py(node: a.Struct, ctx: ConverterContext) -> list[str]:
     i4 = i3 + ctx.indent_char
 
     errors = node.errors
-    status_errors = [e for e in errors if not e.conditions]
-    field_errors = [e for e in errors if e.conditions]
+    status_errors = [
+        e for e in errors if not e.conditions and not e.required_keys
+    ]
+    field_errors = [e for e in errors if e.conditions or e.required_keys]
     union_type = _rest_err_union_type(node)
 
     lines: list[str] = [

{ssc_codegen-0.23.0 → ssc_codegen-0.25.0}/ssc_codegen/core/linting.py

@@ -776,6 +776,26 @@ def lint_reserved_field(
                 message=f"@check {check_name or ''}must contain 'to-bool' to guarantee BOOL return type",
                 code="E100",
             )
+    elif field_name == "@error":
+        err_args = lint.get_args(node)
+        if len(err_args) < 2:
+            lint.error(
+                node,
+                message="@error requires both status and schema name",
+                code="E001",
+                hint="example: @error 404 ApiError",
+            )
+            return
+        positional_keys = set(err_args[2:])
+        property_keys = set(node.properties.keys())
+        duplicates = positional_keys & property_keys
+        if duplicates:
+            lint.error(
+                node,
+                message=f"@error has duplicate keys: {', '.join(sorted(duplicates))}",
+                code="E400",
+                hint="each key must be either a positional arg (presence check) or a property (value check)",
+            )
 
 
 def lint_regular_field(
@@ -932,15 +952,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)
@@ -955,9 +966,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.23.0 → ssc_codegen-0.25.0}/ssc_codegen/core/module_handler.py

@@ -83,9 +83,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 +91,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.23.0 → ssc_codegen-0.25.0}/ssc_codegen/core/struct_parser.py

@@ -146,6 +146,14 @@ def parse_struct(
             schema_name = str(
                 ctx.property_defines.get(node.args[1].value, node.args[1].value)
             )
+            required_keys: list[str] = []
+            for i in range(2, len(node.args)):
+                key = str(
+                    ctx.property_defines.get(
+                        node.args[i].value, node.args[i].value
+                    )
+                )
+                required_keys.append(key)
             conditions: dict[str, Any] = {}
             for k, v in node.properties.items():
                 key = str(ctx.property_defines.get(k, k))
@@ -155,6 +163,7 @@ def parse_struct(
                 parent=parent,
                 status=status_int,
                 schema_name=schema_name,
+                required_keys=required_keys,
                 conditions=conditions,
             )
             parent.body.append(err)
@@ -175,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_ = ""