jac-client 0.2.6__py3-none-any.whl → 0.2.11__py3-none-any.whl

jac_client/plugin/client.jac

@@ -18,14 +18,29 @@ glob JsonValue: TypeAlias = None | str | int | float | bool | list['JsonValue']
      ],
      StatusCode: TypeAlias = Literal[(200, 201, 400, 401, 404, 503)];
 
-"""Jac Client Module Introspector."""
-class JacClientModuleIntrospector(ModuleIntrospector) {
-    def render_page(
-        self: JacClientModuleIntrospector,
+"""Builds HTML head content from meta data."""
+obj HeaderBuilder {
+    has meta_data: dict,
         function_name: str,
-        args: dict[(str, Any)],
-        username: str
-    ) -> dict[str, Any];
+        DEFAULTS: dict = {
+            "charset": "UTF-8",
+            "viewport": "width=device-width,initial-scale=1"
+        },
+        standard_tags: list = [
+            "description",
+            "keywords",
+            "author",
+            "robots",
+            "theme_color"
+        ];
+
+    def build_head -> str;
+    def _get_value(key: str) -> str;
+    def _build_special_tags -> list[str];
+    def _build_meta_tags -> list[str];
+    def _build_og_tags -> list[str];
+    def _build_link_tags -> list[str];
+    def _build_generic_meta_tags -> list[str];
 }
 
 """Jac Client."""
@@ -38,15 +53,18 @@ class JacClient {
         module: types.ModuleType, force: bool = False
     ) -> ClientBundle;
 
-    @hookimpl
-    static def get_module_introspector(
-        module_name: str, base_path: (str | None)
-    ) -> ModuleIntrospector;
-
     @hookimpl
     static def send_static_file(
         handler: BaseHTTPRequestHandler,
         file_path: Path,
         content_type: (str | None) = None
     ) -> None;
+
+    @hookimpl
+    static def render_page(
+        introspector: ModuleIntrospector,
+        function_name: str,
+        args: dict[(str, Any)],
+        username: str
+    ) -> dict[str, Any];
 }

jac_client/plugin/client_runtime.cl.jac

@@ -1,6 +1,7 @@
 """Client-side runtime for Jac JSX and walker interactions."""
 
 import from 'react' { * as React }
+import from 'react' { useState as reactUseState, useEffect as reactUseEffect }
 import from 'react-dom/client' { * as ReactDOM }
 import from 'react-router-dom' {
     HashRouter as ReactRouterHashRouter,
@@ -12,27 +13,36 @@ import from 'react-router-dom' {
     useLocation as reactRouterUseLocation,
     useParams as reactRouterUseParams
 }
+import from 'react-error-boundary' { ErrorBoundary }
 
-def : pub __jacJsx(tag: any, props: dict = {}, children: any = []) -> any;
+def:pub __jacJsx(tag: any, props: dict = {}, children: any = []) -> any;
 
-glob : pub Router = ReactRouterHashRouter,
+# React hooks re-exported for auto-injection by `has` variables and `can with entry/exit` effects
+glob:
+    pub useState = reactUseState,
+     useEffect = reactUseEffect,
+     Router = ReactRouterHashRouter,
      Routes = ReactRouterRoutes,
      Route = ReactRouterRoute,
      Link = ReactRouterLink,
      Navigate = ReactRouterNavigate,
      useNavigate = reactRouterUseNavigate,
      useLocation = reactRouterUseLocation,
-     useParams = reactRouterUseParams;
+     useParams = reactRouterUseParams,
+     JacClientErrorBoundary = ErrorBoundary;
 
-def : pub useRouter -> dict;
-def : pub navigate(path: str) -> None;
-async def : pub __jacSpawn(left: str, right: str = "", fields: dict = {}) -> any;
-def : pub jacSpawn(left: str, right: str = "", fields: dict = {}) -> any;
-async def : pub __jacCallFunction(function_name: str, args: dict = {}) -> any;
-async def : pub jacSignup(username: str, password: str) -> dict;
-async def : pub jacLogin(username: str, password: str) -> bool;
-def : pub jacLogout -> None;
-def : pub jacIsLoggedIn -> bool;
-def : pub __getLocalStorage(key: str) -> str;
-def : pub __setLocalStorage(key: str, value: str) -> None;
-def : pub __removeLocalStorage(key: str) -> None;
+def:pub useRouter -> dict;
+def:pub navigate(path: str) -> None;
+async def:pub __jacSpawn(left: str, right: str = "", fields: dict = {}) -> any;
+def:pub jacSpawn(left: str, right: str = "", fields: dict = {}) -> any;
+async def:pub __jacCallFunction(function_name: str, args: dict = {}) -> any;
+async def:pub jacSignup(username: str, password: str) -> dict;
+async def:pub jacLogin(username: str, password: str) -> bool;
+def:pub jacLogout -> None;
+def:pub jacIsLoggedIn -> bool;
+def:pub __getLocalStorage(key: str) -> str;
+def:pub __setLocalStorage(key: str, value: str) -> None;
+def:pub __removeLocalStorage(key: str) -> None;
+def:pub ErrorFallback(error: str, resetErrorBoundary: any) -> any;
+def:pub errorOverlay(filePath: str, errors: str) -> any;
+# React Router components

jac_client/plugin/impl/client.impl.jac

@@ -30,13 +30,6 @@ impl JacClient.send_static_file(
     }
 }
 
