ssc_codegen 0.27.0__tar.gz → 0.29.0__tar.gz

{ssc_codegen-0.27.0 → ssc_codegen-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.27.0
+Version: 0.29.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.27.0 → ssc_codegen-0.29.0}/pyproject.toml

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

{ssc_codegen-0.27.0 → ssc_codegen-0.29.0}/ssc_codegen/converters/js_pure.py

@@ -259,7 +259,7 @@ def pre_utilities(node: a.Utilities, _: ConverterContext):
                 " * @property {string} cause",
                 " */",
                 "",
-                "async function _parseResponse(_resp) {",
+                "async function sscParseResponse(_resp) {",
                 "    const _status = _resp.status;",
                 "    const _headers = Object.fromEntries"
                 "([..._resp.headers.entries()]);",
@@ -268,7 +268,7 @@ def pre_utilities(node: a.Utilities, _: ConverterContext):
                 "    return [_status, _headers, _body];",
                 "}",
                 "",
-                "function _parseResponseAxios(_resp) {",
+                "function sscParseResponseAxios(_resp) {",
                 "    const _status = _resp.status;",
                 "    const _headers = {};",
                 "    for (const [k, v] of Object.entries(_resp.headers || {})) "
@@ -419,14 +419,17 @@ def pre_struct_item(node: a.StructItem, ctx: ConverterContext):
 def pre_struct_list(node: a.StructList, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructFlatList, post_callback="}")
 def pre_struct_flatlist(node: a.StructFlatList, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructDict, post_callback="}")
 def pre_struct_dict(node: a.StructDict, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructTable, post_callback="}")
 def pre_struct_table(node: a.StructTable, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
@@ -464,7 +467,7 @@ def pre_struct_rest(node: a.StructRest, ctx: ConverterContext):
     )
     lines.extend(doc_lines)
     lines.append(f"class {name} " + "{")
-    # _dispatchErr static method (first member of class body)
+    # sscDispatchErr static method (first member of class body)
     lines.extend(_emit_dispatch_err_js(node, ctx.deeper()))
     return lines
 
@@ -475,7 +478,7 @@ def pre_struct_docstring(node: a.StructDocstring, ctx: ConverterContext):
 
 
 def _emit_dispatch_err_js(node: a.Struct, ctx: ConverterContext) -> list[str]:
-    """Emit `_dispatchErr` static method inside a REST class body."""
+    """Emit `sscDispatchErr` static method inside a REST class body."""
     i1 = ctx.indent  # class-body level
     i2 = i1 + ctx.indent_char  # method body
     i3 = i2 + ctx.indent_char  # nested (if ...)
@@ -487,7 +490,7 @@ def _emit_dispatch_err_js(node: a.Struct, ctx: ConverterContext) -> list[str]:
     field_errors = [e for e in errors if e.conditions or e.required_keys]
 
     lines: list[str] = [
-        f"{i1}static _dispatchErr(_status, _headers, _body) {{",
+        f"{i1}static sscDispatchErr(_status, _headers, _body) {{",
         f"{i2}if (_status >= 200 && _status < 300) {{",
     ]
     for err in field_errors:
@@ -1964,7 +1967,9 @@ def _js_rest_method(node: a.RequestConfig, ctx: ConverterContext) -> list[str]:
 
     # Shared response extraction + dispatch
     parser_fn = (
-        "_parseResponseAxios" if http_client == "axios" else "_parseResponse"
+        "sscParseResponseAxios"
+        if http_client == "axios"
+        else "sscParseResponse"
     )
     parse_prefix = "" if http_client == "axios" else "await "
     lines.append(
@@ -1973,7 +1978,7 @@ def _js_rest_method(node: a.RequestConfig, ctx: ConverterContext) -> list[str]:
     )
     struct_pascal = to_pascal_case(struct_name) if struct_name else ""
     lines.append(
-        f"{i2}const _err = {struct_pascal}._dispatchErr(_status, _headers, _body);"
+        f"{i2}const _err = {struct_pascal}.sscDispatchErr(_status, _headers, _body);"
     )
     lines.append(f"{i2}if (_err !== null) return _err;")
     lines.append(

{ssc_codegen-0.27.0 → ssc_codegen-0.29.0}/ssc_codegen/converters/py_bs4.py

@@ -98,7 +98,7 @@ def runtime_export_names(node: a.Node) -> list[str]:
     names = list(_BASE_EXPORT_NAMES)
     if _module_has_rest(node):
         names.extend(
-            ["Ok", "Err", "UnknownErr", "TransportErr", "_parse_response"]
+            ["Ok", "Err", "UnknownErr", "TransportErr", "ssc_parse_response"]
         )
     return names
 
@@ -199,7 +199,7 @@ def rest_utilities(node: a.Node) -> list[str]:
         "    value: None = None",
         "    headers: Mapping[str, str] = field(default_factory=dict)",
         "\n\n",
-        "def _parse_response(_resp):",
+        "def ssc_parse_response(_resp):",
         "    _status = _resp.status_code",
         "    _headers = {k.lower(): v for k, v in _resp.headers.items()}",
         "    try:",
@@ -459,7 +459,7 @@ def _emit_dispatch_err(node: a.StructBase, ctx: ConverterContext) -> list[str]:
 
     lines: list[str] = [
         f"{i1}@staticmethod",
-        f"{i1}def _dispatch_err("
+        f"{i1}def ssc_dispatch_err("
         f"_status: int, _headers: Mapping[str, str], _body: Any"
         f") -> {union_type}:",
         f"{i2}if 200 <= _status < 300:",
@@ -597,7 +597,7 @@ def pre_struct_rest(node: a.StructRest, ctx: ConverterContext):
         lines.append("")
     # Class header
     lines.append(f"class {name}:")
-    # _dispatch_err staticmethod (first member of class body, needs class-level indent)
+    # ssc_dispatch_err staticmethod (first member of class body, needs class-level indent)
     lines.extend(_emit_dispatch_err(node, ctx.deeper()))
     return lines
 
@@ -1824,8 +1824,12 @@ def _emit_rest_methods(
         lines.append(f"{i3})")
         lines.append(f"{i2}except httpx.HTTPError as _exc:")
         lines.append(f"{i3}return TransportErr(cause=repr(_exc))")
-        lines.append(f"{i2}_status, _headers, _body = _parse_response(_resp)")
-        lines.append(f"{i2}_err = cls._dispatch_err(_status, _headers, _body)")
+        lines.append(
+            f"{i2}_status, _headers, _body = ssc_parse_response(_resp)"
+        )
+        lines.append(
+            f"{i2}_err = cls.ssc_dispatch_err(_status, _headers, _body)"
+        )
         lines.append(f"{i2}if _err is not None:")
         lines.append(f"{i3}return _err")
         lines.append(

{ssc_codegen-0.27.0 → ssc_codegen-0.29.0}/ssc_codegen/kdl/reader.py

@@ -145,7 +145,6 @@ class KdlNode:
     children: tuple[KdlNode, ...]
     span: Span
 
-    @classmethod
     @classmethod
     def _value_type_annotation(cls, entry_value: object) -> str | None:
         if isinstance(entry_value, CSTValue) and entry_value.type_annotation:

{ssc_codegen-0.27.0 → ssc_codegen-0.29.0}/ssc_codegen/main.py

@@ -280,6 +280,7 @@ def generate(
             parsed.append((kdl_file, ast))
         except Exception as exc:
             if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
                 typer.echo(traceback.format_exc(), err=True)
             else:
                 typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
@@ -320,6 +321,7 @@ def generate(
             typer.echo(f"  {kdl_file} -> {out_file}")
         except Exception as exc:
             if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
                 typer.echo(traceback.format_exc(), err=True)
             else:
                 typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
@@ -395,9 +397,18 @@ def check(
     total_errors = 0
 
     for kdl_file in kdl_files:
-        _, errs = parse_module(
-            kdl_file.read_text(encoding="utf-8"), source_path=kdl_file
-        )
+        try:
+            _, errs = parse_module(
+                kdl_file.read_text(encoding="utf-8"), source_path=kdl_file
+            )
+        except Exception as exc:
+            if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
+                typer.echo(traceback.format_exc(), err=True)
+            else:
+                typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
+            total_errors += 1
+            continue
         all_results.extend(errs)
 
         if errs: