ssc_codegen 0.29.5__tar.gz → 0.29.6__tar.gz

{ssc_codegen-0.29.5 → ssc_codegen-0.29.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.29.5
+Version: 0.29.6
 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.29.5 → ssc_codegen-0.29.6}/pyproject.toml

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

{ssc_codegen-0.29.5 → ssc_codegen-0.29.6}/ssc_codegen/converters/js_pure.py

@@ -588,6 +588,7 @@ def pre_struct_check_method(node: a.CheckMethod, ctx: ConverterContext):
     method_name = to_camel_case(node.name)
     return [
         f"{ctx.indent}{method_name}() " + "{",
+        f"{ctx.deeper().indent}let {ctx.var_name} = this._doc;",
     ]
 
 

{ssc_codegen-0.29.5 → ssc_codegen-0.29.6}/ssc_codegen/converters/py_bs4.py

@@ -307,7 +307,7 @@ def pre_utilities(node: a.Utilities, ctx: ConverterContext):
     runtime = ctx.meta.get("runtime_module")
     if runtime:
         names = runtime_export_names(node)
-        return [f"from {runtime} import " + ", ".join(names), ""]
+        return [f"from .{runtime} import " + ", ".join(names), ""]
 
     if module_is_rest_only(node):
         lines = []
@@ -808,16 +808,10 @@ def pre_struct_check_method(node: a.CheckMethod, ctx: ConverterContext):
     from ssc_codegen.converters.helpers import to_snake_case
 
     method_name = to_snake_case(node.name)
-    return [f"    def {method_name}(self) -> bool:"]
-
-
-# @PY_BASE_CONVERTER.post(a.CheckMethod)
-# def post_struct_check_method(node: a.CheckMethod, ctx: ConverterContext):
-#     return [
-#         "            return True",
-#         "        except Exception:",
-#         "            return False",
-#     ]
+    return [
+        f"    def {method_name}(self) -> bool:",
+        f"        {ctx.var_name} = self._doc",
+    ]
 
 
 @PY_BASE_CONVERTER(a.SplitDoc)

{ssc_codegen-0.29.5 → ssc_codegen-0.29.6}/ssc_codegen/converters/py_lxml.py

@@ -87,7 +87,7 @@ def pre_utilities(node: a.Utilities, ctx: ConverterContext):
     if runtime:
         names = py_bs4.runtime_export_names(node)
         names.append(_FALLBACK_HTML_EXPORT)
-        return [f"from {runtime} import " + ", ".join(names), ""]
+        return [f"from .{runtime} import " + ", ".join(names), ""]
 
     if py_bs4.module_is_rest_only(node):
         lines = []
@@ -352,7 +352,7 @@ def pre_expr_attr(node: a.Attr, ctx: ConverterContext):
 @PY_LXML_CONVERTER(a.PredCss)
 def pre_expr_pred_css(node: a.PredCss, ctx: ConverterContext):
     query = repr(node.query)
-    cond = f"bool(i.cssselect({query}))"
+    cond = f"i.cssselect({query}) is not None"
     if ctx.index == 0:
         return ctx.indent + cond
     return ctx.indent + f"and {cond}"
@@ -361,7 +361,7 @@ def pre_expr_pred_css(node: a.PredCss, ctx: ConverterContext):
 @PY_LXML_CONVERTER(a.PredXpath)
 def pre_expr_pred_xpath(node: a.PredXpath, ctx: ConverterContext):
     query = repr(node.query)
-    cond = f"bool(i.xpath({query}))"
+    cond = f"i.xpath({query}) is not None"
     if ctx.index == 0:
         return ctx.indent + cond
     return ctx.indent + f"and {cond}"