-"""Get a module introspector for the supplied module."""
-impl JacClient.get_module_introspector(
-    module_name: str, base_path: (str | None)
-) -> ModuleIntrospector {
-    return JacClientModuleIntrospector(module_name, base_path);
-}
-
 """Build a client bundle for the supplied module."""
 impl JacClient.build_client_bundle(
     module: types.ModuleType, force: bool = False
@@ -57,12 +50,13 @@ impl JacClient.get_client_bundle_builder -> ViteClientBundleBuilder {
         # Fallback to base_path_dir if no project root found
         base_path = base_path_dir;
     }
-    # package.json should only exist in .client-build/.jac-client.configs/
-    generated_package_json = base_path / '.client-build' / '.jac-client.configs' / 'package.json';
+    # Use ViteBundler to get the client directory
+    bundler = ViteBundler(base_path);
+    client_dir = bundler._get_client_dir();
+    # package.json should only exist in .jac/client/configs/
+    generated_package_json = client_dir / 'configs' / 'package.json';
     # Generate package.json if it doesn't exist
     if not generated_package_json.exists() {
-        # Use ViteBundler to generate package.json from config.json
-        bundler = ViteBundler(base_path);
         generated_path = bundler.create_package_json();
         # Verify the file was created and resolve to absolute path
         if not generated_path.exists() {
@@ -80,7 +74,7 @@ impl JacClient.get_client_bundle_builder -> ViteClientBundleBuilder {
             f'package.json not found at {package_json_path}. Expected at {generated_package_json}'
         ) ;
     }
-    output_dir = base_path / '.client-build' / 'dist';
+    output_dir = client_dir / 'dist';
     runtime_path = Path(__file__).with_name('client_runtime.cl.jac');
     return ViteClientBundleBuilder(
         runtime_path=runtime_path,
@@ -91,22 +85,22 @@ impl JacClient.get_client_bundle_builder -> ViteClientBundleBuilder {
 }
 
 """Render HTML page for client function using the Vite bundle."""
-impl JacClientModuleIntrospector.render_page(
-    self: JacClientModuleIntrospector,
+impl JacClient.render_page(
+    introspector: ModuleIntrospector,
     function_name: str,
     args: dict[(str, Any)],
     username: str
 ) -> dict[str, Any] {
-    self.load();
+    introspector.load();
     available_exports = (
-        set(self._client_manifest.get('exports', []))
-        or set(self.get_client_functions().keys())
+        set(introspector._client_manifest.get('exports', []))
+        or set(introspector.get_client_functions().keys())
     );
     if (function_name not in available_exports) {
         raise ValueError(f"Client function '{function_name}' not found") ;
     }
-    bundle_hash = self.ensure_bundle();
-    import from jaclang.project.config { find_project_root }
+    bundle_hash = introspector.ensure_bundle();
+    import from jaclang.project.config { find_project_root, get_config }
     # Find project root by looking for jac.toml (base_path_dir might be src/ for entry files)
     base_path_dir = Path(Jac.base_path_dir);
     project_root_result = find_project_root(base_path_dir);
@@ -116,19 +110,125 @@ impl JacClientModuleIntrospector.render_page(
         # Fallback to base_path_dir if no project root found
         base_path = base_path_dir;
     }
-    dist_dir = base_path / '.client-build' / 'dist';
+    # Get client directory from config or use default
+    config = get_config();
+    if config is not None {
+        dist_dir = config.get_client_dir() / 'dist';
+    } else {
+        dist_dir = base_path / '.jac' / 'client' / 'dist';
+    }
     css_link = '';
-    css_file = dist_dir / 'main.css';
+    css_file = dist_dir / 'styles.css';
     if css_file.exists() {
         css_hash = hashlib.sha256(css_file.read_bytes()).hexdigest()[:8];
-        css_link = f'<link rel="stylesheet" href="/static/main.css?hash={css_hash}"/>';
+        css_link = f'<link rel="stylesheet" href="/static/styles.css?hash={css_hash}"/>';
     }
-    head_content = f'<meta charset="utf-8"/>\n            <title>{html.escape(
-        function_name
-    )}</title>';
+    # Get meta data from config
+    client_cfg = config.get_plugin_config("client") if config else None;
+    meta_data = client_cfg.get("app_meta_data", {}) if client_cfg else {};
+    head_builder = HeaderBuilder(meta_data, function_name);
+    head_content = head_builder.build_head();
     if css_link {
         head_content += f"\n            {css_link}";
     }
     page = f'<!DOCTYPE html><html lang="en"><head>{head_content}</head><body><div id="root"></div><script src="/static/client.js?hash={bundle_hash}" defer></script></body></html>';
-    return {'html': page, 'bundle_hash': bundle_hash, 'bundle_code': self._bundle.code};
+    return {
+        'html': page,
+        'bundle_hash': bundle_hash,
+        'bundle_code': introspector._bundle.code
+    };
+}
+
+"""Build complete HTML head."""
+impl HeaderBuilder.build_head -> str {
+    lines: list = [];
+    lines.extend(self._build_special_tags());  # charset, viewport, title
+    lines.extend(self._build_meta_tags());  # description, robots, etc
+    lines.extend(self._build_og_tags());  # Open Graph
+    lines.extend(self._build_link_tags());  # canonical, icon, etc
+    lines.extend(self._build_generic_meta_tags());  # custom meta_* tags
+    return "\n            ".join(lines);
+}
+
+"""Build generic meta tags (meta_* prefix for any custom metadata)."""
+impl HeaderBuilder._build_generic_meta_tags -> list[str] {
+    lines: list = [];
+    for (key, val) in self.meta_data.items() {
+        if key.startswith("meta_") and val {
+            # meta_custom_field → name="custom-field"
+            name = key[5:].replace("_", "-");
+            lines.append(f'<meta name={name} content={html.escape(str(val))} />');
+        }
+    }
+    return lines;
+}
+
+"""Build link tags (link_* prefix or special cases)."""
+impl HeaderBuilder._build_link_tags -> list[str] {
+    lines: list = [];
+    special_links = {
+        "canonical": "canonical",
+        "icon": "icon",
+        "apple_touch_icon": "apple-touch-icon",
+        "manifest": "manifest"
+    };
+    for (key, rel) in special_links.items() {
+        if val := self._get_value(key) {
+            lines.append(f'<link rel={rel} href={html.escape(str(val))} />');
+        }
+    }
+    for (key, val) in self.meta_data.items() {
+        if key.startswith("link_") and val {
+            # link_preconnect_google → rel="preconnect"
+            rel = key[5:].replace("_", "-");
+            lines.append(f'<link rel={rel} href={html.escape(str(val))} />');
+        }
+    }
+    return lines;
+}
+
+"""Build Open Graph tags (og_* prefix)."""
+impl HeaderBuilder._build_og_tags -> list[str] {
+    lines: list = [];
+    for (key, val) in self.meta_data.items() {
+        if key.startswith("og_") and val {
+            property_name = key[3:].replace("_", ":");
+            lines.append(
+                f'<meta property=og:{property_name} content={html.escape(str(val))} />'
+            );
+        }
+    }
+    return lines;
+}
+
+"""Build standard meta tags (description, robots, keywords, author, etc)."""
+impl HeaderBuilder._build_meta_tags -> list[str] {
+    lines: list = [];
+    for key in self.standard_tags {
+        if val := self._get_value(key) {
+            # Convert underscore to dash (theme_color → theme-color)
+            name = key.replace("_", "-");
+            lines.append(f'<meta name={name} content={html.escape(val)} />');
+        }
+    }
+    return lines;
+}
+
+"""Build special tags (charset, viewport, title)."""
+impl HeaderBuilder._build_special_tags -> list[str] {
+    lines: list = [];
+    if charset := self._get_value("charset") {
+        lines.append(f'<meta charset={html.escape(charset)} />');
+    }
+    if viewport := self._get_value("viewport") {
+        lines.append(f'<meta name="viewport" content={html.escape(viewport)} />');
+    }
+    title = self._get_value("title") or self.function_name;
+    lines.append(f'<title>{html.escape(title)}</title>');
+    return lines;
+}
+
+"""Get value with fallback to defaults."""
+impl HeaderBuilder._get_value(key: str) -> str {
+    return self.meta_data.get(key) or self.DEFAULTS.get(key);
 }

jac_client/plugin/impl/client_runtime.impl.jac

@@ -65,9 +65,11 @@ impl __jacSpawn(left: str, right: str = "", fields: dict = {}) -> any {
     );
     if not response.ok {
         error_text = await response.json();
-        raise Exception(f"Walker {walker} failed: {error_text}") ;
+        walker_name = f"{left}/{right}" if right else left;
+        raise Exception(f"Walker {walker_name} failed: {error_text}") ;
     }
-    return await response.json();
+    payload = await response.json();
+    return payload["data"] if payload["data"] else {};
 }
 
 impl jacSpawn(left: str, right: str = "", fields: dict = {}) -> any {
@@ -84,15 +86,21 @@ impl __jacCallFunction(function_name: str, args: dict = {}) -> any {
                 "Content-Type": "application/json",
                 "Authorization": f"Bearer {token}" if token else ""
             },
-            "body": JSON.stringify({"args": args})
+            "body": JSON.stringify(args)
         }
     );
