jac-client 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

jac_client/plugin/cli.py

@@ -77,12 +77,16 @@ class JacCmd:
                     package_data = json.load(f)
 
                 # create temp folder
-                temp_folder = os.path.join(project_path, "temp")
-                os.makedirs(temp_folder, exist_ok=True)
+                src_folder = os.path.join(project_path, "src")
+                os.makedirs(src_folder, exist_ok=True)
 
-                # create static/client/js folder
-                client_js_folder = os.path.join(project_path, "static", "client", "js")
-                os.makedirs(client_js_folder, exist_ok=True)
+                # create build folder
+                build_folder = os.path.join(project_path, "build")
+                os.makedirs(build_folder, exist_ok=True)
+
+                # create assets folder for static assets (images, fonts, etc.)
+                assets_folder = os.path.join(project_path, "assets")
+                os.makedirs(assets_folder, exist_ok=True)
 
                 # Update package.json with Jac-specific configuration
                 package_data.update(
@@ -91,12 +95,23 @@ class JacCmd:
                         "description": f"Jac application: {name}",
                         "type": "module",
                         "scripts": {
-                            "build": "vite build",
+                            "build": "npm run compile && vite build",
                             "dev": "vite dev",
                             "preview": "vite preview",
+                            "compile": 'babel src --out-dir build --extensions ".jsx,.js" --out-file-extension .js',
+                        },
+                        "devDependencies": {
+                            "vite": "^6.4.1",
+                            "@babel/cli": "^7.28.3",
+                            "@babel/core": "^7.28.5",
+                            "@babel/preset-env": "^7.28.5",
+                            "@babel/preset-react": "^7.28.5",
+                        },
+                        "dependencies": {
+                            "react": "^19.2.0",
+                            "react-dom": "^19.2.0",
+                            "react-router-dom": "^6.30.1",
                         },
-                        "devDependencies": {"vite": "^5.0.0"},
-                        "dependencies": {"react": "^18.2.0", "react-dom": "^18.2.0"},
                     }
                 )
 
@@ -117,190 +132,91 @@ class JacCmd:
                 # Create a basic Jac file
                 main_jac_content = """
 # Pages
-cl def HomeView() -> any {
-    return <div
-    style={{
-        "minHeight": "100vh",
-        "fontFamily": "-apple-system, BlinkMacSystemFont, sans-serif"
-    }}>
-        <main
-        style={{
-            "maxWidth": "1200px",
-            "margin": "0 auto",
-            "padding": "60px 40px"
-        }}>
-            <div
-            style={{
-                "textAlign": "center",
-                "marginBottom": "80px"
-            }}>
-                <h1
-                style={{
-                    "fontSize": "56px",
-                    "marginBottom": "20px"
-                }}>
-                    Welcome to
-                    <span style={{"color": "#007bff"}}>OneLang</span>
-                </h1>
-                <p
-                style={{
-                    "fontSize": "20px",
-                    "color": "#666"
-                }}>
-                    One Language. One Stack. Zero Friction.
-                </p>
-            </div>
-
-            <div
-            style={{
-                "display": "grid",
-                "gridTemplateColumns": "repeat(2, 1fr)",
-                "gap": "24px",
-                "marginBottom": "60px"
-            }}>
-                <a
-                href="https://docs.jaseci.org"
-                target="_blank"
-                style={{
-                    "padding": "32px",
-                    "backgroundColor": "white",
-                    "border": "1px solid #eaeaea",
-                    "borderRadius": "8px",
-                    "textDecoration": "none",
-                    "color": "#000"
-                }}>
-                    <h3
-                    style={{
-                        "marginTop": "0",
-                        "marginBottom": "12px"
-                    }}>📖 Documentation</h3>
-                    <p style={{"color": "#666", "margin": "0"}}>
-                        Learn how to build with OneLang
-                    </p>
-                </a>
-                <a
-                href="https://docs.jaseci.org/learn"
-                target="_blank"
-                style={{
-                    "padding": "32px",
-                    "backgroundColor": "white",
-                    "border": "1px solid #eaeaea",
-                    "borderRadius": "8px",
-                    "textDecoration": "none",
-                    "color": "#000"
-                }}>
-                    <h3
-                    style={{
-                        "marginTop": "0",
-                        "marginBottom": "12px"
-                    }}>🎓 Learn</h3>
-                    <p style={{"color": "#666", "margin": "0"}}>
-                        Tutorials and guides
-                    </p>
-                </a>
-                <a
-                href="/examples"
-                style={{
-                    "padding": "32px",
-                    "backgroundColor": "white",
-                    "border": "1px solid #eaeaea",
-                    "borderRadius": "8px",
-                    "textDecoration": "none",
-                    "color": "#000"
-                }}>
-                    <h3
-                    style={{
-                        "marginTop": "0",
-                        "marginBottom": "12px"
-                    }}>💡 Examples</h3>
-                    <p style={{"color": "#666", "margin": "0"}}>
-                        Sample applications
-                    </p>
-                </a>
-                <a
-                href="https://github.com/Jaseci-Labs/jaseci"
-                target="_blank"
-                style={{
-                    "padding": "32px",
-                    "backgroundColor": "white",
-                    "border": "1px solid #eaeaea",
-                    "borderRadius": "8px",
-                    "textDecoration": "none",
-                    "color": "#000"
-                }}>
-                    <h3
-                    style={{
-                        "marginTop": "0",
-                        "marginBottom": "12px"
-                    }}>🔧 Community</h3>
-                    <p style={{"color": "#666", "margin": "0"}}>
-                        GitHub repository
-                    </p>
-                </a>
-            </div>
-
-            <footer
-            style={{
-                "borderTop": "1px solid #eaeaea",
-                "paddingTop": "40px",
-                "textAlign": "center",
-                "color": "#999"
-            }}>
-                <p>
-                    Get started by editing
-                    <code
-                    style={{
-                        "backgroundColor": "#f5f5f5",
-                        "padding": "2px 6px",
-                        "borderRadius": "3px"
-                    }}>app.jac</code>
-                </p>
-            </footer>
-        </main>
-    </div>;
+cl import from react {useState, useEffect}
+cl {
+    def app() -> any {
+        let [count, setCount] = useState(0);
+        useEffect(lambda -> None {
+            console.log("Count: ", count);
+        }, [count]);
+        return <div>
+            <h1>Hello, World!</h1>
+            <p>Count: {count}</p>
+            <button onClick={lambda e: any ->  None {setCount(count + 1);}}>Increment</button>
+        </div>;
+    }
 }
+"""
 
