ssc_codegen 0.36.0__tar.gz → 0.36.2__tar.gz

{ssc_codegen-0.36.0 → ssc_codegen-0.36.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ssc_codegen
-Version: 0.36.0
+Version: 0.36.2
 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.36.0 → ssc_codegen-0.36.2}/pyproject.toml

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

{ssc_codegen-0.36.0 → ssc_codegen-0.36.2}/ssc_codegen/targets/golang/http_libs/nethttp.py

@@ -38,6 +38,13 @@ _NETHTTP_REST_RUNTIME: list[str] = [
     "\t\t\t\t}",
     "\t\t\t}",
     "\t\t}",
+    "\t\tif len(opts.Cookies) > 0 {",
+    "\t\t\tfor name, vs := range opts.Cookies {",
+    "\t\t\t\tfor _, v := range vs {",
+    "\t\t\t\t\treq.AddCookie(&http.Cookie{Name: name, Value: v})",
+    "\t\t\t\t}",
+    "\t\t\t}",
+    "\t\t}",
     '\t\tif opts.Body != "" {',
     "\t\t\treq.Body = io.NopCloser(strings.NewReader(opts.Body))",
     "\t\t}",

{ssc_codegen-0.36.0 → ssc_codegen-0.36.2}/ssc_codegen/targets/golang/rest.py

@@ -20,7 +20,9 @@ from ssc_codegen.ast import (
     PlaceholderTemplate,
     ResultAliasDef,
     ResultVariantDef,
+    Struct,
     StructBase,
+    StructType as ST,
 )
 from ssc_codegen.ast.struct import RequestHttp
 from ssc_codegen.naming import to_camel_case, to_pascal_case, to_snake_case
@@ -90,17 +92,18 @@ def render_body_json(tmpl: PlaceholderTemplate) -> str:
     return f"fmt.Sprintf({_go_str(fmt_str)}, {', '.join(args)})"
 
 
-def render_form_body(body: dict[str, PlaceholderTemplate]) -> str:
-    """Render a form-urlencoded dict body as ``url.Values{...}.Encode()``.
+def render_url_values(d: dict[str, PlaceholderTemplate]) -> str:
+    """Render a ``dict[str, PlaceholderTemplate]`` as ``url.Values{...}.Encode()``.
 
-    Keys are literal strings; values may contain placeholders (rendered via
-    ``fmt.Sprintf`` through ``render_url``). ``url.Values`` properly escapes
-    both keys and values per RFC 3986.
+    Shared by form-body and query-string rendering. Keys are literal
+    strings; values may contain placeholders (rendered via ``fmt.Sprintf``
+    through ``render_url``). ``url.Values`` properly escapes both keys
+    and values per RFC 3986. Empty dict → ``'""'``.
     """
-    if not body:
+    if not d:
         return '""'
     parts: list[str] = []
-    for k, tmpl in body.items():
+    for k, tmpl in d.items():
         val = (
             render_url(tmpl) if tmpl.has_placeholders else _go_str(tmpl.source)
         )
@@ -108,6 +111,43 @@ def render_form_body(body: dict[str, PlaceholderTemplate]) -> str:
     return f"url.Values{{{', '.join(parts)}}}.Encode()"
 
 
+def render_form_body(body: dict[str, PlaceholderTemplate]) -> str:
+    """Form-urlencoded body via ``url.Values.Encode()``."""
+    return render_url_values(body)
+
+
+def render_full_url(spec: RequestHttp) -> str:
+    """URL with query string from ``spec.params`` appended.
+
+    When params is empty, returns ``render_url(spec.url)`` unchanged.
+    Otherwise appends ``+ "?" + <url.Values.Encode()>`` to the base URL.
+    """
+    base = render_url(spec.url)
+    if not spec.params:
+        return base
+    return f'({base} + "?" + {render_url_values(spec.params)})'
+
+
+def _render_cookie_pairs(
+    spec: RequestHttp,
+) -> list[tuple[str, str]]:
+    """Render each cookie as ``(key_expr, value_expr)`` pair.
+
+    Value uses ``fmt.Sprintf`` if it contains placeholders (via ``render_url``),
+    otherwise a plain string literal. Returns ``[]`` when ``spec.cookies`` is
+    empty. Used by both the inline HTML-@request path (``req.AddCookie``) and
+    the REST path (``sscReqOpts.Cookies``).
+    """
+    pairs: list[tuple[str, str]] = []
+    for k, tmpl in spec.cookies.items():
+        key = _go_str(k)
+        value = (
+            render_url(tmpl) if tmpl.has_placeholders else _go_str(tmpl.source)
+        )
+        pairs.append((key, value))
+    return pairs
+
+
 # ===========================================================================
 # Placeholder parameter signature
 # ===========================================================================
@@ -154,9 +194,10 @@ def _build_opts(spec: RequestHttp, indent: str) -> list[str]:
     """Build sscReqOpts construction lines."""
     lines: list[str] = []
     has_headers = bool(spec.headers)
+    has_cookies = bool(spec.cookies)
     has_body = spec.body_kind not in ("empty", None) and spec.body is not None
 
-    if not has_headers and not has_body:
+    if not has_headers and not has_body and not has_cookies:
         return [f"{indent}nil"]
 
     lines.append(f"{indent}&sscReqOpts{{")
@@ -176,6 +217,9 @@ def _build_opts(spec: RequestHttp, indent: str) -> list[str]:
                 val = _go_str(tmpl.source)
             parts.append(f"{_go_str(k)}: []string{{{val}}}")
         lines.append(f"{indent}\tHeaders: sscHeaders{{{', '.join(parts)}}},")
+    if has_cookies:
+        parts = [f"{k}: []string{{{v}}}" for k, v in _render_cookie_pairs(spec)]
+        lines.append(f"{indent}\tCookies: sscHeaders{{{', '.join(parts)}}},")
     lines.append(f"{indent}}}")
     return lines
 
@@ -206,7 +250,7 @@ def emit_method_fetch(
     method_suffix = to_pascal_case(node.name) if node.name else "Fetch"
     func_name = f"New{name}{method_suffix}"
     ph_params = placeholder_params(spec)
-    url_expr = render_url(spec.url)
+    url_expr = render_full_url(spec)
 
     i1 = ctx.indent
     i2 = i1 + ctx.indent_char
@@ -226,6 +270,13 @@ def emit_method_fetch(
         )
         lines.append(f"{i2}req.Header.Set({_go_str(k)}, {val})")
 
+    # Cookies inline (per-cookie AddCookie — values may interpolate
+    # placeholders via fmt.Sprintf produced by _render_cookie_pairs).
+    for key, val in _render_cookie_pairs(spec):
+        lines.append(
+            f"{i2}req.AddCookie(&http.Cookie{{Name: {key}, Value: {val}}})"
+        )
+
     # Body inline (json/raw or form).
     if spec.body_kind in ("json", "raw") and spec.body is not None:
         if isinstance(spec.body, PlaceholderTemplate):
@@ -289,7 +340,13 @@ def emit_method_fetch(
             )
 
     # Construct parser from body.
-    lines.append(f"{i2}return New{name}(string(body))")
+    # (raw)struct constructor returns a single value (*Name), wrapper
+    # signature is (*Name, error) → must add `, nil`. HTML constructor
+    # already returns (*Name, error) so naked tuple pass-through works.
+    if isinstance(struct, Struct) and struct.type == ST.RAW:
+        lines.append(f"{i2}return New{name}(string(body)), nil")
+    else:
+        lines.append(f"{i2}return New{name}(string(body))")
     lines.append(f"{i1}}}")
     lines.append("")
     return lines
@@ -322,7 +379,7 @@ def emit_method_rest(
     method_name = to_pascal_case(node.name) if node.name else "Fetch"
     ph_params = placeholder_params(spec)
     matchers_var = f"{to_snake_case(struct.name)}Matchers"
-    url_expr = render_url(spec.url)
+    url_expr = render_full_url(spec)
 
     # Resolve return type from AST response_schema (no `any`).
     if node.response_schema:

{ssc_codegen-0.36.0 → ssc_codegen-0.36.2}/ssc_codegen/targets/golang/runtime.py

@@ -490,6 +490,7 @@ BASE_REST_RUNTIME: list[str] = [
     "",
     "type sscReqOpts struct {",
     "\tHeaders sscHeaders",
+    "\tCookies sscHeaders",
     "\tBody    string",
     "}",
     "",

{ssc_codegen-0.36.0 → ssc_codegen-0.36.2}/ssc_codegen/targets/golang/visitor.py

@@ -138,7 +138,6 @@ from ssc_codegen.naming import (
 from ssc_codegen.traversal.utils import (
     find_predicate_container,
     module_has_html_struct,
-    module_has_rest,
     module_uses_http,
 )
 from ssc_codegen.generation.builder import ModuleBuilder
@@ -321,7 +320,7 @@ class GoVisitor(BaseWalker):
         for imp in self._builder.std_imports:
             if imp not in self._all_std_imports:
                 self._all_std_imports.append(imp)
-        if module_has_rest(module_ast):
+        if module_uses_http(module_ast):
             self._has_rest = True
         out: dict[str, str] = {"": _gofmt("\n".join(lines))}
         for fname, provider in self._file_providers.items():
@@ -1890,6 +1889,8 @@ class GoVisitor(BaseWalker):
         spec = node.http_request
         if spec.body_kind == "form" and isinstance(spec.body, dict):
             self._builder.require_import('"net/url"')
+        if spec.params:
+            self._builder.require_import('"net/url"')
         self._builder.require_import('"' + self._http.import_path + '"')
         struct = node.parent
         name = (
@@ -1912,6 +1913,8 @@ class GoVisitor(BaseWalker):
         spec = node.http_request
         if spec.body_kind == "form" and isinstance(spec.body, dict):
             self._builder.require_import('"net/url"')
+        if spec.params:
+            self._builder.require_import('"net/url"')
         if node.response_path:
             self._builder.require_import('"github.com/tidwall/gjson"')
         return rest.emit_method_fetch(node, ctx, self._http)