-    if not response.ok {
-        error_text = await response.text();
-        raise Exception(f"Function {function_name} failed: {error_text}") ;
+    payload = await response.json();
+    if not payload["ok"] {
+        error_msg = payload["error"] if payload["error"] else "Unknown error";
+        raise Exception(f"Function {function_name} failed: {error_msg}") ;
     }
-    data = JSON.parse(await response.text());
-    return data["result"];
+    result = None;
+    try {
+        if payload["data"] and payload["data"]["result"] {
+            result = payload["data"]["result"];
+        }
+    } except Exception { }
+    return result;
 }
 
 impl jacSignup(username: str, password: str) -> dict {
@@ -106,7 +114,10 @@ impl jacSignup(username: str, password: str) -> dict {
     );
     if response.ok {
         data = JSON.parse(await response.text());
-        token = data["token"];
+        token = None;
+        if data["data"] and data["data"]["token"] {
+            token = data["data"]["token"];
+        }
         if token {
             __setLocalStorage("jac_token", token);
             return {"success": True, "token": token, "username": username};
@@ -139,7 +150,14 @@ impl jacLogin(username: str, password: str) -> bool {
     );
     if response.ok {
         data = JSON.parse(await response.text());
-        token = data["token"];
+        console.log("data", data);
+        token = None;
+        try {
+            if data["data"] and data["data"]["token"] {
+                token = data["data"]["token"];
+            }
+        } except Exception { }
+        console.log("token", token);
         if token {
             __setLocalStorage("jac_token", token);
             return True;
@@ -175,3 +193,157 @@ impl __removeLocalStorage(key: str) -> None {
         storage.removeItem(key);
     }
 }
+
+impl ErrorFallback(error: str, resetErrorBoundary: any) -> any {
+    return
+        <div
+            role="alert"
+            style={{
+                minHeight: "100vh",
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+                backgroundColor: "#f9fafb",
+                fontFamily: "system-ui, sans-serif",
+
+            }}
+        >
+            <div
+                role="alert"
+                style={{
+                    minHeight: "100vh",
+                    display: "flex",
+                    flexDirection: "column",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    backgroundColor: "#f9fafb",
+                    fontFamily: "system-ui, sans-serif",
+
+                }}
+            >
+                <h2 style={{color: "#dc2626", marginBottom: "12px"}}>
+                    🚨 Something went wrong
+                </h2>
+                <p style={{color: "#374151", marginBottom: "16px"}}>
+                    An unexpected error occurred. Please try again.
+                </p>
+                <pre
+                    style={{
+                        color: "#991b1b",
+                        background: "#fee2e2",
+                        padding: "12px",
+                        borderRadius: "8px",
+                        fontSize: "14px",
+                        overflowX: "auto",
+                        marginBottom: "16px",
+
+                    }}
+                >
+                    {error.error.message}
+                </pre>
+                <button
+                    onClick={lambda -> None { error.resetErrorBoundary();}}
+                    style={{
+                        backgroundColor: "#2563eb",
+                        color: "#fff",
+                        padding: "10px 16px",
+                        borderRadius: "8px",
+                        border: "none",
+                        cursor: "pointer",
+                        fontSize: "14px",
+
+                    }}
+                >
+                    🔄 Try again
+                </button>
+            </div>
+        </div>;
+}
+
+impl errorOverlay(filePath: str, errors: str) -> any {
+    return (
+        <div
+            style={{
+                position: "fixed",
+                top: 0,
+                left: 0,
+                width: "100%",
+                height: "100%",
+                background: "rgba(0, 0, 0, 0.85)",
+                color: "#fff",
+                fontFamily: "'Monaco', 'Menlo', 'Ubuntu Mono', monospace",
+                fontSize: 14,
+                zIndex: 999999,
+                overflow: "auto",
+                padding: 20,
+                boxSizing: "border-box",
+
+            }}
+        >
+            <div style={{maxWidth: 1200, margin: "0 auto"}}>
+                <div
+                    style={{
+                        background: "#d32f2f",
+                        color: "white",
+                        padding: "16px 24px",
+                        borderRadius: "8px 8px 0 0",
+                        fontSize: 18,
+                        fontWeight: "bold",
+
+                    }}
+                >
+                    ⚠️ Compilation Error
+                </div>
+                <div
+                    style={{
+                        background: "#1e1e1e",
+                        padding: 24,
+                        borderRadius: "0 0 8px 8px",
+
+                    }}
+                >
+                    <div style={{marginBottom: 16}}>
+                        <div style={{color: "#888", marginBottom: 8}}>
+                            File:
+                        </div>
+                        <div style={{color: "#64b5f6", fontWeight: "bold"}}>
+                            {filePath}
+                        </div>
+                    </div>
+                    <div>
+                        <div style={{color: "#888", marginBottom: 8}}>
+                            Error:
+                        </div>
+                        <pre
+                            style={{
+                                background: "#2d2d2d",
+                                padding: 16,
+                                borderRadius: 4,
+                                overflowX: "auto",
+                                margin: 0,
+                                borderLeft: "4px solid #d32f2f",
+                                lineHeight: 1.6,
+                                color: "#ff6b6b",
+
+                            }}
+                        >
+                            {errors}
+                        </pre>
+                    </div>
+                    <div
+                        style={{
+                            marginTop: 24,
+                            paddingTop: 16,
+                            borderTop: "1px solid #444",
+                            color: "#888",
+                            fontSize: 13,
+
+                        }}
+                    >
+                        💡 Fix the error and save the file to continue development.
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}