+                with open(os.path.join(project_path, "app.jac"), "w") as f:
+                    f.write(main_jac_content)
 
-# Main App component with declarative router
-cl def App() -> any {
-
-    home_route = {
-        "path": "/",
-        "component": lambda -> any { return HomeView(); },
-        "guard": None
-    };
-
-    routes = [home_route];
-    router = initRouter(routes, "/");
-
-    # add all the wrapper components here
-    return <div class="app-container">
-        {router.render()}
-    </div>;
-}
-
-# Main SPA entry point - simplified with reactive routing
-cl def jac_app() -> any {
-    return App();
+                # create .babelrc file
+                babel_config_content = """
+{
+    "presets": [[
+        "@babel/preset-env",
+        {
+            "modules": false
+        }
+    ], "@babel/preset-react"]
 }
 """
+                with open(os.path.join(project_path, ".babelrc"), "w") as f:
+                    f.write(babel_config_content)
+
+                # create vite.config.js file
+                vite_config_content = """
+import { defineConfig } from "vite";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig({
+  root: ".", // base folder
+  build: {
+    rollupOptions: {
+      input: "build/main.js", // your compiled entry file
+      output: {
+        entryFileNames: "client.[hash].js", // name of the final js file
+        assetFileNames: "[name].[ext]",
+      },
+    },
+    outDir: "dist", // final bundled output
+    emptyOutDir: true,
+  },
+  publicDir: false,
+  resolve: {
+    alias: {
+      "@jac-client/utils": path.resolve(__dirname, "src/client_runtime.js"),
+      "@jac-client/assets": path.resolve(__dirname, "src/assets"),
+    },
+  },
+});
 
-                with open(os.path.join(project_path, "app.jac"), "w") as f:
-                    f.write(main_jac_content)
+"""
+                with open(os.path.join(project_path, "vite.config.js"), "w") as f:
+                    f.write(vite_config_content)
 
                 # Create README.md
                 readme_content = f"""# {name}
 
-                ## Running Jac Code
+## Running Jac Code
 
-                To run your Jac code, use the Jac CLI:
+make sure node modules are installed:
+```bash
+npm install
+```
 
-                ```bash
-                jac serve app.jac
-                ```
+To run your Jac code, use the Jac CLI:
 
-                Happy coding with Jac!
-                """
+```bash
+jac serve app.jac
+```
+
+Happy coding with Jac!
+"""
 
                 with open(os.path.join(project_path, "README.md"), "w") as f:
                     f.write(readme_content)

jac_client/plugin/client.py

@@ -1,14 +1,79 @@
+import hashlib
+import html
+import mimetypes
 import types
+from http.server import BaseHTTPRequestHandler
 from pathlib import Path
+from typing import Any, Literal, TypeAlias
 
 from jaclang.runtimelib.client_bundle import ClientBundle
 from jaclang.runtimelib.machine import (
     JacMachine as Jac,
     hookimpl,
 )
+from jaclang.runtimelib.server import ModuleIntrospector
 
 from .vite_client_bundle import ViteClientBundleBuilder
 
+JsonValue: TypeAlias = (
+    None | str | int | float | bool | list["JsonValue"] | dict[str, "JsonValue"]
+)
+StatusCode: TypeAlias = Literal[200, 201, 400, 401, 404, 503]
+
+
+class JacClientModuleIntrospector(ModuleIntrospector):
+    """Jac Client Module Introspector."""
+
+    def render_page(
+        self, function_name: str, args: dict[str, Any], username: str
+    ) -> dict[str, Any]:
+        """Render HTML page for client function using the Vite bundle."""
+        self.load()
+
+        available_exports = set(self._client_manifest.get("exports", [])) or set(
+            self.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()
+
+        # Find CSS file in dist directory
+        base_path = Path(Jac.base_path_dir)
+        dist_dir = base_path / "dist"
+        css_link = ""
+
+        # Try to find CSS file (main.css is the default Vite output)
+        css_file = dist_dir / "main.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}"/>'
+            )
+
+        head_content = f'<meta charset="utf-8"/>\n            <title>{html.escape(function_name)}</title>'
+        if css_link:
+            head_content += f"\n            {css_link}"
+
+        page = (
+            "<!DOCTYPE html>"
+            '<html lang="en">'
+            "<head>"
+            f"{head_content}"
+            "</head>"
+            "<body>"
+            '<div id="root"></div>'
+            f'<script src="/static/client.js?hash={bundle_hash}" defer></script>'
+            "</body>"
+            "</html>"
+        )
+
+        return {
+            "html": page,
+            "bundle_hash": bundle_hash,
+            "bundle_code": self._bundle.code,
+        }
+
 
 class JacClient:
     """Jac Client."""
@@ -19,10 +84,9 @@ class JacClient:
         """Get the client bundle builder instance."""
         base_path = Path(Jac.base_path_dir)
         package_json_path = base_path / "package.json"
-        output_dir = base_path / "static" / "client" / "js"
+        output_dir = base_path / "dist"
         # Use the plugin's client_runtime.jac file
         runtime_path = Path(__file__).with_name("client_runtime.jac")
-        print(f"Runtime path: {runtime_path}")
         return ViteClientBundleBuilder(
             runtime_path=runtime_path,
             vite_package_json=package_json_path,
@@ -39,3 +103,48 @@ class JacClient:
         """Build a client bundle for the supplied module."""
         builder = JacClient.get_client_bundle_builder()
         return builder.build(module, force=force)
+
+    @staticmethod
+    @hookimpl
+    def get_module_introspector(
+        module_name: str, base_path: str | None
+    ) -> ModuleIntrospector:
+        """Get a module introspector for the supplied module."""
+        return JacClientModuleIntrospector(module_name, base_path)
+
+    @staticmethod
+    @hookimpl
+    def send_static_file(
+        handler: BaseHTTPRequestHandler,
+        file_path: Path,
+        content_type: str | None = None,
+    ) -> None:
+        """Send static file response (images, fonts, etc.).
+
+        Args:
+            handler: HTTP request handler
+            file_path: Path to the file to serve
+            content_type: MIME type (auto-detected if None)
+        """
+        from jaclang.runtimelib.server import ResponseBuilder
+
+        if not file_path.exists() or not file_path.is_file():
+            ResponseBuilder.send_json(handler, 404, {"error": "File not found"})
+            return
+
+        try:
+            file_content = file_path.read_bytes()
+            if content_type is None:
+                content_type, _ = mimetypes.guess_type(str(file_path))
+                if content_type is None:
+                    content_type = "application/octet-stream"
+
+            handler.send_response(200)
+            handler.send_header("Content-Type", content_type)
+            handler.send_header("Content-Length", str(len(file_content)))
+            handler.send_header("Cache-Control", "public, max-age=3600")
+            ResponseBuilder._add_cors_headers(handler)
+            handler.end_headers()
+            handler.wfile.write(file_content)
+        except Exception as exc:
+            ResponseBuilder.send_json(handler, 500, {"error": str(exc)})